[WIP] Fixed layout type for NAD #918
Open
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: Christian Biasuzzi <[email protected]>
Signed-off-by: Christian Biasuzzi <[email protected]>
…instead of using the constructor which already reached the maximum allowed number of parameters Signed-off-by: Christian Biasuzzi <[email protected]>
|
|
flo-dup
reviewed
Dec 20, 2024
| @@ -369,6 +369,7 @@ typedef struct nad_parameters_struct { | |||
| int scaling_factor; | |||
| double radius_factor; | |||
| int edge_info_displayed; | |||
| char* metadata; | |||
There was a problem hiding this comment.
we'd rather put a fixed_positions parameter in get_network_area_diagram, together with an extract_positions utility method which would link to DiagramMetadata::getFixedPositions and DiagramMetadata::getFixedTextPositions.
| @@ -613,7 +613,8 @@ PYBIND11_MODULE(_pypowsybl, m) { | |||
|
|
|||
| py::enum_<pypowsybl::NadLayoutType>(m, "NadLayoutType") | |||
| .value("FORCE_LAYOUT", pypowsybl::NadLayoutType::FORCE_LAYOUT) | |||
| .value("GEOGRAPHICAL", pypowsybl::NadLayoutType::GEOGRAPHICAL); | |||
| .value("GEOGRAPHICAL", pypowsybl::NadLayoutType::GEOGRAPHICAL) | |||
| .value("FIXED", pypowsybl::NadLayoutType::FIXED); | |||
There was a problem hiding this comment.
Not really fond of having a "fixed" layout, knowing that the voltage levels with no position would be layout based on the force layout.
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
Does this PR already have an issue describing the problem?
no
What kind of change does this PR introduce?
feature
What is the current behavior?
What is the new behavior (if this is a feature change)?
Adds a FIXED type to the NadLayoutType list, to be able to generate a NAD with a fixed layout (through the powsybl-diagram's FixedLayout implementation). The NAD's fixed positions, encoded as JSON metadata (e.g., as a result of a previously computed NAD), can be specified in a new NadParameters' parameter 'metadata'. Diagram elements' positions that are not listed in the JSON metadata will be computed using the Force Layout.
Does this PR introduce a breaking change or deprecate an API?
If yes, please check if the following requirements are fulfilled
What changes might users need to make in their application due to this PR? (migration steps)
Other information:
Note that prerequisite to this PR is the powsybl-diagram's powsybl/powsybl-diagram#656Note that this PR uses powsybl-diagram's APIs available in v4.7.0: the pom.xml is changed temporarily to force that version.Note: comments to this PR suggested a different, scaled-down, approach. Please see PR #928