X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=LogicUI%2Fsrc%2FLogicUI.java;h=8242666e56cd3d66e1871235ba5be01d32097028;hb=c88be3fe785d0b1f9adcae3d9be3606e6982728d;hp=e572730a11e5b40ef14a8a0a414b3a3f9cd8be29;hpb=4c1cb062db70c2644aff237109a03cb60cd5562f;p=Mograsim.git diff --git a/LogicUI/src/LogicUI.java b/LogicUI/src/LogicUI.java index e572730a..8242666e 100644 --- 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()