\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
import net.haspamelodica.swt.helper.gcs.GeneralGC;\r
import net.haspamelodica.swt.helper.swtobjectwrappers.Point;\r
*/\r
public class LogicUICanvas extends ZoomableCanvas\r
{\r
+ private static final boolean DRAW_PINS = false;\r
+\r
private final ViewModel model;\r
\r
public LogicUICanvas(Composite parent, int style, ViewModel model)\r
p.removePinMovedListener(redrawConsumer);\r
redrawThreadsafe();\r
};\r
- model.addComponentAddedListener(c ->\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
+ };\r
+ model.addComponentAddedListener(componentAddedListener);\r
+ model.getComponents().forEach(componentAddedListener);\r
model.addComponentRemovedListener(c ->\r
{\r
c.removeComponentLookChangedListener(redrawConsumer);\r
c.removePinRemovedListener(pinRemovedListener);\r
redrawThreadsafe();\r
});\r
- model.addWireAddedListener(w ->\r
+ Consumer<? super GUIWire> wireAddedListener = w ->\r
{\r
w.addWireLookChangedListener(redrawConsumer);\r
redrawThreadsafe();\r
- });\r
+ };\r
+ model.addWireAddedListener(wireAddedListener);\r
+ model.getWires().forEach(wireAddedListener);\r
model.addWireRemovedListener(w ->\r
{\r
w.removeWireLookChangedListener(redrawConsumer);\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
model.getComponents().forEach(c -> drawComponent(gc, c, visibleRegion));\r
});\r
- addZoomedRenderer(gc -> model.getWires().forEach(w -> w.render(gc)));\r
addListener(SWT.MouseDown, this::mouseDown);\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