Commit 97595edf authored by Dennis Hendriks's avatar Dennis Hendriks
Browse files

Merge branch 'develop' into 'master'

#192 develop to master for v0.4

See merge request !239
parents 5082393f c0aaaa66
Pipeline #1573 passed with stage
in 0 seconds
......@@ -47,6 +47,7 @@ Improvements and fixes:
In particular the CIF pretty printer now generates correct references for such indices (issue #258).
* The CIF to CIF transformation to eliminate component definition/instantiation now correctly handles cases where component definitions are referred to via component instantiations (issue #244).
* The CIF type checker now warns about some overly-convoluted references (issue #234).
* The CIF simulator interactive GUI input mode now is fully responsive to termination requests when asking users for the next transition to take (issue #216).
* The CIF simulator SVG visualizer functionality to save the image as an SVG file no longer crashes (issue #205).
* The CIF simulator plot visualizer and SVG visualizer functionality to save as an image no longer ask duplicate overwrite questions (issue #223).
* The CIF simulator no longer crashes when showing an SVG visualizer if the SVG file can't be loaded (issue #207).
......
......@@ -168,7 +168,6 @@ The popup menu for the time delay then only shows one option, to let the automat
=== Termination
By closing the GUI of the interactive GUI input component, no more interactive choices can be made.
The next time an interactive choice is to be made, simulation <<tools-cifsim-chapter-termination,terminates>>.
The next time an interactive choice is to be made, the simulation <<tools-cifsim-chapter-termination,terminates>>.
While an interactive choice is to be made via the GUI, the red stop button of the Eclipse console does not function.
Once a choice is made, simulation will <<tools-cifsim-chapter-termination,terminate>>.
The simulation can also be <<tools-cifsim-chapter-termination,terminated>> by clicking the red stop button of the Eclipse console.
......@@ -61,8 +61,8 @@ If the <<tools-cifsim-input-chapter-trace,trace input mode>> is used, and no mor
The user can manually request termination of the simulation in several ways.
Termination requests have no effect while the simulator interactively asks for input from the <<tools-cifsim-input-chapter-console,console>> or via the GUI of the <<tools-cifsim-input-chapter-gui,interactive GUI input component>>.
However, once input is provided via the console and kbd:[Enter] is pressed, or a choice is made via the GUI, the termination request will be processed.
Termination requests have no effect while the simulator interactively asks for input from the <<tools-cifsim-input-chapter-console,console>>.
However, once input is provided via the console and kbd:[Enter] is pressed, the termination request will be processed.
Termination requests issued between <<tools-cifsim-output-realtime-frames,intermediate frames>> are delayed until the next intermediate frame.
......@@ -72,7 +72,7 @@ Termination of the simulation can be requested, when using the interactive <<too
==== Interactive GUI input
Termination of the simulation can be requested, when using the interactive <<tools-cifsim-input-chapter-gui,interactive GUI input mode>>, by closing the GUI of the interactive GUI input component, when the simulator asks for input via that GUI.
Termination of the simulation can be requested, when using the interactive <<tools-cifsim-input-chapter-gui,interactive GUI input mode>>, by closing the GUI of the interactive GUI input component, when the simulator asks for input via that GUI, or by clicking the console termination button.
==== Applications view
......
......@@ -322,7 +322,8 @@ public final class InteractiveGuiInputComponent<S extends RuntimeState> extends
synchronized (gui.ready) {
while (!gui.ready.get()) {
try {
gui.ready.wait();
gui.ready.wait(1000);
spec.ctxt.checkTermination();
} catch (InterruptedException e) {
throw new RuntimeException(e);
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment