Timeline updated (executeUntil, setTimeFunction)

[Mograsim.git] / LogicUI / src / era / mi / gui / components / GUIManualSwitch.java

diff --git a/LogicUI/src/era/mi/gui/components/GUIManualSwitch.java b/LogicUI/src/era/mi/gui/components/GUIManualSwitch.java
index 9af3940..ff674c5 100644 (file)
--- a/LogicUI/src/era/mi/gui/components/GUIManualSwitch.java
+++ b/LogicUI/src/era/mi/gui/components/GUIManualSwitch.java
@@ -6,9 +6,11 @@ import java.util.HashMap;
 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 era.mi.logic.timeline.Timeline;\r
+import era.mi.logic.types.Bit;\r
+import era.mi.logic.wires.Wire.ReadEnd;\r
+import era.mi.logic.wires.Wire.ReadWriteEnd;\r
 import net.haspamelodica.swt.helper.gcs.GeneralGC;\r
 import net.haspamelodica.swt.helper.swtobjectwrappers.Font;\r
 import net.haspamelodica.swt.helper.swtobjectwrappers.Point;\r
@@ -28,24 +30,24 @@ public class GUIManualSwitch extends ManualSwitch implements BasicGUIComponent
                bitNames = Collections.unmodifiableMap(bitNamesModifiable);\r
        }\r
 \r
-       private final WireArray                 wa;\r
-       private final List<WireArray>   connectedWireArrays;\r
-       private final List<Point>               wireArrayConnectionPoints;\r
+       private final ReadEnd we;\r
+       private final List<ReadEnd> connectedWireEnds;\r
+       private final List<Point> wireEndConnectionPoints;\r
 \r
-       public GUIManualSwitch(WireArray output)\r
+       public GUIManualSwitch(Timeline timeline, ReadWriteEnd output)\r
        {\r
-               super(output);\r
+               super(timeline, output);\r
 \r
-               this.wa = output;\r
+               this.we = output;\r
 \r
-               List<WireArray> connectedWireArraysModifiable = new ArrayList<>();\r
-               List<Point> wireArrayConnectionPointsModifiable = new ArrayList<>();\r
+               List<ReadEnd> connectedWireEndsModifiable = new ArrayList<>();\r
+               List<Point> wireEndConnectionPointsModifiable = new ArrayList<>();\r
 \r
-               connectedWireArraysModifiable.add(output);\r
-               wireArrayConnectionPointsModifiable.add(new Point(20, 7.5));\r
+               connectedWireEndsModifiable.add(output);\r
+               wireEndConnectionPointsModifiable.add(new Point(20, 7.5));\r
 \r
-               this.connectedWireArrays = Collections.unmodifiableList(connectedWireArraysModifiable);\r
-               this.wireArrayConnectionPoints = Collections.unmodifiableList(wireArrayConnectionPointsModifiable);\r
+               this.connectedWireEnds = Collections.unmodifiableList(connectedWireEndsModifiable);\r
+               this.wireEndConnectionPoints = Collections.unmodifiableList(wireEndConnectionPointsModifiable);\r
        }\r
 \r
        @Override\r
@@ -53,11 +55,12 @@ public class GUIManualSwitch extends ManualSwitch implements BasicGUIComponent
        {\r
                return new Rectangle(0, 0, 20, 15);\r
        }\r
+\r
        @Override\r
        public void render(GeneralGC gc)\r
        {\r
                gc.drawRectangle(0, 0, 20, 15);\r
-               String label = bitNames.get(wa.getValue());\r
+               String label = bitNames.get(we.getValue());\r
                Font oldFont = gc.getFont();\r
                Font labelFont = new Font(oldFont.getName(), 6, oldFont.getStyle());\r
                gc.setFont(labelFont);\r
@@ -65,26 +68,29 @@ public class GUIManualSwitch extends ManualSwitch implements BasicGUIComponent
                gc.drawText(label, 10 - textExtent.x / 2, 7.5 - textExtent.y / 2, true);\r
                gc.setFont(oldFont);\r
        }\r
+\r
        @Override\r
        public boolean clicked(double x, double y)\r
        {\r
-               toggle();\r
+               timeline.addEvent((e) -> toggle(), (int) (System.currentTimeMillis() - timeline.getSimulationTime()));\r
                return true;\r
        }\r
 \r
        @Override\r
-       public int getConnectedWireArraysCount()\r
+       public int getConnectedWireEndsCount()\r
        {\r
-               return connectedWireArrays.size();\r
+               return connectedWireEnds.size();\r
        }\r
+\r
        @Override\r
-       public WireArray getConnectedWireArray(int connectionIndex)\r
+       public ReadEnd getConnectedWireEnd(int connectionIndex)\r
        {\r
-               return connectedWireArrays.get(connectionIndex);\r
+               return connectedWireEnds.get(connectionIndex);\r
        }\r
+\r
        @Override\r
-       public Point getWireArrayConnectionPoint(int connectionI)\r
+       public Point getWireEndConnectionPoint(int connectionI)\r
        {\r
-               return wireArrayConnectionPoints.get(connectionI);\r
+               return wireEndConnectionPoints.get(connectionI);\r
        }\r
 }
\ No newline at end of file