Implemented GUIAndGate

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

diff --git a/LogicUI/src/LogicUI.java b/LogicUI/src/LogicUI.java
index e572730..8242666 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;
 
 import era.mi.components.gui.BasicGUIComponent;
+import era.mi.components.gui.GUIAndGate;
 import era.mi.components.gui.GUIMerger;
 import era.mi.components.gui.GUIMux;
 import era.mi.components.gui.GUINotGate;
 import era.mi.components.gui.GUISplitter;
 import era.mi.logic.Simulation;
-import era.mi.logic.components.gates.AndGate;
 import era.mi.logic.wires.WireArray;
 import net.haspamelodica.swt.helper.gcs.GeneralGC;
 import net.haspamelodica.swt.helper.gcs.TranslatedGC;
@@ -50,7 +50,7 @@ public class LogicUI
                Simulation.TIMELINE.reset();
                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),
                                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);
-               new AndGate(1, f, a, b);
+               addComponent(new GUIAndGate(1, f, a, b), 130, 10);
                addComponent(new GUINotGate(1, f, g), 100, 10);
                addComponent(new GUIMerger(h, c, g), 70, 10);
                addComponent(new GUIMux(1, i, e, h, d), 10, 10);
@@ -70,7 +70,7 @@ public class LogicUI
                {
                        Point connectionPoint = component.getWireArrayConnectionPoint(i);
                        if(connectionPoint != null)
-                               tgc.fillOval(connectionPoint.x - 2, connectionPoint.y - 2, 4, 4);
+                               tgc.fillOval(connectionPoint.x - 1, connectionPoint.y - 1, 2, 2);
                }
        }
        public void run()