X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=LogicUI%2Fsrc%2Fera%2Fmi%2Fgui%2Fexamples%2FPlayground.java;h=5e6bb6664545f8884e4c978fd8a189ad9f959882;hb=15c8ce02755ed263e121fa469b3ef5955b63e707;hp=78524b7d18393f36bda300ebf5b84a00093e2674;hpb=3e313a918963d07e59ddafd259884a6576361926;p=Mograsim.git

diff --git a/LogicUI/src/era/mi/gui/examples/Playground.java b/LogicUI/src/era/mi/gui/examples/Playground.java
index 78524b7d..5e6bb666 100644
--- a/LogicUI/src/era/mi/gui/examples/Playground.java
+++ b/LogicUI/src/era/mi/gui/examples/Playground.java
@@ -5,29 +5,47 @@ import org.eclipse.swt.SWT;
 import era.mi.gui.LogicUIStandalone;
 import era.mi.gui.model.ViewModel;
 import era.mi.gui.model.components.GUIAndGate;
+import era.mi.gui.model.components.GUIManualSwitch;
 import era.mi.gui.model.components.GUINotGate;
 import era.mi.gui.model.wires.GUIWire;
+import era.mi.gui.model.wires.WireCrossPoint;
 import net.haspamelodica.swt.helper.swtobjectwrappers.Point;
 
 public class Playground
 {
-	private static final int WIRE_DELAY = 10;
-	private static final int OR_DELAY = 50;
-	private static final int NOT_DELAY = 50;
-
 	public static void main(String[] args)
 	{
 		ViewModel model = new ViewModel();
+		GUIAndGate andGate = new GUIAndGate(model, 1);
+		andGate.moveTo(10, 10);
+		GUINotGate notGate = new GUINotGate(model, 1);
+		notGate.moveTo(10, 40);
+
+		WireCrossPoint wcp1 = new WireCrossPoint(model, 1);
+		wcp1.moveTo(150, 10);
+
+		new GUIWire(model, andGate.getOutputPin(), notGate.getInputPins().get(0), new Point(60, 50));
+		new GUIWire(model, notGate.getOutputPin(), wcp1.getPin());
+
+		GUIManualSwitch sw1 = new GUIManualSwitch(model);
+		sw1.moveTo(-20, 0);
+		GUIManualSwitch sw2 = new GUIManualSwitch(model);
+		sw2.moveTo(-20, 50);
+
+		new GUIWire(model, sw1.getOutputPin(), andGate.getInputPins().get(0));
+		new GUIWire(model, sw2.getOutputPin(), andGate.getInputPins().get(1));
+
 		LogicUIStandalone ui = new LogicUIStandalone(model);
-		addComponentsAndWires(ui, model);
+
+		ui.getLogicUICanvas().addListener(SWT.KeyDown, e -> notGate.moveTo(100, 10));
 		ui.run();
 	}
 
 	public static void addComponentsAndWires(LogicUIStandalone ui, ViewModel model)
 	{
-		GUIAndGate andGate = new GUIAndGate(model);
+		GUIAndGate andGate = new GUIAndGate(model, 1);
 		andGate.moveTo(10, 10);
-		GUINotGate notGate = new GUINotGate(model);
+		GUINotGate notGate = new GUINotGate(model, 1);
 		notGate.moveTo(10, 40);
 
 		new GUIWire(model, andGate.getPins().get(0), notGate.getPins().get(1), new Point(20, 50));