Merge branch 'master' of git://github.com/boblettoj99/spe into ed

fables-tales · May 7, 2011 · 2836ef7 · 2836ef7
2 parents 87873b4 + e2a7f3b
commit 2836ef7
Show file tree

Hide file tree

Showing 35 changed files with 866 additions and 361 deletions.
diff --git a/src/uk/me/graphe/client/Canvas.java b/src/uk/me/graphe/client/Canvas.java
@@ -8,9 +8,11 @@
 import com.google.gwt.event.dom.client.MouseMoveEvent;
 import com.google.gwt.event.dom.client.MouseOutEvent;
 import com.google.gwt.event.dom.client.MouseUpEvent;
+import com.google.gwt.event.dom.client.MouseWheelEvent;
 import com.google.gwt.uibinder.client.UiBinder;
 import com.google.gwt.uibinder.client.UiField;
 import com.google.gwt.uibinder.client.UiHandler;
+import com.google.gwt.user.client.Window;
 import com.google.gwt.user.client.ui.Composite;
 import com.google.gwt.user.client.ui.Widget;
 
@@ -49,13 +51,13 @@ public void onDoubleClick(DoubleClickEvent e)
 
 			if (parent.toggleSelectedVertexAt(lMouseDown[X], lMouseDown[Y]))
 			{
-				parent.dialog.show(DialogType.vertexName, parent.selectedVertices.get(0).getLabel()
+				parent.dialogVertex.show(parent.selectedVertices.get(0).getLabel()
 						, e.getX(), e.getY());	
 				Console.log("Double click 1");
 			}
 			else if (parent.toggleSelectedEdgeAt(lMouseDown[X], lMouseDown[Y]))
 			{
-				parent.dialog.show(DialogType.edgeWeight, String.valueOf(parent.selectedEdges.get(0).getWeight())
+				parent.dialogEdge.show(String.valueOf(parent.selectedEdges.get(0).getWeight())
 						, e.getX(), e.getY());
 				Console.log("Double click 2");
 			}
@@ -166,6 +168,22 @@ void onMouseOut (MouseOutEvent e)
 		parent.tooltip.hide();
 	}
 
+	@UiHandler("canvasPanel")
+	void onMouseWheel (MouseWheelEvent e)
+	{
+		if(e.isAltKeyDown())
+		{
+			if(e.isNorth())
+			{
+				parent.zoomIn();
+			}
+			else
+			{
+				parent.zoomOut();
+			}
+		}
+	}
+
 	@UiHandler("canvasPanel")
 	void onMouseUp (MouseUpEvent e)
 	{
@@ -174,13 +192,18 @@ void onMouseUp (MouseUpEvent e)
 		switch (parent.tools.currentTool)
 		{
 			case addVertex:
-				parent.dialog.show(DialogType.vertexName,"", e.getX(), e.getY());
+				parent.dialogVertex.show("", e.getX(), e.getY());
 				break;
 			case addEdge:
 				parent.drawing.hideUIline();
 				if (parent.selectedVertices.size() == 2) 
 				{
-					parent.dialog.show(DialogType.edgeWeight,"", e.getX(), e.getY());
+					if(!parent.graphManager.isDirectedEdgeBetweenVertices(
+							parent.graphManager.getVertexFromDrawable(parent.selectedVertices.get(0)), 
+							parent.graphManager.getVertexFromDrawable(parent.selectedVertices.get(1))))
+					{
+						parent.dialogEdge.show("", e.getX(), e.getY());
+					}
 				}				
 				else if ((lMouseDown[X] != lMouseMove[X]) || (lMouseDown[Y] != lMouseMove[Y]))
 				{

diff --git a/src/uk/me/graphe/client/CanvasWrapper.java b/src/uk/me/graphe/client/CanvasWrapper.java
@@ -15,29 +15,35 @@
 import com.google.gwt.event.dom.client.MouseOutHandler;
 import com.google.gwt.event.dom.client.MouseUpEvent;
 import com.google.gwt.event.dom.client.MouseUpHandler;
+import com.google.gwt.event.dom.client.MouseWheelEvent;
+import com.google.gwt.event.dom.client.MouseWheelHandler;
 import com.google.gwt.event.shared.HandlerRegistration;
 import com.google.gwt.user.client.Event;
 import com.google.gwt.user.client.Window;
 import com.google.gwt.widgetideas.graphics.client.GWTCanvas;
+import com.google.gwt.event.dom.client.HasMouseWheelHandlers;
 
 public class CanvasWrapper extends GWTCanvas implements MouseOutHandler, MouseDownHandler, MouseUpHandler,
-        MouseMoveHandler, HasMouseDownHandlers, HasMouseMoveHandlers, HasMouseUpHandlers,
-        HasMouseOutHandlers, DoubleClickHandler, HasDoubleClickHandlers {
+        MouseMoveHandler, MouseWheelHandler, HasMouseDownHandlers, HasMouseMoveHandlers, HasMouseUpHandlers,
+        HasMouseOutHandlers, HasMouseWheelHandlers, DoubleClickHandler, HasDoubleClickHandlers {
 
     public CanvasWrapper() {
         super(2000, 2000);
         sinkEvents(Event.MOUSEEVENTS);
+        sinkEvents(Event.ONMOUSEWHEEL);
         this.createHandlerManager();
     }
 
     public CanvasWrapper(int coordX, int coordY, int pixelX, int pixelY) {
         super(coordX, coordY, pixelX, pixelY);
         sinkEvents(Event.MOUSEEVENTS);
+        sinkEvents(Event.ONMOUSEWHEEL);
     }
 
     public CanvasWrapper(int coordX, int coordY) {
         super(coordX, coordY);
         sinkEvents(Event.MOUSEEVENTS);
+        sinkEvents(Event.ONMOUSEWHEEL);
     }
 
     @Override
@@ -65,6 +71,11 @@ public HandlerRegistration addDoubleClickHandler(DoubleClickHandler handler) {
 		return addHandler(handler, DoubleClickEvent.getType());
 	}
 
+    @Override
+    public HandlerRegistration addMouseWheelHandler(MouseWheelHandler handler) {
+        return addHandler(handler, MouseWheelEvent.getType());
+    }
+
     @Override
     public void onMouseMove(MouseMoveEvent event) {
         Window.alert("An error has occurred.");
@@ -86,7 +97,11 @@ public void onMouseOut(MouseOutEvent event) {
 	}
 
 	@Override
+	public void onMouseWheel(MouseWheelEvent arg0) {
+		Window.alert("An error has occurred.");
+	}
+
 	public void onDoubleClick(DoubleClickEvent arg0) {
-		Window.alert("An error has occurred.");			
+		Window.alert("An error has occurred.");
 	}
 }
diff --git a/src/uk/me/graphe/client/ClientOT.java b/src/uk/me/graphe/client/ClientOT.java
@@ -71,7 +71,8 @@ public void run() {
                 if (mServer == false) {
                     Console.log("No server connection, offline mode enabled");
                     mInfo = mStore.getInformation();
-                    if(Window.confirm("A previous graph has been detected, press okay to load")) {
+                    if(!(mInfo.getLocal().isEmpty() && mInfo.getServer().isEmpty()) &&
+                            Window.confirm("A previous graph has been detected, press okay to load")) {
                         List<GraphOperation> ops = mInfo.getServer();
                         if (!ops.isEmpty()) {
                             for (GraphOperation op : ops) {