Added convenience constructors in GUIWire

[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..a7554e7 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,7 +25,22 @@ 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