~tapaal-contributor/tapaal/Typos-1896460

« back to all changes in this revision

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

  • Committer: srba.jiri at gmail
  • Date: 2020-08-19 12:02:28 UTC
  • mfrom: (1071.2.34 untimed-timed-gui)
  • Revision ID: srba.jiri@gmail.com-20200819120228-ktxdev3ou3kuj3l0
merged in lp:~tapaal-contributor/tapaal/untimed-timed-gui adding timed/untimed lens projection

Show diffs side-by-side

added added

removed removed

Lines of Context:
15
15
import javax.xml.parsers.DocumentBuilderFactory;
16
16
import javax.xml.parsers.ParserConfigurationException;
17
17
 
 
18
import dk.aau.cs.gui.TabContent;
18
19
import org.w3c.dom.Document;
19
20
import org.w3c.dom.Element;
20
21
import org.w3c.dom.Node;
51
52
import pipe.gui.graphicElements.tapn.TimedTransitionComponent;
52
53
 
53
54
public class PNMLoader {
54
 
        
55
 
        enum GraphicsType { Position, Offset }
 
55
 
 
56
    private final TabContent.TAPNLens lens = new TabContent.TAPNLens(false, false);
 
57
 
 
58
    enum GraphicsType { Position, Offset }
56
59
 
57
60
        private final NameGenerator nameGenerator = new NameGenerator();
58
61
        private final IdResolver idResolver = new IdResolver();
192
195
                
193
196
                if(isNetDrawable()){
194
197
                        //We parse the id as both the name and id as in tapaal name = id, and name/id has to be unique 
195
 
                        TimedPlaceComponent placeComponent = new TimedPlaceComponent(position.x, position.y, id, name.point.x, name.point.y);
 
198
                        TimedPlaceComponent placeComponent = new TimedPlaceComponent(position.x, position.y, id, name.point.x, name.point.y, lens);
196
199
                        placeComponent.setUnderlyingPlace(place);
197
200
                        template.guiModel().addPetriNetObject(placeComponent);
198
201
                }
236
239
                if(isNetDrawable()){
237
240
                        TimedTransitionComponent transitionComponent = 
238
241
                                //We parse the id as both the name and id as in tapaal name = id, and name/id has to be unique 
239
 
                                new TimedTransitionComponent(position.x, position.y, id, name.point.x, name.point.y,
240
 
                                                true, false, 0, 0);
 
242
                                new TimedTransitionComponent(position.x, position.y, id, name.point.x, name.point.y, true, false, 0, 0, lens);
241
243
                        transitionComponent.setUnderlyingTransition(transition);
242
244
                        template.guiModel().addPetriNetObject(transitionComponent);
243
245
                }
423
425
                TimedInputArcComponent arc = null;
424
426
                
425
427
                if(isNetDrawable()){
426
 
                        arc = new TimedInputArcComponent(new TimedOutputArcComponent(source, target, weight, arcId));
 
428
                        arc = new TimedInputArcComponent(new TimedOutputArcComponent(source, target, weight, arcId), lens);
427
429
                        arc.setUnderlyingArc(inputArc);
428
430
 
429
431
                        template.guiModel().addPetriNetObject(arc);