Merge pull request #21 from UCSDOalads/branchByDYB

add ZoomIn and ZoomOut and ZoomAction

Author: Ultimate Pea

src/actions/ZoomAction.java

@@ -0,0 +1,54 @@
+package actions;
+
+import paintcomponents.PaintComponent;
+import ui.PaintPanel;
+
+public abstract class ZoomAction extends PaintAction{
+
+	private double zoomValue;
+	private int centerX, centerY;
+	
+	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;
+			com.translate((int)(xDifference * getZoomValue()), (int)(yDifference * getZoomValue()));
+		}
+		panel.repaint();
+	}
+	
+	public int getCenterX() {
+		return centerX;
+	}
+
+	public void setCenterX(int centerX) {
+		this.centerX = centerX;
+	}
+
+	public int getCenterY() {
+		return centerY;
+	}
+
+	public void setCenterY(int centerY) {
+		this.centerY = centerY;
+	}
+
+	public double getZoomValue() {
+		return zoomValue;
+	}
+
+	public void setZoomValue(double value) {
+		zoomValue = value;
+	}
+
+}

src/actions/ZoomInAction.java

@@ -0,0 +1,22 @@
+package actions;
+
+import actions.menu.ActionsMenuBarTitles;
+import ui.PaintPanel;
+
+public class ZoomInAction extends ZoomAction {
+		
+	public ZoomInAction (PaintPanel panel) {
+		super(panel);
+		this.setZoomValue(0.5);
+	}
+
+	@Override
+	public void performAction() {
+		super.performAction();
+	}
+
+	@Override
+	public String locationString() {
+		return ActionsMenuBarTitles.Edit().Zoom_In().toString();
+	}
+}

src/actions/ZoomOutAction.java

@@ -0,0 +1,23 @@
+package actions;
+
+import ui.PaintPanel;
+import actions.menu.ActionsMenuBarTitles;
+
+public class ZoomOutAction extends ZoomAction {
+
+	public ZoomOutAction (PaintPanel panel) {
+		super(panel);
+		this.setZoomValue(-0.5);
+	}
+
+	@Override
+	public void performAction() {
+		super.performAction();
+	}
+
+	@Override
+	public String locationString() {
+		return ActionsMenuBarTitles.Edit().Zoom_Out().toString();
+	}
+
+}

src/actions/menu/ActionsMenuBar.java

@@ -29,6 +29,8 @@
 import actions.PaintAction;
 import actions.RemovePaintComponent;
 import actions.UpdateDataDisplayBoxAction;
+import actions.ZoomInAction;
+import actions.ZoomOutAction;
 
 public class ActionsMenuBar extends JMenuBar implements SelectionToolListener{
 
@@ -55,6 +57,8 @@ public ActionsMenuBar(PaintPanel panel){
 		//edit 
 		addAction(new EditRedoAction(panel));
 		addAction(new EditUndoAction(panel));
+		addAction(new ZoomInAction(panel));
+		addAction(new ZoomOutAction(panel));
 
 		//haskell
 		addAction(new AddHaskellComponent(panel));
@@ -66,6 +70,7 @@ public ActionsMenuBar(PaintPanel panel){
 
 		// remove
 		addAction(new RemovePaintComponent(panel));
+		
 
 	}
 

src/actions/menu/ActionsMenuBarTitles.java

@@ -117,6 +117,15 @@ public Object Open() {
 		append("Open...");
 		return this;
 	}
+
+	public ActionsMenuBarTitles Zoom_In() {
+		append("Zoom In");
+		return this;
+	}
 
+	public ActionsMenuBarTitles Zoom_Out() {
+		append("Zoom Out");
+		return this;
+	}
 
 }