X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.ui%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fui%2Fmodel%2Fcomponents%2Fmi%2Fnandbased%2FGUIand.java;h=eb8b8880478068f06f18ba395787c136d2227d0a;hb=4c7ed08d1aa934f919e0bed29c868b553680a8ef;hp=2d6d3b5fcda94ad7d92d6bdad325dad36f8958fe;hpb=5fd86d84a38b322a67f454998f7f1a0e424c90b4;p=Mograsim.git

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 2d6d3b5f..eb8b8880 100644
--- 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);
 	}