package net.mograsim.logic.ui.model.wires;\r
\r
-import net.mograsim.logic.ui.ColorHelper;\r
-import net.mograsim.logic.ui.model.ViewModel;\r
-import net.mograsim.logic.ui.model.components.GUIComponent;\r
import net.haspamelodica.swt.helper.gcs.GeneralGC;\r
import net.haspamelodica.swt.helper.swtobjectwrappers.Rectangle;\r
+import net.mograsim.logic.core.LogicObservable;\r
+import net.mograsim.logic.core.LogicObserver;\r
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.ViewModelModifiable;\r
+import net.mograsim.logic.ui.model.components.GUIComponent;\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
- private final int logicWidth;\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
{\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(bounds.x, bounds.y, CIRCLE_DIAM, CIRCLE_DIAM));\r
}\r
\r
public void setLogicModelBinding(ReadEnd end)\r
{\r
+ deregisterLogicObs(this.end);\r
this.end = end;\r
- end.registerObserver((i) -> callComponentLookChangedListeners());\r
+ registerLogicObs(end);\r
+ }\r
+\r
+ private void registerLogicObs(LogicObservable observable)\r
+ {\r
+ if (observable != null)\r
+ observable.registerObserver(logicObs);\r
+ }\r
+\r
+ private void deregisterLogicObs(LogicObservable observable)\r
+ {\r
+ if (observable != null)\r
+ observable.deregisterObserver(logicObs);\r
}\r
\r
public int getLogicWidth()\r