Merge lp:~mhm/tapaal/tapaal-fix-873427 into lp:tapaal

[mhm]

Added, zoom "loading/update" functionality when setting the model of the DrawinSurface(DS), fixes bug 873427.

    When selecting a PN-component, the corresponding net is set as the model for the DS. But setting the model for the DS, did not update the zoom.

    This problem was introduced when adding the functionallity to copy components. Before models where only loaded from file, or as a new component, both always with zoom level 100%.

    But when copying a loaded component, it might not be at zoom level 100%, the new compenent had the right zoom level, but it was not loaded correctly.

    The graphical element where copied with a zoomed position, this did not work, as the graphical size of the elements where not "zoomed", and the position did not correspond to the zoom level.

    Now the graphical elements places, transitions and notes are copied with the original position, i.e. at zoom level 100%, and then they are updated when drawn on the DS.

[Jiri Srba (srba)]

Seems to work fine in most cases now, except for the situation when you have some control points
on arcs for making them curved. To see the problem, open e.g. the ABP in the examples, zoom to
50% and make a component copy. Then go to the copy and zoom back to 100%. All works as it should
except for the control points on arcs that stay as they were in the 50% zoom.

review: Needs Fixing

[mhm (mhm)]

I have now fixed the problem Jiri mentioned.

Ready for a new review.

review: Needs Resubmitting

[mhm (mhm)]

review: Approve

[Jiri Srba (srba)]

Works fine now.

review: Approve

[Kenneth Yrke Jørgensen (yrke)]

Seens to work great

review: Approve

[Jiri Srba (srba)]

review: Approve

=== modified file 'src/pipe/gui/DrawingSurfaceImpl.java'
--- src/pipe/gui/DrawingSurfaceImpl.java	2011-11-27 10:15:02 +0000
+++ src/pipe/gui/DrawingSurfaceImpl.java	2011-12-06 10:17:23 +0000
@@ -153,6 +153,7 @@
 		this.removeAll();
 		setPreferredSize(new Dimension(0,0));
 		for (PetriNetObject pnObject : guiModel.getPetriNetObjects()) {
+			pnObject.zoomUpdate(zoomer.getPercent());
 			add(pnObject);
 		}
 

=== modified file 'src/pipe/gui/graphicElements/AnnotationNote.java'
--- src/pipe/gui/graphicElements/AnnotationNote.java	2011-12-01 18:14:49 +0000
+++ src/pipe/gui/graphicElements/AnnotationNote.java	2011-12-06 10:17:23 +0000
@@ -326,7 +326,7 @@
 	}
 	
 	public AnnotationNote copy() {
-		AnnotationNote annotation = new AnnotationNote(note.getText(), Zoomer.getUnzoomedValue(this.getX(), zoom), Zoomer.getUnzoomedValue(this.getY(), zoom),	note.getWidth(), note.getHeight(), this.isShowingBorder());
+		AnnotationNote annotation = new AnnotationNote(note.getText(), getOriginalX(), getOriginalY(),	note.getWidth(), note.getHeight(), this.isShowingBorder());
 		AnnotationNoteHandler noteHandler = new AnnotationNoteHandler((DrawingSurfaceImpl)getParent(), annotation);
 		annotation.addMouseListener(noteHandler);
 		annotation.addMouseMotionListener(noteHandler);

=== modified file 'src/pipe/gui/graphicElements/ArcPath.java'
--- src/pipe/gui/graphicElements/ArcPath.java	2011-09-25 09:35:57 +0000
+++ src/pipe/gui/graphicElements/ArcPath.java	2011-12-06 10:17:23 +0000
@@ -312,6 +312,12 @@
 	public void addPoint(double x, double y, boolean type) {
 		pathPoints.add(new ArcPathPoint((float) x, (float) y, type, this));
 	}
+	
+	public void addPoint(double x, double y, boolean type,int zoom) {		
+		pathPoints.add(new ArcPathPoint((float) x, (float) y, type, this,zoom));
+	}
+	
+	
 
 	public void addPoint() {
 		pathPoints.add(new ArcPathPoint(this));

=== modified file 'src/pipe/gui/graphicElements/ArcPathPoint.java'
--- src/pipe/gui/graphicElements/ArcPathPoint.java	2011-09-23 20:48:39 +0000
+++ src/pipe/gui/graphicElements/ArcPathPoint.java	2011-12-06 10:17:23 +0000
@@ -44,7 +44,7 @@
 
 	private ArcPathPoint() {
 		copyPasteable = false; // we can't copy & paste indivial arc points!
-		zoom = 100;
+		zoom = Pipe.ZOOM_DEFAULT;
 	}
 
 	public ArcPathPoint(ArcPath a) {
@@ -59,6 +59,11 @@
 		setPointLocation(x, y);
 		pointType = _pointType;
 	}
+	
+	public ArcPathPoint(float x, float y, boolean _pointType, ArcPath a, int zoomLevel) {
+		this(x,y,_pointType,a);
+		zoom = zoomLevel;
+	}
 
 	/**
 	 * @author Nadeem
@@ -74,7 +79,7 @@
 	public void setPointLocation(float x, float y) {
 		double realX = Zoomer.getUnzoomedValue(x, zoom);
 		double realY = Zoomer.getUnzoomedValue(y, zoom);
-		realPoint.setLocation(realX, realY);
+		getRealPoint().setLocation(realX, realY);
 		point.setLocation(x, y);
 		setBounds((int) x - SIZE, (int) y - SIZE, 2 * SIZE + SIZE_OFFSET, 2
 				* SIZE + SIZE_OFFSET);
@@ -286,11 +291,19 @@
 		} else {
 			SIZE = 3;
 		}
-		float x = Zoomer.getZoomedValue(realPoint.x, zoom);
-		float y = Zoomer.getZoomedValue(realPoint.y, zoom);
+		float x = Zoomer.getZoomedValue(getRealPoint().x, zoom);
+		float y = Zoomer.getZoomedValue(getRealPoint().y, zoom);
 		point.setLocation(x, y);
 		setBounds((int) x - SIZE, (int) y - SIZE, 2 * SIZE + SIZE_OFFSET, 2
 				* SIZE + SIZE_OFFSET);
 	}
 
+	public Point2D.Float getRealPoint() {
+		return realPoint;
+	}
+
+	public void setRealPoint(Point2D.Float realPoint) {
+		this.realPoint = realPoint;
+	}
+
 }

=== modified file 'src/pipe/gui/graphicElements/PetriNetObject.java'
--- src/pipe/gui/graphicElements/PetriNetObject.java	2011-10-14 12:03:06 +0000
+++ src/pipe/gui/graphicElements/PetriNetObject.java	2011-12-06 10:17:23 +0000
@@ -44,7 +44,7 @@
 	protected boolean markedAsDeleted = false;
 
 	// Integer value which represents a zoom percentage
-	protected int zoom = 100;
+	protected int zoom = Pipe.ZOOM_DEFAULT;
 	private DataLayer guiModel;
 
 	public PetriNetObject() {

=== modified file 'src/pipe/gui/graphicElements/tapn/TimedOutputArcComponent.java'
--- src/pipe/gui/graphicElements/tapn/TimedOutputArcComponent.java	2011-09-23 21:23:31 +0000
+++ src/pipe/gui/graphicElements/tapn/TimedOutputArcComponent.java	2011-12-06 10:17:23 +0000
@@ -78,17 +78,18 @@
 	}
 
 	public TimedOutputArcComponent(TimedOutputArcComponent arc) {
+		zoom = arc.zoom;
 		label = new NameLabel(zoom);
-		
 		myPath = new ArcPath(this);
 		for (int i = 0; i <= arc.myPath.getEndIndex(); i++) {
-			myPath.addPoint(arc.myPath.getPoint(i).getX(), arc.myPath.getPoint(i).getY(), arc.myPath.getPointType(i));
+			myPath.addPoint(arc.myPath.getPoint(i).getX(), arc.myPath.getPoint(i).getY(), arc.myPath.getPointType(i),zoom);
 		}
 		myPath.createPath();
 		this.updateBounds();
 		id = arc.id;
 		this.setSource(arc.getSource());
 		this.setTarget(arc.getTarget());
+		
 	}
 
 	public TimedOutputArcComponent paste(double despX, double despY,
@@ -209,22 +210,22 @@
 	}
 
 	public TimedOutputArcComponent copy(TimedArcPetriNet tapn, DataLayer guiModel, Hashtable<PlaceTransitionObject, PlaceTransitionObject> oldToNewMapping) {
-		TimedOutputArcComponent arc = new TimedOutputArcComponent(this);
-		arc.setSource(oldToNewMapping.get(this.getSource()));
-		arc.setTarget(oldToNewMapping.get(this.getTarget()));
-		arc.setUnderlyingArc(tapn.getOutputArcFromTransitionAndPlace(tapn.getTransitionByName(outputArc.source().name()), tapn.getPlaceByName(outputArc.destination().name())));
-		
-		arc.getSource().addConnectFrom(arc);
-		arc.getTarget().addConnectTo(arc);
-		
-		ArcHandler arcHandler = new ArcHandler((DrawingSurfaceImpl)getParent(), arc);
-		arc.addMouseListener(arcHandler);
+		TimedOutputArcComponent newCopyArc = new TimedOutputArcComponent(this);
+		newCopyArc.setSource(oldToNewMapping.get(this.getSource()));
+		newCopyArc.setTarget(oldToNewMapping.get(this.getTarget()));
+		newCopyArc.setUnderlyingArc(tapn.getOutputArcFromTransitionAndPlace(tapn.getTransitionByName(outputArc.source().name()), tapn.getPlaceByName(outputArc.destination().name())));
+		
+		newCopyArc.getSource().addConnectFrom(newCopyArc);
+		newCopyArc.getTarget().addConnectTo(newCopyArc);
+				
+		ArcHandler arcHandler = new ArcHandler((DrawingSurfaceImpl)getParent(), newCopyArc);
+		newCopyArc.addMouseListener(arcHandler);
 		//arc.addMouseWheelListener(arcHandler);
-		arc.addMouseMotionListener(arcHandler);
-		
-		arc.setGuiModel(guiModel);
-		
-		return arc;
+		newCopyArc.addMouseMotionListener(arcHandler);
+		
+		newCopyArc.setGuiModel(guiModel);
+		
+		return newCopyArc;
 	}
 
 }

=== modified file 'src/pipe/gui/graphicElements/tapn/TimedPlaceComponent.java'
--- src/pipe/gui/graphicElements/tapn/TimedPlaceComponent.java	2011-09-23 21:23:31 +0000
+++ src/pipe/gui/graphicElements/tapn/TimedPlaceComponent.java	2011-12-06 10:17:23 +0000
@@ -368,7 +368,7 @@
 	}
 
 	public TimedPlaceComponent copy(TimedArcPetriNet tapn, DataLayer guiModel) {
-		TimedPlaceComponent placeComponent = new TimedPlaceComponent(positionX, positionY, id, place.name(), nameOffsetX, nameOffsetY, 0, markingOffsetX, markingOffsetY, capacity);
+		TimedPlaceComponent placeComponent = new TimedPlaceComponent(getPositionXObject(), getPositionYObject(), id, place.name(), nameOffsetX, nameOffsetY, 0, markingOffsetX, markingOffsetY, capacity);
 		placeComponent.setUnderlyingPlace(tapn.getPlaceByName(place.name()));
 
 		LabelHandler labelHandler = new LabelHandler(placeComponent.getNameLabel(), placeComponent);

=== modified file 'src/pipe/gui/graphicElements/tapn/TimedTransitionComponent.java'
--- src/pipe/gui/graphicElements/tapn/TimedTransitionComponent.java	2011-09-25 10:07:00 +0000
+++ src/pipe/gui/graphicElements/tapn/TimedTransitionComponent.java	2011-12-06 10:17:23 +0000
@@ -173,7 +173,7 @@
 	}
 
 	public TimedTransitionComponent copy(TimedArcPetriNet tapn, DataLayer guiModel) {
-		TimedTransitionComponent transitionComponent = new TimedTransitionComponent(positionX, positionY, id, transition.name(), nameOffsetX, nameOffsetY, true, false, getAngle(), 0);
+		TimedTransitionComponent transitionComponent = new TimedTransitionComponent(getPositionXObject(), getPositionYObject(), id, transition.name(), nameOffsetX, nameOffsetY, true, false, getAngle(), 0);
 		transitionComponent.setUnderlyingTransition(tapn.getTransitionByName(transition.name()));
 		
 		LabelHandler labelHandler = new LabelHandler(transitionComponent.getNameLabel(), transitionComponent);