X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.model.editor%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fmodel%2Feditor%2Fhandles%2FWireHandle.java;h=d5e80c83b18e461dc1c846ea976a5aa878b4e942;hb=93b398d6271a538a2a4c9f4de07a3b4a8a2a7fd4;hp=7629dcb1774b9f1f65dcf4d083bd5c329bb59c82;hpb=bffda9003a621f34f431230c265b76a79597a1ae;p=Mograsim.git diff --git a/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/handles/WireHandle.java b/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/handles/WireHandle.java index 7629dcb1..d5e80c83 100644 --- a/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/handles/WireHandle.java +++ b/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/handles/WireHandle.java @@ -9,18 +9,21 @@ import net.haspamelodica.swt.helper.gcs.GeneralGC; import net.haspamelodica.swt.helper.swtobjectwrappers.Point; import net.haspamelodica.swt.helper.swtobjectwrappers.Rectangle; import net.mograsim.logic.model.editor.states.EditorState; -import net.mograsim.logic.model.model.wires.GUIWire; +import net.mograsim.logic.model.model.ViewModelModifiable; +import net.mograsim.logic.model.model.wires.ModelWire; public class WireHandle extends Handle { private boolean selected = false; private final static double WIDTH = 2.0; private final static double WIDTH_SQUARED = WIDTH * WIDTH; - public final GUIWire parent; + private final ViewModelModifiable model; + public final ModelWire parent; - public WireHandle(GUIWire parent) + public WireHandle(ViewModelModifiable model, ModelWire parent) { super(5); + this.model = model; this.parent = parent; parent.addPathChangedListener(c -> updateBounds()); updateBounds(); @@ -68,7 +71,7 @@ public class WireHandle extends Handle @Override public void reqDelete() { - parent.destroy(); + model.destroyWire(parent); } @Override @@ -101,7 +104,7 @@ public class WireHandle extends Handle } - private static Optional click(GUIWire w, double x, double y) + private static Optional click(ModelWire w, double x, double y) { Rectangle modifiedBounds = w.getBounds(); modifiedBounds.x -= WIDTH;