Unit for feeder info #555
Merged
Unit for feeder info #555
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Sophie Frasnedo <sophie.frasnedo@rte-france.com>
Signed-off-by: Sophie Frasnedo <sophie.frasnedo@rte-france.com>
Signed-off-by: Sophie Frasnedo <sophie.frasnedo@rte-france.com>
Signed-off-by: Sophie Frasnedo <sophie.frasnedo@rte-france.com>
tadam50
suggested changes
Sep 29, 2023
| @@ -220,10 +220,10 @@ private List<FeederInfo> buildFeederInfos(HvdcLine hvdcLine, NodeSide side) { | |||
|
|
|||
| private List<FeederInfo> buildFeederInfos(Terminal terminal) { | |||
| List<FeederInfo> feederInfoList = new ArrayList<>(); | |||
| feederInfoList.add(new DirectionalFeederInfo(ARROW_ACTIVE, terminal.getP(), valueFormatter::formatPower)); | |||
| feederInfoList.add(new DirectionalFeederInfo(ARROW_REACTIVE, terminal.getQ(), valueFormatter::formatPower)); | |||
| feederInfoList.add(new DirectionalFeederInfo(ARROW_ACTIVE, terminal.getP(), svgParameters.getActivePowerUnit(), (value, unit) -> valueFormatter.formatPower(value, unit))); | |||
There was a problem hiding this comment.
Replace this lambda with method reference 'valueFormatter::formatPower'.
| feederInfoList.add(new DirectionalFeederInfo(ARROW_ACTIVE, terminal.getP(), valueFormatter::formatPower)); | ||
| feederInfoList.add(new DirectionalFeederInfo(ARROW_REACTIVE, terminal.getQ(), valueFormatter::formatPower)); | ||
| feederInfoList.add(new DirectionalFeederInfo(ARROW_ACTIVE, terminal.getP(), svgParameters.getActivePowerUnit(), (value, unit) -> valueFormatter.formatPower(value, unit))); | ||
| feederInfoList.add(new DirectionalFeederInfo(ARROW_REACTIVE, terminal.getQ(), svgParameters.getReactivePowerUnit(), (value, unit) -> valueFormatter.formatPower(value, unit))); |
There was a problem hiding this comment.
Replace this lambda with method reference 'valueFormatter::formatPower'.
| if (this.svgParameters.isDisplayCurrentFeederInfo()) { | ||
| feederInfoList.add(new DirectionalFeederInfo(ARROW_CURRENT, terminal.getI(), valueFormatter::formatCurrent)); | ||
| feederInfoList.add(new DirectionalFeederInfo(ARROW_CURRENT, terminal.getI(), svgParameters.getCurrentUnit(), (value, unit) -> valueFormatter.formatCurrent(value, unit))); |
There was a problem hiding this comment.
Replace this lambda with method reference 'valueFormatter::formatCurrent'.
| @@ -42,6 +43,12 @@ public DirectionalFeederInfo(String componentType, double value, DoubleFunction< | |||
| this.value = value; | |||
| } | |||
|
|
|||
| public DirectionalFeederInfo(String componentType, double value, String unit, BiFunction<Double, String, String> formatter) { | |||
There was a problem hiding this comment.
Missing String userDefinedId parameter
Add a new constructor as following :
public DirectionalFeederInfo(String componentType, double value, String unit, BiFunction<Double, String, String> formatter, String userDefinedId) {
super(componentType, null, formatter.apply(value, unit), userDefinedId);
this.arrowDirection = Objects.requireNonNull(getArrowDirection(value));
this.value = value;
}And change current constructor as following:
public DirectionalFeederInfo(String componentType, double value, String unit, BiFunction<Double, String, String> formatter) {
this(componentType, value, unit, formatter, null);
}Signed-off-by: Sophie Frasnedo <sophie.frasnedo@rte-france.com>
Signed-off-by: Sophie Frasnedo <sophie.frasnedo@rte-france.com>
|
Kudos, SonarCloud Quality Gate passed! |
tadam50
approved these changes
Sep 29, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Please check if the PR fulfills these requirements
What kind of change does this PR introduce?
Feature
What is the current behavior?
While there were existing functions in the ValueFormatter to take into account units for feeder info, it was not possible to customize the diagram: no units were displayed.
What is the new behavior (if this is a feature change)?
The aim is to allow users to choose a unit for feeder info. The setters for single-line diagram feeder info units will be in the SvgParameters class.
The default value for each unit would be an empty String so as not to change the current behaviour.
Does this PR introduce a breaking change or deprecate an API?
No