Basic persistence-of-vision effect, better zoom

Dynamic refresh is capped at 30Hz, changes which occur faster than that
are shown using persistence-of-vision. In the new system, LEDs which
were turned on at any point between the last rendered refresh and this
one are displayed as being on. I also added backend support for
adjustable dynamic (simulation-driven) refresh rate, although this may
not be that useful.

Overhauled zoom to support a wider range of zoom levels and smooth zoom
in/out e.g. with trackpad. Finally fixed zoom-to-point: zooming in and
out rapidly no longer causes the camera location to jump around
randomly. Grid display is now disabled when extremely zoomed-out, which
greatly improves performance (lots of lines = bad).

Author: AliShug

src/com/modsim/gui/GUI.java

@@ -254,15 +254,15 @@ private void createViewport() {
 	 */
 	public void zoomInToView()
 	{
-		view.zoomIn(view.getWidth()/2,view.getHeight()/2);
+		view.zoom(view.getWidth()/2, view.getHeight()/2, 1.0);
 	}
 
 	/*
 	 * Accessible method for zooming out of view
 	 */
 	public void zoomOutToView()
 	{
-		view.zoomOut(view.getWidth()/2,view.getHeight()/2);
+		view.zoom(view.getWidth()/2, view.getHeight()/2, -1.0);
 	}
 
 

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

@@ -4,11 +4,13 @@
 import java.awt.geom.*;
 import java.awt.image.BufferedImage;
 import java.text.DecimalFormat;
+import java.util.prefs.Preferences;
 
 import javax.swing.*;
 
 import com.modsim.modules.BaseModule;
 import com.modsim.modules.Link;
+import com.modsim.modules.parts.VisiblePart;
 import com.modsim.res.Colors;
 import com.modsim.Main;
 import com.modsim.tools.BaseTool;
@@ -38,10 +40,16 @@ public class View extends JPanel {
 
     public boolean useAA = true;
 
+    private int dynamicRefreshRate = 30;
+
     private BufferedImage staticCanvas = null;
     private boolean staticIsDirty = true;
     private long lastDynamicPaint = 0;
 
+    // Zoom caps
+    public static final double minZoom = 0.01;
+    public static final double maxZoom = 6.0;
+
     public View() {
         setFocusable(true);
         ViewUtil listener = new ViewUtil();
@@ -50,7 +58,32 @@ public View() {
         addMouseWheelListener(listener);
         addKeyListener(listener);
 
-        //staticCanvas = getGraphicsConfiguration().createCompatibleImage(800, 600);
+        // Fetch the preferred refresh rate
+        Preferences prefs = Preferences.userNodeForPackage(View.class);
+        dynamicRefreshRate = prefs.getInt("dynamic_refresh_rate", dynamicRefreshRate);
+    }
+
+    /***
+     * @return The current dynamic refresh rate
+     */
+    public int getDynamicRefreshRate() {
+        return dynamicRefreshRate;
+    }
+
+    /***
+     * Sets and stores the dynamic refresh rate for the view. Capped to 5-120Hz
+     * @param newRate The new refresh rate, in Hz
+     */
+    public void setDynamicRefreshRate(int newRate) {
+        if (newRate < 5) {
+            newRate = 5;
+        }
+        else if (newRate > 120) {
+            newRate = 120;
+        }
+        Preferences prefs = Preferences.userNodeForPackage(View.class);
+        dynamicRefreshRate = newRate;
+        prefs.putInt("dynamic_refresh_rate", newRate);
     }
 
     public void calcXForm() {
@@ -192,9 +225,9 @@ public void paintComponent(Graphics oldG) {
     }
 
     /**
-     * Draws an error flag
+     * Draws a module's error flag
      */
-    public void drawError(Graphics2D g) {
+    private void drawError(Graphics2D g) {
         g.setColor(Colors.errorEdge);
         g.drawOval(-30, -30, 60, 60);
         g.setColor(Colors.errorFill);
@@ -205,27 +238,32 @@ public void drawError(Graphics2D g) {
     }
 
     /**
-     * Draws a grid
+     * Draws the background grid
      */
-    public void drawGrid(Graphics2D g) {
+    private void drawGrid(Graphics2D g) {
         double grid = zoom * Main.sim.grid;
 
+        // When extremely zoomed-out, displaying the grid is costly and pointless
+        if (grid < 1.5) {
+            return;
+        }
+
         int xNum = (int)(getWidth() / grid);
         int yNum = (int)(getHeight() / grid);
 
-        AffineTransform oldxform = new AffineTransform(g.getTransform());
+        AffineTransform oldTransform = new AffineTransform(g.getTransform());
         Line2D verticalLine = new Line2D.Double(0.0, -grid, 0.0, getHeight() + grid);
         Line2D horizontalLine = new Line2D.Double(-grid, 0.0, getWidth() + grid, 0.0);
         for (int i = 0; i <= xNum + 1; i++) {
             g.draw(verticalLine);
             g.translate(grid, 0.0);
         }
-        g.setTransform(oldxform);
+        g.setTransform(oldTransform);
         for (int i = 0; i <= yNum + 1; i++) {
             g.draw(horizontalLine);
             g.translate(0.0, grid);
         }
-        g.setTransform(oldxform);
+        g.setTransform(oldTransform);
     }
 
     /**
@@ -254,45 +292,25 @@ public void setTool(BaseTool newTool) {
     }
 
     /**
-     * Zooms the viewport in on the specified screen point
+     * Smoothly zooms the viewport in or out of the specified screen point
      * @param x X-coordinate
      * @param y Y-coordinate
      */
-    public void zoomIn(int x, int y) {
+    public void zoom(int x, int y, double amount) {
         Vec2 zmPt = ViewUtil.screenToWorld(new Vec2(x, y));
 
-        zoomI++;
-        if (zoomI > ZOOM_LIMIT) {
-            zoomI --;
+        zoom -= zoom * amount * ZOOM_MULTIPLIER;
+        if (zoom < minZoom) {
+            zoom = minZoom;
         }
-        else {
-            zoom = zoomI * ZOOM_MULTIPLIER;
-            calcXForm();
-            Vec2 newScreenPt = ViewUtil.worldToScreen(zmPt);
-            camX -= newScreenPt.x - x;
-            camY -= newScreenPt.y - y;
-        }
-    }
-
-    /**
-     * Zooms the view out form the specified screen point
-     * @param x X-coordinate
-     * @param y Y-coordinate
-     */
-    public void zoomOut(int x, int y) {
-        Vec2 zmPt = ViewUtil.screenToWorld(new Vec2(x, y));
-
-        zoomI--;
-        if (zoomI < 1) {
-            zoomI = 1;
-        }
-        else {
-            zoom = zoomI * ZOOM_MULTIPLIER;
-            calcXForm();
-            Vec2 newScreenPt = ViewUtil.worldToScreen(zmPt);
-            camX -= newScreenPt.x - x;
-            camY -= newScreenPt.y - y;
+        else if (zoom > maxZoom) {
+            zoom = maxZoom;
         }
+        calcXForm();
+        Vec2 newScreenPt = ViewUtil.worldToScreen(zmPt);
+        camX -= newScreenPt.x - x;
+        camY -= newScreenPt.y - y;
+        calcXForm();
     }
 
     /***
@@ -308,12 +326,16 @@ public void flagStaticRedraw() {
      */
     public void flagDynamicRedraw() {
         long currentTime = System.currentTimeMillis();
-        if (abs(currentTime - lastDynamicPaint) > 33) {
+        if (abs(currentTime - lastDynamicPaint) > (1000 / dynamicRefreshRate)) {
             repaint();
         }
         else {
             // persistence-of-vision simulation
-            // TODO!!
+            for (BaseModule m : Main.sim.getModules()) {
+                for (VisiblePart p : m.parts) {
+                    p.povTick();
+                }
+            }
         }
     }
 }

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

@@ -385,18 +385,13 @@ public void mouseMoved(MouseEvent e) {
             Main.ui.view.curTool = tool.mouseMove(e.getX(), e.getY());
         }
 
-        Main.ui.view.repaint();
+        Main.ui.view.flagDynamicRedraw();
     }
 
     public void mouseWheelMoved(MouseWheelEvent e) {
         testKeys(e);
         if (e.getScrollType() == MouseWheelEvent.WHEEL_UNIT_SCROLL) {
-            if (e.getWheelRotation() < 0) {
-                Main.ui.view.zoomIn(e.getX(), e.getY());
-            }
-            else {
-                Main.ui.view.zoomOut(e.getX(), e.getY());
-            }
+            Main.ui.view.zoom(e.getX(), e.getY(), e.getPreciseWheelRotation());
         }
 
         Main.ui.view.flagStaticRedraw();

src/com/modsim/modules/parts/LED.java

@@ -11,6 +11,9 @@ public class LED extends TogglePart {
 	private Color color;
 	private Color hColor;
 
+	private int povTicks = 0;
+	private int povHits = 0;
+
     // Convenience method, single LEDs are most commonly control.
     public LED(int x, int y) {
         this(x, y, LEDColour.BLUE);
@@ -30,9 +33,9 @@ public void paint(Graphics2D g) {
 		g.setColor(Colors.ledBack);
 		g.fillRect(x-4, y-4, 8, 8);
 
-		if (getEnabled()) {
+		if (getEnabled() || povHits > 0) {
 			g.setColor(color);
-			g.fillRect(x-4, y-4, 8, 8);
+            g.fillRect(x-4, y-4, 8, 8);
 			g.setColor(hColor);
 			g.fillRect(x-2, y-2, 4, 4);
 		}
@@ -41,6 +44,15 @@ public void paint(Graphics2D g) {
 			g.fillRect(x-2, y-2, 4, 4);
 		}
 
+		povTicks = 0;
+        povHits = 0;
 	}
 
+	@Override
+	public void povTick() {
+		povTicks++;
+		if (getEnabled()) {
+			povHits++;
+		}
+	}
 }

src/com/modsim/modules/parts/LEDRow.java

@@ -14,11 +14,16 @@
  */
 public class LEDRow extends VisiblePart {
 
+	private static final int NLEDS = 4;
+
 	private Color color = Color.BLUE;
 	private Color hColor = Color.BLUE;
 
 	private volatile BinData curVal = new BinData(0);
 
+	private int povTicks = 0;
+	private int povHits[] = new int[NLEDS];
+
     // Convenience method, LEDRow is usually data.
     public LEDRow(int x, int y) {
         this(x, y, LEDColour.RED);
@@ -55,10 +60,10 @@ public void paint(Graphics2D g) {
 		g.fillRect(x-15, y-3, 30, 6);
 
 		BinData v = getVal();
-		for (int i = 0; i < 4; i++) {
+		for (int i = 0; i < NLEDS; i++) {
 			int offs = x+(1-i)*8;
 
-			if (v.getBit(i) == 1) {
+			if (v.getBit(i) == 1 || povHits[i] > 0) {
 				g.setColor(color);
 				g.fillRect(offs+1, y-3, 6, 6);
 				g.setColor(hColor);
@@ -69,12 +74,27 @@ public void paint(Graphics2D g) {
 				g.fillRect(offs+2, y-2, 4, 4);
 			}
 		}
+
+		resetPov();
 	}
 
-    @Override
-    public void reset() {
-        curVal = new BinData(0);
-    }
+	@Override
+	public void povTick() {
+		povTicks++;
+		BinData v = getVal();
+		for (int i = 0; i < NLEDS; i++) {
+			if (v.getBit(i) == 1) {
+				povHits[i]++;
+			}
+		}
+	}
+
+	private void resetPov() {
+		povTicks = 0;
+		for (int i = 0; i < NLEDS; i++) {
+			povHits[i] = 0;
+		}
+	}
 
     @Override
 	public RefreshMode getRefreshMode() {

src/com/modsim/modules/parts/PushBtn.java

@@ -88,4 +88,8 @@ public void paint(Graphics2D g) {
 		}
 	}
 
+	@Override
+	public void povTick() {
+		// Don't care
+	}
 }

src/com/modsim/modules/parts/SSText.java

@@ -55,8 +55,8 @@ public void paint(Graphics2D g) {
     }
 
     @Override
-    public void reset() {
-        // Noop
+    public void povTick() {
+        // Don't care
     }
 
     @Override

src/com/modsim/modules/parts/Switch.java

@@ -68,4 +68,8 @@ public void paint(Graphics2D g) {
 		}
 	}
 
+	@Override
+	public void povTick() {
+		// Don't care
+	}
 }

src/com/modsim/modules/parts/VisiblePart.java

@@ -25,6 +25,10 @@ public enum RefreshMode {
 
 	// Display
 	public abstract void paint(Graphics2D g);
-	public abstract void reset();
 	public abstract RefreshMode getRefreshMode();
+
+	/***
+	 * Use to update the part's persistence-of-vision data
+	 */
+	public abstract void povTick();
 }