Merge

Author: AliShug

src/com/modsim/gui/GUI.java

@@ -265,7 +265,10 @@ public void zoomOutToView()
 		view.zoom(view.getWidth()/2, view.getHeight()/2, -1.0);
 	}
 
-	
+	public void resetView()
+	{
+		view.resetView();
+	} 
 
 
 	/**

src/com/modsim/gui/Menu.java

@@ -83,6 +83,7 @@ private void addViewMenu() {
         JMenu view = new JMenu("View");
         view.setMnemonic(KeyEvent.VK_V);
         view.add(Ops.toggleAA);
+        view.add(Ops.resetView);
         app_menu.add(view);
     }
 

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

@@ -26,13 +26,16 @@
  */
 public class View extends JPanel {
 
-    public int zoomI = 3;
+	public int init_zoomI = 3;
+	public double init_camX = 0, init_camY = 0;
+		
+    public int zoomI = init_zoomI;
     public double zoom = zoomI * ZOOM_MULTIPLIER;
 
     public static final double ZOOM_MULTIPLIER = 0.15;
     public static final int ZOOM_LIMIT = 12;
 
-    public double camX = 0, camY = 0;
+    public double camX = init_camX, camY = init_camY;
     public AffineTransform wToV = new AffineTransform();
 
     private static final long serialVersionUID = 1L;
@@ -338,4 +341,15 @@ public void flagDynamicRedraw() {
             }
         }
     }
+
+	public void resetView() {
+		//center view
+		camX = init_camX;
+		camY = init_camY;
+		//reset zoom
+		zoomI = init_zoomI;
+	    zoom = zoomI * ZOOM_MULTIPLIER;
+        //redraw
+        flagStaticRedraw();
+	}
 }

src/com/modsim/operations/Ops.java

@@ -136,7 +136,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, zoomIn, zoomOut, toggleAA, open, save, saveAs, fileNew, quit;
+            pause, run, step, toggleRun, zoomIn, zoomOut, resetView, toggleAA, open, save, saveAs, fileNew, quit;
 
     static {
         // Keyboard shortcuts
@@ -248,7 +248,7 @@ public static void fileNew() {
         //Zoom controls
         zoomIn = new DesignAction(event -> Main.ui.zoomInToView(), "Zoom In");
         zoomOut = new DesignAction(event -> Main.ui.zoomOutToView(), "Zoom Out");
-        
+        resetView = new DesignAction(event -> Main.ui.resetView(), "Reset View");
 
         // View controls
         toggleAA = new DesignAction(event -> Main.ui.view.useAA = !Main.ui.view.useAA,

src/com/modsim/util/XMLReader.java

@@ -44,9 +44,9 @@ public static void readFile(File xmlFile) {
             // View load
             Element view = (Element) doc.getElementsByTagName("view").item(0);
             View v = Main.ui.view;
-            v.camX = Double.parseDouble(view.getAttribute("camX"));
-            v.camY = Double.parseDouble(view.getAttribute("camY"));
-            v.zoomI = Integer.parseInt(view.getAttribute("zoom"));
+            v.init_camX = v.camX = Double.parseDouble(view.getAttribute("camX"));
+            v.init_camY = v.camY = Double.parseDouble(view.getAttribute("camY"));
+            v.init_zoomI = v.zoomI = Integer.parseInt(view.getAttribute("zoom"));
             v.zoom = View.ZOOM_MULTIPLIER * v.zoomI;
             v.calcXForm();
 

src/com/modsim/util/XMLWriter.java

@@ -9,6 +9,7 @@
 
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.transform.OutputKeys;
 import javax.xml.transform.Transformer;
 import javax.xml.transform.TransformerFactory;
 import javax.xml.transform.dom.DOMSource;
@@ -177,6 +178,8 @@ public static void writeFile(File xmlFile) {
             // Saving operation
             TransformerFactory tf = TransformerFactory.newInstance();
             Transformer t = tf.newTransformer();
+            t.setOutputProperty(OutputKeys.INDENT, "yes");
+            t.setOutputProperty("{http://xml.apache.org/xslt}indent-amount", "2");
             DOMSource src = new DOMSource(doc);
             StreamResult r = new StreamResult(xmlFile);