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

diff --git a/LogicUI/src/era/mi/gui/LogicUIStandalone.java b/LogicUI/src/era/mi/gui/LogicUIStandalone.java
index 2febb5cb..3312308d 100644
--- a/LogicUI/src/era/mi/gui/LogicUIStandalone.java
+++ b/LogicUI/src/era/mi/gui/LogicUIStandalone.java
@@ -7,6 +7,9 @@ import org.eclipse.swt.layout.FillLayout;
 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;
@@ -18,24 +21,32 @@ 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;
 	private final LogicUICanvas ui;
-	private Timeline timeline;
 
-	public LogicUIStandalone(Timeline timeline)
+	public LogicUIStandalone(ViewModel model)
 	{
-		this.timeline = timeline;
+		this.model = model;
 		display = new Display();
 		shell = new Shell(display);
 		shell.setLayout(new FillLayout());
-		ui = new LogicUICanvas(shell, SWT.NONE);
+		ui = new LogicUICanvas(shell, SWT.NONE, model);
 
 		ZoomableCanvasUserInput userInput = new ZoomableCanvasUserInput(ui);
 		userInput.buttonDrag = 3;
 		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()
@@ -54,7 +65,7 @@ public class LogicUIStandalone
 			while (running.get())
 			{
 				// always execute to keep timeline from "hanging behind" for too long
-				timeline.executeUntil(timeline.laterThan(System.currentTimeMillis()), System.currentTimeMillis() + 10);
+			    	timeline.executeUntil(timeline.laterThan(System.currentTimeMillis()), System.currentTimeMillis() + 10);
 				long sleepTime;
 				if (timeline.hasNext())
 					sleepTime = timeline.nextEventTime() - System.currentTimeMillis();
@@ -82,6 +93,6 @@ public class LogicUIStandalone
 			if (!display.readAndDispatch())
 				display.sleep();
 		running.set(false);
-		simulationThread.interrupt();
+//		simulationThread.interrupt();
 	}
 }
\ No newline at end of file