X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=LogicUI%2Fsrc%2FLogicUI.java;h=e572730a11e5b40ef14a8a0a414b3a3f9cd8be29;hb=4c1cb062db70c2644aff237109a03cb60cd5562f;hp=070f34311fd38ef969a970827b6b492974196763;hpb=438233eadb7f86a33953c21a8d6d6488ec9c2d66;p=Mograsim.git diff --git a/LogicUI/src/LogicUI.java b/LogicUI/src/LogicUI.java index 070f3431..e572730a 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.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.Merger; -import era.mi.logic.components.Splitter; import era.mi.logic.components.gates.AndGate; -import era.mi.logic.components.gates.NotGate; import era.mi.logic.wires.WireArray; import net.haspamelodica.swt.helper.gcs.GeneralGC; import net.haspamelodica.swt.helper.gcs.TranslatedGC; @@ -51,10 +51,10 @@ public class LogicUI 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); - new NotGate(1, f, g); - new Merger(h, c, g); + 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); - new Splitter(i, k, j); + addComponent(new GUISplitter(i, k, j), 40, 10); } private void addComponent(BasicGUIComponent component, double x, double y) {