~tapaal-contributor/tapaal/tikz-export-label-placement-1820528

Viewing changes to src/dk/aau/cs/verification/TAPNComposer.java

Committer: srba.jiri at gmail
Date: 2019-03-13 08:30:09 UTC
mfrom: (975.5.2 removedUnusedFieldsFromXML)
Revision ID: srba.jiri@gmail.com-20190313083009-lta1rcyteit9goes

merged in branch lp:~yrke/tapaal/removedUnusedFieldsFromXML that removes unused offset fields for intial marking from XML and PNML input formats

files modified:
src/dk/aau/cs/io/PNMLWriter.java

src/dk/aau/cs/io/PNMLoader.java

src/dk/aau/cs/io/TapnLegacyXmlLoader.java

src/dk/aau/cs/io/TapnXmlLoader.java

src/dk/aau/cs/io/TimedArcPetriNetNetworkWriter.java

src/dk/aau/cs/verification/TAPNComposer.java

src/pipe/gui/graphicElements/Place.java

src/pipe/gui/graphicElements/tapn/TimedPlaceComponent.java

Show diffs side-by-side

added added

removed removed

src/dk/aau/cs/verification/TAPNComposer.java

186

oldPlace.getPositionY(),

187

oldPlace.getId(),

188

oldPlace.getNameOffsetX(),

189

oldPlace.getNameOffsetY(),

190

oldPlace.getMarkingOffsetXObject().doubleValue(),

191

oldPlace.getMarkingOffsetYObject().doubleValue()

189

oldPlace.getNameOffsetY()

192

190

);

193

191

newPlace.setUnderlyingPlace(constructedPlace);

194

192

newPlace.setName(uniquePlaceName);

235

233

oldPlace.getPositionY() + offset.value2() * greatestHeight,

236

234