X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=LogicUI%2Fsrc%2Fera%2Fmi%2Fgui%2Fcomponents%2FGUIManualSwitch.java;h=fde7bbdea1b4e8e8ec9cd5bd77eb23a3037ea07d;hb=0ce7f7122a702c3d6a4b864172b8c93620c8b03b;hp=09e243a76f43a39b5fc59605007be1aab03fd266;hpb=4be7eddcfc45e5e5794bd0dc1e2c2423fa43ec51;p=Mograsim.git

diff --git a/LogicUI/src/era/mi/gui/components/GUIManualSwitch.java b/LogicUI/src/era/mi/gui/components/GUIManualSwitch.java
index 09e243a7..fde7bbde 100644
--- a/LogicUI/src/era/mi/gui/components/GUIManualSwitch.java
+++ b/LogicUI/src/era/mi/gui/components/GUIManualSwitch.java
@@ -7,8 +7,10 @@ import java.util.List;
 import java.util.Map;
 
 import era.mi.logic.components.ManualSwitch;
+import era.mi.logic.timeline.Timeline;
 import era.mi.logic.types.Bit;
-import era.mi.logic.wires.Wire.WireEnd;
+import era.mi.logic.wires.Wire.ReadEnd;
+import era.mi.logic.wires.Wire.ReadWriteEnd;
 import net.haspamelodica.swt.helper.gcs.GeneralGC;
 import net.haspamelodica.swt.helper.swtobjectwrappers.Font;
 import net.haspamelodica.swt.helper.swtobjectwrappers.Point;
@@ -28,17 +30,17 @@ public class GUIManualSwitch extends ManualSwitch implements BasicGUIComponent
 		bitNames = Collections.unmodifiableMap(bitNamesModifiable);
 	}
 
-	private final WireEnd we;
-	private final List<WireEnd> connectedWireEnds;
+	private final ReadEnd we;
+	private final List<ReadEnd> connectedWireEnds;
 	private final List<Point> wireEndConnectionPoints;
 
-	public GUIManualSwitch(WireEnd output)
+	public GUIManualSwitch(Timeline timeline, ReadWriteEnd output)
 	{
-		super(output);
+		super(timeline, output);
 
 		this.we = output;
 
-		List<WireEnd> connectedWireEndsModifiable = new ArrayList<>();
+		List<ReadEnd> connectedWireEndsModifiable = new ArrayList<>();
 		List<Point> wireEndConnectionPointsModifiable = new ArrayList<>();
 
 		connectedWireEndsModifiable.add(output);
@@ -70,7 +72,7 @@ public class GUIManualSwitch extends ManualSwitch implements BasicGUIComponent
 	@Override
 	public boolean clicked(double x, double y)
 	{
-		toggle();
+		timeline.addEvent((e) -> toggle(), (int) (System.currentTimeMillis() - timeline.getSimulationTime()));
 		return true;
 	}
 
@@ -81,7 +83,7 @@ public class GUIManualSwitch extends ManualSwitch implements BasicGUIComponent
 	}
 
 	@Override
-	public WireEnd getConnectedWireEnd(int connectionIndex)
+	public ReadEnd getConnectedWireEnd(int connectionIndex)
 	{
 		return connectedWireEnds.get(connectionIndex);
 	}