TAPAAL

Merge lp:~tapaal-contributor/tapaal/layout-of-net-depends-on-gridsize-1429880 into lp:tapaal

  1. layout-of-net-depends-on-gridsize-1429880
  2. Merge into trunk
Proposed by Peter Haahr Taankvist
Status: Merged
Approved by: Jiri Srba
Approved revision: 1016
Merged at revision: 1016
Proposed branch: lp:~tapaal-contributor/tapaal/layout-of-net-depends-on-gridsize-1429880
Merge into: lp:tapaal
Diff against target: 61 lines (+0/-12)
2 files modified
src/dk/aau/cs/io/TapnLegacyXmlLoader.java (+0/-7)
src/dk/aau/cs/io/TapnXmlLoader.java (+0/-5)
To merge this branch: bzr merge lp:~tapaal-contributor/tapaal/layout-of-net-depends-on-gridsize-1429880
Reviewer Review Type Date Requested Status
Jiri Srba Approve
Review via email: mp+373629@code.launchpad.net

Commit message

positions of petrinet objects not longer depend on the size of the grid when loading a net. They are placed exactly on the specified coordinates.

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/dk/aau/cs/io/TapnLegacyXmlLoader.java'
2--- src/dk/aau/cs/io/TapnLegacyXmlLoader.java 2019-06-22 15:00:18 +0000
3+++ src/dk/aau/cs/io/TapnLegacyXmlLoader.java 2019-10-04 08:25:54 +0000
4@@ -28,7 +28,6 @@
5 import pipe.dataLayer.Template;
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.AnnotationNote;
12@@ -538,9 +537,6 @@
13 int angle = getContentOfFirstSpecificChildNodesValueChildNodeAsInt(element,"orientation");
14 int priority = getContentOfFirstSpecificChildNodesValueChildNodeAsInt(element,"priority");
15
16- positionXInput = Grid.getModifiedX(positionXInput);
17- positionYInput = Grid.getModifiedY(positionYInput);
18-
19 if (idInput.length() == 0 && nameInput.length() > 0) {
20 idInput = nameInput;
21 }
22@@ -570,9 +566,6 @@
23 int initialMarkingInput = getContentOfFirstSpecificChildNodesValueChildNodeAsInt(element, "initialMarking");
24 String invariant = getChildNodesContentOfValueChildNodeAsString(element, "invariant");
25
26- positionXInput = Grid.getModifiedX(positionXInput);
27- positionYInput = Grid.getModifiedY(positionYInput);
28-
29 if (idInput.length() == 0 && nameInput.length() > 0) {
30 idInput = nameInput;
31 }
32
33=== modified file 'src/dk/aau/cs/io/TapnXmlLoader.java'
34--- src/dk/aau/cs/io/TapnXmlLoader.java 2019-06-22 15:00:18 +0000
35+++ src/dk/aau/cs/io/TapnXmlLoader.java 2019-10-04 08:25:54 +0000
36@@ -24,7 +24,6 @@
37 import pipe.dataLayer.Template;
38 import pipe.gui.CreateGui;
39 import pipe.gui.DrawingSurfaceImpl;
40-import pipe.gui.Grid;
41 import pipe.gui.Pipe;
42 import pipe.gui.Zoomer;
43 import pipe.gui.graphicElements.AnnotationNote;
44@@ -366,8 +365,6 @@
45 int priority = Integer.parseInt(transition.getAttribute("priority"));
46 boolean displayName = transition.getAttribute("displayName").equals("false") ? false : true;
47
48- positionXInput = Grid.getModifiedX(positionXInput);
49- positionYInput = Grid.getModifiedY(positionYInput);
50
51 if (idInput.length() == 0 && nameInput.length() > 0) {
52 idInput = nameInput;
53@@ -411,8 +408,6 @@
54 String invariant = place.getAttribute("invariant");
55 boolean displayName = place.getAttribute("displayName").equals("false") ? false : true;
56
57- positionXInput = Grid.getModifiedX(positionXInput);
58- positionYInput = Grid.getModifiedY(positionYInput);
59
60 if (idInput.length() == 0 && nameInput.length() > 0) {
61 idInput = nameInput;

Subscribers

People subscribed via source and target branches