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_4.java;h=479f66a951b9df77a86e38ac002e23b94737f311;hb=19ee1a7fdb06a1df65cd7df78fed935124496707;hp=19c6c33a250318360f66dd9f9398da111a6b9fe3;hpb=5ca1908c7f6b61c834c69ed21f75e8e2eb48b21a;p=Mograsim.git

diff --git a/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/mi/nandbased/GUImux1_4.java b/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/mi/nandbased/GUImux1_4.java
index 19c6c33a..479f66a9 100644
--- a/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/mi/nandbased/GUImux1_4.java
+++ b/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/mi/nandbased/GUImux1_4.java
@@ -7,80 +7,70 @@ import net.mograsim.logic.ui.model.wires.GUIWire;
 import net.mograsim.logic.ui.model.wires.Pin;
 import net.mograsim.logic.ui.model.wires.WireCrossPoint;
 
-/**
- * @formatter:off
- * Inputs:
- * 0: select
- * 1: I0_0
- * 2: I0_1
- * 3: I0_2
- * 4: I0_3
- * 5: I1_0
- * 6: I1_1
- * 7: I1_2
- * 8: I1_3
- * Outputs:
- * 0: Y0
- * 1: Y1
- * 2: Y2
- * 3: Y3
- * @formatter:on
- */
 public class GUImux1_4 extends SimpleRectangularSubmodelComponent
 {
 	public GUImux1_4(ViewModelModifiable model)
 	{
 		super(model, 1, "GUImux1_4");
 		setSubmodelScale(.4);
-		setInputCount(9);
-		setOutputCount(4);
+		setInputPins("S0", "I0_1", "I0_2", "I0_3", "I0_4", "I1_1", "I1_2", "I1_3", "I1_4");
+		setOutputPins("Y1", "Y2", "Y3", "Y4");
 		initSubmodelComponents();
 	}
 
 	@SuppressWarnings("unused")
 	private void initSubmodelComponents()
 	{
+		Pin S0 = getSubmodelPin("S0");
+		Pin I0_1 = getSubmodelPin("I0_1");
+		Pin I0_2 = getSubmodelPin("I0_2");
+		Pin I0_3 = getSubmodelPin("I0_3");
+		Pin I0_4 = getSubmodelPin("I0_4");
+		Pin I1_1 = getSubmodelPin("I1_1");
+		Pin I1_2 = getSubmodelPin("I1_2");
+		Pin I1_3 = getSubmodelPin("I1_3");
+		Pin I1_4 = getSubmodelPin("I1_4");
+		Pin Y1 = getSubmodelPin("Y1");
+		Pin Y2 = getSubmodelPin("Y2");
+		Pin Y3 = getSubmodelPin("Y3");
+		Pin Y4 = getSubmodelPin("Y4");
 
 		GUImux1 mux1 = new GUImux1(submodelModifiable);
 		GUImux1 mux2 = new GUImux1(submodelModifiable);
 		GUImux1 mux3 = new GUImux1(submodelModifiable);
 		GUImux1 mux4 = new GUImux1(submodelModifiable);
 
-		GUImux1 mux[] = { mux1, mux2, mux3, mux4 };
-		WireCrossPoint[] cps = new WireCrossPoint[mux.length - 1];
+		WireCrossPoint cp1 = new WireCrossPoint(submodelModifiable, 1);
+		WireCrossPoint cp2 = new WireCrossPoint(submodelModifiable, 1);
+		WireCrossPoint cp3 = new WireCrossPoint(submodelModifiable, 1);
 
-		double muxXOffset = 30, muxYOffset = 7.5, muxYMargin = 5;
-		Pin test = getInputPins().get(0);
-		Pin test2 = mux[0].getInputPins().get(1);
-		for (int i = 0; i < mux.length; i++)
-		{
-			mux[i].moveTo(muxXOffset, muxYOffset + (mux[0].getBounds().height + muxYMargin) * i);
-			Pin inPinA = getInputSubmodelPins().get(i + 1);
-			Pin inPinB = getInputSubmodelPins().get(mux.length + i + 1);
-			Pin muxPin = mux[i].getInputPins().get(1);
+		mux1.moveTo(30, 7.5);
+		mux2.moveTo(30, 42.5);
+		mux3.moveTo(30, 77.5);
+		mux4.moveTo(30, 112.5);
+		cp1.moveCenterTo(25, 12.5);
+		cp2.moveCenterTo(25, 47.5);
+		cp3.moveCenterTo(25, 82.5);
 
-			new GUIWire(submodelModifiable, inPinA, muxPin, new Point(inPinA.getPos().x + 5, inPinA.getPos().y),
-					new Point(inPinA.getPos().x + 5, muxPin.getPos().y));
-			new GUIWire(submodelModifiable, inPinB, mux[i].getInputPins().get(2), new Point(10 + 5 * i, inPinB.getPos().y),
-					new Point(10 + 5 * i, mux[i].getInputPins().get(2).getPos().y));
-			new GUIWire(submodelModifiable, mux[i].getOutputPins().get(0), getOutputSubmodelPins().get(i));
+		new GUIWire(submodelModifiable, S0, cp1, new Point[0]);
+		new GUIWire(submodelModifiable, cp1, mux1.getPin("S0"), new Point[0]);
+		new GUIWire(submodelModifiable, I0_1, mux1.getPin("I0"), new Point(5, 37.5), new Point(5, 22.5));
+		new GUIWire(submodelModifiable, I1_1, mux1.getPin("I1"), new Point(10, 137.5), new Point(10, 32.5));
+		new GUIWire(submodelModifiable, mux1.getPin("Y"), Y1, new Point[0]);
+		new GUIWire(submodelModifiable, cp1, cp2, new Point[0]);
+		new GUIWire(submodelModifiable, cp2, mux2.getPin("S0"), new Point[0]);
+		new GUIWire(submodelModifiable, I0_2, mux2.getPin("I0"), new Point(5, 62.5), new Point(5, 57.5));
+		new GUIWire(submodelModifiable, I1_2, mux2.getPin("I1"), new Point(15, 162.5), new Point(15, 67.5));
+		new GUIWire(submodelModifiable, mux2.getPin("Y"), Y2);
+		new GUIWire(submodelModifiable, cp2, cp3, new Point[0]);
+		new GUIWire(submodelModifiable, cp3, mux3.getPin("S0"), new Point[0]);
+		new GUIWire(submodelModifiable, I0_3, mux3.getPin("I0"), new Point(5, 87.5), new Point(5, 92.5));
+		new GUIWire(submodelModifiable, I1_3, mux3.getPin("I1"), new Point(20, 187.5), new Point(20, 102.5));
+		new GUIWire(submodelModifiable, mux3.getPin("Y"), Y3);
+		new GUIWire(submodelModifiable, cp3, mux4.getPin("S0"), new Point(25, 117.5));
+		new GUIWire(submodelModifiable, I0_4, mux4.getPin("I0"), new Point(5, 112.5), new Point(5, 127.5));
+		new GUIWire(submodelModifiable, I1_4, mux4.getPin("I1"), new Point(25, 212.5), new Point(25, 137.5));
+		new GUIWire(submodelModifiable, mux4.getPin("Y"), Y4);
 
-			if (i != mux.length - 1)
-			{
-				WireCrossPoint cp = new WireCrossPoint(submodelModifiable, logicWidth);
-				cps[i] = cp;
-				Pin p = mux[i].getInputPins().get(0);
-				cp.moveTo(muxXOffset - 3, p.getPos().y);
-				new GUIWire(submodelModifiable, cp, mux[i].getInputPins().get(0));
-				if (i > 0)
-					new GUIWire(submodelModifiable, cps[i - 1], cp, new Point[0]);
-				else
-					new GUIWire(submodelModifiable, getInputSubmodelPins().get(0), cp, new Point[0]);
-			} else
-			{
-				new GUIWire(submodelModifiable, cps[i - 1], mux[i].getInputPins().get(0),
-						new Point(cps[i - 1].getPin().getPos().x, mux[i].getInputPins().get(0).getPos().y));
-			}
-		}
 	}
 }
\ No newline at end of file