X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.ui%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fui%2Fmodel%2Fcomponents%2Fmi%2Fnandbased%2FGUIxor.java;h=c8adf057f5081696a6183e3835ac3e15f9f4966d;hb=ae74a6a022756a4cc7ee5b453ad7a68e13832788;hp=da3410bfd438e19cc338690e595f9f4837a337ab;hpb=6074b5904dc7a1c2e4ba37976f37b8b4ad524de5;p=Mograsim.git 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 da3410bf..c8adf057 100644 --- 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);