Merge lp:~tapaal-contributor/tapaal/rapid-drawing-fix-810906 into lp:tapaal

[Jakob Dyhr]

Holding ctrl when adding places/transitions now switches between adding places and transitions and connects arcs between them.

When holding ctrl and clicking with create place/transition tool, the user enters "fast mode" where the create tool switches between creating places and transitions. When creating an object, an outgoing arc is attached to it, and it will also be attached to the next created object, unless the user cancels the process by changing tool.

The implementation lacks a way to cancel the current arc being drawn other than by changing to another tool from the menu.
Undo first removes the arc, and then the place/transition that was last drawn, instead of removing both arc and place/transition.

[Jiri Srba (srba)]

Tested and works fine, the small drawbacks are not important.

review: Approve

=== modified file 'src/pipe/gui/DrawingSurfaceImpl.java'
--- src/pipe/gui/DrawingSurfaceImpl.java	2015-11-23 17:12:41 +0000
+++ src/pipe/gui/DrawingSurfaceImpl.java	2017-05-20 20:24:03 +0000
@@ -1,14 +1,8 @@
 package pipe.gui;
 
-import java.awt.Component;
-import java.awt.Container;
-import java.awt.Cursor;
-import java.awt.Dimension;
-import java.awt.Graphics;
-import java.awt.Graphics2D;
-import java.awt.Point;
-import java.awt.Rectangle;
+import java.awt.*;
 import java.awt.event.MouseEvent;
+import java.awt.event.MouseListener;
 import java.awt.event.MouseWheelEvent;
 import java.awt.print.PageFormat;
 import java.awt.print.Printable;
@@ -20,6 +14,7 @@
 import javax.swing.JViewport;
 import javax.swing.SwingUtilities;
 import javax.swing.event.MouseInputAdapter;
+
 import pipe.dataLayer.DataLayer;
 import pipe.dataLayer.Template;
 import pipe.gui.GuiFrame.GUIMode;
@@ -31,19 +26,8 @@
 import pipe.gui.graphicElements.Place;
 import pipe.gui.graphicElements.PlaceTransitionObject;
 import pipe.gui.graphicElements.Transition;
-import pipe.gui.graphicElements.tapn.TimedInputArcComponent;
-import pipe.gui.graphicElements.tapn.TimedPlaceComponent;
-import pipe.gui.graphicElements.tapn.TimedTransitionComponent;
-import pipe.gui.graphicElements.tapn.TimedTransportArcComponent;
-import pipe.gui.handler.AnimationHandler;
-import pipe.gui.handler.AnnotationNoteHandler;
-import pipe.gui.handler.ArcHandler;
-import pipe.gui.handler.LabelHandler;
-import pipe.gui.handler.PlaceHandler;
-import pipe.gui.handler.TAPNTransitionHandler;
-import pipe.gui.handler.TimedArcHandler;
-import pipe.gui.handler.TransitionHandler;
-import pipe.gui.handler.TransportArcHandler;
+import pipe.gui.graphicElements.tapn.*;
+import pipe.gui.handler.*;
 import pipe.gui.undo.AddPetriNetObjectEdit;
 import pipe.gui.undo.AddTimedPlaceCommand;
 import pipe.gui.undo.AddTimedTransitionCommand;
@@ -59,9 +43,7 @@
 public class DrawingSurfaceImpl extends JLayeredPane implements Observer,
 Printable, DrawingSurface {
 	private static final long serialVersionUID = 4434596266503933386L;
-
 	private boolean netChanged = false;
-
 	private boolean animationmode = false;
 
 	public Arc createArc; // no longer static
@@ -618,10 +600,13 @@
 		@Override
 		public void mousePressed(MouseEvent e) {
 			if(app.getGUIMode().equals(GUIMode.animation)) return;
-			
+
+			// check for control down here enables it to attach the arc being drawn to an existing place/transition
+
 			Point start = e.getPoint();
 			Point p;
 			if (SwingUtilities.isLeftMouseButton(e)) {
+
 				Pipe.ElementType mode = app.getMode();
 				switch (mode) {
 				case PLACE:
@@ -635,13 +620,19 @@
 					break;
 
 				case TAPNPLACE:
+					// create place
 					PlaceTransitionObject pto2 = newTimedPlace(e.getPoint());
 					getUndoManager().addNewEdit(
 							new AddTimedPlaceCommand(
 									(TimedPlaceComponent) pto2, model,
 									guiModel, view));
 					if (e.isControlDown()) {
+						// connect arc
+						app.setMode(ElementType.TAPNARC);
+						getPlaceTransitionObjectHandlerOf(pto2).mousePressed(e);
+						getPlaceTransitionObjectHandlerOf(pto2).mouseReleased(e);
 						app.setFastMode(ElementType.FAST_TRANSITION);
+						// enter fast mode
 						pnObject.dispatchEvent(e);
 					}
 					break;
@@ -658,12 +649,18 @@
 					}
 					break;
 				case TAPNTRANS:
+					// create transition
 					pto = newTAPNTransition(e.getPoint());
 					getUndoManager().addNewEdit(
 							new AddTimedTransitionCommand(
 									(TimedTransitionComponent) pto, model,
 									guiModel, view));
 					if (e.isControlDown()) {
+						// connect arc
+						app.setMode(ElementType.TAPNARC);
+						getPlaceTransitionObjectHandlerOf(pto).mousePressed(e);
+						getPlaceTransitionObjectHandlerOf(pto).mouseReleased(e);
+						// enter fast mode
 						app.setFastMode(ElementType.FAST_PLACE);
 						pnObject.dispatchEvent(e);
 					}
@@ -705,6 +702,44 @@
 					dragStart = new Point(start);
 					break;
 
+				case FAST_TRANSITION:
+					// create transition
+					pto = newTAPNTransition(e.getPoint());
+					getUndoManager().addNewEdit(new AddTimedTransitionCommand((TimedTransitionComponent) pto, model, guiModel, view));
+					app.setMode(ElementType.TAPNARC);
+					getPlaceTransitionObjectHandlerOf(pto).mouseReleased(e);
+
+					if (e.isControlDown()) {
+						// connect arc
+						pnObject.dispatchEvent(e);
+						app.setMode(ElementType.TAPNARC);
+						getPlaceTransitionObjectHandlerOf(pto).mousePressed(e);
+						getPlaceTransitionObjectHandlerOf(pto).mouseReleased(e);
+						// enter fast mode
+						app.setFastMode(ElementType.FAST_PLACE);
+					} else{
+						app.endFastMode();
+					}
+					break;
+				case FAST_PLACE:
+					// create place
+					PlaceTransitionObject pto3 = newTimedPlace(e.getPoint());
+					getUndoManager().addNewEdit(new AddTimedPlaceCommand((TimedPlaceComponent) pto3, model, guiModel, view));
+					app.setMode(ElementType.TAPNARC);
+					getPlaceTransitionObjectHandlerOf(pto3).mouseReleased(e);
+
+					if (e.isControlDown()) {
+						// connect arc
+						pnObject.dispatchEvent(e);
+						app.setMode(ElementType.TAPNARC);
+						getPlaceTransitionObjectHandlerOf(pto3).mousePressed(e);
+						getPlaceTransitionObjectHandlerOf(pto3).mouseReleased(e);
+						// enter fast mode
+						app.setFastMode(ElementType.FAST_TRANSITION);
+					} else{
+						app.endFastMode();
+					}
+					break;
 				default:
 					break;
 				}
@@ -715,6 +750,14 @@
 			updatePreferredSize();
 		}
 
+		private MouseListener getPlaceTransitionObjectHandlerOf(PlaceTransitionObject obj){
+			for (MouseListener listener : obj.getMouseListeners()) {
+				if (listener instanceof PlaceTransitionObjectHandler)
+					return listener;
+			}
+			return null;
+		}
+
 		private void addPoint(final Arc createArc, final MouseEvent e) {
 			int x = Grid.getModifiedX(e.getX());
 			int y = Grid.getModifiedY(e.getY());

=== modified file 'src/pipe/gui/GuiFrame.java'
--- src/pipe/gui/GuiFrame.java	2016-11-14 09:58:40 +0000
+++ src/pipe/gui/GuiFrame.java	2017-05-20 20:24:03 +0000
@@ -1750,6 +1750,15 @@
 		setMode(old_mode);
 	}
 
+	public void endFastMode(){
+		if(timedPlaceAction.isSelected())
+			mode=ElementType.TAPNPLACE;
+		else if(transAction.isSelected())
+			mode=ElementType.TAPNTRANS;
+		else
+			mode=ElementType.SELECT;
+	}
+
 	public void setFastMode(Pipe.ElementType _mode) {
 		old_mode = mode;
 		setMode(_mode);

=== modified file 'src/pipe/gui/handler/ArcKeyboardEventHandler.java'
--- src/pipe/gui/handler/ArcKeyboardEventHandler.java	2011-09-23 21:18:31 +0000
+++ src/pipe/gui/handler/ArcKeyboardEventHandler.java	2017-05-20 20:24:03 +0000
@@ -43,7 +43,7 @@
 
 			if ((CreateGui.getApp().getMode() == ElementType.FAST_PLACE)
 					|| (CreateGui.getApp().getMode() == ElementType.FAST_TRANSITION)) {
-				CreateGui.getApp().resetMode();
+				CreateGui.getApp().endFastMode();
 			}
 			aView.repaint();
 			break;

=== modified file 'src/pipe/gui/undo/UndoManager.java'
--- src/pipe/gui/undo/UndoManager.java	2012-10-11 15:01:09 +0000
+++ src/pipe/gui/undo/UndoManager.java	2017-05-20 20:24:03 +0000
@@ -216,7 +216,7 @@
 	private void checkMode() {
 		if ((app.getMode() == Pipe.ElementType.FAST_PLACE)
 				|| (app.getMode() == Pipe.ElementType.FAST_TRANSITION)) {
-			app.resetMode();
+			app.endFastMode();
 		}
 	}