Added fulladder. GUIWires are now drawn with right angles.

[Mograsim.git] / net.mograsim.logic.ui / src / net / mograsim / logic / ui / model / wires / GUIWire.java

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