\r
import net.mograsim.logic.core.wires.Wire.ReadEnd;\r
import net.mograsim.preferences.ColorDefinition;\r
-import net.mograsim.preferences.Preferences;\r
import net.mograsim.preferences.ColorDefinition.BuiltInColor;\r
+import net.mograsim.preferences.Preferences;\r
\r
public class BitVectorFormatter\r
{\r
{\r
if (bitVector == null)\r
return "null";\r
- return bitVector.toBitStringMSBFirst();\r
+ return bitVector.toString();\r
}\r
\r
- // TODO doesn't this belong to logic.ui?\r
+ // TODO doesn't this belong to logic.model?\r
public static ColorDefinition formatAsColor(ReadEnd end)\r
{\r
return formatAsColor(end == null ? null : end.getValues());\r
// TODO maybe find a color assignment for multiple-bit bit vectors?\r
if (bitVector == null || bitVector.length() != 1)\r
return new ColorDefinition(BuiltInColor.COLOR_BLACK);\r
- switch (bitVector.getBit(0))\r
+ switch (bitVector.getLSBit(0))\r
{\r
case ONE:\r
- return Preferences.current().getColorDefinition("net.mograsim.logic.ui.color.bit.one");\r
+ return Preferences.current().getColorDefinition("net.mograsim.logic.model.color.bit.one");\r
case U:\r
- return Preferences.current().getColorDefinition("net.mograsim.logic.ui.color.bit.u");\r
+ return Preferences.current().getColorDefinition("net.mograsim.logic.model.color.bit.u");\r
case X:\r
- return Preferences.current().getColorDefinition("net.mograsim.logic.ui.color.bit.x");\r
+ return Preferences.current().getColorDefinition("net.mograsim.logic.model.color.bit.x");\r
case Z:\r
- return Preferences.current().getColorDefinition("net.mograsim.logic.ui.color.bit.z");\r
+ return Preferences.current().getColorDefinition("net.mograsim.logic.model.color.bit.z");\r
case ZERO:\r
- return Preferences.current().getColorDefinition("net.mograsim.logic.ui.color.bit.zero");\r
+ return Preferences.current().getColorDefinition("net.mograsim.logic.model.color.bit.zero");\r
default:\r
- throw new IllegalArgumentException("Unknown enum constant: " + bitVector.getBit(0));\r
+ throw new IllegalArgumentException("Unknown enum constant: " + bitVector.getLSBit(0));\r
}\r
}\r
\r