← Back to branch summary

~tapaal-contributor/tapaal/open-arg-file-1855267

« back to all changes in this revision

Viewing changes to src/dk/aau/cs/io/TapnLegacyXmlLoader.java

  • Committer: Jiri Srba
  • Date: 2019-10-08 09:28:19 UTC
  • mfrom: (1015.1.1 tapaal)
  • Revision ID: srba.jiri@gmail.com-20191008092819-yod63nbqex30sybk
merged in  lp:~tapaal-contributor/tapaal/layout-of-net-depends-on-gridsize-1429880 fixing loading of nets without aligning to current grid size

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/dk/aau/cs/io/TapnLegacyXmlLoader.java
28
28
import pipe.dataLayer.Template;
29
29
import pipe.gui.CreateGui;
30
30
import pipe.gui.DrawingSurfaceImpl;
31
 
import pipe.gui.Grid;
32
31
import pipe.gui.Pipe;
33
32
import pipe.gui.Zoomer;
34
33
import pipe.gui.graphicElements.AnnotationNote;
538
537
                int angle = getContentOfFirstSpecificChildNodesValueChildNodeAsInt(element,"orientation");
539
538
                int priority = getContentOfFirstSpecificChildNodesValueChildNodeAsInt(element,"priority");
540
539
 
541
 
                positionXInput = Grid.getModifiedX(positionXInput);
542
 
                positionYInput = Grid.getModifiedY(positionYInput);
543
 
 
544
540
                if (idInput.length() == 0 && nameInput.length() > 0) {
545
541
                        idInput = nameInput;
546
542
                }
570
566
                int initialMarkingInput = getContentOfFirstSpecificChildNodesValueChildNodeAsInt(element, "initialMarking");
571
567
                String invariant = getChildNodesContentOfValueChildNodeAsString(element, "invariant");
572
568
 
573
 
                positionXInput = Grid.getModifiedX(positionXInput);
574
 
                positionYInput = Grid.getModifiedY(positionYInput);
575
 
 
576
569
                if (idInput.length() == 0 && nameInput.length() > 0) {
577
570
                        idInput = nameInput;
578
571
                }