X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.model%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fmodel%2Fmodel%2Fwires%2FModelWireCrossPoint.java;h=b9a5ccc6c3315569946cd7a4ff6af34b6f581e0d;hb=0e506ec1b95fb65d5cb85412b59e528f9a996038;hp=28181b20e9cf80363e502a418a534cfd9ab789a3;hpb=552986fd8718d5f2db00802015fdd1ecd58a5a2f;p=Mograsim.git diff --git a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/wires/ModelWireCrossPoint.java b/net.mograsim.logic.model/src/net/mograsim/logic/model/model/wires/ModelWireCrossPoint.java index 28181b20..b9a5ccc6 100644 --- a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/wires/ModelWireCrossPoint.java +++ b/net.mograsim.logic.model/src/net/mograsim/logic/model/model/wires/ModelWireCrossPoint.java @@ -5,7 +5,7 @@ import net.haspamelodica.swt.helper.swtobjectwrappers.Rectangle; import net.mograsim.logic.core.LogicObserver; import net.mograsim.logic.core.types.BitVectorFormatter; import net.mograsim.logic.core.wires.CoreWire.ReadEnd; -import net.mograsim.logic.model.model.ViewModelModifiable; +import net.mograsim.logic.model.model.LogicModelModifiable; import net.mograsim.logic.model.model.components.ModelComponent; import net.mograsim.logic.model.serializing.IdentifyParams; import net.mograsim.logic.model.serializing.IndirectModelComponentCreator; @@ -46,19 +46,21 @@ public class ModelWireCrossPoint extends ModelComponent // creation and destruction - public ModelWireCrossPoint(ViewModelModifiable model, int logicWidth) + public ModelWireCrossPoint(LogicModelModifiable model, int logicWidth) { this(model, logicWidth, null); } - public ModelWireCrossPoint(ViewModelModifiable model, int logicWidth, String name) + public ModelWireCrossPoint(LogicModelModifiable model, int logicWidth, String name) { - super(model, name); + super(model, name, false); this.logicWidth = logicWidth; logicObs = (i) -> model.requestRedraw(); setSize(CIRCLE_DIAM, CIRCLE_DIAM); - addPin(this.pin = new Pin(this, "", logicWidth, PinUsage.TRISTATE, CIRCLE_RADIUS, CIRCLE_RADIUS)); + addPin(this.pin = new Pin(model, this, "", logicWidth, PinUsage.TRISTATE, CIRCLE_RADIUS, CIRCLE_RADIUS)); + + init(); } // pins