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 82fdf4b..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
@@ -10,11 +10,11 @@ import net.mograsim.logic.core.LogicObserver;
 import net.mograsim.logic.core.types.BitVectorFormatter;\r
 import net.mograsim.logic.core.wires.Wire.ReadEnd;\r
 import net.mograsim.logic.ui.ColorHelper;\r
-import net.mograsim.logic.ui.model.ViewModel;\r
+import net.mograsim.logic.ui.model.ViewModelModifiable;\r
 \r
 public class GUIWire\r
 {\r
-       private final ViewModel model;\r
+       private final ViewModelModifiable model;\r
        public final int logicWidth;\r
        private Pin pin1;\r
        private Pin pin2;\r
@@ -25,20 +25,37 @@ public class GUIWire
        private final LogicObserver logicObs;\r
        private ReadEnd end;\r
 \r
-       public GUIWire(ViewModel model, Pin pin1, Pin pin2, Point... path)\r
+       public GUIWire(ViewModelModifiable model, WireCrossPoint pin1, WireCrossPoint pin2, Point... path)\r
+       {\r
+               this(model, pin1.getPin(), pin2.getPin(), path);\r
+       }\r
+\r
+       public GUIWire(ViewModelModifiable model, WireCrossPoint pin1, Pin pin2, Point... path)\r
+       {\r
+               this(model, pin1.getPin(), pin2, path);\r
+       }\r
+\r
+       public GUIWire(ViewModelModifiable model, Pin pin1, WireCrossPoint pin2, Point... path)\r
+       {\r
+               this(model, pin1, pin2.getPin(), path);\r
+       }\r
+\r
+       public GUIWire(ViewModelModifiable model, Pin pin1, Pin pin2, Point... path)\r
        {\r
                logicObs = (i) -> callRedrawListeners();\r
                this.model = model;\r
                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
@@ -52,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