X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=LogicUI%2Fsrc%2Fera%2Fmi%2Fgui%2FLogicUIStandalone.java;fp=LogicUI%2Fsrc%2Fera%2Fmi%2Fgui%2FLogicUIStandalone.java;h=0000000000000000000000000000000000000000;hb=29cfa7eb267542506beb197e54af8aa3f642c3fb;hp=3312308dc5cf41dc77e35ba4b197e4cf64f0773f;hpb=08e8b43a28e078ec84cff02edf9d640bcbad2a35;p=Mograsim.git

diff --git a/LogicUI/src/era/mi/gui/LogicUIStandalone.java b/LogicUI/src/era/mi/gui/LogicUIStandalone.java
deleted file mode 100644
index 3312308d..00000000
--- a/LogicUI/src/era/mi/gui/LogicUIStandalone.java
+++ /dev/null
@@ -1,98 +0,0 @@
-package era.mi.gui;
-
-import java.util.concurrent.atomic.AtomicBoolean;
-
-import org.eclipse.swt.SWT;
-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;
-
-/**
- * Standalone simulation visualizer.
- * 
- * @author Daniel Kirschten
- */
-public class LogicUIStandalone
-{
-	private ViewModel model;
-	private Timeline timeline;
-
-	private final Display display;
-	private final Shell shell;
-	private final LogicUICanvas ui;
-
-	public LogicUIStandalone(ViewModel model)
-	{
-		this.model = model;
-		display = new Display();
-		shell = new Shell(display);
-		shell.setLayout(new FillLayout());
-		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()
-	{
-		return ui;
-	}
-
-	/**
-	 * Start the simulation timeline, and open the UI shell. Returns when the shell is closed.
-	 */
-	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);
-				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())
-			if (!display.readAndDispatch())
-				display.sleep();
-		running.set(false);
-//		simulationThread.interrupt();
-	}
-}
\ No newline at end of file