Merge lp:~tapaal-contributor/tapaal/set-labels-to-default-smartdraw-1841192 into lp:tapaal

[Peter Haahr Taankvist]

Labels are properly set to default values when smartdrawing

[Jiri Srba (srba)]

review: Approve

=== modified file 'src/dk/aau/cs/gui/smartDraw/SmartDrawWorker.java'
--- src/dk/aau/cs/gui/smartDraw/SmartDrawWorker.java	2019-08-18 08:11:04 +0000
+++ src/dk/aau/cs/gui/smartDraw/SmartDrawWorker.java	2019-09-09 14:57:21 +0000
@@ -9,7 +9,7 @@
 
 import javax.swing.SwingWorker;
 
-import dk.aau.cs.gui.undo.SetNameLabelPositionCommand;
+import dk.aau.cs.gui.undo.UpdateNameLabelOffsetCommand;
 import dk.aau.cs.gui.undo.Command;
 import dk.aau.cs.gui.undo.MovePlaceTransitionObject;
 import dk.aau.cs.util.Require;
@@ -470,13 +470,15 @@
 	public void resetLabelsToDefault() {
 		for(PetriNetObject pNetObject : drawingSurface.getPNObjects()) {
 			if(pNetObject instanceof PlaceTransitionObject) {
-				Command cmd = new SetNameLabelPositionCommand(pNetObject, pipe.gui.Pipe.DEFAULT_OFFSET_X, pipe.gui.Pipe.DEFAULT_OFFSET_Y);
+				Command cmd = new UpdateNameLabelOffsetCommand(pipe.gui.Pipe.DEFAULT_OFFSET_X, pipe.gui.Pipe.DEFAULT_OFFSET_Y, ((PlaceTransitionObject) pNetObject).getNameOffsetX(), 
+																((PlaceTransitionObject) pNetObject).getNameOffsetY(), pNetObject);
 				cmd.redo();
 				undoManager.addEdit(cmd);
 				
 			}
 			else if(pNetObject instanceof Arc) {
-				Command cmd = new SetNameLabelPositionCommand(pNetObject, 0, 0);
+				Command cmd = new UpdateNameLabelOffsetCommand(0, 0, ((Arc) pNetObject).getNameOffsetX(), 
+						((Arc) pNetObject).getNameOffsetY(), pNetObject);
 				cmd.redo();
 				undoManager.addEdit(cmd);
 			}

=== removed file 'src/dk/aau/cs/gui/undo/SetNameLabelPositionCommand.java'
--- src/dk/aau/cs/gui/undo/SetNameLabelPositionCommand.java	2019-08-18 08:11:04 +0000
+++ src/dk/aau/cs/gui/undo/SetNameLabelPositionCommand.java	1970-01-01 00:00:00 +0000
@@ -1,35 +0,0 @@
-package dk.aau.cs.gui.undo;
-
-import pipe.gui.Grid;
-import pipe.gui.graphicElements.PetriNetObject;
-
-public class SetNameLabelPositionCommand extends Command {
-	PetriNetObject object;
-	double newX;
-	double newY;
-	double oldY;
-	double oldX;
-		
-	public SetNameLabelPositionCommand(PetriNetObject object, double xOffset, double yOffset) {
-		this.object = object;
-		this.newX = xOffset;
-		this.newY = yOffset;
-	}
-
-	@Override
-	public void undo() {
-		object.getNameLabel().setPosition(object.getX() + Grid.getModifiedX(oldX), object.getY() + Grid.getModifiedX(oldY));
-		object.updateOnMoveOrZoom();
-	}
-
-	@Override
-	public void redo() {
-		oldY = object.getNameOffsetXObject();
-		oldX = object.getNameOffsetYObject();
-		
-		object.getNameLabel().setPosition(object.getX() + Grid.getModifiedX(newX), object.getY() + Grid.getModifiedX(newY));
-		object.updateOnMoveOrZoom();
-	}
-}
-
-

=== modified file 'src/pipe/gui/graphicElements/Arc.java'
--- src/pipe/gui/graphicElements/Arc.java	2019-05-06 12:21:58 +0000
+++ src/pipe/gui/graphicElements/Arc.java	2019-09-09 14:57:21 +0000
@@ -116,6 +116,13 @@
 
 	abstract public void setWeight(Weight weight);
 	abstract public Weight getWeight();
+	
+	public double getNameOffsetX() {
+		return nameOffsetX;
+	}
+	public double getNameOffsetY() {
+		return nameOffsetY;
+	}
 
 	/**
 	 * Set source