X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=LogicUI%2Fsrc%2Fera%2Fmi%2Fgui%2FLogicUICanvas.java;h=6355044391b9dcfd8448e13bce4b9772b91f2f16;hb=80bfbd8ebf0ad8a7ad98584544a0c73f43e6f3b6;hp=da338013fe528388956f67920d90eb8fad149760;hpb=f2886cbd57dd08b797921fc2421b41bd92915799;p=Mograsim.git

diff --git a/LogicUI/src/era/mi/gui/LogicUICanvas.java b/LogicUI/src/era/mi/gui/LogicUICanvas.java
index da338013..63550443 100644
--- a/LogicUI/src/era/mi/gui/LogicUICanvas.java
+++ b/LogicUI/src/era/mi/gui/LogicUICanvas.java
@@ -1,11 +1,14 @@
 package era.mi.gui;
 
+import java.util.function.Consumer;
+
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Event;
 
 import era.mi.gui.model.ViewModel;
 import era.mi.gui.model.components.GUIComponent;
+import era.mi.gui.model.wires.GUIWire;
 import era.mi.gui.model.wires.Pin;
 import net.haspamelodica.swt.helper.gcs.GeneralGC;
 import net.haspamelodica.swt.helper.swtobjectwrappers.Point;
@@ -19,6 +22,8 @@ import net.haspamelodica.swt.helper.zoomablecanvas.ZoomableCanvas;
  */
 public class LogicUICanvas extends ZoomableCanvas
 {
+	private static final boolean DRAW_PINS = false;
+
 	private final ViewModel model;
 
 	public LogicUICanvas(Composite parent, int style, ViewModel model)
@@ -27,26 +32,69 @@ public class LogicUICanvas extends ZoomableCanvas
 
 		this.model = model;
 
-		model.addComponentAddedListener(c -> redrawThreadsafe());
-		model.addWireAddedListener(c -> redrawThreadsafe());
+		Consumer<Object> redrawConsumer = o -> redrawThreadsafe();
+		Consumer<Pin> pinAddedListener = p ->
+		{
+			p.addPinMovedListener(redrawConsumer);
+			redrawThreadsafe();
+		};
+		Consumer<Pin> pinRemovedListener = p ->
+		{
+			p.removePinMovedListener(redrawConsumer);
+			redrawThreadsafe();
+		};
+		Consumer<? super GUIComponent> componentAddedListener = c ->
+		{
+			c.addComponentLookChangedListener(redrawConsumer);
+			c.addComponentMovedListener(redrawConsumer);
+			c.addPinAddedListener(pinAddedListener);
+			c.addPinRemovedListener(pinRemovedListener);
+			redrawThreadsafe();
+		};
+		model.addComponentAddedListener(componentAddedListener);
+		model.getComponents().forEach(componentAddedListener);
+		model.addComponentRemovedListener(c ->
+		{
+			c.removeComponentLookChangedListener(redrawConsumer);
+			c.removeComponentMovedListener(redrawConsumer);
+			c.removePinAddedListener(pinAddedListener);
+			c.removePinRemovedListener(pinRemovedListener);
+			redrawThreadsafe();
+		});
+		Consumer<? super GUIWire> wireAddedListener = w ->
+		{
+			w.addWireLookChangedListener(redrawConsumer);
+			redrawThreadsafe();
+		};
+		model.addWireAddedListener(wireAddedListener);
+		model.getWires().forEach(wireAddedListener);
+		model.addWireRemovedListener(w ->
+		{
+			w.removeWireLookChangedListener(redrawConsumer);
+			redrawThreadsafe();
+		});
 
 		addZoomedRenderer(gc ->
 		{
+			gc.setLineWidth(.5);
+			model.getWires().forEach(w -> w.render(gc));
 			Rectangle visibleRegion = new Rectangle(offX, offY, gW / zoom, gH / zoom);
 			model.getComponents().forEach(c -> drawComponent(gc, c, visibleRegion));
 		});
-		addZoomedRenderer(gc -> model.getWires().forEach(w -> w.render(gc)));
 		addListener(SWT.MouseDown, this::mouseDown);
 	}
 
 	private void drawComponent(GeneralGC gc, GUIComponent component, Rectangle visibleRegion)
 	{
 		component.render(gc, visibleRegion);
-		gc.setBackground(getDisplay().getSystemColor(SWT.COLOR_CYAN));
-		for (Pin p : component.getPins())
+		if (DRAW_PINS)
 		{
-			Point pos = p.getPos();
-			gc.fillOval(pos.x - 1, pos.y - 1, 2, 2);
+			gc.setBackground(getDisplay().getSystemColor(SWT.COLOR_DARK_CYAN));
+			for (Pin p : component.getPins())
+			{
+				Point pos = p.getPos();
+				gc.fillOval(pos.x - 1, pos.y - 1, 2, 2);
+			}
 		}
 	}