Added fulladder. GUIWires are now drawn with right angles.

diff --git a/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/mi/nandbased/GUIfulladder.java b/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/mi/nandbased/GUIfulladder.java
new file mode 100644 (file)
index 0000000..0e3a8fd
--- /dev/null
+++ b/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/mi/nandbased/GUIfulladder.java
@@ -0,0 +1,83 @@
+package net.mograsim.logic.ui.model.components.mi.nandbased;
+
+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.wires.GUIWire;
+import net.mograsim.logic.ui.model.wires.Pin;
+
+public class GUIfulladder extends SubmodelComponent
+{
+       private final Pin pinA;
+       private final Pin pinB;
+       private final Pin pinC;
+       private final Pin pinY;
+       private final Pin pinZ;
+
+       public GUIfulladder(ViewModelModifiable model)
+       {
+               super(model, "GUIfulladder");
+               setSize(50, 40);
+               setSubmodelScale(.4);
+
+               Pin A = addSubmodelInterface(1, 0, 5);
+               Pin B = addSubmodelInterface(1, 0, 20);
+               Pin C = addSubmodelInterface(1, 0, 35);
+               Pin Y = addSubmodelInterface(1, 50, 5);
+               Pin Z = addSubmodelInterface(1, 50, 20);
+
+               this.pinA = getSupermodelPin(A);
+               this.pinB = getSupermodelPin(B);
+               this.pinC = getSupermodelPin(C);
+               this.pinY = getSupermodelPin(Y);
+               this.pinZ = getSupermodelPin(Z);
+
+               initSubmodelComponents(A, B, C, Y, Z);
+       }
+
+       @SuppressWarnings("unused") // for GUIWires being created
+       private void initSubmodelComponents(Pin A, Pin B, Pin C, Pin Y, Pin Z)
+       {
+               GUIhalfadder halfBC = new GUIhalfadder(submodelModifiable);
+               GUIhalfadder halfAY = new GUIhalfadder(submodelModifiable);
+               GUINandGate nandZ = new GUINandGate(submodelModifiable, 1);
+
+               halfAY.moveTo(55, 7.5);
+               halfBC.moveTo(10, 40);
+               nandZ.moveTo(100, 25);
+
+               new GUIWire(submodelModifiable, A, halfAY.getPinA());
+               new GUIWire(submodelModifiable, B, halfBC.getPinA());// , new Point(5, 50), new Point(5, 45));
+               new GUIWire(submodelModifiable, C, halfBC.getPinB());// , new Point(5, 87.5), new Point(5, 60));
+               new GUIWire(submodelModifiable, halfBC.getPinY(), halfAY.getPinB());// , new Point(50, 45), new Point(50, 27.5));
+               new GUIWire(submodelModifiable, halfBC.getPin_Z(), nandZ.getInputPins().get(1));
+               new GUIWire(submodelModifiable, halfAY.getPinY(), Y);
+               new GUIWire(submodelModifiable, halfAY.getPin_Z(), nandZ.getInputPins().get(0));
+               new GUIWire(submodelModifiable, nandZ.getOutputPin(), Z);
+       }
+
+       public Pin getPinA()
+       {
+               return pinA;
+       }
+
+       public Pin getPinB()
+       {
+               return pinB;
+       }
+
+       public Pin getPinC()
+       {
+               return pinC;
+       }
+
+       public Pin getPinY()
+       {
+               return pinY;
+       }
+
+       public Pin getPinZ()
+       {
+               return pinZ;
+       }
+}
\ No newline at end of file

diff --git a/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/wires/GUIWire.java b/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/wires/GUIWire.java
index a7554e7..eddf98d 100644 (file)
--- a/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/wires/GUIWire.java
+++ b/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/wires/GUIWire.java
@@ -47,13 +47,15 @@ public class GUIWire
                this.logicWidth = pin1.logicWidth;\r
                if (pin2.logicWidth != pin1.logicWidth)\r
                        throw new IllegalArgumentException("Can't connect pins of different logic width");\r
-               this.path = new double[path.length * 2 + 4];\r
-               for (int srcI = 0, dstI = 2; srcI < path.length; srcI++, dstI += 2)\r
+\r
+               if (path.length == 0)\r
                {\r
-                       this.path[dstI + 0] = path[srcI].x;\r
-                       this.path[dstI + 1] = path[srcI].y;\r
+                       Point pos1 = pin1.getPos(), pos2 = pin2.getPos();\r
+                       path = new Point[] { new Point((pos1.x + pos2.x) / 2, pos1.y), new Point((pos1.x + pos2.x) / 2, pos2.y) };\r
                }\r
 \r
+               applyPath(path);\r
+\r
                this.pin1 = pin1;\r
                this.pin2 = pin2;\r
 \r
@@ -67,6 +69,17 @@ public class GUIWire
                model.wireCreated(this);\r
        }\r
 \r
+       private void applyPath(Point... path)\r
+       {\r
+               this.path = new double[path.length * 2 + 4];\r
+\r
+               for (int srcI = 0, dstI = 2; srcI < path.length; srcI++, dstI += 2)\r
+               {\r
+                       this.path[dstI + 0] = path[srcI].x;\r
+                       this.path[dstI + 1] = path[srcI].y;\r
+               }\r
+       }\r
+\r
        private void pin1Moved()\r
        {\r
                Point pos = pin1.getPos();\r