Splitted LogicUI from hardcoded example code
authorDaniel Kirschten <daniel.kirschten@gmx.de>
Thu, 16 May 2019 08:57:36 +0000 (10:57 +0200)
committerDaniel Kirschten <daniel.kirschten@gmx.de>
Thu, 16 May 2019 08:57:36 +0000 (10:57 +0200)
LogicUI/src/era/mi/gui/LogicUI.java [new file with mode: 0644]
LogicUI/src/era/mi/gui/examples/LogicUI.java [deleted file]
LogicUI/src/era/mi/gui/examples/RSLatchGUIExample.java [new file with mode: 0644]

diff --git a/LogicUI/src/era/mi/gui/LogicUI.java b/LogicUI/src/era/mi/gui/LogicUI.java
new file mode 100644 (file)
index 0000000..8cbb46c
--- /dev/null
@@ -0,0 +1,131 @@
+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
+import java.util.concurrent.atomic.AtomicBoolean;\r
+\r
+import org.eclipse.swt.SWT;\r
+import org.eclipse.swt.layout.FillLayout;\r
+import org.eclipse.swt.widgets.Display;\r
+import org.eclipse.swt.widgets.Event;\r
+import org.eclipse.swt.widgets.Shell;\r
+\r
+import era.mi.gui.components.BasicGUIComponent;\r
+import era.mi.gui.wires.GUIWire;\r
+import era.mi.logic.Simulation;\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.zoomablecanvas.ZoomableCanvas;\r
+import net.haspamelodica.swt.helper.zoomablecanvas.helper.ZoomableCanvasOverlay;\r
+import net.haspamelodica.swt.helper.zoomablecanvas.helper.ZoomableCanvasUserInput;\r
+\r
+public class LogicUI\r
+{\r
+       private final Display                                           display;\r
+       private final Shell                                                     shell;\r
+       private final ZoomableCanvas                            canvas;\r
+       private final Set<BasicGUIComponent>            components;\r
+       private final Map<BasicGUIComponent, Point>     componentPositions;\r
+       private final Set<GUIWire>                                      wires;\r
+\r
+       public LogicUI()\r
+       {\r
+               display = new Display();\r
+               shell = new Shell(display);\r
+               shell.setLayout(new FillLayout());\r
+               canvas = new ZoomableCanvas(shell, SWT.NONE);\r
+\r
+               components = new HashSet<>();\r
+               componentPositions = new HashMap<>();\r
+               wires = new HashSet<>();\r
+\r
+               canvas.addZoomedRenderer(gc -> components.forEach(c -> drawComponent(gc, c)));\r
+               canvas.addZoomedRenderer(gc -> wires.forEach(w -> w.render(gc)));\r
+               ZoomableCanvasUserInput userInput = new ZoomableCanvasUserInput(canvas);\r
+               userInput.buttonDrag = 3;\r
+               userInput.buttonZoom = 2;\r
+               userInput.enableUserInput();\r
+               new ZoomableCanvasOverlay(canvas, null).enableScale();\r
+               canvas.addListener(SWT.MouseDown, this::mouseDown);\r
+       }\r
+       /**\r
+        * Returns the given component for convenience.\r
+        */\r
+       public <C extends BasicGUIComponent> C addComponent(C component, double x, double y)\r
+       {\r
+               components.add(component);\r
+               componentPositions.put(component, new Point(x, y));\r
+               return component;\r
+       }\r
+       public void addWire(BasicGUIComponent component1, int component1ConnectionIndex, BasicGUIComponent component2, int component2ConnectionIndex, Point... path)\r
+       {\r
+               wires.add(new GUIWire(canvas::redrawThreadsafe, component1, component1ConnectionIndex, componentPositions.get(component1), component2, component2ConnectionIndex, componentPositions.get(component2), path));\r
+       }\r
+       private void drawComponent(GeneralGC gc, BasicGUIComponent component)\r
+       {\r
+               TranslatedGC tgc = new TranslatedGC(gc, componentPositions.get(component));\r
+               component.render(tgc);\r
+               tgc.setBackground(display.getSystemColor(SWT.COLOR_BLUE));\r
+//             for(int i = 0; i < component.getConnectedWireArraysCount(); i ++)\r
+//             {\r
+//                     Point connectionPoint = component.getWireArrayConnectionPoint(i);\r
+//                     if(connectionPoint != null)\r
+//                             tgc.fillOval(connectionPoint.x - 1, connectionPoint.y - 1, 2, 2);\r
+//             }\r
+       }\r
+       private void mouseDown(Event e)\r
+       {\r
+               if(e.button == 1)\r
+               {\r
+                       Point click = canvas.displayToWorldCoords(e.x, e.y);\r
+                       for(BasicGUIComponent component : components)\r
+                               if(component.getBounds().translate(componentPositions.get(component)).contains(click))\r
+                               {\r
+                                       if(component.clicked(click.x, click.y))\r
+                                               canvas.redraw();\r
+                                       break;\r
+                               }\r
+               }\r
+       }\r
+\r
+       public void run()\r
+       {\r
+               AtomicBoolean running = new AtomicBoolean(true);\r
+               Thread simulationThread = new Thread(() ->\r
+               {\r
+                       while(running.get())\r
+                       {\r
+                               //always execute to keep timeline from "hanging behind" for too long\r
+                               Simulation.TIMELINE.executeUpTo(System.currentTimeMillis(), System.currentTimeMillis() + 10);\r
+                               long sleepTime;\r
+                               if(Simulation.TIMELINE.hasNext())\r
+                               {\r
+                                       sleepTime = Simulation.TIMELINE.nextEventTime() - System.currentTimeMillis();\r
+                               } else\r
+                                       sleepTime = 100;\r
+                               try\r
+                               {\r
+                                       if(sleepTime > 0)\r
+                                               Thread.sleep(sleepTime);\r
+                               } catch(InterruptedException e)\r
+                               {} //it is normal execution flow to be interrupted\r
+                       }\r
+               });\r
+               simulationThread.start();\r
+               Simulation.TIMELINE.addEventAddedListener(event ->\r
+               {\r
+                       if(event.getTiming() >= System.currentTimeMillis() / (double) 1)\r
+                               simulationThread.interrupt();\r
+               });\r
+\r
+               shell.open();\r
+               while(!shell.isDisposed())\r
+                       if(!display.readAndDispatch())\r
+                               display.sleep();\r
+               running.set(false);\r
+               simulationThread.interrupt();\r
+       }\r
+}
\ No newline at end of file
diff --git a/LogicUI/src/era/mi/gui/examples/LogicUI.java b/LogicUI/src/era/mi/gui/examples/LogicUI.java
deleted file mode 100644 (file)
index b3d2488..0000000
+++ /dev/null
@@ -1,166 +0,0 @@
-package era.mi.gui.examples;\r
-\r
-import java.util.HashMap;\r
-import java.util.HashSet;\r
-import java.util.Map;\r
-import java.util.Set;\r
-import java.util.concurrent.atomic.AtomicBoolean;\r
-\r
-import org.eclipse.swt.SWT;\r
-import org.eclipse.swt.layout.FillLayout;\r
-import org.eclipse.swt.widgets.Display;\r
-import org.eclipse.swt.widgets.Event;\r
-import org.eclipse.swt.widgets.Shell;\r
-\r
-import era.mi.gui.components.BasicGUIComponent;\r
-import era.mi.gui.components.GUIManualSwitch;\r
-import era.mi.gui.components.GUINotGate;\r
-import era.mi.gui.components.GUIOrGate;\r
-import era.mi.gui.wires.GUIWire;\r
-import era.mi.gui.wires.WireConnectionPoint;\r
-import era.mi.logic.Simulation;\r
-import era.mi.logic.wires.WireArray;\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.zoomablecanvas.ZoomableCanvas;\r
-import net.haspamelodica.swt.helper.zoomablecanvas.helper.ZoomableCanvasOverlay;\r
-import net.haspamelodica.swt.helper.zoomablecanvas.helper.ZoomableCanvasUserInput;\r
-\r
-public class LogicUI\r
-{\r
-       private static final int                                        WIRE_DELAY      = 40;\r
-       private static final int                                        OR_DELAY        = 100;\r
-       private static final int                                        NOT_DELAY       = 100;\r
-       private final Display                                           display;\r
-       private final Shell                                                     shell;\r
-       private final ZoomableCanvas                            canvas;\r
-       private final Set<BasicGUIComponent>            components;\r
-       private final Map<BasicGUIComponent, Point>     componentPositions;\r
-       private final Set<GUIWire>                                      wires;\r
-\r
-       public LogicUI()\r
-       {\r
-               display = new Display();\r
-               shell = new Shell(display);\r
-               shell.setLayout(new FillLayout());\r
-               canvas = new ZoomableCanvas(shell, SWT.NONE);\r
-\r
-               components = new HashSet<>();\r
-               componentPositions = new HashMap<>();\r
-               wires = new HashSet<>();\r
-               initComponents();\r
-\r
-               canvas.addZoomedRenderer(gc -> components.forEach(c -> drawComponent(gc, c)));\r
-               canvas.addZoomedRenderer(gc -> wires.forEach(w -> w.render(gc)));\r
-               ZoomableCanvasUserInput userInput = new ZoomableCanvasUserInput(canvas);\r
-               userInput.buttonDrag = 3;\r
-               userInput.buttonZoom = 2;\r
-               userInput.enableUserInput();\r
-               new ZoomableCanvasOverlay(canvas, null).enableScale();\r
-               canvas.addListener(SWT.MouseDown, this::mouseDown);\r
-       }\r
-       private void initComponents()\r
-       {\r
-               Simulation.TIMELINE.reset();\r
-               WireArray r = new WireArray(1, WIRE_DELAY);\r
-               WireArray s = new WireArray(1, WIRE_DELAY);\r
-               WireArray t2 = new WireArray(1, WIRE_DELAY);\r
-               WireArray t1 = new WireArray(1, WIRE_DELAY);\r
-               WireArray q = new WireArray(1, WIRE_DELAY);\r
-               WireArray nq = new WireArray(1, WIRE_DELAY);\r
-\r
-               GUIManualSwitch rIn = addComponent(new GUIManualSwitch(r), 100, 100);\r
-               GUIManualSwitch sIn = addComponent(new GUIManualSwitch(s), 100, 200);\r
-               GUIOrGate or1 = addComponent(new GUIOrGate(OR_DELAY, t1, r, nq), 160, 102.5);\r
-               GUIOrGate or2 = addComponent(new GUIOrGate(OR_DELAY, t2, q, s), 160, 192.5);\r
-               GUINotGate not1 = addComponent(new GUINotGate(NOT_DELAY, t1, q), 200, 107.5);\r
-               GUINotGate not2 = addComponent(new GUINotGate(NOT_DELAY, t2, nq), 200, 197.5);\r
-\r
-               WireConnectionPoint p1 = addComponent(new WireConnectionPoint(q, 2), 250, 112.5);\r
-               WireConnectionPoint p2 = addComponent(new WireConnectionPoint(nq, 2), 250, 202.5);\r
-\r
-               addWire(rIn, 0, or1, 0);\r
-               addWire(sIn, 0, or2, 1);\r
-               addWire(or1, 2, not1, 0);\r
-               addWire(or2, 2, not2, 0);\r
-               addWire(not1, 1, p1, 0);\r
-               addWire(not2, 1, p2, 0);\r
-               addWire(p1, 1, or2, 0, new Point(250, 130), new Point(140, 185), new Point(140, 197.5));\r
-               addWire(p2, 1, or1, 1, new Point(250, 185), new Point(140, 130), new Point(140, 117.5));\r
-       }\r
-       /**\r
-        * Returns the given component for convenience.\r
-        */\r
-       private <C extends BasicGUIComponent> C addComponent(C component, double x, double y)\r
-       {\r
-               components.add(component);\r
-               componentPositions.put(component, new Point(x, y));\r
-               return component;\r
-       }\r
-       private void addWire(BasicGUIComponent component1, int component1ConnectionIndex, BasicGUIComponent component2, int component2ConnectionIndex, Point... path)\r
-       {\r
-               wires.add(new GUIWire(canvas::redrawThreadsafe, component1, component1ConnectionIndex, componentPositions.get(component1), component2, component2ConnectionIndex, componentPositions.get(component2), path));\r
-       }\r
-       private void drawComponent(GeneralGC gc, BasicGUIComponent component)\r
-       {\r
-               component.render(new TranslatedGC(gc, componentPositions.get(component)));\r
-       }\r
-       private void mouseDown(Event e)\r
-       {\r
-               if(e.button == 1)\r
-               {\r
-                       Point click = canvas.displayToWorldCoords(e.x, e.y);\r
-                       for(BasicGUIComponent component : components)\r
-                               if(component.getBounds().translate(componentPositions.get(component)).contains(click))\r
-                               {\r
-                                       if(component.clicked(click.x, click.y))\r
-                                               canvas.redraw();\r
-                                       break;\r
-                               }\r
-               }\r
-       }\r
-\r
-       public void run()\r
-       {\r
-               AtomicBoolean running = new AtomicBoolean(true);\r
-               Thread simulationThread = new Thread(() ->\r
-               {\r
-                       while(running.get())\r
-                       {\r
-                               //always execute to keep timeline from "hanging behind" for too long\r
-                               Simulation.TIMELINE.executeUpTo(System.currentTimeMillis(), System.currentTimeMillis() + 10);\r
-                               long sleepTime;\r
-                               if(Simulation.TIMELINE.hasNext())\r
-                               {\r
-                                       sleepTime = Simulation.TIMELINE.nextEventTime() - System.currentTimeMillis();\r
-                               } else\r
-                                       sleepTime = 100;\r
-                               try\r
-                               {\r
-                                       if(sleepTime > 0)\r
-                                               Thread.sleep(sleepTime);\r
-                               } catch(InterruptedException e)\r
-                               {} //it is normal execution flow to be interrupted\r
-                       }\r
-               });\r
-               simulationThread.start();\r
-               Simulation.TIMELINE.addEventAddedListener(event ->\r
-               {\r
-                       if(event.getTiming() >= System.currentTimeMillis() / (double) 1)\r
-                               simulationThread.interrupt();\r
-               });\r
-\r
-               shell.open();\r
-               while(!shell.isDisposed())\r
-                       if(!display.readAndDispatch())\r
-                               display.sleep();\r
-               running.set(false);\r
-               simulationThread.interrupt();\r
-       }\r
-\r
-       public static void main(String[] args)\r
-       {\r
-               new LogicUI().run();\r
-       }\r
-}
\ No newline at end of file
diff --git a/LogicUI/src/era/mi/gui/examples/RSLatchGUIExample.java b/LogicUI/src/era/mi/gui/examples/RSLatchGUIExample.java
new file mode 100644 (file)
index 0000000..4dd9c44
--- /dev/null
@@ -0,0 +1,54 @@
+package era.mi.gui.examples;\r
+\r
+import era.mi.gui.LogicUI;\r
+import era.mi.gui.components.GUIManualSwitch;\r
+import era.mi.gui.components.GUINotGate;\r
+import era.mi.gui.components.GUIOrGate;\r
+import era.mi.gui.wires.WireConnectionPoint;\r
+import era.mi.logic.Simulation;\r
+import era.mi.logic.wires.WireArray;\r
+import net.haspamelodica.swt.helper.swtobjectwrappers.Point;\r
+\r
+public class RSLatchGUIExample\r
+{\r
+       private static final int        WIRE_DELAY      = 40;\r
+       private static final int        OR_DELAY        = 100;\r
+       private static final int        NOT_DELAY       = 100;\r
+\r
+       public static void main(String[] args)\r
+       {\r
+               LogicUI ui = new LogicUI();\r
+               initComponents(ui);\r
+               ui.run();\r
+       }\r
+\r
+       private static void initComponents(LogicUI ui)\r
+       {\r
+               Simulation.TIMELINE.reset();\r
+               WireArray r = new WireArray(1, WIRE_DELAY);\r
+               WireArray s = new WireArray(1, WIRE_DELAY);\r
+               WireArray t2 = new WireArray(1, WIRE_DELAY);\r
+               WireArray t1 = new WireArray(1, WIRE_DELAY);\r
+               WireArray q = new WireArray(1, WIRE_DELAY);\r
+               WireArray nq = new WireArray(1, WIRE_DELAY);\r
+\r
+               GUIManualSwitch rIn = ui.addComponent(new GUIManualSwitch(r), 100, 100);\r
+               GUIManualSwitch sIn = ui.addComponent(new GUIManualSwitch(s), 100, 200);\r
+               GUIOrGate or1 = ui.addComponent(new GUIOrGate(OR_DELAY, t1, r, nq), 160, 102.5);\r
+               GUIOrGate or2 = ui.addComponent(new GUIOrGate(OR_DELAY, t2, q, s), 160, 192.5);\r
+               GUINotGate not1 = ui.addComponent(new GUINotGate(NOT_DELAY, t1, q), 200, 107.5);\r
+               GUINotGate not2 = ui.addComponent(new GUINotGate(NOT_DELAY, t2, nq), 200, 197.5);\r
+\r
+               WireConnectionPoint p1 = ui.addComponent(new WireConnectionPoint(q, 2), 250, 112.5);\r
+               WireConnectionPoint p2 = ui.addComponent(new WireConnectionPoint(nq, 2), 250, 202.5);\r
+\r
+               ui.addWire(rIn, 0, or1, 0);\r
+               ui.addWire(sIn, 0, or2, 1);\r
+               ui.addWire(or1, 2, not1, 0);\r
+               ui.addWire(or2, 2, not2, 0);\r
+               ui.addWire(not1, 1, p1, 0);\r
+               ui.addWire(not2, 1, p2, 0);\r
+               ui.addWire(p1, 1, or2, 0, new Point(250, 130), new Point(140, 185), new Point(140, 197.5));\r
+               ui.addWire(p2, 1, or1, 1, new Point(250, 185), new Point(140, 130), new Point(140, 117.5));\r
+       }\r
+}
\ No newline at end of file