Merge branch 'development' of

[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 4e61988..7faefe3 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;
 
-import java.util.HashSet;
-import java.util.Set;
+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;
@@ -22,49 +22,65 @@ import net.haspamelodica.swt.helper.zoomablecanvas.ZoomableCanvas;
  */
 public class LogicUICanvas extends ZoomableCanvas
 {
-       private final Set<GUIComponent> components;
-       private final Set<GUIWire> wires;
+       private final ViewModel model;
 
-       public LogicUICanvas(Composite parent, int style)
+       public LogicUICanvas(Composite parent, int style, ViewModel model)
        {
                super(parent, style);
 
-               components = new HashSet<>();
-               wires = new HashSet<>();
+               this.model = model;
+
+               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 ->
                {
                        Rectangle visibleRegion = new Rectangle(offX, offY, gW / zoom, gH / zoom);
-                       components.forEach(c -> drawComponent(gc, c, visibleRegion));
+                       model.getComponents().forEach(c -> drawComponent(gc, c, visibleRegion));
                });
-               addZoomedRenderer(gc -> wires.forEach(w -> w.render(gc)));
+               addZoomedRenderer(gc -> model.getWires().forEach(w -> w.render(gc)));
                addListener(SWT.MouseDown, this::mouseDown);
        }
 
-       /**
-        * Add a component to be drawn. Returns the given component for convenience.
-        * 
-        * @author Daniel Kirschten
-        */
-       // TODO replace with model change listener
-       public <C extends GUIComponent> C addComponent(C component)
-       {
-               components.add(component);
-               return component;
-       }
-
-       /**
-        * Add a graphical wire between the given connection points of the given components. The given components have to be added and the given
-        * connection points have to be connected logically first.
-        * 
-        * @author Daniel Kirschten
-        */
-       // TODO replace with model change listener
-       public void addWire(Pin pin1, Pin pin2, Point... path)
-       {
-               wires.add(new GUIWire(this::redrawThreadsafe, pin1, pin2, path));
-       }
-
        private void drawComponent(GeneralGC gc, GUIComponent component, Rectangle visibleRegion)
        {
                component.render(gc, visibleRegion);
@@ -81,11 +97,10 @@ public class LogicUICanvas extends ZoomableCanvas
                if (e.button == 1)
                {
                        Point click = displayToWorldCoords(e.x, e.y);
-                       for (GUIComponent component : components)
-                               if (component.getBounds().contains(click))
+                       for (GUIComponent component : model.getComponents())
+                               if (component.getBounds().contains(click) && component.clicked(click.x, click.y))
                                {
-                                       if (component.clicked(click.x, click.y))
-                                               redraw();
+                                       redraw();
                                        break;
                                }
                }