Suppressed warnings where the thing warned about is intentional

[Mograsim.git] / LogicUI / src / era / mi / gui / LogicUICanvas.java

diff --git a/LogicUI/src/era/mi/gui/LogicUICanvas.java b/LogicUI/src/era/mi/gui/LogicUICanvas.java
index a752711..a571387 100644 (file)
--- a/LogicUI/src/era/mi/gui/LogicUICanvas.java
+++ b/LogicUI/src/era/mi/gui/LogicUICanvas.java
@@ -1,12 +1,12 @@
 package era.mi.gui;\r
 \r
-import java.util.HashSet;\r
-import java.util.Set;\r
+import java.util.function.Consumer;\r
 \r
 import org.eclipse.swt.SWT;\r
 import org.eclipse.swt.widgets.Composite;\r
 import org.eclipse.swt.widgets.Event;\r
 \r
+import era.mi.gui.model.ViewModel;\r
 import era.mi.gui.model.components.GUIComponent;\r
 import era.mi.gui.model.wires.GUIWire;\r
 import era.mi.gui.model.wires.Pin;\r
@@ -22,57 +22,79 @@ import net.haspamelodica.swt.helper.zoomablecanvas.ZoomableCanvas;
  */\r
 public class LogicUICanvas extends ZoomableCanvas\r
 {\r
-       private final Set<GUIComponent> components;\r
-       private final Set<GUIWire> wires;\r
+       private static final boolean DRAW_PINS = false;\r
 \r
-       public LogicUICanvas(Composite parent, int style)\r
+       private final ViewModel model;\r
+\r
+       public LogicUICanvas(Composite parent, int style, ViewModel model)\r
        {\r
                super(parent, style);\r
 \r
-               components = new HashSet<>();\r
-               wires = new HashSet<>();\r
+               this.model = model;\r
+\r
+               Consumer<Object> redrawConsumer = o -> redrawThreadsafe();\r
+               Consumer<Pin> pinAddedListener = p ->\r
+               {\r
+                       p.addPinMovedListener(redrawConsumer);\r
+                       redrawThreadsafe();\r
+               };\r
+               Consumer<Pin> pinRemovedListener = p ->\r
+               {\r
+                       p.removePinMovedListener(redrawConsumer);\r
+                       redrawThreadsafe();\r
+               };\r
+               Consumer<? super GUIComponent> componentAddedListener = c ->\r
+               {\r
+                       c.addComponentLookChangedListener(redrawConsumer);\r
+                       c.addComponentMovedListener(redrawConsumer);\r
+                       c.addPinAddedListener(pinAddedListener);\r
+                       c.addPinRemovedListener(pinRemovedListener);\r
+                       redrawThreadsafe();\r
+               };\r
+               model.addComponentAddedListener(componentAddedListener);\r
+               model.getComponents().forEach(componentAddedListener);\r
+               model.addComponentRemovedListener(c ->\r
+               {\r
+                       c.removeComponentLookChangedListener(redrawConsumer);\r
+                       c.removeComponentMovedListener(redrawConsumer);\r
+                       c.removePinAddedListener(pinAddedListener);\r
+                       c.removePinRemovedListener(pinRemovedListener);\r
+                       redrawThreadsafe();\r
+               });\r
+               Consumer<? super GUIWire> wireAddedListener = w ->\r
+               {\r
+                       w.addWireLookChangedListener(redrawConsumer);\r
+                       redrawThreadsafe();\r
+               };\r
+               model.addWireAddedListener(wireAddedListener);\r
+               model.getWires().forEach(wireAddedListener);\r
+               model.addWireRemovedListener(w ->\r
+               {\r
+                       w.removeWireLookChangedListener(redrawConsumer);\r
+                       redrawThreadsafe();\r
+               });\r
 \r
                addZoomedRenderer(gc ->\r
                {\r
+                       gc.setLineWidth(.5);\r
+                       model.getWires().forEach(w -> w.render(gc));\r
                        Rectangle visibleRegion = new Rectangle(offX, offY, gW / zoom, gH / zoom);\r
-                       components.forEach(c -> drawComponent(gc, c, visibleRegion));\r
+                       model.getComponents().forEach(c -> drawComponent(gc, c, visibleRegion));\r
                });\r
-               addZoomedRenderer(gc -> wires.forEach(w -> w.render(gc)));\r
                addListener(SWT.MouseDown, this::mouseDown);\r
        }\r
 \r
-       /**\r
-        * Add a component to be drawn. Returns the given component for convenience.\r
-        * \r
-        * @author Daniel Kirschten\r
-        */\r
-       // TODO replace with model change listener\r
-       public <C extends GUIComponent> C addComponent(C component)\r
-       {\r
-               components.add(component);\r
-               return component;\r
-       }\r
-\r
-       /**\r
-        * Add a graphical wire between the given connection points of the given components. The given components have to be added and the given\r
-        * connection points have to be connected logically first.\r
-        * \r
-        * @author Daniel Kirschten\r
-        */\r
-       // TODO replace with model change listener\r
-       public void addWire(Pin pin1, Pin pin2, Point... path)\r
-       {\r
-               wires.add(new GUIWire(this::redrawThreadsafe, pin1, pin2, path));\r
-       }\r
-\r
        private void drawComponent(GeneralGC gc, GUIComponent component, Rectangle visibleRegion)\r
        {\r
                component.render(gc, visibleRegion);\r
-               gc.setBackground(getDisplay().getSystemColor(SWT.COLOR_CYAN));\r
-               for (Pin p : component.getPins())\r
+               if (DRAW_PINS)\r
                {\r
-                       Point pos = p.getPos();\r
-                       gc.fillOval(pos.x - 1, pos.y - 1, 2, 2);\r
+                       gc.setBackground(getDisplay().getSystemColor(SWT.COLOR_DARK_CYAN));\r
+                       for (Pin p : component.getPins())\r
+                       {\r
+                               Point pos = p.getPos();\r
+                               gc.fillOval(pos.x - 1, pos.y - 1, 2, 2);\r
+                       }\r
                }\r
        }\r
 \r
@@ -81,11 +103,10 @@ public class LogicUICanvas extends ZoomableCanvas
                if (e.button == 1)\r
                {\r
                        Point click = displayToWorldCoords(e.x, e.y);\r
-                       for (GUIComponent component : components)\r
-                               if (component.getBounds().contains(click))\r
+                       for (GUIComponent component : model.getComponents())\r
+                               if (component.getBounds().contains(click) && component.clicked(click.x, click.y))\r
                                {\r
-                                       if (component.clicked(click.x, click.y))\r
-                                               redraw();\r
+                                       redraw();\r
                                        break;\r
                                }\r
                }\r