X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.model%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fmodel%2Fmodel%2Fcomponents%2Fsubmodels%2FSubmodelComponent.java;h=ffe6ed63fdcea8247186541ef879df7219411a3b;hb=92862c4723c5eff22257e8de06166a124efb5d77;hp=a08c0934e3dd7d886be1c92edd466164c66f082c;hpb=3a52b6bffe52db5dd5ca907b4b3dfd368a58e14f;p=Mograsim.git diff --git a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/submodels/SubmodelComponent.java b/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/submodels/SubmodelComponent.java index a08c0934..ffe6ed63 100644 --- a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/submodels/SubmodelComponent.java +++ b/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/submodels/SubmodelComponent.java @@ -101,7 +101,12 @@ public abstract class SubmodelComponent extends ModelComponent public SubmodelComponent(LogicModelModifiable model, String name) { - super(model, name); + this(model, name, true); + } + + protected SubmodelComponent(LogicModelModifiable model, String name, boolean callInit) + { + super(model, name, false); this.submodelModifiable = new LogicModelModifiable(); this.submodel = submodelModifiable; this.submodelPins = new HashMap<>(); @@ -125,6 +130,9 @@ public abstract class SubmodelComponent extends ModelComponent model.removeRedrawHandlerChangedListener(redrawHandlerChangedListener); }); submodelModifiable.setRedrawHandler(model.getRedrawHandler()); + + if (callInit) + init(); } // pins @@ -159,7 +167,7 @@ public abstract class SubmodelComponent extends ModelComponent default: throw new IllegalArgumentException("Unknown enum constant: " + supermodelPin.usage); } - MovablePin submodelPin = new MovablePin(submodelInterface, name, supermodelPin.logicWidth, submodelPinUsage, + MovablePin submodelPin = new MovablePin(model, submodelInterface, name, supermodelPin.logicWidth, submodelPinUsage, supermodelPin.getRelX() / submodelScale, supermodelPin.getRelY() / submodelScale); submodelPin.addPinMovedListener(p ->