Merge pull request TeachingTechnologistBeth#33 from EdNutting/master

EdNutting · web-flow · commit e80f9ffa2ac7 · 2018-11-04T14:22:04.000Z
Straight Paths
diff --git a/src/com/modsim/gui/view/ViewUtil.java b/src/com/modsim/gui/view/ViewUtil.java
@@ -12,7 +12,7 @@
 import com.modsim.modules.parts.Port;
 import com.modsim.simulator.*;
 import com.modsim.tools.*;
-import com.modsim.util.BezierPath;
+import com.modsim.util.Path;
 import com.modsim.util.Vec2;
 
 /**
@@ -34,7 +34,7 @@ public class ViewUtil implements MouseListener, MouseMotionListener, MouseWheelL
      */
     public static Link worldSpace_linkAt(Vec2 pt) {
         for (Link link : Main.sim.getLinks()) {
-            BezierPath.PointInfo info = link.path.approxClosestPoint(pt, 6);
+            Path.PointInfo info = link.path.approxClosestPoint(pt, 6);
 
             if (info.dist < 15.0) {
                 return link;
@@ -267,12 +267,12 @@ public void mousePressed(MouseEvent e) {
             boolean handled = false;
             if (targ != null && targ.getType() == PickableEntity.MODULE) {
                 BaseModule m = (BaseModule) targ;
-                handled = m.lbDown(e.getX(), e.getY());
+                handled = m.lbDown(e.getX(), e.getY(), e.isShiftDown());
             }
 
             if (!handled) {
                 if (tool != null) {
-                    Main.ui.view.curTool = tool.lbDown(e.getX(), e.getY());
+                    Main.ui.view.curTool = tool.lbDown(e.getX(), e.getY(), e.isShiftDown());
                 }
                 else {
                     Port p = screenSpace_portAt(e.getX(), e.getY());
@@ -282,7 +282,7 @@ public void mousePressed(MouseEvent e) {
                     //Link behaviour
                     if (p != null) {
                         tool = new MakeLinkTool();
-                        Main.ui.view.curTool = tool.lbDown(e.getX(), e.getY());
+                        Main.ui.view.curTool = tool.lbDown(e.getX(), e.getY(), e.isShiftDown());
                     }
                     else {
                         // Link edit if we haven't hit a module
@@ -299,7 +299,7 @@ public void mousePressed(MouseEvent e) {
 
                         // Finally, try selection behaviour
                         tool = new SelectTool();
-                        Main.ui.view.curTool = tool.lbDown(e.getX(), e.getY());
+                        Main.ui.view.curTool = tool.lbDown(e.getX(), e.getY(), e.isShiftDown());
                     }
                 }
             }
diff --git a/src/com/modsim/modules/BaseModule.java b/src/com/modsim/modules/BaseModule.java
@@ -560,7 +560,7 @@ public void delete() {
      * @param iy Y coord in view space
      * @return Whether the input was handled
      */
-    public boolean lbDown(int ix, int iy) {
+    public boolean lbDown(int ix, int iy, boolean isShiftDown) {
         if (!enabled) return false;
 
         // Coords in object space
@@ -573,7 +573,7 @@ public boolean lbDown(int ix, int iy) {
 
         synchronized (parts) {
             for (VisiblePart p : parts) {
-                if (p.lbDown(dx, dy)) {
+                if (p.lbDown(dx, dy, isShiftDown)) {
                     return true;
                 }
             }
diff --git a/src/com/modsim/modules/Link.java b/src/com/modsim/modules/Link.java
@@ -10,7 +10,9 @@
 import com.modsim.Main;
 import com.modsim.res.Colors;
 import com.modsim.operations.DeleteOperation;
+import com.modsim.util.Path;
 import com.modsim.util.BezierPath;
+import com.modsim.util.StraightPath;
 import com.modsim.util.BinData;
 
 /**
@@ -22,7 +24,7 @@ public class Link {
 
     public Port src;
     public Port targ;
-    public BezierPath path;
+    public Path path;
 
     public boolean highlight = false;
 
@@ -47,7 +49,7 @@ public int getLinkID() {
      * @param path A bezier path to display for the link
      * @return New link, or null if link was invalid
      */
-    public static Link createLink(Port source, Port target, BezierPath path) {
+    public static Link createLink(Port source, Port target, Path path) {
         // Check error conditions first
 
     	if (source == null || target == null) {
diff --git a/src/com/modsim/modules/parts/PushBtn.java b/src/com/modsim/modules/parts/PushBtn.java
@@ -42,7 +42,7 @@ public void init() {
 	}
 
 	@Override
-	public boolean lbDown(int xPt, int yPt) {
+	public boolean lbDown(int xPt, int yPt, boolean isShiftDown) {
 		if (xPt > x-w/2 && xPt < x+w/2 && yPt > y-h/2 && yPt < y+h/2) {
 			// Clicked
 			setEnabled(true);
diff --git a/src/com/modsim/modules/parts/Switch.java b/src/com/modsim/modules/parts/Switch.java
@@ -36,7 +36,7 @@ public void setColour(LEDColour col) {
     }
 
 	@Override
-	public boolean lbDown(int xPt, int yPt) {
+	public boolean lbDown(int xPt, int yPt, boolean isShiftDown) {
 		if (xPt > x-w/2 && xPt < x+w/2 && yPt > y-h/2 && yPt < y+h/2) {
 			// Clicked
 			toggleEnabled();
diff --git a/src/com/modsim/modules/parts/VisiblePart.java b/src/com/modsim/modules/parts/VisiblePart.java
@@ -20,7 +20,7 @@ public enum RefreshMode {
 	public BaseModule owner;
 
 	// Interaction
-	public boolean lbDown(int x, int y) {return false;}
+	public boolean lbDown(int x, int y, boolean isShiftDown) {return false;}
 	public boolean lbUp(int x, int y) {return false;}
 
 	// Display
diff --git a/src/com/modsim/tools/BaseTool.java b/src/com/modsim/tools/BaseTool.java
@@ -18,7 +18,7 @@ public abstract class BaseTool {
 	public BaseTool rbDown(int x, int y)  	{return this;}
 	public BaseTool rbUp(int x, int y)  	{return this;}
 
-	public BaseTool lbDown(int x, int y) 	{return this;}
+	public BaseTool lbDown(int x, int y, boolean isShiftDown) 	{return this;}
 	public BaseTool lbUp(int x, int y) 		{return this;}
 	public BaseTool mouseMove(int x, int y) {return this;}
 	public BaseTool mouseDrag(int x, int y) {return this;}
diff --git a/src/com/modsim/tools/EditLinkTool.java b/src/com/modsim/tools/EditLinkTool.java
@@ -6,7 +6,7 @@
 import com.modsim.operations.CreateOperation;
 import com.modsim.operations.MoveOperation;
 import com.modsim.res.Colors;
-import com.modsim.util.BezierPath.PointInfo;
+import com.modsim.util.Path.PointInfo;
 import com.modsim.util.CtrlPt;
 import com.modsim.util.Vec2;
 
@@ -77,7 +77,7 @@ public BaseTool rbDown(int x, int y) {
     }
 
     @Override
-    public BaseTool lbDown(int x, int y) {
+    public BaseTool lbDown(int x, int y, boolean isShiftDown) {
         // Try picking nearest control point
         Vec2 worldPoint = ViewUtil.screenToWorld(new Vec2(x, y));
         CtrlPt pickCtrl = link.path.closestCtrlPt(worldPoint);
diff --git a/src/com/modsim/tools/MakeLinkTool.java b/src/com/modsim/tools/MakeLinkTool.java
@@ -23,15 +23,15 @@ public class MakeLinkTool extends BaseTool {
 
 	public Vec2 start = new Vec2();
 	public Vec2 current = new Vec2();
-	public BezierPath curve;
+	public Path curve;
 
 	public boolean working = false;
 
 	@Override
-	public BaseTool lbDown(int x, int y) {
+	public BaseTool lbDown(int x, int y, boolean isShiftDown) {
 		// Get the clicked port, start linking from here
 		if (!working) {
-			if (!startLink(x, y)) {
+			if (!startLink(x, y, isShiftDown)) {
 				return null;
 			}
 		}
@@ -93,14 +93,18 @@ public void paintWorld(Graphics2D g) {
 	 * @param y Y position to check
 	 * @return True if successful
 	 */
-	public boolean startLink(int x, int y) {
+	public boolean startLink(int x, int y, boolean isShiftDown) {
 		source = ViewUtil.screenSpace_portAt(x, y);
 		if (source != null) {
             Main.selection.clear();
 
             working = true;
 			start = new Vec2(x, y);
-			curve = new BezierPath();
+            if (isShiftDown) {
+	             curve = new BezierPath();
+            } else {
+                curve = new StraightPath();
+            }
 
 			curve.setEnd(source.getDisplayPosW());
 			curve.setStart(source);
diff --git a/src/com/modsim/tools/PlaceTool.java b/src/com/modsim/tools/PlaceTool.java
@@ -72,7 +72,7 @@ public BaseTool mouseMove(int x, int y) {
     }
 
     @Override
-    public BaseTool lbDown(int x, int y) {
+    public BaseTool lbDown(int x, int y, boolean isShiftDown) {
         // Make sure the positions are up to date
         mouseMove(x, y);
 
diff --git a/src/com/modsim/tools/SelectTool.java b/src/com/modsim/tools/SelectTool.java
@@ -61,7 +61,7 @@ else if (e != null) {
 
     // This just fixes the weird delayed-start drag bug
     @Override
-    public BaseTool lbDown(int x, int y) {
+    public BaseTool lbDown(int x, int y, boolean isShiftDown) {
         synchronized (this) {
             // Don't actually set dragging=true till we get a mouseDrag() event
             screenDragStart.set(x, y);
diff --git a/src/com/modsim/util/BezierPath.java b/src/com/modsim/util/BezierPath.java
@@ -12,14 +12,7 @@
  * @author aw12700
  *
  */
-public class BezierPath {
-
-    public class PointInfo {
-        public Vec2 pt;
-        public double dist;
-        public double t;
-        public int curveIndex;
-    }
+public class BezierPath extends Path {
 
 	public List<BezierCurve> curves = new ArrayList<>();
 	protected ArrayList<CtrlPt> ctrlPts = new ArrayList<>();
@@ -118,6 +111,10 @@ public BezierPath(BezierPath curve) {
         calcCurves();
     }
 
+    public Path duplicate() {
+        return new BezierPath(this);
+    }
+
     /**
 	 * Moves the startpoint
 	 */
@@ -344,4 +341,7 @@ public void draw(Graphics2D g) {
 		}
 	}
 
+    public String XMLTagName() {
+        return "BezierPath";
+    }
 }
diff --git a/src/com/modsim/util/CtrlPt.java b/src/com/modsim/util/CtrlPt.java
@@ -10,7 +10,7 @@
 
 public class CtrlPt extends PickableEntity {
 
-    public BezierPath parent = null;
+    public Path parent = null;
 
     /**
      * Create a control point at the specified position
diff --git a/src/com/modsim/util/ModuleClipboard.java b/src/com/modsim/util/ModuleClipboard.java
@@ -147,7 +147,7 @@ protected void doCopy(List<BaseModule> src, List<BaseModule> destModules, List<L
 
                     newPort.link = null;
                     targetPort.link = null;
-                    Link newLink = Link.createLink(newPort, targetPort, new BezierPath(oldPort.link.path));
+                    Link newLink = Link.createLink(newPort, targetPort, oldPort.link.path.duplicate());
 
                     // Store the new link
                     if (newLink != null) {
diff --git a/src/com/modsim/util/Path.java b/src/com/modsim/util/Path.java
@@ -0,0 +1,53 @@
+package com.modsim.util;
+
+import java.awt.Graphics2D;
+import java.util.ArrayList;
+import java.util.List;
+
+import com.modsim.modules.parts.Port;
+import com.modsim.Main;
+
+public abstract class Path {
+
+    public class PointInfo {
+        public Vec2 pt;
+        public double dist;
+        public double t;
+        public int curveIndex;
+
+        public String toString() {
+            return pt.toString() + ", " + dist + ", " + t + ", " + curveIndex;
+        }
+    }
+
+	protected ArrayList<CtrlPt> ctrlPts = new ArrayList<>();
+
+    public abstract PointInfo approxClosestPoint(Vec2 searchPt, int iterations);
+    public abstract CtrlPt closestCtrlPt(Vec2 searchPt);
+
+    public abstract Path duplicate();
+
+    public abstract void updateContours();
+
+    public abstract void calcCurves();
+
+    public abstract void draw(Graphics2D g);
+
+    public abstract List<CtrlPt> getCtrlPts();
+
+    public abstract void setStart(Vec2 end);
+	public abstract void setStart(Vec2 end, Vec2 c);
+	public abstract void setStart(Port p);
+    public abstract void setEnd(Vec2 end);
+	public abstract void setEnd(Vec2 end, Vec2 c);
+	public abstract void setEnd(Port p);
+
+    public abstract void reverse();
+
+    public abstract void addPt(CtrlPt pt);
+    public abstract void addPt(int index, CtrlPt pt);
+    public abstract boolean removePt();
+    public abstract void removePt(CtrlPt ctrlPt);
+
+    public abstract String XMLTagName();
+}
diff --git a/src/com/modsim/util/StraightLine.java b/src/com/modsim/util/StraightLine.java
@@ -0,0 +1,69 @@
+package com.modsim.util;
+
+import java.awt.Graphics2D;
+import java.awt.geom.Line2D;
+
+public class StraightLine {
+
+	public Vec2 p1 = new Vec2();
+	public Vec2 p2 = new Vec2();
+
+	public Line2D line;
+
+	/**
+	 * Create a new bezier line
+	 */
+	public StraightLine(Vec2 pt1, Vec2 pt2) {
+		p1.set(pt1);
+		p2.set(pt2);
+
+		line = new Line2D.Double(p1.x, p1.y, p2.x, p2.y);
+	}
+
+	public StraightLine() {
+		line = new Line2D.Double(p1.x, p1.y, p2.x, p2.y);
+	}
+
+	/**
+	 * Update the display line
+	 */
+	public void update() {
+		line = new Line2D.Double(p1.x, p1.y, p2.x, p2.y);
+	}
+
+	/**
+	 * Calculate a point on the line
+	 * @param t Point on line to calculate
+	 * @return Cartesian coordinates of point
+	 */
+	public Vec2 calcPoint(double t) {
+        Vec2 a = new Vec2();
+        t = t * (p1.dist(p2));
+
+        if (p2.x - p1.x == 0) {
+            a.set(p1.x, p1.y + (p2.y - p1.y < 0 ? -t : t));
+        }
+        else {
+            double m = (p2.y - p1.y) / (p2.x - p1.x);
+            a.set(p1.x + (p2.x - p1.x < 0 ? -t : t), p1.y + (m * (p2.x - p1.x < 0 ? -t : t)));
+        }
+        
+		return a;
+	}
+
+	/**
+	 * Draw the line using java's straight line
+	 */
+	public void draw(Graphics2D g) {
+		g.draw(line);
+	}
+
+	/**
+	 * Return distance between start and end point
+	 */
+	public double len() {
+		Vec2 d = new Vec2(p1);
+		d.sub(p2);
+		return d.len();
+	}
+}
diff --git a/src/com/modsim/util/StraightPath.java b/src/com/modsim/util/StraightPath.java
diff --git a/src/com/modsim/util/XMLReader.java b/src/com/modsim/util/XMLReader.java
diff --git a/src/com/modsim/util/XMLWriter.java b/src/com/modsim/util/XMLWriter.java

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ public void init() {`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`@Override`
`45`		`- public boolean lbDown(int xPt, int yPt) {`
	`45`	`+ public boolean lbDown(int xPt, int yPt, boolean isShiftDown) {`
`46`	`46`	`if (xPt > x-w/2 && xPt < x+w/2 && yPt > y-h/2 && yPt < y+h/2) {`
`47`	`47`	`// Clicked`
`48`	`48`	`setEnabled(true);`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ public void setColour(LEDColour col) {`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`@Override`
`39`		`- public boolean lbDown(int xPt, int yPt) {`
	`39`	`+ public boolean lbDown(int xPt, int yPt, boolean isShiftDown) {`
`40`	`40`	`if (xPt > x-w/2 && xPt < x+w/2 && yPt > y-h/2 && yPt < y+h/2) {`
`41`	`41`	`// Clicked`
`42`	`42`	`toggleEnabled();`
Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ public BaseTool mouseMove(int x, int y) {`
`72`	`72`	`}`
`73`	`73`
`74`	`74`	`@Override`
`75`		`- public BaseTool lbDown(int x, int y) {`
	`75`	`+ public BaseTool lbDown(int x, int y, boolean isShiftDown) {`
`76`	`76`	`// Make sure the positions are up to date`
`77`	`77`	`mouseMove(x, y);`
`78`	`78`