Added new zoom in/out states. Complimented with toolbar buttons.

Author: shedandburied

src/com/modsim/gui/GUI.java

@@ -195,6 +195,25 @@ private void createViewport() {
 		hSplit.add(view, JSplitPane.RIGHT);
 	}
 
+	/*
+	 * Accessible method for zooming into view
+	 */
+	public void zoomInToView()
+	{
+		view.zoomIn(view.getWidth()/2,view.getHeight()/2);
+	}
+	
+	/*
+	 * Accessible method for zooming out of view
+	 */
+	public void zoomOutToView()
+	{
+		view.zoomOut(view.getWidth()/2,view.getHeight()/2);
+	}
+	
+	
+	
+	
 	/**
 	 * Creates the context menu
 	 */

src/com/modsim/gui/ToolBar.java

@@ -11,7 +11,7 @@
 
 public class ToolBar {
 	public JToolBar toolbar = null;
-	public JButton btnPause, btnRun, btnStep;
+	public JButton btnPause, btnRun, btnStep, btnZoomIn, btnZoomOut;
 	public JSlider slideSpeed;
 
 	/**
@@ -32,7 +32,7 @@ public ToolBar() {
 		toolbar.setMargin(margin);
 
 		// Buttons
-		addButtons();
+		addSimButtons();
 		toolbar.addSeparator(new Dimension(15, 0));
 
 		// Slider
@@ -41,12 +41,15 @@ public ToolBar() {
 		slideSpeed = new JSlider(JSlider.HORIZONTAL, 0, 60, 10);
 		toolbar.add(slideSpeed);
 		slideSpeed.addChangeListener(Ops.sliderSetSpeed);
+		
+		toolbar.addSeparator(new Dimension(15, 0));
+		addNavButtons();
 	}
 
 	/**
-	 * Generate the toolbar buttons
+	 * Generate the toolbar simulation buttons
 	 */
-	private void addButtons() {
+	private void addSimButtons() {
 		btnPause = new JButton(Ops.pause);
 		btnPause.setHideActionText(true);
 		toolbar.add(btnPause);
@@ -59,4 +62,18 @@ private void addButtons() {
 		btnStep.setHideActionText(true);
 		toolbar.add(btnStep);
 	}
+	
+	/**
+	 * Generate the toolbar navigation buttons
+	 */
+	private void addNavButtons()
+	{
+		btnZoomIn = new JButton(Ops.zoomIn);
+		btnZoomIn.setHideActionText(true);
+		toolbar.add(btnZoomIn);
+		
+		btnZoomOut = new JButton(Ops.zoomOut);
+		btnZoomOut.setHideActionText(true);
+		toolbar.add(btnZoomOut);
+	}
 }

src/com/modsim/gui/view/View.java

@@ -24,7 +24,7 @@ public class View extends JPanel {
     public int zoomI = 3;
     public double zoom = zoomI * ZOOM_MULTIPLIER;
 
-    public static final double ZOOM_MULTIPLIER = 0.2;
+    public static final double ZOOM_MULTIPLIER = 0.15;
     public static final int ZOOM_LIMIT = 12;
 
     public double camX = 0, camY = 0;

src/com/modsim/operations/Ops.java

@@ -133,7 +133,7 @@ public static void fileNew() {
     // Core application actions
     public static final DesignAction undo, redo, copy, paste, delete, rotateCW, rotateCCW, rotate180,
             labelEdit, labelBig, labelSmall,
-            pause, run, step, toggleRun, toggleAA, open, save, saveAs, fileNew, quit;
+            pause, run, step, toggleRun, zoomIn, zoomOut, toggleAA, open, save, saveAs, fileNew, quit;
 
     static {
         // Keyboard shortcuts
@@ -241,7 +241,12 @@ public static void fileNew() {
             Main.sim.stop();
             Main.sim.step();
         }, "Step Simulation", "Steps the simulation forward by one iteration", period);
-
+        
+        //Zoom controls
+        zoomIn = new DesignAction(event -> Main.ui.zoomInToView(), "Zoom In");
+        zoomOut = new DesignAction(event -> Main.ui.zoomOutToView(), "Zoom Out");
+        
+        
         // View controls
         toggleAA = new DesignAction(event -> Main.ui.view.useAA = !Main.ui.view.useAA,
                 "Toggle anti-aliasing", "Toggles anti-aliased rendering in the viewport: " +

src/com/modsim/package-info.java

@@ -1,3 +1,5 @@
+package com.modsim;
+
 /**
  * ModuleSim
  *