Merge lp:~tapaal-contributor/tapaal/undo-namelabel-movement-1834783 into lp:tapaal

[Peter Haahr Taankvist]

Can now undo movement of name labels

[Jiri Srba (srba)]

Two things to fix:

1. Please, remove the debugging information.

2. ctrl-z does not work after automatic layout was run (it seems that it is not enabled in the menu)

review: Needs Fixing

[lp:~tapaal-contributor/tapaal/undo-namelabel-movement-1834783]

1014. By Peter Taankvist <email address hidden> on 2019-08-21

Removed debugging lines

[Jiri Srba (srba)]

Point 1 is fixed, I could not reproduce point one (maybe I had some problems with keyboard) so the merge is approved.

review: Approve

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

=== removed file 'src/dk/aau/cs/gui/undo/ChangeNameOffsetCommand.java'
--- src/dk/aau/cs/gui/undo/ChangeNameOffsetCommand.java	2019-08-15 09:32:19 +0000
+++ src/dk/aau/cs/gui/undo/ChangeNameOffsetCommand.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 ChangeNameOffsetCommand extends Command {
-	PetriNetObject object;
-	double newX;
-	double newY;
-	double oldY;
-	double oldX;
-		
-	public ChangeNameOffsetCommand(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();
-	}
-}
-
-

=== added file 'src/dk/aau/cs/gui/undo/SetNameLabelPositionCommand.java'
--- src/dk/aau/cs/gui/undo/SetNameLabelPositionCommand.java	1970-01-01 00:00:00 +0000
+++ src/dk/aau/cs/gui/undo/SetNameLabelPositionCommand.java	2019-08-21 12:34:13 +0000
@@ -0,0 +1,35 @@
+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();
+	}
+}
+
+

=== added file 'src/dk/aau/cs/gui/undo/UpdateNameLabelOffsetCommand.java'
--- src/dk/aau/cs/gui/undo/UpdateNameLabelOffsetCommand.java	1970-01-01 00:00:00 +0000
+++ src/dk/aau/cs/gui/undo/UpdateNameLabelOffsetCommand.java	2019-08-21 12:34:13 +0000
@@ -0,0 +1,31 @@
+package dk.aau.cs.gui.undo;
+
+import pipe.gui.graphicElements.PetriNetObject;
+
+public class UpdateNameLabelOffsetCommand extends Command {
+	double newXOffset, newYOffset, oldXOffset, oldYOffset;
+	PetriNetObject obj;
+	
+	public UpdateNameLabelOffsetCommand(double newXOffset, double newYOffset, double oldXOffset, double oldYOffset, PetriNetObject obj) {
+		this.obj = obj;
+		this.newXOffset = newXOffset;
+		this.newYOffset = newYOffset;
+		this.oldXOffset = oldXOffset;
+		this.oldYOffset = oldYOffset;
+	}
+
+	@Override
+	public void undo() {
+		obj.setNameOffsetX(oldXOffset);;
+		obj.setNameOffsetY(oldYOffset);
+		obj.updateOnMoveOrZoom();		
+	}
+
+	@Override
+	public void redo() {
+		obj.setNameOffsetX(newXOffset);
+		obj.setNameOffsetY(newYOffset);
+		obj.updateOnMoveOrZoom();		
+	}
+
+}

=== modified file 'src/pipe/gui/handler/LabelHandler.java'
--- src/pipe/gui/handler/LabelHandler.java	2019-06-22 15:00:18 +0000
+++ src/pipe/gui/handler/LabelHandler.java	2019-08-21 12:34:13 +0000
@@ -4,6 +4,9 @@
 import java.awt.event.MouseEvent;
 import java.awt.event.MouseWheelEvent;
 import javax.swing.SwingUtilities;
+
+import dk.aau.cs.gui.undo.Command;
+import dk.aau.cs.gui.undo.UpdateNameLabelOffsetCommand;
 import pipe.dataLayer.NetType;
 import pipe.gui.CreateGui;
 import pipe.gui.graphicElements.Arc;
@@ -19,7 +22,9 @@
 	private NameLabel nl;
 
 	protected Point dragInit = new Point();
-
+	
+	private double originalOffsetX, originalOffsetY;
+	
 	public LabelHandler(NameLabel _nl, PetriNetObject _obj) {
 		obj = _obj;
 		nl = _nl;
@@ -32,6 +37,7 @@
 
 	@Override
 	public void mousePressed(MouseEvent e) {
+		
 		if(obj instanceof Arc) {
 			if (((Arc) obj).isPrototype()) {
 				return;
@@ -49,6 +55,8 @@
 		dragInit = e.getPoint(); //
 		// dragInit = e.getLocationOnScreen(); //causes exception in Windows!
 		dragInit = javax.swing.SwingUtilities.convertPoint(nl, dragInit, obj);
+		originalOffsetX = obj.getNameOffsetXObject();
+		originalOffsetY = obj.getNameOffsetYObject();
 	}
 
 	@Override
@@ -65,11 +73,22 @@
 		// obj.setNameOffsetY((e.getYOnScreen() - dragInit.y)); //causes
 		// exception in Windows!
 		// dragInit = e.getLocationOnScreen(); //causes exception in Windows!
+		
+		
 		obj.updateNameOffsetX((p.x - dragInit.x));
 		obj.updateNameOffsetY((p.y - dragInit.y));
 		dragInit = p;
 		obj.updateOnMoveOrZoom();
 	}
+	
+	@Override
+	public void mouseReleased(MouseEvent e) {
+		Point p = javax.swing.SwingUtilities
+				.convertPoint(nl, e.getPoint(), obj);
+		
+		CreateGui.getDrawingSurface().getUndoManager().addNewEdit(new UpdateNameLabelOffsetCommand(obj.getNameOffsetXObject(), obj.getNameOffsetYObject(), originalOffsetX, originalOffsetY, obj));
+		
+	}
 
 	@Override
 	public void mouseWheelMoved(MouseWheelEvent e) {