Merge lp:~tapaal-contributor/tapaal/arc-label-position-on-template-copy-1820176 into lp:tapaal

Proposed by Peter Haahr Taankvist
Status: Merged
Approved by: Jiri Srba
Approved revision: 999
Merged at revision: 999
Proposed branch: lp:~tapaal-contributor/tapaal/arc-label-position-on-template-copy-1820176
Merge into: lp:tapaal
Diff against target: 23 lines (+6/-0)
1 file modified
src/pipe/gui/graphicElements/tapn/TimedOutputArcComponent.java (+6/-0)
To merge this branch: bzr merge lp:~tapaal-contributor/tapaal/arc-label-position-on-template-copy-1820176
Reviewer Review Type Date Requested Status
Jiri Srba Approve
Review via email: mp+364648@code.launchpad.net

Commit message

Arc label positions will correctly be copied when copying a template.

To post a comment you must log in.
Revision history for this message
Jiri Srba (srba) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/pipe/gui/graphicElements/tapn/TimedOutputArcComponent.java'
2--- src/pipe/gui/graphicElements/tapn/TimedOutputArcComponent.java 2019-03-13 07:27:29 +0000
3+++ src/pipe/gui/graphicElements/tapn/TimedOutputArcComponent.java 2019-03-16 14:00:17 +0000
4@@ -14,6 +14,7 @@
5 import pipe.dataLayer.DataLayer;
6 import pipe.gui.CreateGui;
7 import pipe.gui.DrawingSurfaceImpl;
8+import pipe.gui.Grid;
9 import pipe.gui.Pipe;
10 import pipe.gui.Zoomer;
11 import pipe.gui.graphicElements.Arc;
12@@ -102,6 +103,11 @@
13 id = arc.id;
14 this.setSource(arc.getSource());
15 this.setTarget(arc.getTarget());
16+ this.setNameOffsetX(arc.getNameOffsetXObject());
17+ this.setNameOffsetY(arc.getNameOffsetYObject());
18+ this.getNameLabel().setPosition(
19+ Grid.getModifiedX((int) (arc.getNameLabel().getXPosition() + Zoomer.getZoomedValue(this.nameOffsetX, zoom))),
20+ Grid.getModifiedY((int) (arc.getNameLabel().getYPosition() + Zoomer.getZoomedValue(this.nameOffsetY, zoom))));
21
22 //XXX: se note in funcation
23 addMouseHandler();

Subscribers

People subscribed via source and target branches