Started restructuring LogicUI

[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 dadbae0..a752711 100644 (file)
--- a/LogicUI/src/era/mi/gui/LogicUICanvas.java
+++ b/LogicUI/src/era/mi/gui/LogicUICanvas.java
@@ -1,19 +1,18 @@
 package era.mi.gui;\r
 \r
-import java.util.HashMap;\r
 import java.util.HashSet;\r
-import java.util.Map;\r
 import java.util.Set;\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.components.BasicGUIComponent;\r
-import era.mi.gui.wires.GUIWire;\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
 import net.haspamelodica.swt.helper.gcs.GeneralGC;\r
-import net.haspamelodica.swt.helper.gcs.TranslatedGC;\r
 import net.haspamelodica.swt.helper.swtobjectwrappers.Point;\r
+import net.haspamelodica.swt.helper.swtobjectwrappers.Rectangle;\r
 import net.haspamelodica.swt.helper.zoomablecanvas.ZoomableCanvas;\r
 \r
 /**\r
@@ -23,8 +22,7 @@ import net.haspamelodica.swt.helper.zoomablecanvas.ZoomableCanvas;
  */\r
 public class LogicUICanvas extends ZoomableCanvas\r
 {\r
-       private final Set<BasicGUIComponent> components;\r
-       private final Map<BasicGUIComponent, Point> componentPositions;\r
+       private final Set<GUIComponent> components;\r
        private final Set<GUIWire> wires;\r
 \r
        public LogicUICanvas(Composite parent, int style)\r
@@ -32,10 +30,13 @@ public class LogicUICanvas extends ZoomableCanvas
                super(parent, style);\r
 \r
                components = new HashSet<>();\r
-               componentPositions = new HashMap<>();\r
                wires = new HashSet<>();\r
 \r
-               addZoomedRenderer(gc -> components.forEach(c -> drawComponent(gc, c)));\r
+               addZoomedRenderer(gc ->\r
+               {\r
+                       Rectangle visibleRegion = new Rectangle(offX, offY, gW / zoom, gH / zoom);\r
+                       components.forEach(c -> drawComponent(gc, c, visibleRegion));\r
+               });\r
                addZoomedRenderer(gc -> wires.forEach(w -> w.render(gc)));\r
                addListener(SWT.MouseDown, this::mouseDown);\r
        }\r
@@ -45,10 +46,10 @@ public class LogicUICanvas extends ZoomableCanvas
         * \r
         * @author Daniel Kirschten\r
         */\r
-       public <C extends BasicGUIComponent> C addComponent(C component, double x, double y)\r
+       // TODO replace with model change listener\r
+       public <C extends GUIComponent> C addComponent(C component)\r
        {\r
                components.add(component);\r
-               componentPositions.put(component, new Point(x, y));\r
                return component;\r
        }\r
 \r
@@ -58,18 +59,21 @@ public class LogicUICanvas extends ZoomableCanvas
         * \r
         * @author Daniel Kirschten\r
         */\r
-       public void addWire(BasicGUIComponent component1, int component1ConnectionIndex, BasicGUIComponent component2,\r
-                       int component2ConnectionIndex, Point... path)\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, component1, component1ConnectionIndex, componentPositions.get(component1), component2,\r
-                               component2ConnectionIndex, componentPositions.get(component2), path));\r
+               wires.add(new GUIWire(this::redrawThreadsafe, pin1, pin2, path));\r
        }\r
 \r
-       private void drawComponent(GeneralGC gc, BasicGUIComponent component)\r
+       private void drawComponent(GeneralGC gc, GUIComponent component, Rectangle visibleRegion)\r
        {\r
-               TranslatedGC tgc = new TranslatedGC(gc, componentPositions.get(component));\r
-               component.render(tgc);\r
-               tgc.setBackground(getDisplay().getSystemColor(SWT.COLOR_BLUE));\r
+               component.render(gc, visibleRegion);\r
+               gc.setBackground(getDisplay().getSystemColor(SWT.COLOR_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
        private void mouseDown(Event e)\r
@@ -77,8 +81,8 @@ public class LogicUICanvas extends ZoomableCanvas
                if (e.button == 1)\r
                {\r
                        Point click = displayToWorldCoords(e.x, e.y);\r
-                       for (BasicGUIComponent component : components)\r
-                               if (component.getBounds().translate(componentPositions.get(component)).contains(click))\r
+                       for (GUIComponent component : components)\r
+                               if (component.getBounds().contains(click))\r
                                {\r
                                        if (component.clicked(click.x, click.y))\r
                                                redraw();\r