X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.ui%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fui%2Fmodel%2Fwires%2FWireCrossPoint.java;h=22868ccfb97a22f65e2b742ebd21d4311adbe535;hb=f14ea37d69488dd51518a36413af7176916b8bd7;hp=927e4e508cec37acefbbae5f3b6267f3e8c52739;hpb=f338e2a024c8edca6ab72230747ea5e4889d8b0b;p=Mograsim.git 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 927e4e50..22868ccf 100644 --- 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,40 +1,69 @@ package net.mograsim.logic.ui.model.wires; -import net.mograsim.logic.ui.ColorHelper; -import net.mograsim.logic.ui.model.ViewModel; -import net.mograsim.logic.ui.model.components.GUIComponent; +import java.util.Map; + import net.haspamelodica.swt.helper.gcs.GeneralGC; import net.haspamelodica.swt.helper.swtobjectwrappers.Rectangle; +import net.mograsim.logic.core.LogicObservable; +import net.mograsim.logic.core.LogicObserver; import net.mograsim.logic.core.types.BitVectorFormatter; import net.mograsim.logic.core.wires.Wire.ReadEnd; +import net.mograsim.logic.ui.ColorHelper; +import net.mograsim.logic.ui.model.ModelVisitor; +import net.mograsim.logic.ui.model.ViewModelModifiable; +import net.mograsim.logic.ui.model.components.GUIComponent; +import net.mograsim.logic.ui.model.components.SimpleRectangularGUIGate; public class WireCrossPoint extends GUIComponent { + private static final int CIRCLE_RADIUS = 1; + private static final int CIRCLE_DIAM = CIRCLE_RADIUS * 2; + private final Pin pin; + private final int logicWidth; + private final LogicObserver logicObs; private ReadEnd end; - private final int logicWidth; - public WireCrossPoint(ViewModel model, int logicWidth) + public WireCrossPoint(ViewModelModifiable model, int logicWidth) { super(model); + logicObs = (i) -> requestRedraw(); + this.logicWidth = logicWidth; - setSize(0, 0); - addPin(this.pin = new Pin(this, logicWidth, 0, 0)); + setSize(CIRCLE_DIAM, CIRCLE_DIAM); + addPin(this.pin = new Pin(this, "", logicWidth, CIRCLE_RADIUS, CIRCLE_RADIUS)); + } + + public void moveCenterTo(double x, double y) + { + moveTo(x - CIRCLE_RADIUS, y - CIRCLE_RADIUS); } @Override public void render(GeneralGC gc, Rectangle visibleRegion) { - Rectangle bounds = getBounds(); ColorHelper.executeWithDifferentBackground(gc, BitVectorFormatter.formatAsColor(end), - () -> gc.fillOval(bounds.x - 1, bounds.y - 1, 2, 2)); + () -> gc.fillOval(getPosX(), getPosY(), CIRCLE_DIAM, CIRCLE_DIAM)); } public void setLogicModelBinding(ReadEnd end) { + deregisterLogicObs(this.end); this.end = end; - end.registerObserver((i) -> callComponentLookChangedListeners()); + registerLogicObs(end); + } + + private void registerLogicObs(LogicObservable observable) + { + if (observable != null) + observable.registerObserver(logicObs); + } + + private void deregisterLogicObs(LogicObservable observable) + { + if (observable != null) + observable.deregisterObserver(logicObs); } public int getLogicWidth() @@ -46,4 +75,18 @@ public class WireCrossPoint extends GUIComponent { return pin; } + + @Override + public Map getInstantiationParameters() + { + Map m = super.getInstantiationParameters(); + m.put(SimpleRectangularGUIGate.kLogicWidth, logicWidth); + return m; + } + + @Override + public void accept(ModelVisitor mv) + { + mv.visit(this); + } } \ No newline at end of file