Hardcoded GUImux1_4 coordinates

diff --git a/net.mograsim.logic.ui/src/net/mograsim/logic/ui/examples/SubmodelComponentTestbench.java b/net.mograsim.logic.ui/src/net/mograsim/logic/ui/examples/SubmodelComponentTestbench.java
index 0f5e345..21f2dc3 100644 (file)
--- a/net.mograsim.logic.ui/src/net/mograsim/logic/ui/examples/SubmodelComponentTestbench.java
+++ b/net.mograsim.logic.ui/src/net/mograsim/logic/ui/examples/SubmodelComponentTestbench.java
@@ -5,7 +5,7 @@ import net.mograsim.logic.ui.model.ViewModelModifiable;
 import net.mograsim.logic.ui.model.components.GUIBitDisplay;
 import net.mograsim.logic.ui.model.components.GUIManualSwitch;
 import net.mograsim.logic.ui.model.components.SimpleRectangularSubmodelComponent;
-import net.mograsim.logic.ui.model.components.mi.nandbased.GUImux1;
+import net.mograsim.logic.ui.model.components.mi.nandbased.GUImux1_4;
 import net.mograsim.logic.ui.model.wires.GUIWire;
 
 public class SubmodelComponentTestbench
@@ -18,7 +18,7 @@ public class SubmodelComponentTestbench
        @SuppressWarnings("unused") // for GUIWires being created
        public static void createTestbench(ViewModelModifiable model)
        {
-               SimpleRectangularSubmodelComponent comp = new GUImux1(model);
+               SimpleRectangularSubmodelComponent comp = new GUImux1_4(model);
 
                comp.moveTo(100, 0);
                for (int i = 0; i < comp.getInputPins().size(); i++)

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 19c6c33..6e2be51 100644 (file)
--- 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
@@ -40,47 +40,56 @@ public class GUImux1_4 extends SimpleRectangularSubmodelComponent
        @SuppressWarnings("unused")
        private void initSubmodelComponents()
        {
+               Pin S0 = getInputSubmodelPins().get(0);
+               Pin I0_1 = getInputSubmodelPins().get(1);
+               Pin I0_2 = getInputSubmodelPins().get(2);
+               Pin I0_3 = getInputSubmodelPins().get(3);
+               Pin I0_4 = getInputSubmodelPins().get(4);
+               Pin I1_1 = getInputSubmodelPins().get(5);
+               Pin I1_2 = getInputSubmodelPins().get(6);
+               Pin I1_3 = getInputSubmodelPins().get(7);
+               Pin I1_4 = getInputSubmodelPins().get(8);
+               Pin Y1 = getOutputSubmodelPins().get(0);
+               Pin Y2 = getOutputSubmodelPins().get(1);
+               Pin Y3 = getOutputSubmodelPins().get(2);
+               Pin Y4 = getOutputSubmodelPins().get(3);
 
                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.moveTo(25, 12.5);
+               cp2.moveTo(25, 47.5);
+               cp3.moveTo(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.getInputPins().get(0), new Point[0]);
+               new GUIWire(submodelModifiable, I0_1, mux1.getInputPins().get(1), new Point(5, 37.5), new Point(5, 22.5));
+               new GUIWire(submodelModifiable, I1_1, mux1.getInputPins().get(2), new Point(10, 137.5), new Point(10, 32.5));
+               new GUIWire(submodelModifiable, mux1.getOutputPins().get(0), Y1, new Point[0]);
+               new GUIWire(submodelModifiable, cp1, cp2, new Point[0]);
+               new GUIWire(submodelModifiable, cp2, mux2.getInputPins().get(0), new Point[0]);
+               new GUIWire(submodelModifiable, I0_2, mux2.getInputPins().get(1), new Point(5, 62.5), new Point(5, 57.5));
+               new GUIWire(submodelModifiable, I1_2, mux2.getInputPins().get(2), new Point(15, 162.5), new Point(15, 67.5));
+               new GUIWire(submodelModifiable, mux2.getOutputPins().get(0), Y2);
+               new GUIWire(submodelModifiable, cp2, cp3, new Point[0]);
+               new GUIWire(submodelModifiable, cp3, mux3.getInputPins().get(0), new Point[0]);
+               new GUIWire(submodelModifiable, I0_3, mux3.getInputPins().get(1), new Point(5, 87.5), new Point(5, 92.5));
+               new GUIWire(submodelModifiable, I1_3, mux3.getInputPins().get(2), new Point(20, 187.5), new Point(20, 102.5));
+               new GUIWire(submodelModifiable, mux3.getOutputPins().get(0), Y3);
+               new GUIWire(submodelModifiable, cp3, mux4.getInputPins().get(0), new Point(25, 117.5));
+               new GUIWire(submodelModifiable, I0_4, mux4.getInputPins().get(1), new Point(5, 112.5), new Point(5, 127.5));
+               new GUIWire(submodelModifiable, I1_4, mux4.getInputPins().get(2), new Point(25, 212.5), new Point(25, 137.5));
+               new GUIWire(submodelModifiable, mux4.getOutputPins().get(0), 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