From 15c8ce02755ed263e121fa469b3ef5955b63e707 Mon Sep 17 00:00:00 2001 From: Daniel Kirschten Date: Wed, 29 May 2019 17:45:28 +0200 Subject: [PATCH] Created a working, usable example in Playground --- .../src/era/mi/gui/examples/Playground.java | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/LogicUI/src/era/mi/gui/examples/Playground.java b/LogicUI/src/era/mi/gui/examples/Playground.java index cf9f1e07..5e6bb666 100644 --- a/LogicUI/src/era/mi/gui/examples/Playground.java +++ b/LogicUI/src/era/mi/gui/examples/Playground.java @@ -5,8 +5,10 @@ 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 @@ -19,11 +21,23 @@ public class Playground 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)); + 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); - ui.getLogicUICanvas().addListener(SWT.KeyDown, e -> notGate.moveTo(150, 10)); + ui.getLogicUICanvas().addListener(SWT.KeyDown, e -> notGate.moveTo(100, 10)); ui.run(); } -- 2.17.1