Implemented GUIor4

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 945aaa8..c6120ab 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.GUIsel3_4;
+import net.mograsim.logic.ui.model.components.mi.nandbased.GUIor4;
 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 GUIsel3_4(model);
+               SimpleRectangularSubmodelComponent comp = new GUIor4(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/GUIor4.java b/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/mi/nandbased/GUIor4.java
new file mode 100644 (file)
index 0000000..cda2b32
--- /dev/null
+++ b/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/mi/nandbased/GUIor4.java
@@ -0,0 +1,90 @@
+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.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 GUIor4 extends SimpleRectangularSubmodelComponent
+{
+       public GUIor4(ViewModelModifiable model)
+       {
+               super(model, 1, "GUIor4");
+               setSubmodelScale(.2);
+               setInputCount(4);
+               setOutputCount(1);
+               initSubmodelComponents();
+       }
+
+       @SuppressWarnings("unused") // for GUIWires being created
+       private void initSubmodelComponents()
+       {
+               Pin A1 = getInputSubmodelPins().get(0);
+               Pin A2 = getInputSubmodelPins().get(1);
+               Pin A3 = getInputSubmodelPins().get(2);
+               Pin A4 = getInputSubmodelPins().get(3);
+               Pin Y = getOutputSubmodelPins().get(0);
+
+               GUINandGate nandA1 = new GUINandGate(submodelModifiable, 1);
+               GUINandGate nandA2 = new GUINandGate(submodelModifiable, 1);
+               GUINandGate nandA3 = new GUINandGate(submodelModifiable, 1);
+               GUINandGate nandA4 = new GUINandGate(submodelModifiable, 1);
+               GUINandGate or12 = new GUINandGate(submodelModifiable, 1);
+               GUINandGate or34 = new GUINandGate(submodelModifiable, 1);
+               GUINandGate nor12 = new GUINandGate(submodelModifiable, 1);
+               GUINandGate nor34 = new GUINandGate(submodelModifiable, 1);
+               GUINandGate or1234 = new GUINandGate(submodelModifiable, 1);
+
+               WireCrossPoint cpA1 = new WireCrossPoint(submodelModifiable, 1);
+               WireCrossPoint cpA2 = new WireCrossPoint(submodelModifiable, 1);
+               WireCrossPoint cpA3 = new WireCrossPoint(submodelModifiable, 1);
+               WireCrossPoint cpA4 = new WireCrossPoint(submodelModifiable, 1);
+               WireCrossPoint cpOr12 = new WireCrossPoint(submodelModifiable, 1);
+               WireCrossPoint cpOr34 = new WireCrossPoint(submodelModifiable, 1);
+
+               nandA1.moveTo(20, 15);
+               nandA2.moveTo(20, 65);
+               nandA3.moveTo(20, 115);
+               nandA4.moveTo(20, 165);
+               or12.moveTo(50, 40);
+               or34.moveTo(50, 140);
+               nor12.moveTo(110, 40);
+               nor34.moveTo(110, 140);
+               or1234.moveTo(140, 90);
+               cpA1.moveCenterTo(15, 25);
+               cpA2.moveCenterTo(15, 75);
+               cpA3.moveCenterTo(15, 125);
+               cpA4.moveCenterTo(15, 175);
+               cpOr12.moveCenterTo(105, 50);
+               cpOr34.moveCenterTo(105, 150);
+
+               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, cpA1, nandA1.getInputPins().get(0), new Point(15, 20));
+               new GUIWire(submodelModifiable, cpA2, nandA2.getInputPins().get(0), new Point(15, 70));
+               new GUIWire(submodelModifiable, cpA3, nandA3.getInputPins().get(0), new Point(15, 120));
+               new GUIWire(submodelModifiable, cpA4, nandA4.getInputPins().get(0), new Point(15, 170));
+               new GUIWire(submodelModifiable, cpA1, nandA1.getInputPins().get(1), new Point(15, 30));
+               new GUIWire(submodelModifiable, cpA2, nandA2.getInputPins().get(1), new Point(15, 80));
+               new GUIWire(submodelModifiable, cpA3, nandA3.getInputPins().get(1), new Point(15, 130));
+               new GUIWire(submodelModifiable, cpA4, nandA4.getInputPins().get(1), new Point(15, 180));
+               new GUIWire(submodelModifiable, nandA1.getOutputPin(), or12.getInputPins().get(0));
+               new GUIWire(submodelModifiable, nandA2.getOutputPin(), or12.getInputPins().get(1));
+               new GUIWire(submodelModifiable, nandA3.getOutputPin(), or34.getInputPins().get(0));
+               new GUIWire(submodelModifiable, nandA4.getOutputPin(), or34.getInputPins().get(1));
+               new GUIWire(submodelModifiable, or12.getOutputPin(), cpOr12, new Point[0]);
+               new GUIWire(submodelModifiable, or34.getOutputPin(), cpOr34, new Point[0]);
+               new GUIWire(submodelModifiable, cpOr12, nor12.getInputPins().get(0), new Point(105, 45));
+               new GUIWire(submodelModifiable, cpOr12, nor12.getInputPins().get(1), new Point(105, 55));
+               new GUIWire(submodelModifiable, cpOr34, nor34.getInputPins().get(0), new Point(105, 145));
+               new GUIWire(submodelModifiable, cpOr34, nor34.getInputPins().get(1), new Point(105, 155));
+               new GUIWire(submodelModifiable, nor12.getOutputPin(), or1234.getInputPins().get(0));
+               new GUIWire(submodelModifiable, nor34.getOutputPin(), or1234.getInputPins().get(1));
+               new GUIWire(submodelModifiable, or1234.getOutputPin(), Y);
+       }
+}
\ No newline at end of file