Up to N FeederInfos #341
Merged
Up to N FeederInfos #341
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: Thomas ADAM <tadam@silicom.fr>
Signed-off-by: Thomas ADAM <tadam@silicom.fr>
Signed-off-by: Thomas ADAM <tadam@silicom.fr>
Signed-off-by: Thomas ADAM <tadam@silicom.fr>
…IntraMargin parameter Signed-off-by: Thomas ADAM <tadam@silicom.fr>
Signed-off-by: Thomas ADAM <tadam@silicom.fr>
flo-dup
requested changes
Jan 25, 2022
Comment on lines
788
to
796
| // If not enough space to have layoutParameters.getArrowDistance() at both sides of the 2 feeder infos, | ||
| // we compute the distance between feeder anchor and first feeder info so that the two feeder infos are centered. | ||
| double distFeederAnchorToFirstFeederInfoCenter = | ||
| distancePoints >= 2 * layoutParameters.getFeederInfosOuterMargin() + 2 * componentSize.getHeight() | ||
| ? layoutParameters.getFeederInfosOuterMargin() | ||
| : (distancePoints - 2 * componentSize.getHeight()) / 2; | ||
| double x = pointA.getX() + cosAngle * (distFeederAnchorToFirstArrowCenter + shift); | ||
| double y = pointA.getY() + sinAngle * (distFeederAnchorToFirstArrowCenter + shift); | ||
| double x = pointA.getX() + cosAngle * (distFeederAnchorToFirstFeederInfoCenter + shift); | ||
| double y = pointA.getY() + sinAngle * (distFeederAnchorToFirstFeederInfoCenter + shift); | ||
|
|
There was a problem hiding this comment.
Could you delete this code? I think there's no use to keep it now that the user is responsible for giving enough space for the feederInfos
There was a problem hiding this comment.
I've changed as following :
double distFeederAnchorToFirstFeederInfoCenter = layoutParameters.getFeederInfosOuterMargin()
| @@ -851,15 +851,15 @@ protected void insertFeederInfos(String prefixId, | |||
| points.add(new Point(feederNode.getDiagramCoordinates())); | |||
| } | |||
|
|
|||
| int iArrow = 0; | |||
| double shiftFeederInfo2 = 0; | |||
Signed-off-by: Thomas ADAM <tadam@silicom.fr>
|
Kudos, SonarCloud Quality Gate passed! |
flo-dup
approved these changes
Jan 26, 2022
MarinPinchinatLoth
pushed a commit
that referenced
this pull request
Feb 8, 2022
* Adding feederInfosIntraMargin parameter in LayoutParameters * Rename feederArrowSymmetry to feederInfoSymmetry in LayoutParameters * Rename arrowDistance to feederInfosOuterMargin in LayoutParameters * Rename minSpaceForFeederArrow to spaceForFeederInfos in LayoutParameters * Rename Arrow to FeederInfo in DefaultSVGWriter * Rename Arrow to FeederInfo in LayoutParameters * Add new test with 5 feeder info Signed-off-by: Thomas ADAM <tadam@silicom.fr> Signed-off-by: Marin Pinchinat-Loth <marin.pinchinat@rte-france.com>
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.
Signed-off-by: Thomas ADAM tadam@silicom.fr
Please check if the PR fulfills these requirements (please use
'[x]'to check the checkboxes, or submit the PR and then click the checkboxes)Does this PR already have an issue describing the problem ? If so, link to this issue using
'#XXX'and skip the restFixes #303
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)
Only 2 FeederInfos expected
What is the new behavior (if this is a feature change)?
Add more that 2 FeederInfos
Does this PR introduce a breaking change or deprecate an API? If yes, check the following:
Other information:
(if any of the questions/checkboxes don't apply, please delete them entirely)