Merge pull request #136 from UCSDOalads/addMoreMouseFunctionality

chenggong03 · web-flow · commit aeb4f35c518a · 2017-05-27T17:51:19.000-07:00
Add mouse scroll Zoom implemented by dyb previously
diff --git a/?/.java/fonts/1.8.0_121/fcinfo-1-its-cseb260-28.ucsd.edu-null-null-en.properties b/?/.java/fonts/1.8.0_121/fcinfo-1-its-cseb260-28.ucsd.edu-null-null-en.properties
diff --git a/src/actions/ZoomAction.java b/src/actions/ZoomAction.java
@@ -12,13 +12,16 @@ public ZoomAction(PaintPanel panel) {
 		super(panel);
 		centerX = panel.getWidth() / 2;
 		centerY = panel.getHeight() / 2;
+
 	}
 	
 	public boolean canPerformAction() {
 		return true;
 	}
 	
 	public void performAction() {
+		
+		
 		for ( PaintComponent com: panel.getPaintComponents() ) {
 			int xDifference = com.getX() - centerX;
 			int yDifference = com.getY() - centerY;
diff --git a/src/actions/ZoomInAction.java b/src/actions/ZoomInAction.java
@@ -7,7 +7,7 @@ public class ZoomInAction extends ZoomAction {
 		
 	public ZoomInAction (PaintPanel panel) {
 		super(panel);
-		this.setZoomValue(0.5);
+		this.setZoomValue(0.1);
 	}
 
 	@Override
diff --git a/src/actions/ZoomOutAction.java b/src/actions/ZoomOutAction.java
@@ -7,7 +7,7 @@ public class ZoomOutAction extends ZoomAction {
 
 	public ZoomOutAction (PaintPanel panel) {
 		super(panel);
-		this.setZoomValue(-0.5);
+		this.setZoomValue(-0.1);
 	}
 
 	@Override
diff --git a/src/painttools/toolbar/ToolBar.java b/src/painttools/toolbar/ToolBar.java
@@ -12,7 +12,6 @@
 import javax.swing.SwingConstants;
 
 import buttons.ToolButton;
-
 import painttools.tools.AddClassTool;
 import painttools.tools.AddInputBoxTool;
 import painttools.tools.AddOutputBoxTool;
diff --git a/src/painttools/tools/AddClassTool.java b/src/painttools/tools/AddClassTool.java
@@ -2,6 +2,7 @@
 
 import java.awt.event.ActionEvent;
 import java.awt.event.MouseEvent;
+import java.awt.event.MouseWheelEvent;
 
 import actions.AddLazyJavaClassAction;
 import buttons.ToolButton;
@@ -101,14 +102,17 @@ public void mouseMoved(MouseEvent e) {
 
 	}
 
+	@Override
+	public void mouseWheelMoved(MouseWheelEvent e) {
+		// TODO Auto-generated method stub
+		
+	}
+
 	/**
 	 * change the cursor when add button is clicked
 	 */
 	@Override
 	public void actionPerformed(ActionEvent e) {
 		panel.setNewCursor (CustomCursors.addComponentcursor());
 	}
-
-
-
 }
diff --git a/src/painttools/tools/AddInputBoxTool.java b/src/painttools/tools/AddInputBoxTool.java
@@ -2,6 +2,7 @@
 
 import java.awt.event.ActionEvent;
 import java.awt.event.MouseEvent;
+import java.awt.event.MouseWheelEvent;
 
 import actions.AddDataInputBoxAction;
 import buttons.ToolButton;
@@ -101,6 +102,12 @@ public void mouseMoved(MouseEvent e) {
 
 	}
 
+	@Override
+	public void mouseWheelMoved(MouseWheelEvent e) {
+		// TODO Auto-generated method stub
+		
+	}
+
 	/**
 	 * change the cursor when add button is clicked
 	 */
@@ -110,7 +117,4 @@ public void actionPerformed(ActionEvent e) {
 		panel.setNewCursor (CustomCursors.addComponentcursor());
 		
 	}
-
-
-
 }
diff --git a/src/painttools/tools/AddMethodTool.java b/src/painttools/tools/AddMethodTool.java
@@ -3,6 +3,7 @@
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.MouseEvent;
+import java.awt.event.MouseWheelEvent;
 
 import javax.swing.ImageIcon;
 
@@ -112,8 +113,10 @@ public void actionPerformed(ActionEvent e) {
 		
 	}
 
-
-
-
+	@Override
+	public void mouseWheelMoved(MouseWheelEvent e) {
+		// TODO Auto-generated method stub
+		
+	}
 	
 }
diff --git a/src/painttools/tools/AddOutputBoxTool.java b/src/painttools/tools/AddOutputBoxTool.java
@@ -2,6 +2,7 @@
 
 import java.awt.event.ActionEvent;
 import java.awt.event.MouseEvent;
+import java.awt.event.MouseWheelEvent;
 
 import actions.AddDataDisplayBoxAction;
 import buttons.ToolButton;
@@ -102,6 +103,12 @@ public void mouseMoved(MouseEvent e) {
 
 	}
 
+	@Override
+	public void mouseWheelMoved(MouseWheelEvent e) {
+		// TODO Auto-generated method stub
+		
+	}
+
 	/**
 	 * change the cursor when add button is clicked
 	 */
@@ -111,5 +118,4 @@ public void actionPerformed(ActionEvent e) {
 	}
 
 
-
 }
diff --git a/src/painttools/tools/DotTool.java b/src/painttools/tools/DotTool.java
@@ -1,6 +1,7 @@
 package painttools.tools;
 
 import java.awt.event.MouseEvent;
+import java.awt.event.MouseWheelEvent;
 
 import buttons.ToolButton;
 import paintcomponents.SimplePoint;
@@ -48,7 +49,8 @@ public void mouseClicked(MouseEvent e) {
 		panel.getSelectTool().selectComponent(pointToAdd);
 
 		panel.addPaintComponent(pointToAdd);
-		//panel.toolSelected(panel.getSelectTool());
+		panel.toolSelected(panel.getSelectTool());
+
 	}
 
 	@Override
@@ -95,6 +97,10 @@ public void reset() {
 
 	}
 
-
+	@Override
+	public void mouseWheelMoved(MouseWheelEvent e) {
+		// TODO Auto-generated method stub
+		
+	}
 
 }
diff --git a/src/painttools/tools/LineTool.java b/src/painttools/tools/LineTool.java
@@ -1,6 +1,7 @@
 package painttools.tools;
 
 import java.awt.event.MouseEvent;
+import java.awt.event.MouseWheelEvent;
 import java.util.ArrayList;
 
 import javax.swing.SwingUtilities;
@@ -264,6 +265,10 @@ public void reset() {
 
 	}
 
-
+	@Override
+	public void mouseWheelMoved(MouseWheelEvent arg0) {
+		// TODO Auto-generated method stub
+		
+	}
 
 }
diff --git a/src/painttools/tools/PaintToolsInterface.java b/src/painttools/tools/PaintToolsInterface.java
@@ -1,11 +1,12 @@
 package painttools.tools;
 import java.awt.event.MouseListener;
 import java.awt.event.MouseMotionListener;
+import java.awt.event.MouseWheelListener;
 
 import buttons.ToolButton;
 import ui.PaintPanel;
 
-public interface PaintToolsInterface extends MouseListener, MouseMotionListener {
+public interface PaintToolsInterface extends MouseListener, MouseMotionListener, MouseWheelListener {
 
 	
 	/**
@@ -18,7 +19,6 @@ public interface PaintToolsInterface extends MouseListener, MouseMotionListener
 	 * or when esc is pressed.
 	 */
 	public abstract void reset();
-	
 
 	public ToolButton getButton();
 	
diff --git a/src/painttools/tools/RemoveComponentTool.java b/src/painttools/tools/RemoveComponentTool.java
@@ -1,6 +1,7 @@
 package painttools.tools;
 
 import java.awt.event.MouseEvent;
+import java.awt.event.MouseWheelEvent;
 
 import buttons.ToolButton;
 import ui.PaintPanel;
@@ -73,4 +74,10 @@ public void createButton() {
 		
 	}
 
+	@Override
+	public void mouseWheelMoved(MouseWheelEvent e) {
+		// TODO Auto-generated method stub
+
+	}
+
 }
diff --git a/src/painttools/tools/SelectTool.java b/src/painttools/tools/SelectTool.java
@@ -1,11 +1,14 @@
 package painttools.tools;
 
 import java.awt.event.MouseEvent;
+import java.awt.event.MouseWheelEvent;
 import java.util.ArrayList;
 
 
 import javax.swing.ImageIcon;
 
+import actions.ZoomInAction;
+import actions.ZoomOutAction;
 import actions.InputDataForDataInputBoxAction;
 import buttons.ToolButton;
 import paintcomponents.PaintComponent;
@@ -257,7 +260,6 @@ public void mouseMoved(MouseEvent e) {
 			panel.showCursor();
 			panel.repaint();
 		}
-
 	}
 
 	@Override
@@ -302,8 +304,24 @@ public void removeSelectedComponent(PaintComponent pc){
 		selectedComponents.remove(pc);
 	}
 
+	@Override
+	public void mouseWheelMoved(MouseWheelEvent e) {
+		// TODO Auto-generated method stub
+		ZoomInAction zoomIn = new ZoomInAction(panel);
+		ZoomOutAction zoomOut = new ZoomOutAction(panel);
 
-	/**
+		if (e.getWheelRotation() > 0) {
+			zoomIn.setCenterX(e.getX());
+			zoomIn.setCenterY(e.getY());
+			zoomIn.performAction();
+		} else {
+			zoomOut.setCenterX(e.getX());
+			zoomOut.setCenterY(e.getY());
+			zoomOut.performAction();
+    }
+  }
+  
+  /**
 	 * Check if user double clicked a data box and it will prompt user to type
 	 * data if double clicked on a selected or de-selected data box
 	 * 
diff --git a/src/ui/PaintPanel.java b/src/ui/PaintPanel.java
@@ -67,6 +67,7 @@ private void setTool(PaintToolsInterface tool) {
 		this.state = State.TOOLS;
 		this.addMouseListener(this.tool);
 		this.addMouseMotionListener(this.tool);
+		this.addMouseWheelListener(this.tool);
 	}
 
 	private void resetTool() {

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ public class ZoomInAction extends ZoomAction {`
`7`	`7`
`8`	`8`	`public ZoomInAction (PaintPanel panel) {`
`9`	`9`	`super(panel);`
`10`		`- this.setZoomValue(0.5);`
	`10`	`+ this.setZoomValue(0.1);`
`11`	`11`	`}`
`12`	`12`
`13`	`13`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ public class ZoomOutAction extends ZoomAction {`
`7`	`7`
`8`	`8`	`public ZoomOutAction (PaintPanel panel) {`
`9`	`9`	`super(panel);`
`10`		`- this.setZoomValue(-0.5);`
	`10`	`+ this.setZoomValue(-0.1);`
`11`	`11`	`}`
`12`	`12`
`13`	`13`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@`
`2`	`2`
`3`	`3`	`import java.awt.event.ActionEvent;`
`4`	`4`	`import java.awt.event.MouseEvent;`
	`5`	`+import java.awt.event.MouseWheelEvent;`
`5`	`6`
`6`	`7`	`import actions.AddDataDisplayBoxAction;`
`7`	`8`	`import buttons.ToolButton;`
`@@ -102,6 +103,12 @@ public void mouseMoved(MouseEvent e) {`
`102`	`103`
`103`	`104`	`}`
`104`	`105`
	`106`	`+ @Override`
	`107`	`+ public void mouseWheelMoved(MouseWheelEvent e) {`
	`108`	`+ // TODO Auto-generated method stub`
	`109`	`+`
	`110`	`+ }`
	`111`	`+`
`105`	`112`	`/**`
`106`	`113`	`* change the cursor when add button is clicked`
`107`	`114`	`*/`
`@@ -111,5 +118,4 @@ public void actionPerformed(ActionEvent e) {`
`111`	`118`	`}`
`112`	`119`
`113`	`120`
`114`		`-`
`115`	`121`	`}`