Skip to content

Commit

Permalink
Merge branch 'master' into bdd
Browse files Browse the repository at this point in the history
  • Loading branch information
AlexandreDecan committed Jan 27, 2016
2 parents 4273f99 + 0304ed3 commit 906d74d
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 1 deletion.
5 changes: 4 additions & 1 deletion docs/advancedtopics/integrate_code.rst
Expand Up @@ -29,6 +29,7 @@ split time feature and a display of the elapsed time. A button-controlled GUI of
(inactive buttons are greyed out):

.. image:: /images/stopwatch_gui.png
:align: center

Essentially, the stopwatch simply displays a value, representing the elapsed time (expressed in seconds), which is
initially 0. By clicking on the *start* button the stopwatch starts running. When clicking on *stop*, the stopwatch stops running.
Expand All @@ -39,7 +40,7 @@ The idea is that the buttons will trigger state changes and actions carried out
Taking abstraction of the concrete implementation, the statechart would essentially look as follows, with one main *active* state containing two parallel substates *timer* and *display*.

.. image:: /images/stopwatch_overview.png

:align: center

Controlling a statechart from within the environment
----------------------------------------------------
Expand All @@ -51,6 +52,7 @@ Conversely, the statechart itself can send events back to the source code to upd
This statechart looks as follows:

.. image:: /images/stopwatch_with_logic.png
:align: center

Here is the YAML file containing the textual description of this statechart:

Expand Down Expand Up @@ -96,6 +98,7 @@ The statechart is simpler than in the previous example: one parallel region hand
running status of the stopwatch, and a second one handles its split features.

.. image:: /images/stopwatch_with_object.png
:align: center

.. literalinclude:: /examples/stopwatch_external.yaml
:language: yaml
Expand Down
1 change: 1 addition & 0 deletions docs/format.rst
Expand Up @@ -215,6 +215,7 @@ Elevator
The Elevator statechart is one of the running examples in this documentation. Its visual description (currently not supported by Sismic) could look as follows:

.. image:: /images/elevator.png
:align: center

The corresponding YAML description is given below. To make the statechart self-contained, a Python class ``Doors``
is included containing two methods ``open()`` and ``close()`` and a boolean variable ``opened``. Upon entering in the *active* state, a ``doors`` object of this class will be created and initialised by setting the value of ``opened`` to ``True``.
Expand Down

0 comments on commit 906d74d

Please sign in to comment.