X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=LogicUI%2Fsrc%2Fera%2Fmi%2Fgui%2FLogicUIStandalone.java;fp=LogicUI%2Fsrc%2Fera%2Fmi%2Fgui%2FLogicUIStandalone.java;h=3312308dc5cf41dc77e35ba4b197e4cf64f0773f;hb=86f2e11d28a4100a7fe142e103b7b5eeb9de4214;hp=a4711666c1b9eb39638b015567c90c9e20f57478;hpb=72198e2b8d4aebb6e4096802030960e029948100;p=Mograsim.git

diff --git a/LogicUI/src/era/mi/gui/LogicUIStandalone.java b/LogicUI/src/era/mi/gui/LogicUIStandalone.java
index a4711666..3312308d 100644
--- a/LogicUI/src/era/mi/gui/LogicUIStandalone.java
+++ b/LogicUI/src/era/mi/gui/LogicUIStandalone.java
@@ -8,6 +8,9 @@ import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Shell;
 
 import era.mi.gui.model.ViewModel;
+import era.mi.gui.modeladapter.LogicModelParameters;
+import era.mi.gui.modeladapter.ViewLogicModelAdapter;
+import era.mi.logic.timeline.Timeline;
 import net.haspamelodica.swt.helper.zoomablecanvas.helper.ZoomableCanvasOverlay;
 import net.haspamelodica.swt.helper.zoomablecanvas.helper.ZoomableCanvasUserInput;
 
@@ -19,6 +22,7 @@ import net.haspamelodica.swt.helper.zoomablecanvas.helper.ZoomableCanvasUserInpu
 public class LogicUIStandalone
 {
 	private ViewModel model;
+	private Timeline timeline;
 
 	private final Display display;
 	private final Shell shell;
@@ -37,6 +41,12 @@ public class LogicUIStandalone
 		userInput.buttonZoom = 2;
 		userInput.enableUserInput();
 		new ZoomableCanvasOverlay(ui, null).enableScale();
+
+		// TODO don't do this here
+		LogicModelParameters params = new LogicModelParameters();
+		params.gateProcessTime = 50;
+		params.wireTravelTime = 10;
+		timeline = ViewLogicModelAdapter.convert(model, params);
 	}
 
 	public LogicUICanvas getLogicUICanvas()
@@ -50,34 +60,33 @@ public class LogicUIStandalone
 	public void run()
 	{
 		AtomicBoolean running = new AtomicBoolean(true);
-//		Thread simulationThread = new Thread(() ->
-//		{
-//			while (running.get())
-//			{
-//				// always execute to keep timeline from "hanging behind" for too long
-//				timeline.executeUntil(timeline.laterThan(System.currentTimeMillis()), System.currentTimeMillis() + 10);		
-//				model.timeline.executeUpTo(System.currentTimeMillis(), System.currentTimeMillis() + 10);
-//				long sleepTime;
-//				if (model.timeline.hasNext())
-//					sleepTime = model.timeline.nextEventTime() - System.currentTimeMillis();
-//				else
-//					sleepTime = 10;
-//				try
-//				{
-//					if (sleepTime > 0)
-//						Thread.sleep(sleepTime);
-//				}
-//				catch (InterruptedException e)
-//				{
-//				} // it is normal execution flow to be interrupted
-//			}
-//		});
-//		simulationThread.start();
-//		model.timeline.addEventAddedListener(event ->
-//		{
-//			if (event.getTiming() <= System.currentTimeMillis())
-//				simulationThread.interrupt();
-//		});
+		Thread simulationThread = new Thread(() ->
+		{
+			while (running.get())
+			{
+				// always execute to keep timeline from "hanging behind" for too long
+			    	timeline.executeUntil(timeline.laterThan(System.currentTimeMillis()), System.currentTimeMillis() + 10);
+				long sleepTime;
+				if (timeline.hasNext())
+					sleepTime = timeline.nextEventTime() - System.currentTimeMillis();
+				else
+					sleepTime = 10;
+				try
+				{
+					if (sleepTime > 0)
+						Thread.sleep(sleepTime);
+				}
+				catch (InterruptedException e)
+				{
+				} // it is normal execution flow to be interrupted
+			}
+		});
+		simulationThread.start();
+		timeline.addEventAddedListener(event ->
+		{
+			if (event.getTiming() <= System.currentTimeMillis())
+				simulationThread.interrupt();
+		});
 
 		shell.open();
 		while (!shell.isDisposed())