projects
/
Mograsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Made Am2901 tests work again
[Mograsim.git]
/
net.mograsim.logic.ui
/
src
/
net
/
mograsim
/
logic
/
ui
/
LogicUIStandaloneGUI.java
diff --git
a/net.mograsim.logic.ui/src/net/mograsim/logic/ui/LogicUIStandaloneGUI.java
b/net.mograsim.logic.ui/src/net/mograsim/logic/ui/LogicUIStandaloneGUI.java
index
64b442e
..
a71cdde
100644
(file)
--- a/
net.mograsim.logic.ui/src/net/mograsim/logic/ui/LogicUIStandaloneGUI.java
+++ b/
net.mograsim.logic.ui/src/net/mograsim/logic/ui/LogicUIStandaloneGUI.java
@@
-8,14
+8,13
@@
import org.eclipse.swt.widgets.Shell;
import net.haspamelodica.swt.helper.zoomablecanvas.helper.ZoomableCanvasOverlay;
import net.haspamelodica.swt.helper.zoomablecanvas.helper.ZoomableCanvasUserInput;
import net.mograsim.logic.ui.model.ViewModel;
import net.haspamelodica.swt.helper.zoomablecanvas.helper.ZoomableCanvasOverlay;
import net.haspamelodica.swt.helper.zoomablecanvas.helper.ZoomableCanvasUserInput;
import net.mograsim.logic.ui.model.ViewModel;
-import net.mograsim.logic.ui.modeladapter.LogicModelParameters;
/**
* Standalone simulation visualizer graphical user interface.
*
* @author Daniel Kirschten
*/
/**
* Standalone simulation visualizer graphical user interface.
*
* @author Daniel Kirschten
*/
-public class LogicUIStandaloneGUI
+public class LogicUIStandaloneGUI
implements Runnable
{
private final Display display;
private final Shell shell;
{
private final Display display;
private final Shell shell;
@@
-33,12
+32,6
@@
public class LogicUIStandaloneGUI
userInput.buttonZoom = 2;
userInput.enableUserInput();
new ZoomableCanvasOverlay(ui, null).enableScale();
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()
}
public LogicUICanvas getLogicUICanvas()
@@
-49,6
+42,7
@@
public class LogicUIStandaloneGUI
/**
* Opens the UI shell. Returns when the shell is closed.
*/
/**
* Opens the UI shell. Returns when the shell is closed.
*/
+ @Override
public void run()
{
shell.open();
public void run()
{
shell.open();