X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=net.mograsim.logic.ui%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fui%2Fmodel%2Fwires%2FGUIWire.java;h=7b641ff3484c05bf8e92cb87b73b408775b2381b;hb=a2eef1d1616d03af5b464f347f6176ea9d2cc75e;hp=db6d440759ea465153d91628a98b675d1fdc9456;hpb=6c1fd50db4ade47f87011879b4a6548495eb183f;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..7b641ff3 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
@@ -14,8 +14,9 @@ import net.mograsim.logic.core.types.BitVector;
 import net.mograsim.logic.core.types.BitVectorFormatter;
 import net.mograsim.logic.core.wires.Wire;
 import net.mograsim.logic.core.wires.Wire.ReadEnd;
-import net.mograsim.logic.ui.ColorHelper;
 import net.mograsim.logic.ui.model.ViewModelModifiable;
+import net.mograsim.preferences.ColorDefinition;
+import net.mograsim.preferences.ColorManager;
 
 /**
  * A wire connecting exactly two {@link Pin}s.
@@ -276,7 +277,10 @@ public class GUIWire
 	 */
 	public void render(GeneralGC gc)
 	{
-		ColorHelper.executeWithDifferentForeground(gc, BitVectorFormatter.formatAsColor(end), () -> gc.drawPolyline(effectivePath));
+		ColorDefinition wireColor = BitVectorFormatter.formatAsColor(end);
+		if (wireColor != null)
+			gc.setForeground(ColorManager.current().toColor(wireColor));
+		gc.drawPolyline(effectivePath);
 	}
 
 	/**
@@ -312,6 +316,8 @@ public class GUIWire
 
 	/**
 	 * Returns whether this {@link GUIWire} has a logic model binding or not.
+	 * 
+	 * @author Daniel Kirschten
 	 */
 	public boolean hasLogicModelBinding()
 	{
@@ -321,12 +327,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