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=5a0579c3b0a728e0f8911271d60b616a89cc30d1;hb=ab6fe55865636188226545f5047a606ebd95674c;hp=db6d440759ea465153d91628a98b675d1fdc9456;hpb=67c7e16eac6ef555f7ebe0cbe6048598d7f1187e;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 db6d4407..5a0579c3 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
@@ -73,37 +73,7 @@ public class GUIWire
 	 * 
 	 * @author Daniel Kirschten
 	 */
-	public GUIWire(ViewModelModifiable model, WireCrossPoint pin1, WireCrossPoint pin2)
-	{
-		this(model, pin1, pin2, (Point[]) null);
-	}
-
-	/**
-	 * Creates a new {@link GUIWire} with automatic interpolation.
-	 * 
-	 * @author Daniel Kirschten
-	 */
-	public GUIWire(ViewModelModifiable model, WireCrossPoint pin1, Pin pin2)
-	{
-		this(model, pin1, pin2, (Point[]) null);
-	}
-
-	/**
-	 * Creates a new {@link GUIWire} with automatic interpolation.
-	 * 
-	 * @author Daniel Kirschten
-	 */
-	public GUIWire(ViewModelModifiable model, Pin pin1, WireCrossPoint pin2)
-	{
-		this(model, pin1, pin2, (Point[]) null);
-	}
-
-	/**
-	 * Creates a new {@link GUIWire} with automatic interpolation.
-	 * 
-	 * @author Daniel Kirschten
-	 */
-	public GUIWire(ViewModelModifiable model, Pin pin1, Pin pin2)
+	public GUIWire(ViewModelModifiable model, ConnectionPoint pin1, ConnectionPoint pin2)
 	{
 		this(model, pin1, pin2, (Point[]) null);
 	}
@@ -113,7 +83,7 @@ public class GUIWire
 	 * 
 	 * @author Daniel Kirschten
 	 */
-	public GUIWire(ViewModelModifiable model, WireCrossPoint pin1, WireCrossPoint pin2, Point... path)
+	public GUIWire(ViewModelModifiable model, ConnectionPoint pin1, ConnectionPoint pin2, Point... path)
 	{
 		this(model, pin1.getPin(), pin2.getPin(), path);
 	}
@@ -123,27 +93,7 @@ public class GUIWire
 	 * 
 	 * @author Daniel Kirschten
 	 */
-	public GUIWire(ViewModelModifiable model, WireCrossPoint pin1, Pin pin2, Point... path)
-	{
-		this(model, pin1.getPin(), pin2, path);
-	}
-
-	/**
-	 * Creates a new {@link GUIWire} without automatic interpolation.
-	 * 
-	 * @author Daniel Kirschten
-	 */
-	public GUIWire(ViewModelModifiable model, Pin pin1, WireCrossPoint pin2, Point... path)
-	{
-		this(model, pin1, pin2.getPin(), path);
-	}
-
-	/**
-	 * Creates a new {@link GUIWire} without automatic interpolation.
-	 * 
-	 * @author Daniel Kirschten
-	 */
-	public GUIWire(ViewModelModifiable model, Pin pin1, Pin pin2, Point... path)
+	GUIWire(ViewModelModifiable model, Pin pin1, Pin pin2, Point... path)
 	{
 		logicObs = (i) -> callRedrawListeners();
 		this.model = model;
@@ -312,6 +262,8 @@ public class GUIWire
 
 	/**
 	 * Returns whether this {@link GUIWire} has a logic model binding or not.
+	 * 
+	 * @author Daniel Kirschten
 	 */
 	public boolean hasLogicModelBinding()
 	{
@@ -321,12 +273,25 @@ public class GUIWire
 	/**
 	 * If this {@link GUIWire} has a logic model binding, delegates to {@link Wire#forceValues(BitVector)} for the {@link Wire}
 	 * corresponding to this {@link GUIWire}.
+	 * 
+	 * @author Daniel Kirschten
 	 */
 	public void forceWireValues(BitVector values)
 	{
 		end.getWire().forceValues(values);
 	}
 
+	/**
+	 * If this {@link GUIWire} has a logic model binding, delegates to {@link ReadEnd#getValues()} for the {@link ReadEnd} corresponding to
+	 * this {@link GUIWire}.
+	 * 
+	 * @author Daniel Kirschten
+	 */
+	public BitVector getWireValues()
+	{
+		return end.getValues();
+	}
+
 	// listeners
 
 	// @formatter:off