Implemented GUIAndGate

[Mograsim.git] / LogicUI / src / LogicUI.java

diff --git a/LogicUI/src/LogicUI.java b/LogicUI/src/LogicUI.java
index 515bdb4..d0e23b4 100644 (file)
--- a/LogicUI/src/LogicUI.java
+++ b/LogicUI/src/LogicUI.java
@@ -9,12 +9,12 @@ import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Shell;\r
 \r
 import era.mi.components.gui.BasicGUIComponent;\r
+import era.mi.components.gui.GUIAndGate;\r
 import era.mi.components.gui.GUIMerger;\r
 import era.mi.components.gui.GUIMux;\r
 import era.mi.components.gui.GUINotGate;\r
 import era.mi.components.gui.GUISplitter;\r
 import era.mi.logic.Simulation;\r
-import era.mi.logic.components.gates.AndGate;\r
 import era.mi.logic.wires.WireArray;\r
 import net.haspamelodica.swt.helper.gcs.GeneralGC;\r
 import net.haspamelodica.swt.helper.gcs.TranslatedGC;\r
@@ -50,7 +50,7 @@ public class LogicUI
                Simulation.TIMELINE.reset();\r
                WireArray a = new WireArray(1, 1), b = new WireArray(1, 1), c = new WireArray(1, 10), d = new WireArray(2, 1), e = new WireArray(1, 1),\r
                                f = new WireArray(1, 1), g = new WireArray(1, 1), h = new WireArray(2, 1), i = new WireArray(2, 1), j = new WireArray(1, 1), k = new WireArray(1, 1);\r
-               new AndGate(1, f, a, b);\r
+               addComponent(new GUIAndGate(1, f, a, b), 130, 10);\r
                addComponent(new GUINotGate(1, f, g), 100, 10);\r
                addComponent(new GUIMerger(h, c, g), 70, 10);\r
                addComponent(new GUIMux(1, i, e, h, d), 10, 10);\r