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
=== modified file 'src/dk/aau/cs/io/TapnLegacyXmlLoader.java'
--- src/dk/aau/cs/io/TapnLegacyXmlLoader.java 2019-06-22 15:00:18 +0000
+++ src/dk/aau/cs/io/TapnLegacyXmlLoader.java 2019-10-04 08:25:54 +0000
@@ -28,7 +28,6 @@
28import pipe.dataLayer.Template;28import pipe.dataLayer.Template;
29import pipe.gui.CreateGui;29import pipe.gui.CreateGui;
30import pipe.gui.DrawingSurfaceImpl;30import pipe.gui.DrawingSurfaceImpl;
31import pipe.gui.Grid;
32import pipe.gui.Pipe;31import pipe.gui.Pipe;
33import pipe.gui.Zoomer;32import pipe.gui.Zoomer;
34import pipe.gui.graphicElements.AnnotationNote;33import pipe.gui.graphicElements.AnnotationNote;
@@ -538,9 +537,6 @@
538 int angle = getContentOfFirstSpecificChildNodesValueChildNodeAsInt(element,"orientation");537 int angle = getContentOfFirstSpecificChildNodesValueChildNodeAsInt(element,"orientation");
539 int priority = getContentOfFirstSpecificChildNodesValueChildNodeAsInt(element,"priority");538 int priority = getContentOfFirstSpecificChildNodesValueChildNodeAsInt(element,"priority");
540539
541 positionXInput = Grid.getModifiedX(positionXInput);
542 positionYInput = Grid.getModifiedY(positionYInput);
543
544 if (idInput.length() == 0 && nameInput.length() > 0) {540 if (idInput.length() == 0 && nameInput.length() > 0) {
545 idInput = nameInput;541 idInput = nameInput;
546 }542 }
@@ -570,9 +566,6 @@
570 int initialMarkingInput = getContentOfFirstSpecificChildNodesValueChildNodeAsInt(element, "initialMarking");566 int initialMarkingInput = getContentOfFirstSpecificChildNodesValueChildNodeAsInt(element, "initialMarking");
571 String invariant = getChildNodesContentOfValueChildNodeAsString(element, "invariant");567 String invariant = getChildNodesContentOfValueChildNodeAsString(element, "invariant");
572568
573 positionXInput = Grid.getModifiedX(positionXInput);
574 positionYInput = Grid.getModifiedY(positionYInput);
575
576 if (idInput.length() == 0 && nameInput.length() > 0) {569 if (idInput.length() == 0 && nameInput.length() > 0) {
577 idInput = nameInput;570 idInput = nameInput;
578 }571 }
579572
=== modified file 'src/dk/aau/cs/io/TapnXmlLoader.java'
--- src/dk/aau/cs/io/TapnXmlLoader.java 2019-06-22 15:00:18 +0000
+++ src/dk/aau/cs/io/TapnXmlLoader.java 2019-10-04 08:25:54 +0000
@@ -24,7 +24,6 @@
24import pipe.dataLayer.Template;24import pipe.dataLayer.Template;
25import pipe.gui.CreateGui;25import pipe.gui.CreateGui;
26import pipe.gui.DrawingSurfaceImpl;26import pipe.gui.DrawingSurfaceImpl;
27import pipe.gui.Grid;
28import pipe.gui.Pipe;27import pipe.gui.Pipe;
29import pipe.gui.Zoomer;28import pipe.gui.Zoomer;
30import pipe.gui.graphicElements.AnnotationNote;29import pipe.gui.graphicElements.AnnotationNote;
@@ -366,8 +365,6 @@
366 int priority = Integer.parseInt(transition.getAttribute("priority"));365 int priority = Integer.parseInt(transition.getAttribute("priority"));
367 boolean displayName = transition.getAttribute("displayName").equals("false") ? false : true;366 boolean displayName = transition.getAttribute("displayName").equals("false") ? false : true;
368367
369 positionXInput = Grid.getModifiedX(positionXInput);
370 positionYInput = Grid.getModifiedY(positionYInput);
371368
372 if (idInput.length() == 0 && nameInput.length() > 0) {369 if (idInput.length() == 0 && nameInput.length() > 0) {
373 idInput = nameInput;370 idInput = nameInput;
@@ -411,8 +408,6 @@
411 String invariant = place.getAttribute("invariant");408 String invariant = place.getAttribute("invariant");
412 boolean displayName = place.getAttribute("displayName").equals("false") ? false : true;409 boolean displayName = place.getAttribute("displayName").equals("false") ? false : true;
413 410
414 positionXInput = Grid.getModifiedX(positionXInput);
415 positionYInput = Grid.getModifiedY(positionYInput);
416411
417 if (idInput.length() == 0 && nameInput.length() > 0) {412 if (idInput.length() == 0 && nameInput.length() > 0) {
418 idInput = nameInput;413 idInput = nameInput;

Subscribers

People subscribed via source and target branches