X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.ui%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fui%2Fmodel%2Fwires%2FGUIWire.java;h=eb7e8aba435eef04910992eada977683a2e474cb;hb=a93901091c018edc992828e3a23817e97a98e4ca;hp=771e2e3adef6f5398d2d8dfa5c521c4bcef281f2;hpb=9c142c9ad59d2af070ebb6495b1ca48242da62d8;p=Mograsim.git

diff --git a/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/wires/GUIWire.java b/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/wires/GUIWire.java
index 771e2e3a..eb7e8aba 100644
--- a/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/wires/GUIWire.java
+++ b/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/wires/GUIWire.java
@@ -1,10 +1,12 @@
 package net.mograsim.logic.ui.model.wires;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 import net.haspamelodica.swt.helper.gcs.GeneralGC;
 import net.haspamelodica.swt.helper.swtobjectwrappers.Point;
+import net.haspamelodica.swt.helper.swtobjectwrappers.Rectangle;
 import net.mograsim.logic.core.LogicObservable;
 import net.mograsim.logic.core.LogicObserver;
 import net.mograsim.logic.core.types.BitVectorFormatter;
@@ -18,13 +20,50 @@ public class GUIWire
 	public final int logicWidth;
 	private Pin pin1;
 	private Pin pin2;
-	private double[] path;
+	private Point[] path;
+	private final Rectangle bounds;
+	private double[] effectivePath;
 
 	private final List<Runnable> redrawListeners;
 
 	private final LogicObserver logicObs;
 	private ReadEnd end;
 
+	public GUIWire(ViewModelModifiable model, WireCrossPoint pin1, WireCrossPoint pin2)
+	{
+		this(model, pin1, pin2, (Point[]) null);
+	}
+
+	public GUIWire(ViewModelModifiable model, WireCrossPoint pin1, Pin pin2)
+	{
+		this(model, pin1, pin2, (Point[]) null);
+	}
+
+	public GUIWire(ViewModelModifiable model, Pin pin1, WireCrossPoint pin2)
+	{
+		this(model, pin1, pin2, (Point[]) null);
+	}
+
+	public GUIWire(ViewModelModifiable model, Pin pin1, Pin pin2)
+	{
+		this(model, pin1, pin2, (Point[]) null);
+	}
+
+	public GUIWire(ViewModelModifiable model, WireCrossPoint pin1, WireCrossPoint pin2, Point... path)
+	{
+		this(model, pin1.getPin(), pin2.getPin(), path);
+	}
+
+	public GUIWire(ViewModelModifiable model, WireCrossPoint pin1, Pin pin2, Point... path)
+	{
+		this(model, pin1.getPin(), pin2, path);
+	}
+
+	public GUIWire(ViewModelModifiable model, Pin pin1, WireCrossPoint pin2, Point... path)
+	{
+		this(model, pin1, pin2.getPin(), path);
+	}
+
 	public GUIWire(ViewModelModifiable model, Pin pin1, Pin pin2, Point... path)
 	{
 		logicObs = (i) -> callRedrawListeners();
@@ -32,39 +71,73 @@ public class GUIWire
 		this.logicWidth = pin1.logicWidth;
 		if (pin2.logicWidth != pin1.logicWidth)
 			throw new IllegalArgumentException("Can't connect pins of different logic width");
-		this.path = new double[path.length * 2 + 4];
-		for (int srcI = 0, dstI = 2; srcI < path.length; srcI++, dstI += 2)
-		{
-			this.path[dstI + 0] = path[srcI].x;
-			this.path[dstI + 1] = path[srcI].y;
-		}
 
 		this.pin1 = pin1;
 		this.pin2 = pin2;
 
+		this.path = path == null ? null : Arrays.copyOf(path, path.length);
+		this.bounds = new Rectangle(0, 0, -1, -1);
+
 		redrawListeners = new ArrayList<>();
 
 		pin1.addPinMovedListener(p -> pin1Moved());
 		pin2.addPinMovedListener(p -> pin2Moved());
-		pin1Moved();
-		pin2Moved();
+
+		recalculateEffectivePath();
 
 		model.wireCreated(this);
 	}
 
+	private void recalculateEffectivePath()
+	{
+		Point pos1 = pin1.getPos(), pos2 = pin2.getPos();
+
+		double boundsX1 = Math.min(pos1.x, pos2.x);
+		double boundsY1 = Math.min(pos1.y, pos2.y);
+		double boundsX2 = Math.max(pos1.x, pos2.x);
+		double boundsY2 = Math.max(pos1.y, pos2.y);
+
+		if (path == null)
+			effectivePath = new double[] { pos1.x, pos1.y, (pos1.x + pos2.x) / 2, pos1.y, (pos1.x + pos2.x) / 2, pos2.y, pos2.x, pos2.y };
+		else
+		{
+			effectivePath = new double[path.length * 2 + 4];
+			effectivePath[0] = pos1.x;
+			effectivePath[1] = pos1.y;
+			for (int srcI = 0, dstI = 2; srcI < path.length; srcI++, dstI += 2)
+			{
+				double pathX = path[srcI].x;
+				double pathY = path[srcI].y;
+				effectivePath[dstI + 0] = pathX;
+				effectivePath[dstI + 1] = pathY;
+				if (pathX < boundsX1)
+					boundsX1 = pathX;
+				if (pathX > boundsX2)
+					boundsX2 = pathX;
+				if (pathY < boundsY1)
+					boundsY1 = pathY;
+				if (pathY > boundsY2)
+					boundsY2 = pathY;
+			}
+			effectivePath[effectivePath.length - 2] = pos2.x;
+			effectivePath[effectivePath.length - 1] = pos2.y;
+		}
+
+		bounds.x = boundsX1;
+		bounds.y = boundsY1;
+		bounds.width = boundsX2 - boundsX1;
+		bounds.height = boundsY2 - boundsY1;
+	}
+
 	private void pin1Moved()
 	{
-		Point pos = pin1.getPos();
-		this.path[0] = pos.x;
-		this.path[1] = pos.y;
+		recalculateEffectivePath();
 		callRedrawListeners();
 	}
 
 	private void pin2Moved()
 	{
-		Point pos = pin2.getPos();
-		this.path[this.path.length - 2] = pos.x;
-		this.path[this.path.length - 1] = pos.y;
+		recalculateEffectivePath();
 		callRedrawListeners();
 	}
 
@@ -73,9 +146,14 @@ public class GUIWire
 		model.wireDestroyed(this);
 	}
 
+	public Rectangle getBounds()
+	{
+		return new Rectangle(bounds.x, bounds.y, bounds.width, bounds.height);
+	}
+
 	public void render(GeneralGC gc)
 	{
-		ColorHelper.executeWithDifferentForeground(gc, BitVectorFormatter.formatAsColor(end), () -> gc.drawPolyline(path));
+		ColorHelper.executeWithDifferentForeground(gc, BitVectorFormatter.formatAsColor(end), () -> gc.drawPolyline(effectivePath));
 	}
 
 	public void setLogicModelBinding(ReadEnd end)
@@ -107,6 +185,11 @@ public class GUIWire
 		return pin2;
 	}
 
+	public Point[] getPath()
+	{
+		return path == null ? null : path.clone();
+	}
+
 	// @formatter:off
 	public void addRedrawListener   (Runnable listener) {redrawListeners         .add   (listener);}