X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.core%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fcore%2Ftypes%2FBitVectorFormatter.java;h=6a48cdc9c036f7ef71a29f994df80b561f272464;hb=aec975231e1341a403eb0c78af605e3be9adef95;hp=eb4e45ff2f5a516497fa1b0f8546487a45b2391f;hpb=218ed3e44595ad3534c33e05b43a55cc1a67e851;p=Mograsim.git

diff --git a/net.mograsim.logic.core/src/net/mograsim/logic/core/types/BitVectorFormatter.java b/net.mograsim.logic.core/src/net/mograsim/logic/core/types/BitVectorFormatter.java
index eb4e45ff..6a48cdc9 100644
--- a/net.mograsim.logic.core/src/net/mograsim/logic/core/types/BitVectorFormatter.java
+++ b/net.mograsim.logic.core/src/net/mograsim/logic/core/types/BitVectorFormatter.java
@@ -1,7 +1,9 @@
 package net.mograsim.logic.core.types;
 
-import net.mograsim.logic.core.types.ColorDefinition.BuiltInColor;
 import net.mograsim.logic.core.wires.Wire.ReadEnd;
+import net.mograsim.preferences.ColorDefinition;
+import net.mograsim.preferences.Preferences;
+import net.mograsim.preferences.ColorDefinition.BuiltInColor;
 
 public class BitVectorFormatter
 {
@@ -14,9 +16,10 @@ public class BitVectorFormatter
 	{
 		if (bitVector == null)
 			return "null";
-		return bitVector.toString();
+		return bitVector.toBitStringMSBFirst();
 	}
 
+	// TODO doesn't this belong to logic.ui?
 	public static ColorDefinition formatAsColor(ReadEnd end)
 	{
 		return formatAsColor(end == null ? null : end.getValues());
@@ -30,15 +33,15 @@ public class BitVectorFormatter
 		switch (bitVector.getBit(0))
 		{
 		case ONE:
-			return new ColorDefinition(BuiltInColor.COLOR_GREEN);
+			return Preferences.current().getColorDefinition("net.mograsim.logic.ui.color.bit.one");
 		case U:
-			return new ColorDefinition(BuiltInColor.COLOR_CYAN);
+			return Preferences.current().getColorDefinition("net.mograsim.logic.ui.color.bit.u");
 		case X:
-			return new ColorDefinition(BuiltInColor.COLOR_RED);
+			return Preferences.current().getColorDefinition("net.mograsim.logic.ui.color.bit.x");
 		case Z:
-			return new ColorDefinition(BuiltInColor.COLOR_YELLOW);
+			return Preferences.current().getColorDefinition("net.mograsim.logic.ui.color.bit.z");
 		case ZERO:
-			return new ColorDefinition(BuiltInColor.COLOR_GRAY);
+			return Preferences.current().getColorDefinition("net.mograsim.logic.ui.color.bit.zero");
 		default:
 			throw new IllegalArgumentException("Unknown enum constant: " + bitVector.getBit(0));
 		}