Completely changed the structure and switched to Eclipse Plugin.

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

diff --git a/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/wires/WireCrossPoint.java b/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/wires/WireCrossPoint.java
index fb161ac..2b07238 100644 (file)
--- a/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/wires/WireCrossPoint.java
+++ b/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/wires/WireCrossPoint.java
@@ -1,5 +1,7 @@
 package net.mograsim.logic.ui.model.wires;\r
 \r
+import java.util.Map;\r
+\r
 import net.haspamelodica.swt.helper.gcs.GeneralGC;\r
 import net.haspamelodica.swt.helper.swtobjectwrappers.Rectangle;\r
 import net.mograsim.logic.core.LogicObservable;\r
@@ -7,33 +9,42 @@ 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.ModelVisitor;\r
+import net.mograsim.logic.ui.model.ViewModelModifiable;\r
 import net.mograsim.logic.ui.model.components.GUIComponent;\r
+import net.mograsim.logic.ui.model.components.SimpleRectangularGUIGate;\r
 \r
 public class WireCrossPoint extends GUIComponent\r
 {\r
+       private static final int CIRCLE_RADIUS = 1;\r
+       private static final int CIRCLE_DIAM = CIRCLE_RADIUS * 2;\r
+\r
        private final Pin pin;\r
        private final int logicWidth;\r
 \r
        private final LogicObserver logicObs;\r
        private ReadEnd end;\r
 \r
-       public WireCrossPoint(ViewModel model, int logicWidth)\r
+       public WireCrossPoint(ViewModelModifiable model, int logicWidth)\r
        {\r
                super(model);\r
                logicObs = (i) -> requestRedraw();\r
 \r
                this.logicWidth = logicWidth;\r
-               setSize(0, 0);\r
-               addPin(this.pin = new Pin(this, logicWidth, 0, 0));\r
+               setSize(CIRCLE_DIAM, CIRCLE_DIAM);\r
+               addPin(this.pin = new Pin(this, "", logicWidth, CIRCLE_RADIUS, CIRCLE_RADIUS));\r
+       }\r
+\r
+       public void moveCenterTo(double x, double y)\r
+       {\r
+               moveTo(x - CIRCLE_RADIUS, y - CIRCLE_RADIUS);\r
        }\r
 \r
        @Override\r
        public void render(GeneralGC gc, Rectangle visibleRegion)\r
        {\r
-               Rectangle bounds = getBounds();\r
                ColorHelper.executeWithDifferentBackground(gc, BitVectorFormatter.formatAsColor(end),\r
-                               () -> gc.fillOval(bounds.x - 1, bounds.y - 1, 2, 2));\r
+                               () -> gc.fillOval(getPosX(), getPosY(), CIRCLE_DIAM, CIRCLE_DIAM));\r
        }\r
 \r
        public void setLogicModelBinding(ReadEnd end)\r
@@ -64,4 +75,18 @@ public class WireCrossPoint extends GUIComponent
        {\r
                return pin;\r
        }\r
+\r
+       @Override\r
+       public Map<String, Object> getInstantiationParameters()\r
+       {\r
+               Map<String, Object> m = super.getInstantiationParameters();\r
+               m.put(SimpleRectangularGUIGate.kLogicWidth, logicWidth);\r
+               return m;\r
+       }\r
+\r
+       @Override\r
+       public void accept(ModelVisitor mv)\r
+       {\r
+               mv.visit(this);\r
+       }\r
 }
\ No newline at end of file