LogicUI actually runs the simulation

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

diff --git a/LogicUI/src/era/mi/examples/gui/LogicUI.java b/LogicUI/src/era/mi/examples/gui/LogicUI.java
index 9d71e00..5c77574 100644 (file)
--- a/LogicUI/src/era/mi/examples/gui/LogicUI.java
+++ b/LogicUI/src/era/mi/examples/gui/LogicUI.java
@@ -4,6 +4,7 @@ import java.util.HashMap;
 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
@@ -130,10 +131,40 @@ public class LogicUI
 \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