X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.ui%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fui%2Fmodel%2Fcomponents%2Fmi%2Fnandbased%2FGUIsel3_4.java;h=dd342c91c08d2ae9d84380a7c40261cbbdaaa1ad;hb=19ee1a7fdb06a1df65cd7df78fed935124496707;hp=5892e0465e16b6584000dd5fb978a6ebe72912d8;hpb=29948edc1851d17311c50c7eff34070a0dc36ceb;p=Mograsim.git diff --git a/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/mi/nandbased/GUIsel3_4.java b/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/mi/nandbased/GUIsel3_4.java index 5892e046..dd342c91 100644 --- a/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/mi/nandbased/GUIsel3_4.java +++ b/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/mi/nandbased/GUIsel3_4.java @@ -22,25 +22,25 @@ public class GUIsel3_4 extends SimpleRectangularSubmodelComponent @SuppressWarnings("unused") // for GUIWires being created private void initSubmodelComponents() { - Pin SA = getInputSubmodelPins().get(0); - Pin SB = getInputSubmodelPins().get(1); - Pin SC = getInputSubmodelPins().get(2); - Pin A1 = getInputSubmodelPins().get(3); - Pin A2 = getInputSubmodelPins().get(4); - Pin A3 = getInputSubmodelPins().get(5); - Pin A4 = getInputSubmodelPins().get(6); - Pin B1 = getInputSubmodelPins().get(7); - Pin B2 = getInputSubmodelPins().get(8); - Pin B3 = getInputSubmodelPins().get(9); - Pin B4 = getInputSubmodelPins().get(10); - Pin C1 = getInputSubmodelPins().get(11); - Pin C2 = getInputSubmodelPins().get(12); - Pin C3 = getInputSubmodelPins().get(13); - Pin C4 = getInputSubmodelPins().get(14); - Pin Y1 = getOutputSubmodelPins().get(0); - Pin Y2 = getOutputSubmodelPins().get(1); - Pin Y3 = getOutputSubmodelPins().get(2); - Pin Y4 = getOutputSubmodelPins().get(3); + Pin SA = getSubmodelPin("SA"); + Pin SB = getSubmodelPin("SB"); + Pin SC = getSubmodelPin("SC"); + Pin A1 = getSubmodelPin("A1"); + Pin A2 = getSubmodelPin("A2"); + Pin A3 = getSubmodelPin("A3"); + Pin A4 = getSubmodelPin("A4"); + Pin B1 = getSubmodelPin("B1"); + Pin B2 = getSubmodelPin("B2"); + Pin B3 = getSubmodelPin("B3"); + Pin B4 = getSubmodelPin("B4"); + Pin C1 = getSubmodelPin("C1"); + Pin C2 = getSubmodelPin("C2"); + Pin C3 = getSubmodelPin("C3"); + Pin C4 = getSubmodelPin("C4"); + Pin Y1 = getSubmodelPin("Y1"); + Pin Y2 = getSubmodelPin("Y2"); + Pin Y3 = getSubmodelPin("Y3"); + Pin Y4 = getSubmodelPin("Y4"); GUIsel2_4 sel2_4 = new GUIsel2_4(submodelModifiable); GUInot4 not4 = new GUInot4(submodelModifiable); @@ -71,44 +71,42 @@ public class GUIsel3_4 extends SimpleRectangularSubmodelComponent cpSC2.moveCenterTo(30, 635); cpSC3.moveCenterTo(30, 685); - new GUIWire(submodelModifiable, SA, sel2_4.getInputPins().get(0), new Point(25, 25), new Point(25, 255)); - new GUIWire(submodelModifiable, SB, sel2_4.getInputPins().get(1), new Point(20, 75), new Point(20, 265)); - new GUIWire(submodelModifiable, A1, sel2_4.getInputPins().get(2), new Point(15, 175), new Point(15, 275)); - new GUIWire(submodelModifiable, A2, sel2_4.getInputPins().get(3), new Point(10, 225), new Point(10, 285)); - new GUIWire(submodelModifiable, A3, sel2_4.getInputPins().get(4), new Point(5, 275), new Point(5, 295)); - new GUIWire(submodelModifiable, A4, sel2_4.getInputPins().get(5), new Point(5, 325), new Point(5, 305)); - new GUIWire(submodelModifiable, B1, sel2_4.getInputPins().get(6), new Point(10, 375), new Point(10, 315)); - new GUIWire(submodelModifiable, B2, sel2_4.getInputPins().get(7), new Point(15, 425), new Point(15, 325)); - new GUIWire(submodelModifiable, B3, sel2_4.getInputPins().get(8), new Point(20, 475), new Point(20, 335)); - new GUIWire(submodelModifiable, B4, sel2_4.getInputPins().get(9), new Point(25, 525), new Point(25, 345)); - new GUIWire(submodelModifiable, sel2_4.getOutputPins().get(0), not4.getInputPins().get(0), new Point[0]); - new GUIWire(submodelModifiable, sel2_4.getOutputPins().get(1), not4.getInputPins().get(1), new Point[0]); - new GUIWire(submodelModifiable, sel2_4.getOutputPins().get(2), not4.getInputPins().get(2), new Point[0]); - new GUIWire(submodelModifiable, sel2_4.getOutputPins().get(3), not4.getInputPins().get(3), new Point[0]); + new GUIWire(submodelModifiable, SA, sel2_4.getPin("SA"), new Point(25, 25), new Point(25, 255)); + new GUIWire(submodelModifiable, SB, sel2_4.getPin("SB"), new Point(20, 75), new Point(20, 265)); + new GUIWire(submodelModifiable, A1, sel2_4.getPin("A1"), new Point(15, 175), new Point(15, 275)); + new GUIWire(submodelModifiable, A2, sel2_4.getPin("A2"), new Point(10, 225), new Point(10, 285)); + new GUIWire(submodelModifiable, A3, sel2_4.getPin("A3"), new Point(5, 275), new Point(5, 295)); + new GUIWire(submodelModifiable, A4, sel2_4.getPin("A4"), new Point(5, 325), new Point(5, 305)); + new GUIWire(submodelModifiable, B1, sel2_4.getPin("B1"), new Point(10, 375), new Point(10, 315)); + new GUIWire(submodelModifiable, B2, sel2_4.getPin("B2"), new Point(15, 425), new Point(15, 325)); + new GUIWire(submodelModifiable, B3, sel2_4.getPin("B3"), new Point(20, 475), new Point(20, 335)); + new GUIWire(submodelModifiable, B4, sel2_4.getPin("B4"), new Point(25, 525), new Point(25, 345)); + new GUIWire(submodelModifiable, sel2_4.getPin("Y1"), not4.getPin("A1"), new Point[0]); + new GUIWire(submodelModifiable, sel2_4.getPin("Y2"), not4.getPin("A2"), new Point[0]); + new GUIWire(submodelModifiable, sel2_4.getPin("Y3"), not4.getPin("A3"), new Point[0]); + new GUIWire(submodelModifiable, sel2_4.getPin("Y4"), not4.getPin("A4"), new Point[0]); new GUIWire(submodelModifiable, SC, cpSC1, new Point(30, 125)); - new GUIWire(submodelModifiable, cpSC1, nandC1.getInputPins().get(1), new Point[0]); + new GUIWire(submodelModifiable, cpSC1, nandC1.getPin("B"), new Point[0]); new GUIWire(submodelModifiable, cpSC1, cpSC2, new Point(30, 125)); - new GUIWire(submodelModifiable, cpSC2, nandC2.getInputPins().get(1), new Point[0]); + new GUIWire(submodelModifiable, cpSC2, nandC2.getPin("B"), new Point[0]); new GUIWire(submodelModifiable, cpSC2, cpSC3, new Point(30, 125)); - new GUIWire(submodelModifiable, cpSC3, nandC3.getInputPins().get(1), new Point[0]); - new GUIWire(submodelModifiable, cpSC3, nandC4.getInputPins().get(1), new Point(30, 735)); - new GUIWire(submodelModifiable, C1, nandC1.getInputPins().get(0), new Point[0]); - new GUIWire(submodelModifiable, C2, nandC2.getInputPins().get(0), new Point[0]); - new GUIWire(submodelModifiable, C3, nandC3.getInputPins().get(0), new Point[0]); - new GUIWire(submodelModifiable, C4, nandC4.getInputPins().get(0), new Point[0]); - new GUIWire(submodelModifiable, not4.getOutputPins().get(0), nandY1.getInputPins().get(0), new Point(115, 255), new Point(115, 20)); - new GUIWire(submodelModifiable, not4.getOutputPins().get(1), nandY2.getInputPins().get(0), new Point(120, 265), new Point(120, 70)); - new GUIWire(submodelModifiable, not4.getOutputPins().get(2), nandY3.getInputPins().get(0), new Point(125, 275), - new Point(125, 120)); - new GUIWire(submodelModifiable, not4.getOutputPins().get(3), nandY4.getInputPins().get(0), new Point(130, 285), - new Point(130, 170)); - new GUIWire(submodelModifiable, nandC1.getOutputPin(), nandY1.getInputPins().get(1), new Point(135, 580), new Point(135, 30)); - new GUIWire(submodelModifiable, nandC2.getOutputPin(), nandY2.getInputPins().get(1), new Point(140, 630), new Point(140, 80)); - new GUIWire(submodelModifiable, nandC3.getOutputPin(), nandY3.getInputPins().get(1), new Point(145, 680), new Point(145, 130)); - new GUIWire(submodelModifiable, nandC4.getOutputPin(), nandY4.getInputPins().get(1), new Point(150, 730), new Point(150, 180)); - new GUIWire(submodelModifiable, nandY1.getOutputPin(), Y1, new Point[0]); - new GUIWire(submodelModifiable, nandY2.getOutputPin(), Y2, new Point[0]); - new GUIWire(submodelModifiable, nandY3.getOutputPin(), Y3, new Point[0]); - new GUIWire(submodelModifiable, nandY4.getOutputPin(), Y4, new Point[0]); + new GUIWire(submodelModifiable, cpSC3, nandC3.getPin("B"), new Point[0]); + new GUIWire(submodelModifiable, cpSC3, nandC4.getPin("B"), new Point(30, 735)); + new GUIWire(submodelModifiable, C1, nandC1.getPin("A"), new Point[0]); + new GUIWire(submodelModifiable, C2, nandC2.getPin("A"), new Point[0]); + new GUIWire(submodelModifiable, C3, nandC3.getPin("A"), new Point[0]); + new GUIWire(submodelModifiable, C4, nandC4.getPin("A"), new Point[0]); + new GUIWire(submodelModifiable, not4.getPin("Y1"), nandY1.getPin("A"), new Point(115, 255), new Point(115, 20)); + new GUIWire(submodelModifiable, not4.getPin("Y2"), nandY2.getPin("A"), new Point(120, 265), new Point(120, 70)); + new GUIWire(submodelModifiable, not4.getPin("Y3"), nandY3.getPin("A"), new Point(125, 275), new Point(125, 120)); + new GUIWire(submodelModifiable, not4.getPin("Y4"), nandY4.getPin("A"), new Point(130, 285), new Point(130, 170)); + new GUIWire(submodelModifiable, nandC1.getPin("Y"), nandY1.getPin("B"), new Point(135, 580), new Point(135, 30)); + new GUIWire(submodelModifiable, nandC2.getPin("Y"), nandY2.getPin("B"), new Point(140, 630), new Point(140, 80)); + new GUIWire(submodelModifiable, nandC3.getPin("Y"), nandY3.getPin("B"), new Point(145, 680), new Point(145, 130)); + new GUIWire(submodelModifiable, nandC4.getPin("Y"), nandY4.getPin("B"), new Point(150, 730), new Point(150, 180)); + new GUIWire(submodelModifiable, nandY1.getPin("Y"), Y1, new Point[0]); + new GUIWire(submodelModifiable, nandY2.getPin("Y"), Y2, new Point[0]); + new GUIWire(submodelModifiable, nandY3.getPin("Y"), Y3, new Point[0]); + new GUIWire(submodelModifiable, nandY4.getPin("Y"), Y4, new Point[0]); } } \ No newline at end of file