Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Possibility to add indicators on busbarsection #354

Merged
merged 23 commits into from
Mar 3, 2022
Merged

Possibility to add indicators on busbarsection #354

merged 23 commits into from
Mar 3, 2022

Conversation

tadam50
Copy link
Contributor

@tadam50 tadam50 commented Feb 21, 2022 •
edited by flo-dup
Loading

Please check if the PR fulfills these requirements (please use '[x]' to check the checkboxes, or submit the PR and then click the checkboxes)

  • The commit message follows our guidelines
  • Tests for the changes have been added (for bug fixes / features)
  • Docs have been added / updated (for bug fixes / features)

Does this PR already have an issue describing the problem ?
Fixes #311

What kind of change does this PR introduce? (Bug fix, feature, docs update, ...)
feature

What is the current behavior? (You can also link to an open issue here)
No indicator provided on busbar section

What is the new behavior (if this is a feature change)?
Be able to add indicator on busbar section

Does this PR introduce a breaking change or deprecate an API?
No

@tadam50 tadam50 requested a review from flo-dup February 21, 2022 14:42
@tadam50 tadam50 self-assigned this Feb 21, 2022
flo-dup
flo-dup reviewed Feb 21, 2022
View reviewed changes
Copy link
Contributor

@flo-dup flo-dup left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Great! Similarly to the FeederInfo you can now add a BusInfo given by the LabelProvider to draw something in that new cell

@tadam50 tadam50 force-pushed the issue_311_add_lack_voltage_information_on_bus branch from ae96230 to d7e895b Compare February 22, 2022 14:16
@tadam50
Copy link
Contributor Author

tadam50 commented Feb 23, 2022 •
edited
Loading

Indicators drawn with bus style as following :
TestCase15GraphWithVoltageLackInfo

TestCase15GraphWithVoltageLackInfoTopological

flo-dup
flo-dup reviewed Feb 24, 2022
View reviewed changes
Copy link
Contributor

@flo-dup flo-dup left a comment •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Great job! I think we can now go a bit further, and always add a cell on the left but also one on the right. Then an enum parameter on the BusInfo will tell us if we need to draw it on the left or right side of the bus.

single-line-diagram-core/src/main/java/com/powsybl/sld/svg/DefaultSVGWriter.java Outdated Show resolved Hide resolved
single-line-diagram-core/src/main/java/com/powsybl/sld/svg/DefaultSVGWriter.java Outdated Show resolved Hide resolved
single-line-diagram-core/src/main/java/com/powsybl/sld/svg/DefaultSVGWriter.java Outdated Show resolved Hide resolved
single-line-diagram-core/src/main/resources/ConvergenceLibrary/components.json Outdated Show resolved Hide resolved
flo-dup
flo-dup requested changes Mar 2, 2022
View reviewed changes
single-line-diagram-core/src/main/java/com/powsybl/sld/layout/BlockOrganizer.java Outdated
@@ -34,6 +34,8 @@

private final boolean exceptionIfPatternNotHandled;

private final boolean voltageIndicatorOnBus;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

voltageIndicator is only one possible use for busInfo, so we should keep that keyword for the test only

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

maybe addCellForBusInfo, what do you think?

single-line-diagram-core/src/main/java/com/powsybl/sld/layout/LayoutParameters.java Outdated Show resolved Hide resolved
single-line-diagram-core/src/main/java/com/powsybl/sld/svg/BusInfo.java Outdated Show resolved Hide resolved
single-line-diagram-core/src/main/java/com/powsybl/sld/svg/BusInfo.java Outdated Show resolved Hide resolved
single-line-diagram-core/src/main/java/com/powsybl/sld/svg/DefaultSVGWriter.java
GraphMetadata metadata,
DiagramLabelProvider initProvider,
DiagramStyleProvider styleProvider) {
Optional<BusInfo> busInfo = initProvider.getBusInfo(busNode);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you can remove busInfo variable, you don't need it (use info in the lambda instead of busInfo.get())

single-line-diagram-core/src/main/java/com/powsybl/sld/svg/DefaultSVGWriter.java Show resolved Hide resolved
single-line-diagram-core/src/main/java/com/powsybl/sld/svg/DiagramStyles.java Outdated Show resolved Hide resolved
single-line-diagram-core/src/test/resources/VoltageIndicatorLibrary/components.css Show resolved Hide resolved
...ine-diagram-core/src/test/java/com/powsybl/sld/iidm/TestCase15GraphWithVoltageIndicator.java Outdated Show resolved Hide resolved
@flo-dup flo-dup marked this pull request as ready for review March 3, 2022 08:40
tadam50 added 21 commits March 3, 2022 10:48
@tadam50
Add cell if LackVoltageInformation is requested
4648ba6 
Signed-off-by: Thomas ADAM <tadam@silicom.fr>
@tadam50
Draw indicator on BusNode
73ed5f3 
Signed-off-by: Thomas ADAM <tadam@silicom.fr>
@tadam50
Missing resources/TestVoltageLackInformation.svg
7e32b4c 
Signed-off-by: Thomas ADAM <tadam@silicom.fr>
@tadam50
Fix code smells
65743cc 
Signed-off-by: Thomas ADAM <tadam@silicom.fr>
@tadam50
Add parametrized TestCase15GraphWithVoltageLackInfo class
3ab08e5 
Signed-off-by: Thomas ADAM <tadam@silicom.fr>
@tadam50
Add lack-voltage svg component and use it instead of drawing rect
5106277 
Signed-off-by: Thomas ADAM <tadam@silicom.fr>
@tadam50
Increase code coverage
462e9bd 
Signed-off-by: Thomas ADAM <tadam@silicom.fr>
@tadam50
Fix height of lack-voltage.svg
1e0ebc9 
Signed-off-by: Thomas ADAM <tadam@silicom.fr>
@tadam50
Add Left & right label on lack info indicator
6ea7dba 
Signed-off-by: Thomas ADAM <tadam@silicom.fr>
@tadam50
Add side info in BusInfo in order to draw indicator on the right or l…
a21e15a 
…eft sode of busbar

Signed-off-by: Thomas ADAM <tadam@silicom.fr>
@tadam50
Increase code coverage
bbcdf5f 
Signed-off-by: Thomas ADAM <tadam@silicom.fr>
@tadam50
Add VoltageIndicatorLibrary
8ada120 
Signed-off-by: Thomas ADAM <tadam@silicom.fr>
@tadam50
Rename LackVoltage to VoltageIndicator
a8f425a 
Signed-off-by: Thomas ADAM <tadam@silicom.fr>
@tadam50
Change BusInfo horizontal labels to vertical (top & bottom)
9ab2046 
Signed-off-by: Thomas ADAM <tadam@silicom.fr>
@tadam50
Add powered field into BusInfo in order to display lack voltage
4785da5 
Signed-off-by: Thomas ADAM <tadam@silicom.fr>
@tadam50
Add comments on BusInfo + add powerred into metadata
7cf96a8 
Signed-off-by: Thomas ADAM <tadam@silicom.fr>
@tadam50
Rename fields
7d6ead8 
Signed-off-by: Thomas ADAM <tadam@silicom.fr>
@tadam50
Take into account PR reviews comments
8c49e44 
Signed-off-by: Thomas ADAM <tadam@silicom.fr>
@tadam50
Increase code coverage
7a622ac 
Signed-off-by: Thomas ADAM <tadam@silicom.fr>
@tadam50
Use Voltage Indicator only for tests
207ab43 
Signed-off-by: Thomas ADAM <tadam@silicom.fr>
@tadam50
Fix checkstyles
7c6cd3c 
Signed-off-by: Thomas ADAM <tadam@silicom.fr>
tadam50 added 2 commits March 3, 2022 10:48
@tadam50
Draw BusInfo into BusNode group
cf9159c 
Signed-off-by: Thomas ADAM <tadam@silicom.fr>
@tadam50
Rename indicatorOnBus to AddCellForBusInfo
6d5c8f8 
Signed-off-by: Thomas ADAM <tadam@silicom.fr>
@tadam50 tadam50 force-pushed the issue_311_add_lack_voltage_information_on_bus branch from 71a1123 to 6d5c8f8 Compare March 3, 2022 09:49
@sonarqubecloud
Copy link

sonarqubecloud bot commented Mar 3, 2022

Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 0 Code Smells

99.1% 99.1% Coverage
0.0% 0.0% Duplication

@flo-dup flo-dup merged commit 6df567f into main Mar 3, 2022
@flo-dup flo-dup deleted the issue_311_add_lack_voltage_information_on_bus branch March 3, 2022 13:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@flo-dup flo-dup flo-dup approved these changes

Assignees

@tadam50 tadam50

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Possibility to add indicators on busbarsection
2 participants
@tadam50 @flo-dup