X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.ui%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fui%2Fmodel%2Fcomponents%2Fmi%2Fnandbased%2FGUInot4.java;h=e3db01033dc69ec154d4645b156abb2164631629;hb=a84700145147c263ad6692c99117a7cf37832378;hp=3d745fd9e0b56c7d5cc9e8005edff6d0daef5b71;hpb=3eab8ad51d76fc6cb8d88b80644bd518bd1dc8df;p=Mograsim.git

diff --git a/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/mi/nandbased/GUInot4.java b/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/mi/nandbased/GUInot4.java
index 3d745fd9..e3db0103 100644
--- a/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/mi/nandbased/GUInot4.java
+++ b/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/mi/nandbased/GUInot4.java
@@ -14,22 +14,22 @@ public class GUInot4 extends SimpleRectangularSubmodelComponent
 	{
 		super(model, 1, "GUInot4");
 		setSubmodelScale(.4);
-		setInputCount(4);
-		setOutputCount(4);
+		setInputPins("A1", "A2", "A3", "A4");
+		setOutputPins("Y1", "Y2", "Y3", "Y4");
 		initSubmodelComponents();
 	}
 
 	@SuppressWarnings("unused") // for GUIWires being created
 	private void initSubmodelComponents()
 	{
-		Pin A1 = getInputSubmodelPins().get(0);
-		Pin A2 = getInputSubmodelPins().get(1);
-		Pin A3 = getInputSubmodelPins().get(2);
-		Pin A4 = getInputSubmodelPins().get(3);
-		Pin Y1 = getOutputSubmodelPins().get(0);
-		Pin Y2 = getOutputSubmodelPins().get(1);
-		Pin Y3 = getOutputSubmodelPins().get(2);
-		Pin Y4 = getOutputSubmodelPins().get(3);
+		Pin A1 = getSubmodelPin("A1");
+		Pin A2 = getSubmodelPin("A2");
+		Pin A3 = getSubmodelPin("A3");
+		Pin A4 = getSubmodelPin("A4");
+		Pin Y1 = getSubmodelPin("Y1");
+		Pin Y2 = getSubmodelPin("Y2");
+		Pin Y3 = getSubmodelPin("Y3");
+		Pin Y4 = getSubmodelPin("Y4");
 
 		GUINandGate nand1 = new GUINandGate(submodelModifiable, 1);
 		GUINandGate nand2 = new GUINandGate(submodelModifiable, 1);
@@ -45,26 +45,26 @@ public class GUInot4 extends SimpleRectangularSubmodelComponent
 		nand2.moveTo(30, 27.5);
 		nand3.moveTo(30, 52.5);
 		nand4.moveTo(30, 77.5);
-		cp1.moveTo(15, 12.5);
-		cp2.moveTo(15, 37.5);
-		cp3.moveTo(15, 62.5);
-		cp4.moveTo(15, 87.5);
+		cp1.moveCenterTo(15, 12.5);
+		cp2.moveCenterTo(15, 37.5);
+		cp3.moveCenterTo(15, 62.5);
+		cp4.moveCenterTo(15, 87.5);
 
 		new GUIWire(submodelModifiable, A1, cp1, new Point[0]);
 		new GUIWire(submodelModifiable, A2, cp2, new Point[0]);
 		new GUIWire(submodelModifiable, A3, cp3, new Point[0]);
 		new GUIWire(submodelModifiable, A4, cp4, new Point[0]);
-		new GUIWire(submodelModifiable, cp1, nand1.getInputPins().get(0), new Point(15, 7.5));
-		new GUIWire(submodelModifiable, cp2, nand2.getInputPins().get(0), new Point(15, 32.5));
-		new GUIWire(submodelModifiable, cp3, nand3.getInputPins().get(0), new Point(15, 57.5));
-		new GUIWire(submodelModifiable, cp4, nand4.getInputPins().get(0), new Point(15, 82.5));
-		new GUIWire(submodelModifiable, cp1, nand1.getInputPins().get(1), new Point(15, 17.5));
-		new GUIWire(submodelModifiable, cp2, nand2.getInputPins().get(1), new Point(15, 42.5));
-		new GUIWire(submodelModifiable, cp3, nand3.getInputPins().get(1), new Point(15, 67.5));
-		new GUIWire(submodelModifiable, cp4, nand4.getInputPins().get(1), new Point(15, 92.5));
-		new GUIWire(submodelModifiable, nand1.getOutputPin(), Y1, new Point[0]);
-		new GUIWire(submodelModifiable, nand2.getOutputPin(), Y2, new Point[0]);
-		new GUIWire(submodelModifiable, nand3.getOutputPin(), Y3, new Point[0]);
-		new GUIWire(submodelModifiable, nand4.getOutputPin(), Y4, new Point[0]);
+		new GUIWire(submodelModifiable, cp1, nand1.getPin("A"), new Point(15, 7.5));
+		new GUIWire(submodelModifiable, cp2, nand2.getPin("A"), new Point(15, 32.5));
+		new GUIWire(submodelModifiable, cp3, nand3.getPin("A"), new Point(15, 57.5));
+		new GUIWire(submodelModifiable, cp4, nand4.getPin("A"), new Point(15, 82.5));
+		new GUIWire(submodelModifiable, cp1, nand1.getPin("B"), new Point(15, 17.5));
+		new GUIWire(submodelModifiable, cp2, nand2.getPin("B"), new Point(15, 42.5));
+		new GUIWire(submodelModifiable, cp3, nand3.getPin("B"), new Point(15, 67.5));
+		new GUIWire(submodelModifiable, cp4, nand4.getPin("B"), new Point(15, 92.5));
+		new GUIWire(submodelModifiable, nand1.getPin("Y"), Y1, new Point[0]);
+		new GUIWire(submodelModifiable, nand2.getPin("Y"), Y2, new Point[0]);
+		new GUIWire(submodelModifiable, nand3.getPin("Y"), Y3, new Point[0]);
+		new GUIWire(submodelModifiable, nand4.getPin("Y"), Y4, new Point[0]);
 	}
 }
\ No newline at end of file