X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.model%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fmodel%2Fmodel%2Fwires%2FGUIWire.java;h=8b91fc4d2cacb6af7e37bfadbe6d490d3f89a0cc;hb=9e0665527c4813950f523164cd753652feacbd21;hp=144a1a380fb684cd51636dc56835cfde57878abe;hpb=f9eeb6f0746ed17665fdeafefb5b7e11afd22278;p=Mograsim.git

diff --git a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/wires/GUIWire.java b/net.mograsim.logic.model/src/net/mograsim/logic/model/model/wires/GUIWire.java
index 144a1a38..8b91fc4d 100644
--- a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/wires/GUIWire.java
+++ b/net.mograsim.logic.model/src/net/mograsim/logic/model/model/wires/GUIWire.java
@@ -61,7 +61,6 @@ public class GUIWire
 	 */
 	private double[] effectivePath;
 
-	private final List<Runnable> redrawListeners;
 	private final List<Consumer<GUIWire>> pathChangedListeners;
 
 	/**
@@ -244,28 +243,27 @@ public class GUIWire
 		this.path = path == null ? null : Arrays.copyOf(path, path.length);
 		this.bounds = new Rectangle(0, 0, -1, -1);
 
-		redrawListeners = new ArrayList<>();
 		pathChangedListeners = new ArrayList<>();
 
-		logicObs = (i) -> callRedrawListeners();
+		logicObs = (i) -> model.requestRedraw();
 
 		pin1.addPinMovedListener(p -> pinMoved());
 		pin2.addPinMovedListener(p -> pinMoved());
 
 		recalculateEffectivePath();
 
-		model.wireCreated(this);
+		model.wireCreated(this, this::destroyed);
 	}
 
 	/**
-	 * Destroys this wire. This method implicitly calls {@link ViewModelModifiable#wireDestroyed(GUIWire) wireDestroyed()} for the model
-	 * this component is a part of.
+	 * Destroys this wire. This method is called from {@link ViewModelModifiable#wireDestroyed(GUIWire) wireDestroyed()} of the model this
+	 * wire is a part of.
 	 * 
 	 * @author Daniel Kirschten
 	 */
-	public void destroy()
+	private void destroyed()
 	{
-		model.wireDestroyed(this);
+		// nothing to do
 	}
 
 	// pins
@@ -298,7 +296,7 @@ public class GUIWire
 	private void pinMoved()
 	{
 		recalculateEffectivePath();
-		callRedrawListeners();
+		model.requestRedraw();
 	}
 
 	// "graphical" operations
@@ -366,6 +364,7 @@ public class GUIWire
 	 */
 	public void render(GeneralGC gc)
 	{
+		// TODO maybe make wires with logicWidth!=1 thicker? Maybe make thickness selectable?
 		ColorDefinition wireColor = BitVectorFormatter.formatAsColor(end);
 		if (wireColor != null)
 			gc.setForeground(ColorManager.current().toColor(wireColor));
@@ -392,7 +391,7 @@ public class GUIWire
 		this.path = deepPathCopy(path);
 		recalculateEffectivePath();
 		callPathChangedListeners();
-		callRedrawListeners();
+		model.requestRedraw();
 	}
 
 	public Point getPathPoint(int index)
@@ -405,7 +404,7 @@ public class GUIWire
 		path[index] = pointCopy(p);
 		recalculateEffectivePath();
 		callPathChangedListeners();
-		callRedrawListeners();
+		model.requestRedraw();
 	}
 
 	public void insertPathPoint(Point p, int index)
@@ -514,13 +513,10 @@ public class GUIWire
 	// listeners
 
 	// @formatter:off
-	public void addRedrawListener        (Runnable          listener) {redrawListeners     .add    (listener);}
 	public void addPathChangedListener   (Consumer<GUIWire> listener) {pathChangedListeners.add    (listener);}
 
-	public void removeRedrawListener     (Runnable          listener) {redrawListeners     .remove(listener);}
 	public void removePathChangedListener(Consumer<GUIWire> listener) {pathChangedListeners.remove(listener);}
 
-	private void callRedrawListeners     () {redrawListeners     .forEach(l -> l.run   (    ));}
 	private void callPathChangedListeners() {pathChangedListeners.forEach(l -> l.accept(this));}
 	// @formatter:on