Added convenience constructors in GUIWire

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

diff --git a/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/mi/nandbased/GUIdemux2.java b/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/mi/nandbased/GUIdemux2.java
index ca9650e..3f5dbc8 100644 (file)
--- a/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/mi/nandbased/GUIdemux2.java
+++ b/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/mi/nandbased/GUIdemux2.java
@@ -74,26 +74,26 @@ public class GUIdemux2 extends SubmodelComponent
                cpNotS0.moveTo(40, 12.5);
                cpNotS1.moveTo(45, 37.5);
 
-               new GUIWire(submodelModifiable, S0, cpS01.getPin());
-               new GUIWire(submodelModifiable, S1, cpS11.getPin());
-               new GUIWire(submodelModifiable, cpS01.getPin(), notS0.getInputPins().get(0), new Point(5, 7.5));
-               new GUIWire(submodelModifiable, cpS11.getPin(), notS1.getInputPins().get(0), new Point(10, 32.5));
-               new GUIWire(submodelModifiable, cpS01.getPin(), cpS02.getPin());
-               new GUIWire(submodelModifiable, cpS11.getPin(), cpS12.getPin());
-               new GUIWire(submodelModifiable, cpS02.getPin(), notS0.getInputPins().get(1));
-               new GUIWire(submodelModifiable, cpS12.getPin(), notS1.getInputPins().get(1));
-               new GUIWire(submodelModifiable, cpS02.getPin(), cpS03.getPin(), new Point(5, 67.5));
-               new GUIWire(submodelModifiable, cpS12.getPin(), cpS13.getPin(), new Point(10, 62.5), new Point(40, 62.5));
-               new GUIWire(submodelModifiable, notS0.getOutputPin(), cpNotS0.getPin());
-               new GUIWire(submodelModifiable, notS1.getOutputPin(), cpNotS1.getPin());
-               new GUIWire(submodelModifiable, cpNotS0.getPin(), andY00.getPinA(), new Point(40, 7.5));
-               new GUIWire(submodelModifiable, cpNotS1.getPin(), andY00.getPinB(), new Point(45, 22.5));
-               new GUIWire(submodelModifiable, cpS03.getPin(), andY01.getPinA(), new Point(50, 32.5));
-               new GUIWire(submodelModifiable, cpNotS1.getPin(), andY01.getPinB(), new Point(45, 47.5));
-               new GUIWire(submodelModifiable, cpNotS0.getPin(), andY10.getPinA(), new Point(40, 57.5));
-               new GUIWire(submodelModifiable, cpS13.getPin(), andY10.getPinB());
-               new GUIWire(submodelModifiable, cpS03.getPin(), andY11.getPinA(), new Point(50, 82.5));
-               new GUIWire(submodelModifiable, cpS13.getPin(), andY11.getPinB(), new Point(40, 97.5));
+               new GUIWire(submodelModifiable, S0, cpS01);
+               new GUIWire(submodelModifiable, S1, cpS11);
+               new GUIWire(submodelModifiable, cpS01, notS0.getInputPins().get(0), new Point(5, 7.5));
+               new GUIWire(submodelModifiable, cpS11, notS1.getInputPins().get(0), new Point(10, 32.5));
+               new GUIWire(submodelModifiable, cpS01, cpS02);
+               new GUIWire(submodelModifiable, cpS11, cpS12);
+               new GUIWire(submodelModifiable, cpS02, notS0.getInputPins().get(1));
+               new GUIWire(submodelModifiable, cpS12, notS1.getInputPins().get(1));
+               new GUIWire(submodelModifiable, cpS02, cpS03, new Point(5, 67.5));
+               new GUIWire(submodelModifiable, cpS12, cpS13, new Point(10, 62.5), new Point(40, 62.5));
+               new GUIWire(submodelModifiable, notS0.getOutputPin(), cpNotS0);
+               new GUIWire(submodelModifiable, notS1.getOutputPin(), cpNotS1);
+               new GUIWire(submodelModifiable, cpNotS0, andY00.getPinA(), new Point(40, 7.5));
+               new GUIWire(submodelModifiable, cpNotS1, andY00.getPinB(), new Point(45, 22.5));
+               new GUIWire(submodelModifiable, cpS03, andY01.getPinA(), new Point(50, 32.5));
+               new GUIWire(submodelModifiable, cpNotS1, andY01.getPinB(), new Point(45, 47.5));
+               new GUIWire(submodelModifiable, cpNotS0, andY10.getPinA(), new Point(40, 57.5));
+               new GUIWire(submodelModifiable, cpS13, andY10.getPinB());
+               new GUIWire(submodelModifiable, cpS03, andY11.getPinA(), new Point(50, 82.5));
+               new GUIWire(submodelModifiable, cpS13, andY11.getPinB(), new Point(40, 97.5));
                new GUIWire(submodelModifiable, andY00.getPinY(), Y00, new Point(95, 15), new Point(95, 12.5));
                new GUIWire(submodelModifiable, andY01.getPinY(), Y01, new Point(95, 40), new Point(95, 37.5));
                new GUIWire(submodelModifiable, andY10.getPinY(), Y10, new Point(95, 65), new Point(95, 62.5));