X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.ui%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fui%2Fmodel%2Fcomponents%2Fmi%2Fnandbased%2FGUIand41.java;h=b97e39b77a12896b1ff9a023ea956f165d752646;hb=19ee1a7fdb06a1df65cd7df78fed935124496707;hp=13ed464d7ee59dd326127ab6ced1c5c241307742;hpb=506435012240652d7a71b8597cc868853409e397;p=Mograsim.git diff --git a/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/mi/nandbased/GUIand41.java b/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/mi/nandbased/GUIand41.java index 13ed464d..b97e39b7 100644 --- a/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/mi/nandbased/GUIand41.java +++ b/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/mi/nandbased/GUIand41.java @@ -2,55 +2,35 @@ package net.mograsim.logic.ui.model.components.mi.nandbased; import net.haspamelodica.swt.helper.swtobjectwrappers.Point; import net.mograsim.logic.ui.model.ViewModelModifiable; -import net.mograsim.logic.ui.model.components.SubmodelComponent; +import net.mograsim.logic.ui.model.components.SimpleRectangularSubmodelComponent; import net.mograsim.logic.ui.model.wires.GUIWire; import net.mograsim.logic.ui.model.wires.Pin; import net.mograsim.logic.ui.model.wires.WireCrossPoint; -public class GUIand41 extends SubmodelComponent +public class GUIand41 extends SimpleRectangularSubmodelComponent { - private final Pin pinA1; - private final Pin pinA2; - private final Pin pinA3; - private final Pin pinA4; - private final Pin pinB; - private final Pin pinY1; - private final Pin pinY2; - private final Pin pinY3; - private final Pin pinY4; - public GUIand41(ViewModelModifiable model) { - super(model, "GUIand41"); - setSize(35, 55); - setSubmodelScale(.2); - - Pin A1 = addSubmodelInterface(1, 0, 5); - Pin A2 = addSubmodelInterface(1, 0, 15); - Pin A3 = addSubmodelInterface(1, 0, 25); - Pin A4 = addSubmodelInterface(1, 0, 35); - Pin B = addSubmodelInterface(1, 0, 50); - Pin Y1 = addSubmodelInterface(1, 35, 5); - Pin Y2 = addSubmodelInterface(1, 35, 15); - Pin Y3 = addSubmodelInterface(1, 35, 25); - Pin Y4 = addSubmodelInterface(1, 35, 35); - - this.pinA1 = getSupermodelPin(A1); - this.pinA2 = getSupermodelPin(A2); - this.pinA3 = getSupermodelPin(A3); - this.pinA4 = getSupermodelPin(A4); - this.pinB = getSupermodelPin(B); - this.pinY1 = getSupermodelPin(Y1); - this.pinY2 = getSupermodelPin(Y2); - this.pinY3 = getSupermodelPin(Y3); - this.pinY4 = getSupermodelPin(Y4); - - initSubmodelComponents(A1, A2, A3, A4, B, Y1, Y2, Y3, Y4); + super(model, 1, "GUIand41"); + setSubmodelScale(.4); + setInputPins("A1", "A2", "A3", "A4", "B"); + setOutputPins("Y1", "Y2", "Y3", "Y4"); + initSubmodelComponents(); } @SuppressWarnings("unused") // for GUIWires being created - private void initSubmodelComponents(Pin A1, Pin A2, Pin A3, Pin A4, Pin B, Pin Y1, Pin Y2, Pin Y3, Pin Y4) + private void initSubmodelComponents() { + Pin A1 = getSubmodelPin("A1"); + Pin A2 = getSubmodelPin("A2"); + Pin A3 = getSubmodelPin("A3"); + Pin A4 = getSubmodelPin("A4"); + Pin B = getSubmodelPin("B"); + Pin Y1 = getSubmodelPin("Y1"); + Pin Y2 = getSubmodelPin("Y2"); + Pin Y3 = getSubmodelPin("Y3"); + Pin Y4 = getSubmodelPin("Y4"); + GUIand and1 = new GUIand(submodelModifiable); GUIand and2 = new GUIand(submodelModifiable); GUIand and3 = new GUIand(submodelModifiable); @@ -60,73 +40,28 @@ public class GUIand41 extends SubmodelComponent WireCrossPoint cpB3 = new WireCrossPoint(submodelModifiable, 1); WireCrossPoint cpB4 = new WireCrossPoint(submodelModifiable, 1); - and1.moveTo(70, 20); - and2.moveTo(70, 70); - and3.moveTo(70, 120); - and4.moveTo(70, 170); - cpB2.moveTo(60, 90); - cpB3.moveTo(60, 140); - cpB4.moveTo(60, 190); - - new GUIWire(submodelModifiable, A1, and1.getPinA()); - new GUIWire(submodelModifiable, A2, and2.getPinA()); - new GUIWire(submodelModifiable, A3, and3.getPinA()); - new GUIWire(submodelModifiable, A4, and4.getPinA()); - new GUIWire(submodelModifiable, B, cpB4.getPin(), new Point(60, 250)); - new GUIWire(submodelModifiable, cpB4.getPin(), and4.getPinB()); - new GUIWire(submodelModifiable, cpB4.getPin(), cpB3.getPin()); - new GUIWire(submodelModifiable, cpB3.getPin(), and3.getPinB()); - new GUIWire(submodelModifiable, cpB3.getPin(), cpB2.getPin()); - new GUIWire(submodelModifiable, cpB2.getPin(), and2.getPinB()); - new GUIWire(submodelModifiable, cpB2.getPin(), and1.getPinB(), new Point(60, 40)); - new GUIWire(submodelModifiable, and1.getPinY(), Y1, new Point(150, 32.5), new Point(150, 25)); - new GUIWire(submodelModifiable, and2.getPinY(), Y2, new Point(150, 82.5), new Point(150, 75)); - new GUIWire(submodelModifiable, and3.getPinY(), Y3, new Point(150, 132.5), new Point(150, 125)); - new GUIWire(submodelModifiable, and4.getPinY(), Y4, new Point(150, 182.5), new Point(150, 175)); - } - - public Pin getPinA1() - { - return pinA1; - } - - public Pin getPinA2() - { - return pinA2; - } - - public Pin getPinA3() - { - return pinA3; - } - - public Pin getPinA4() - { - return pinA4; - } - - public Pin getPinB() - { - return pinB; - } - - public Pin getPinY1() - { - return pinY1; - } - - public Pin getPinY2() - { - return pinY2; - } - - public Pin getPinY3() - { - return pinY3; - } - - public Pin getPinY4() - { - return pinY4; + and1.moveTo(30, 7.5); + and2.moveTo(30, 32.5); + and3.moveTo(30, 57.5); + and4.moveTo(30, 82.5); + cpB2.moveCenterTo(25, 47.5); + cpB3.moveCenterTo(25, 72.5); + cpB4.moveCenterTo(25, 97.5); + + new GUIWire(submodelModifiable, A1, and1.getPin("A"), new Point[0]); + new GUIWire(submodelModifiable, A2, and2.getPin("A"), new Point[0]); + new GUIWire(submodelModifiable, A3, and3.getPin("A"), new Point[0]); + new GUIWire(submodelModifiable, A4, and4.getPin("A"), new Point[0]); + new GUIWire(submodelModifiable, B, cpB4, new Point(25, 112.5)); + new GUIWire(submodelModifiable, cpB4, and4.getPin("B"), new Point[0]); + new GUIWire(submodelModifiable, cpB4, cpB3, new Point[0]); + new GUIWire(submodelModifiable, cpB3, and3.getPin("B"), new Point[0]); + new GUIWire(submodelModifiable, cpB3, cpB2, new Point[0]); + new GUIWire(submodelModifiable, cpB2, and2.getPin("B"), new Point[0]); + new GUIWire(submodelModifiable, cpB2, and1.getPin("B"), new Point(25, 22.5)); + new GUIWire(submodelModifiable, and1.getPin("Y"), Y1, new Point[0]); + new GUIWire(submodelModifiable, and2.getPin("Y"), Y2, new Point[0]); + new GUIWire(submodelModifiable, and3.getPin("Y"), Y3, new Point[0]); + new GUIWire(submodelModifiable, and4.getPin("Y"), Y4, new Point[0]); } } \ No newline at end of file