X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=net.mograsim.logic.model%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fmodel%2Fmodel%2Fwires%2FGUIWire.java;h=99241a3e4372cee8e4d0952c8949b8000c4ab970;hb=662eb9515b9fcbccc4997f50fecfb597ee8eb316;hp=7146d63166189dca4348eb7d9208b23efa2c69d3;hpb=e5ba4628b160a373ed5e7bdcd96ae59b7fbc1faa;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 7146d631..99241a3e 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
@@ -30,6 +30,10 @@ public class GUIWire
 	 * The model this wire is a part of.
 	 */
 	private final ViewModelModifiable model;
+	/**
+	 * The name of this wire. Is unique for all wires in its model.
+	 */
+	public final String name;
 	/**
 	 * The logical width of this wire. Is equal to the logical with of {@link #pin1} and {@link #pin2}.
 	 */
@@ -57,7 +61,6 @@ public class GUIWire
 	 */
 	private double[] effectivePath;
 
-	private final List<Runnable> redrawListeners;
 	private final List<Consumer<GUIWire>> pathChangedListeners;
 
 	/**
@@ -72,83 +75,164 @@ public class GUIWire
 	// creation and destruction
 
 	/**
-	 * Creates a new {@link GUIWire} with automatic interpolation.
+	 * Creates a new {@link GUIWire} with automatic interpolation and using the default name.
 	 * 
 	 * @author Daniel Kirschten
 	 */
 	public GUIWire(ViewModelModifiable model, WireCrossPoint pin1, WireCrossPoint pin2)
 	{
-		this(model, pin1, pin2, (Point[]) null);
+		this(model, null, pin1, pin2);
 	}
 
 	/**
-	 * Creates a new {@link GUIWire} with automatic interpolation.
+	 * Creates a new {@link GUIWire} with automatic interpolation and using the default name.
 	 * 
 	 * @author Daniel Kirschten
 	 */
 	public GUIWire(ViewModelModifiable model, WireCrossPoint pin1, Pin pin2)
 	{
-		this(model, pin1, pin2, (Point[]) null);
+		this(model, null, pin1, pin2);
 	}
 
 	/**
-	 * Creates a new {@link GUIWire} with automatic interpolation.
+	 * Creates a new {@link GUIWire} with automatic interpolation and using the default name.
 	 * 
 	 * @author Daniel Kirschten
 	 */
 	public GUIWire(ViewModelModifiable model, Pin pin1, WireCrossPoint pin2)
 	{
-		this(model, pin1, pin2, (Point[]) null);
+		this(model, null, pin1, pin2);
 	}
 
 	/**
-	 * Creates a new {@link GUIWire} with automatic interpolation.
+	 * Creates a new {@link GUIWire} with automatic interpolation and using the default name.
 	 * 
 	 * @author Daniel Kirschten
 	 */
 	public GUIWire(ViewModelModifiable model, Pin pin1, Pin pin2)
 	{
-		this(model, pin1, pin2, (Point[]) null);
+		this(model, null, pin1, pin2);
 	}
 
 	/**
-	 * Creates a new {@link GUIWire} without automatic interpolation.
+	 * Creates a new {@link GUIWire} without automatic interpolation and using the default name.
 	 * 
 	 * @author Daniel Kirschten
 	 */
 	public GUIWire(ViewModelModifiable model, WireCrossPoint pin1, WireCrossPoint pin2, Point... path)
 	{
-		this(model, pin1.getPin(), pin2.getPin(), path);
+		this(model, null, pin1, pin2, path);
 	}
 
 	/**
-	 * Creates a new {@link GUIWire} without automatic interpolation.
+	 * Creates a new {@link GUIWire} without automatic interpolation and using the default name.
 	 * 
 	 * @author Daniel Kirschten
 	 */
 	public GUIWire(ViewModelModifiable model, WireCrossPoint pin1, Pin pin2, Point... path)
 	{
-		this(model, pin1.getPin(), pin2, path);
+		this(model, null, pin1, pin2, path);
 	}
 
 	/**
-	 * Creates a new {@link GUIWire} without automatic interpolation.
+	 * Creates a new {@link GUIWire} without automatic interpolation and using the default name.
 	 * 
 	 * @author Daniel Kirschten
 	 */
 	public GUIWire(ViewModelModifiable model, Pin pin1, WireCrossPoint pin2, Point... path)
 	{
-		this(model, pin1, pin2.getPin(), path);
+		this(model, null, pin1, pin2, path);
 	}
 
 	/**
-	 * Creates a new {@link GUIWire} without automatic interpolation.
+	 * Creates a new {@link GUIWire} without automatic interpolation and using the default name.
 	 * 
 	 * @author Daniel Kirschten
 	 */
 	public GUIWire(ViewModelModifiable model, Pin pin1, Pin pin2, Point... path)
+	{
+		this(model, null, pin1, pin2, path);
+	}
+
+	/**
+	 * Creates a new {@link GUIWire} with automatic interpolation.
+	 * 
+	 * @author Daniel Kirschten
+	 */
+	public GUIWire(ViewModelModifiable model, String name, WireCrossPoint pin1, WireCrossPoint pin2)
+	{
+		this(model, name, pin1, pin2, (Point[]) null);
+	}
+
+	/**
+	 * Creates a new {@link GUIWire} with automatic interpolation.
+	 * 
+	 * @author Daniel Kirschten
+	 */
+	public GUIWire(ViewModelModifiable model, String name, WireCrossPoint pin1, Pin pin2)
+	{
+		this(model, name, pin1, pin2, (Point[]) null);
+	}
+
+	/**
+	 * Creates a new {@link GUIWire} with automatic interpolation.
+	 * 
+	 * @author Daniel Kirschten
+	 */
+	public GUIWire(ViewModelModifiable model, String name, Pin pin1, WireCrossPoint pin2)
+	{
+		this(model, name, pin1, pin2, (Point[]) null);
+	}
+
+	/**
+	 * Creates a new {@link GUIWire} with automatic interpolation.
+	 * 
+	 * @author Daniel Kirschten
+	 */
+	public GUIWire(ViewModelModifiable model, String name, Pin pin1, Pin pin2)
+	{
+		this(model, name, pin1, pin2, (Point[]) null);
+	}
+
+	/**
+	 * Creates a new {@link GUIWire} without automatic interpolation.
+	 * 
+	 * @author Daniel Kirschten
+	 */
+	public GUIWire(ViewModelModifiable model, String name, WireCrossPoint pin1, WireCrossPoint pin2, Point... path)
+	{
+		this(model, name, pin1.getPin(), pin2.getPin(), path);
+	}
+
+	/**
+	 * Creates a new {@link GUIWire} without automatic interpolation.
+	 * 
+	 * @author Daniel Kirschten
+	 */
+	public GUIWire(ViewModelModifiable model, String name, WireCrossPoint pin1, Pin pin2, Point... path)
+	{
+		this(model, name, pin1.getPin(), pin2, path);
+	}
+
+	/**
+	 * Creates a new {@link GUIWire} without automatic interpolation.
+	 * 
+	 * @author Daniel Kirschten
+	 */
+	public GUIWire(ViewModelModifiable model, String name, Pin pin1, WireCrossPoint pin2, Point... path)
+	{
+		this(model, name, pin1, pin2.getPin(), path);
+	}
+
+	/**
+	 * Creates a new {@link GUIWire} without automatic interpolation.
+	 * 
+	 * @author Daniel Kirschten
+	 */
+	public GUIWire(ViewModelModifiable model, String name, Pin pin1, Pin pin2, Point... path)
 	{
 		this.model = model;
+		this.name = name == null ? model.getDefaultWireName() : name;
 		this.logicWidth = pin1.logicWidth;
 		if (pin2.logicWidth != pin1.logicWidth)
 			throw new IllegalArgumentException("Can't connect pins of different logic width");
@@ -159,10 +243,9 @@ 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());
@@ -213,7 +296,7 @@ public class GUIWire
 	private void pinMoved()
 	{
 		recalculateEffectivePath();
-		callRedrawListeners();
+		model.requestRedraw();
 	}
 
 	// "graphical" operations
@@ -281,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));
@@ -307,7 +391,7 @@ public class GUIWire
 		this.path = deepPathCopy(path);
 		recalculateEffectivePath();
 		callPathChangedListeners();
-		callRedrawListeners();
+		model.requestRedraw();
 	}
 
 	public Point getPathPoint(int index)
@@ -320,7 +404,7 @@ public class GUIWire
 		path[index] = pointCopy(p);
 		recalculateEffectivePath();
 		callPathChangedListeners();
-		callRedrawListeners();
+		model.requestRedraw();
 	}
 
 	public void insertPathPoint(Point p, int index)
@@ -336,6 +420,8 @@ public class GUIWire
 				System.arraycopy(oldPath, index, path, index + 1, oldPath.length - index);
 			path[index] = pointCopy(p);
 		}
+		recalculateEffectivePath();
+		callPathChangedListeners();
 	}
 
 	public void removePathPoint(int index)
@@ -350,6 +436,8 @@ public class GUIWire
 			if (index < oldPath.length - 1)
 				System.arraycopy(oldPath, index + 1, path, index, oldPath.length - index - 1);
 		}
+		recalculateEffectivePath();
+		callPathChangedListeners();
 	}
 
 	public double[] getEffectivePath()
@@ -425,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