From db49bc3573ccbfa4afc025101dba4f1c30c54672 Mon Sep 17 00:00:00 2001 From: Daniel Kirschten Date: Wed, 5 Jun 2019 17:57:20 +0200 Subject: [PATCH] Updated GUIor_4 to SimpleRectangularSubmodelComponent --- .../examples/SubmodelComponentTestbench.java | 4 +- .../components/mi/nandbased/GUIor_4.java | 166 +++++------------- 2 files changed, 42 insertions(+), 128 deletions(-) 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 57b449aa..7698bbc8 100644 --- 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.GUIand41; +import net.mograsim.logic.ui.model.components.mi.nandbased.GUIor_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 GUIand41(model); + SimpleRectangularSubmodelComponent comp = new GUIor_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/GUIor_4.java b/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/mi/nandbased/GUIor_4.java index aff35ff1..e29848a9 100644 --- a/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/mi/nandbased/GUIor_4.java +++ b/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/mi/nandbased/GUIor_4.java @@ -3,64 +3,38 @@ 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.GUINandGate; -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 GUIor_4 extends SubmodelComponent +public class GUIor_4 extends SimpleRectangularSubmodelComponent { - private final Pin pinA1; - private final Pin pinA2; - private final Pin pinA3; - private final Pin pinA4; - private final Pin pinB1; - private final Pin pinB2; - private final Pin pinB3; - private final Pin pinB4; - private final Pin pinY1; - private final Pin pinY2; - private final Pin pinY3; - private final Pin pinY4; - public GUIor_4(ViewModelModifiable model) { - super(model, "GUIor_4"); - setSize(40, 80); + super(model, 1, "GUIor_4"); setSubmodelScale(.4); - - 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 B1 = addSubmodelInterface(1, 0, 45); - Pin B2 = addSubmodelInterface(1, 0, 55); - Pin B3 = addSubmodelInterface(1, 0, 65); - Pin B4 = addSubmodelInterface(1, 0, 75); - Pin Y1 = addSubmodelInterface(1, 40, 5); - Pin Y2 = addSubmodelInterface(1, 40, 15); - Pin Y3 = addSubmodelInterface(1, 40, 25); - Pin Y4 = addSubmodelInterface(1, 40, 35); - - this.pinA1 = getSupermodelPin(A1); - this.pinA2 = getSupermodelPin(A2); - this.pinA3 = getSupermodelPin(A3); - this.pinA4 = getSupermodelPin(A4); - this.pinB1 = getSupermodelPin(B1); - this.pinB2 = getSupermodelPin(B2); - this.pinB3 = getSupermodelPin(B3); - this.pinB4 = getSupermodelPin(B4); - this.pinY1 = getSupermodelPin(Y1); - this.pinY2 = getSupermodelPin(Y2); - this.pinY3 = getSupermodelPin(Y3); - this.pinY4 = getSupermodelPin(Y4); - - initSubmodelComponents(A1, A2, A3, A4, B1, B2, B3, B4, Y1, Y2, Y3, Y4); + setInputCount(8); + setOutputCount(4); + initSubmodelComponents(); } @SuppressWarnings("unused") // for GUIWires being created - private void initSubmodelComponents(Pin A1, Pin A2, Pin A3, Pin A4, Pin B1, Pin B2, Pin B3, Pin B4, Pin Y1, Pin Y2, Pin Y3, Pin Y4) + private void initSubmodelComponents() { + Pin A1 = getInputSubmodelPins().get(0); + Pin A2 = getInputSubmodelPins().get(1); + Pin A3 = getInputSubmodelPins().get(2); + Pin A4 = getInputSubmodelPins().get(3); + Pin B1 = getInputSubmodelPins().get(4); + Pin B2 = getInputSubmodelPins().get(5); + Pin B3 = getInputSubmodelPins().get(6); + Pin B4 = getInputSubmodelPins().get(7); + Pin Y1 = getOutputSubmodelPins().get(0); + Pin Y2 = getOutputSubmodelPins().get(1); + Pin Y3 = getOutputSubmodelPins().get(2); + Pin Y4 = getOutputSubmodelPins().get(3); + GUINandGate notA1 = new GUINandGate(submodelModifiable, 1); GUINandGate notA2 = new GUINandGate(submodelModifiable, 1); GUINandGate notA3 = new GUINandGate(submodelModifiable, 1); @@ -91,10 +65,10 @@ public class GUIor_4 extends SubmodelComponent notB2.moveTo(15, 127.5); notB3.moveTo(15, 152.5); notB4.moveTo(15, 177.5); - nandY1.moveTo(70, 2.5); - nandY2.moveTo(70, 27.5); - nandY3.moveTo(70, 52.5); - nandY4.moveTo(70, 77.5); + nandY1.moveTo(65, 2.5); + nandY2.moveTo(65, 27.5); + nandY3.moveTo(65, 52.5); + nandY4.moveTo(65, 77.5); cpA1.moveTo(7.5, 12.5); cpA2.moveTo(7.5, 37.5); cpA3.moveTo(7.5, 62.5); @@ -104,14 +78,14 @@ public class GUIor_4 extends SubmodelComponent cpB3.moveTo(7.5, 162.5); cpB4.moveTo(7.5, 187.5); - new GUIWire(submodelModifiable, A1, cpA1); - new GUIWire(submodelModifiable, A2, cpA2); - new GUIWire(submodelModifiable, A3, cpA3); - new GUIWire(submodelModifiable, A4, cpA4); - new GUIWire(submodelModifiable, B1, cpB1); - new GUIWire(submodelModifiable, B2, cpB2); - new GUIWire(submodelModifiable, B3, cpB3); - new GUIWire(submodelModifiable, B4, cpB4); + new GUIWire(submodelModifiable, A1, cpA1, new Point[0]); + new GUIWire(submodelModifiable, A2, cpA2, new Point[0]); + new GUIWire(submodelModifiable, A3, cpA3, new Point[0]); + new GUIWire(submodelModifiable, A4, cpA4, new Point[0]); + new GUIWire(submodelModifiable, B1, cpB1, new Point[0]); + new GUIWire(submodelModifiable, B2, cpB2, new Point[0]); + new GUIWire(submodelModifiable, B3, cpB3, new Point[0]); + new GUIWire(submodelModifiable, B4, cpB4, new Point[0]); new GUIWire(submodelModifiable, cpA1, notA1.getInputPins().get(0), new Point(7.5, 7.5)); new GUIWire(submodelModifiable, cpA1, notA1.getInputPins().get(1), new Point(7.5, 17.5)); new GUIWire(submodelModifiable, cpA2, notA2.getInputPins().get(0), new Point(7.5, 32.5)); @@ -129,76 +103,16 @@ public class GUIor_4 extends SubmodelComponent new GUIWire(submodelModifiable, cpB4, notB4.getInputPins().get(0), new Point(7.5, 182.5)); new GUIWire(submodelModifiable, cpB4, notB4.getInputPins().get(1), new Point(7.5, 192.5)); new GUIWire(submodelModifiable, notA1.getOutputPin(), nandY1.getInputPins().get(0), new Point(40, 12.5), new Point(40, 7.5)); - new GUIWire(submodelModifiable, notB1.getOutputPin(), nandY1.getInputPins().get(1), new Point(50, 112.5), new Point(50, 17.5)); + new GUIWire(submodelModifiable, notB1.getOutputPin(), nandY1.getInputPins().get(1), new Point(45, 112.5), new Point(45, 17.5)); new GUIWire(submodelModifiable, notA2.getOutputPin(), nandY2.getInputPins().get(0), new Point(40, 37.5), new Point(40, 32.5)); - new GUIWire(submodelModifiable, notB2.getOutputPin(), nandY2.getInputPins().get(1), new Point(55, 137.5), new Point(55, 42.5)); + new GUIWire(submodelModifiable, notB2.getOutputPin(), nandY2.getInputPins().get(1), new Point(50, 137.5), new Point(50, 42.5)); new GUIWire(submodelModifiable, notA3.getOutputPin(), nandY3.getInputPins().get(0), new Point(40, 62.5), new Point(40, 57.5)); - new GUIWire(submodelModifiable, notB3.getOutputPin(), nandY3.getInputPins().get(1), new Point(60, 162.5), new Point(60, 67.5)); + new GUIWire(submodelModifiable, notB3.getOutputPin(), nandY3.getInputPins().get(1), new Point(55, 162.5), new Point(55, 67.5)); new GUIWire(submodelModifiable, notA4.getOutputPin(), nandY4.getInputPins().get(0), new Point(40, 87.5), new Point(40, 82.5)); - new GUIWire(submodelModifiable, notB4.getOutputPin(), nandY4.getInputPins().get(1), new Point(65, 187.5), new Point(65, 92.5)); - new GUIWire(submodelModifiable, nandY1.getOutputPin(), Y1); - new GUIWire(submodelModifiable, nandY2.getOutputPin(), Y2); - new GUIWire(submodelModifiable, nandY3.getOutputPin(), Y3); - new GUIWire(submodelModifiable, nandY4.getOutputPin(), Y4); - } - - public Pin getPinA1() - { - return pinA1; - } - - public Pin getPinA2() - { - return pinA2; - } - - public Pin getPinA3() - { - return pinA3; - } - - public Pin getPinA4() - { - return pinA4; - } - - public Pin getPinB1() - { - return pinB1; - } - - public Pin getPinB2() - { - return pinB2; - } - - public Pin getPinB3() - { - return pinB3; - } - - public Pin getPinB4() - { - return pinB4; - } - - public Pin getPinY1() - { - return pinY1; - } - - public Pin getPinY2() - { - return pinY2; - } - - public Pin getPinY3() - { - return pinY3; - } - - public Pin getPinY4() - { - return pinY4; + new GUIWire(submodelModifiable, notB4.getOutputPin(), nandY4.getInputPins().get(1), new Point(60, 187.5), new Point(60, 92.5)); + 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]); } } \ No newline at end of file -- 2.17.1