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

diff --git a/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/mi/nandbased/GUImux1.java b/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/mi/nandbased/GUImux1.java
index 3bd6d237..9707e217 100644
--- a/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/mi/nandbased/GUImux1.java
+++ b/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/mi/nandbased/GUImux1.java
@@ -13,53 +13,45 @@ public class GUImux1 extends SimpleRectangularSubmodelComponent
 	public GUImux1(ViewModelModifiable model)
 	{
 		super(model, 1, "GUImux1");
-		setSize(80, 40);
 		setSubmodelScale(.4);
-
-		setInputCount(3);
-		setOutputCount(1);
+		setInputPins("S0", "I0", "I1");
+		setOutputPins("Y");
 		initSubmodelComponents();
 	}
 
 	@SuppressWarnings("unused")
 	private void initSubmodelComponents()
 	{
-		Pin S0 = getInputSubmodelPins().get(0);
-		Pin I0 = getInputSubmodelPins().get(1);
-		Pin I1 = getInputSubmodelPins().get(2);
-		Pin Y = getOutputSubmodelPins().get(0);
+		Pin S0 = getSubmodelPin("S0");
+		Pin I0 = getSubmodelPin("I0");
+		Pin I1 = getSubmodelPin("I1");
+		Pin Y = getSubmodelPin("Y");
 
 		GUINandGate nandS0 = new GUINandGate(submodelModifiable, 1);
 		GUINandGate nandI0 = new GUINandGate(submodelModifiable, 1);
 		GUINandGate nandI1 = new GUINandGate(submodelModifiable, 1);
 		GUINandGate nandY = new GUINandGate(submodelModifiable, 1);
 
+		WireCrossPoint cp0 = new WireCrossPoint(submodelModifiable, 1);
+		WireCrossPoint cp1 = new WireCrossPoint(submodelModifiable, 1);
+
 		nandS0.moveTo(10, 7.5);
 		nandI0.moveTo(35, 22.5);
 		nandI1.moveTo(35, 47.5);
 		nandY.moveTo(60, 30);
-
-		WireCrossPoint cp0 = new WireCrossPoint(submodelModifiable, 1);
-		WireCrossPoint cp1 = new WireCrossPoint(submodelModifiable, 1);
-
-		cp0.moveTo(5, 12.5);
-		cp1.moveTo(5, 22.5);
-
-		new GUIWire(submodelModifiable, S0, cp0);
-		new GUIWire(submodelModifiable, cp0, nandS0.getInputPins().get(0));
-		new GUIWire(submodelModifiable, cp0, cp1);
-		new GUIWire(submodelModifiable, cp1, nandS0.getInputPins().get(1));
-
-		new GUIWire(submodelModifiable, nandS0.getOutputPin(), nandI0.getInputPins().get(0));
-		new GUIWire(submodelModifiable, I0, nandI0.getInputPins().get(1));
-
-		new GUIWire(submodelModifiable, cp1, nandI1.getInputPins().get(0),
-				new Point(cp1.getPin().getPos().x, nandI1.getInputPins().get(0).getPos().y));
-		new GUIWire(submodelModifiable, I1, nandI1.getInputPins().get(1));
-
-		new GUIWire(submodelModifiable, nandI0.getOutputPin(), nandY.getInputPins().get(0));
-		new GUIWire(submodelModifiable, nandI1.getOutputPin(), nandY.getInputPins().get(1));
-
-		new GUIWire(submodelModifiable, nandY.getOutputPin(), Y);
+		cp0.moveCenterTo(5, 12.5);
+		cp1.moveCenterTo(5, 22.5);
+
+		new GUIWire(submodelModifiable, S0, cp0, new Point[0]);
+		new GUIWire(submodelModifiable, cp0, nandS0.getPin("A"), new Point[0]);
+		new GUIWire(submodelModifiable, cp0, cp1, new Point[0]);
+		new GUIWire(submodelModifiable, cp1, nandS0.getPin("B"), new Point[0]);
+		new GUIWire(submodelModifiable, nandS0.getPin("Y"), nandI0.getPin("A"));
+		new GUIWire(submodelModifiable, I0, nandI0.getPin("B"), new Point[0]);
+		new GUIWire(submodelModifiable, cp1, nandI1.getPin("A"), new Point(5, 52.5));
+		new GUIWire(submodelModifiable, I1, nandI1.getPin("B"), new Point[0]);
+		new GUIWire(submodelModifiable, nandI0.getPin("Y"), nandY.getPin("A"));
+		new GUIWire(submodelModifiable, nandI1.getPin("Y"), nandY.getPin("B"));
+		new GUIWire(submodelModifiable, nandY.getPin("Y"), Y);
 	}
 }
\ No newline at end of file