GUIManualSwitch now shows the actual value of the output WireArray

diff --git a/LogicUI/src/era/mi/gui/components/GUIManualSwitch.java b/LogicUI/src/era/mi/gui/components/GUIManualSwitch.java
index 3201bae..9af3940 100644 (file)
--- a/LogicUI/src/era/mi/gui/components/GUIManualSwitch.java
+++ b/LogicUI/src/era/mi/gui/components/GUIManualSwitch.java
@@ -2,8 +2,11 @@ package era.mi.gui.components;
 \r
 import java.util.ArrayList;\r
 import java.util.Collections;\r
+import java.util.HashMap;\r
 import java.util.List;\r
+import java.util.Map;\r
 \r
+import era.mi.logic.Bit;\r
 import era.mi.logic.components.ManualSwitch;\r
 import era.mi.logic.wires.WireArray;\r
 import net.haspamelodica.swt.helper.gcs.GeneralGC;\r
@@ -13,6 +16,19 @@ import net.haspamelodica.swt.helper.swtobjectwrappers.Rectangle;
 \r
 public class GUIManualSwitch extends ManualSwitch implements BasicGUIComponent\r
 {\r
+       private static final Map<Bit, String> bitNames;\r
+       static\r
+       {\r
+               Map<Bit, String> bitNamesModifiable = new HashMap<>();\r
+               bitNamesModifiable.put(Bit.ONE, "1");\r
+               bitNamesModifiable.put(Bit.ZERO, "0");\r
+               bitNamesModifiable.put(Bit.Z, "Z");\r
+               bitNamesModifiable.put(Bit.U, "U");\r
+               bitNamesModifiable.put(Bit.X, "X");\r
+               bitNames = Collections.unmodifiableMap(bitNamesModifiable);\r
+       }\r
+\r
+       private final WireArray                 wa;\r
        private final List<WireArray>   connectedWireArrays;\r
        private final List<Point>               wireArrayConnectionPoints;\r
 \r
@@ -20,6 +36,8 @@ public class GUIManualSwitch extends ManualSwitch implements BasicGUIComponent
        {\r
                super(output);\r
 \r
+               this.wa = output;\r
+\r
                List<WireArray> connectedWireArraysModifiable = new ArrayList<>();\r
                List<Point> wireArrayConnectionPointsModifiable = new ArrayList<>();\r
 \r
@@ -39,7 +57,7 @@ public class GUIManualSwitch extends ManualSwitch implements BasicGUIComponent
        public void render(GeneralGC gc)\r
        {\r
                gc.drawRectangle(0, 0, 20, 15);\r
-               String label = isOn() ? "ON" : "OFF";\r
+               String label = bitNames.get(wa.getValue());\r
                Font oldFont = gc.getFont();\r
                Font labelFont = new Font(oldFont.getName(), 6, oldFont.getStyle());\r
                gc.setFont(labelFont);\r