Implemented GUIhalfadder

[Mograsim.git] / net.mograsim.logic.ui / src / net / mograsim / logic / ui / model / components / mi / nandbased / GUIand.java

diff --git a/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/mi/nandbased/GUIand.java b/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/mi/nandbased/GUIand.java
index 2d6d3b5..eb8b888 100644 (file)
--- a/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/mi/nandbased/GUIand.java
+++ b/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/mi/nandbased/GUIand.java
@@ -35,18 +35,19 @@ public class GUIand extends SubmodelComponent
        private void initSubmodelComponents(Pin A, Pin B, Pin Y)
        {
                GUINandGate nand = new GUINandGate(submodelModifiable, 1);
-               nand.moveTo(20, 21.25);
                GUINandGate not = new GUINandGate(submodelModifiable, 1);
-               not.moveTo(50, 21.25);
 
                WireCrossPoint cp1 = new WireCrossPoint(submodelModifiable, 1);
+
+               nand.moveTo(20, 21.25);
+               not.moveTo(50, 21.25);
                cp1.moveTo(45, 31.25);
 
                new GUIWire(submodelModifiable, A, nand.getInputPins().get(0), new Point(10, 12.5), new Point(10, 26.25));
                new GUIWire(submodelModifiable, B, nand.getInputPins().get(1), new Point(10, 50), new Point(10, 36.25));
-               new GUIWire(submodelModifiable, nand.getOutputPin(), cp1.getPin());
-               new GUIWire(submodelModifiable, cp1.getPin(), not.getInputPins().get(0), new Point(45, 26.25));
-               new GUIWire(submodelModifiable, cp1.getPin(), not.getInputPins().get(1), new Point(45, 36.25));
+               new GUIWire(submodelModifiable, nand.getOutputPin(), cp1);
+               new GUIWire(submodelModifiable, cp1, not.getInputPins().get(0), new Point(45, 26.25));
+               new GUIWire(submodelModifiable, cp1, not.getInputPins().get(1), new Point(45, 36.25));
                new GUIWire(submodelModifiable, not.getOutputPin(), Y);
        }