SimpleRectangularSubmodelComponent now supports pin names

[Mograsim.git] / net.mograsim.logic.ui / src / net / mograsim / logic / ui / model / components / mi / nandbased / GUIxor.java

diff --git a/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/mi/nandbased/GUIxor.java b/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/mi/nandbased/GUIxor.java
index da3410b..c8adf05 100644 (file)
--- a/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/mi/nandbased/GUIxor.java
+++ b/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/mi/nandbased/GUIxor.java
@@ -14,8 +14,8 @@ public class GUIxor extends SimpleRectangularSubmodelComponent
        {
                super(model, 1, "GUIxor");
                setSubmodelScale(.4);
-               setInputCount(2);
-               setOutputCount(1);
+               setInputPins("A", "B");
+               setOutputPins("Y");
                initSubmodelComponents();
        }
 
@@ -47,11 +47,11 @@ public class GUIxor extends SimpleRectangularSubmodelComponent
                new GUIWire(submodelModifiable, B, cpB, new Point[0]);
                new GUIWire(submodelModifiable, cpA, nandAB.getInputPins().get(0), new Point(5, 20));
                new GUIWire(submodelModifiable, cpB, nandAB.getInputPins().get(1), new Point(5, 30));
-               new GUIWire(submodelModifiable, nandAB.getOutputPin(), cpAB.getPin());
-               new GUIWire(submodelModifiable, cpAB.getPin(), nandYA.getInputPins().get(1), new Point(30, 17.5));
-               new GUIWire(submodelModifiable, cpAB.getPin(), nandYB.getInputPins().get(0), new Point(30, 32.5));
-               new GUIWire(submodelModifiable, cpA.getPin(), nandYA.getInputPins().get(0), new Point(5, 7.5));
-               new GUIWire(submodelModifiable, cpB.getPin(), nandYB.getInputPins().get(1), new Point(5, 42.5));
+               new GUIWire(submodelModifiable, nandAB.getOutputPin(), cpAB);
+               new GUIWire(submodelModifiable, cpAB, nandYA.getInputPins().get(1), new Point(30, 17.5));
+               new GUIWire(submodelModifiable, cpAB, nandYB.getInputPins().get(0), new Point(30, 32.5));
+               new GUIWire(submodelModifiable, cpA, nandYA.getInputPins().get(0), new Point(5, 7.5));
+               new GUIWire(submodelModifiable, cpB, nandYB.getInputPins().get(1), new Point(5, 42.5));
                new GUIWire(submodelModifiable, nandYA.getOutputPin(), nandY.getInputPins().get(0));
                new GUIWire(submodelModifiable, nandYB.getOutputPin(), nandY.getInputPins().get(1));
                new GUIWire(submodelModifiable, nandY.getOutputPin(), Y);