diff --git a/Documentation/Doxygen/DeveloperManual/Starting/GettingToKnow/Tutorial/Step10.dox b/Documentation/Doxygen/DeveloperManual/Starting/GettingToKnow/Tutorial/Step10.dox
index 542dd477c9..42dad050d2 100644
--- a/Documentation/Doxygen/DeveloperManual/Starting/GettingToKnow/Tutorial/Step10.dox
+++ b/Documentation/Doxygen/DeveloperManual/Starting/GettingToKnow/Tutorial/Step10.dox
@@ -1,432 +1,439 @@
/**
\page Step10Page MITK Tutorial - Step 10: Adding new Interaction
\tableofcontents
\section HowToUseDataInteractor How to use an existing DataInteractor
MITK provides finished DataInteractors for a variety of tasks, they can be found in Code/Core/Interactors. They can be used with
state machine patterns and config files located under Resources/Interaction.
A DataInteractor consists of four parts. The class describing the functionality and two XML files; one describes the state machine pattern, that is the workflow of an interaction and
the second describes the user events which trigger an action. Lastly every DataInteractor works on a DataNode in which it stores and manipulates data.
To use a DataInteractor these parts have to be brought together.
This code demonstrates the use of an existing DataInteractor exemplary for the PointSetDataInteractor:
First we need a DataNode that is added to the DataStorage.
\code
mitk::DataNode::Pointer dataNode = mitk::DataNode::New();
GetDataStorage()->Add(dataNode.GetPointer());
\endcode
Then we create an instance of to PointSetDataInteractor and load a statemachine pattern as well as a configuration
for it:
\code
m_CurrentInteractor = mitk::PointSetDataInteractor::New();
m_CurrentInteractor->LoadStateMachine("PointSet.xml");
- m_CurrentInteractor->LoadEventConfig("PointSetConfig.xml");
+ m_CurrentInteractor->SetEventConfig("PointSetConfig.xml");
\endcode
Lastly the DataNode is added to the DataInteractor
\code
m_CurrentInteractor->SetDataNode(dataNode);
\endcode
now the DataInteractor is ready for usage.
\section SectionImplementationDataInteractor How to implement a new DataInteractor
This second part of the tutorial step goes beyond the activation of an interactor, that modifies data by user interaction) as shown above. It shows what needs to be implemented to add a new way of interaction within your MITK application.
Please see \ref DataInteractionPage as an introduction to the MITK interaction mechanism, you may also want to read \ref DataInteractionTechnicalPage.
This tutorial is structured as follows: The first section deals with config files, describing all the parameters of events and how to use them
in a configuration file. In the second section the basics are described that are needed to write a state machine pattern. The last section
deals with brining configuration, state machine pattern and code together and gives an examplary implementation of a DataInteractor.
\section ConfigFileDescriptionSection How to create a Config-File
\subsection EventDescriptionSection Event Description
Events are described by their parameters. Each event type has its own set of parameters that can be set in the configuration file.
If a parameter is ommitted it is set to its default value. Following all possible parameters are listed and described, to which parameters
events have is decribed in their respective documentation.
Mandatory for each event description is the event class and the event variant. The parameters of an event are set by attribute tags.
\note Refer to \ref EventClassSection for the meaning of event class.
\b Mouse \b Buttons \n
mitk::MouseButtons represent the buttons. They can be used for two attributes. First the EventButton which describes the button that triggered the event,
-this allways is a single button. Secondly the ButtonState attribute that describes which buttons were pressed at the moment the event has been generated.
+this allways is a single button.\dontinclude mitkInteractionEventConst.h
+\skipline // Special Keys
+\until // End special keys Secondly the ButtonState attribute that describes which buttons were pressed at the moment the event has been generated.
For example assume the right mouse button and the middle mouse button are already pressed, now also the left mouse button is pressed too and generates a second event,
this would be described as follows:
\code
\endcode
Note: Technically the LeftMouseButton is also pressed and should be listed in the ButtonState, but this is taken care of by the mitk:EventFactory .
Key Events \n
mitk::InteractionKeyEvent represents a pressed key, which key is pressed is provided with the Key attribute like this
\code
\endcode
or
\code
\endcode
\note Key Events do not require an explicit configuration all, for all key events there exists
a predefined event variant with the name 'Std' + value, that is key a is named 'StdA'.
The names for special keys are listed here:
\dontinclude mitkInteractionEventConst.h
\skipline // Special Keys
\until // End special keys
Modifier Keys \n
mitk::ModifierKeys represent the combination of pressed modifier keys, several modifier keys pressed at the same time
are denoted by listing them all separated by commas.
\code
\endcode
\b ScrollDirection \n
This attribute is unique to the mitk::MouseWheelEvent and describes the direction in which the mouse wheel is rotated. In the event description actual only the direction is provided,
but the event is generated with the actual value, and this value can be retrieved from the object.
\code
\endcode
\subsection ExamplesSection Examples
Examples for key events:
\code
\endcode
Examples for MousePress events:
\code
\endcode
There exists a standard configuration file for the most common events called GlobalConfig.xml that can be used to as a default and can be extended
by a specific definition.
\subsection ParameterDescriptionSection Parameter Description
It is also possible to store parameters in the config file. Those are stored using the param-tag, like this:
\code
\endcode
Within the application these properties can then be access via a mitk::PropertyList like this:
\code
// sm - state machine loaded with config file example2
mitk::PropertyList::Pointer properties = GetAttributes();
std::string prop1;
properties->GetStringProperty("property1",prop1);
\endcode
\section HowToStateMachine HowTo Write a State Machine
A state machine pattern is described in a XML file.
\subsection StateSection States
States are described using the state-tag. Each state has to have a name. Exactly one state has to be as start state in
each state machine to indicate the state in which the state machine is set when it is constructed.
So a valid, but rather useless state machine would like like this:
\code
\endcode
Optionally a state can be assigned a special mode that influences the event distribution.
These modes are GRAB_INPUT , PREFER_INPUT and REGULAR (where REGULAR is default and does not need to be indicated).
See \ref DispatcherEventDistSection for a description of these modes. Use the special modes only when necessary as they prevent other DataInteractors to
receive events.
\code
\endcode
\subsection TransitionSection Transitions
Transitions are part of a state and describe all possible state switches, and are therefore important for modelling an interaction scheme.
Transitions consist a part that describes the event which triggers the transition (event class and event variant) and a target which is state
to which the state machine switches after executing a transition.
An event class describes the event type (see mitk::InteractionEvent for the different classes) and the event variant is a specification thereof
and the exact description is taken from a config file. Together they determine which event can trigger this transition.
For example this state machine will switch from state A to state B when the StdMousePressPrimaryButton event (left mouse button is pressed) occurs.
\subsubsection EventClassSection Event Class
The event class description supports the polymorphism of the event classes. Therefore state machine patters should be written in the most
general ways possible.
So for a given class hierarchy like this:
\dot
digraph {
node [shape=record, fontname=Helvetica, fontsize=10];
a [ label="{PositionEvent}"];
b [ label="{MousePressEvent}" ];
c [ label="MouseReleaseEvent" ];
d [ label="TouchEvent", style=dotted ];
a -> b;
a -> c;
a -> d;
}
\enddot
in the state machine pattern the PositionEvent can be declared as event class to restrict to the events which hold a position information.
The actual implementation is then given in the configuration file. In this case it allows to define event of the classes PositionEvent itself, or
MousePressEvent,MouseReleaseEvent,TouchEvent.
This has the advantage that the patterns remain the same no matter what input devices are used, and the state machine patterns can be configured
for newly added event classes as long as they match the class hierachy (this ensures they hold the neccessary properties).
\code
\endcode
\subsection ActionSection Actions
Actions can be added to transitions and represent functions in the DataInteractor that are executed on taking a transition.
The following simple state machine will listen for left mouse clicks and execute two actions (and actually never stop).
\code
\endcode
In order to tell the DataInteractor which function to execute these actions are made known to the DataInteractor using
the CONNECT_FUNCTION macro. This example assumes that there exists an ExampleInteractor which inherits from DataInteractor.
This class implements the functions AddPoint and CountClicks. The actions are introduced by implementing the virtual method
ConnectActionsAndFunctions():
\code
void mitk::ExampleInteractor::ConnectActionsAndFunctions()
{
CONNECT_FUNCTION("addPoint", AddPoint);
CONNECT_FUNCTION("countClicks", CountClicks);
}
\endcode
-\section HowToDataInteractor Implementation a new DataInteractor
+\section ReferenceToIncludeFiles Integration of the pattern and configuration files
+
+See \ref IncludeFiles for a description.
+
+
+\section HowToDataInteractor Implementation of a new DataInteractor
DataInteractors are to inherit from mitk::DataInteractor. Their functionality is implemented in functions that follow this interface:
\code
bool SomeFunctionality(StateMachineAction* , InteractionEvent*);
\endcode
Your functions are connected with actions by implementing the function ConnectActionsAndFunctions(), e.g.
\code
void mitk::ExampleInteractor::ConnectActionsAndFunctions()
{
CONNECT_FUNCTION("addPoint", AddPoint);
CONNECT_FUNCTION("enoughPoints", EnoughPoints);
}
\endcode
Now all that is left it to write a state machine pattern and a config file as is described in the tutorials.
\subsection ExampleInternalEvent PointSetDataInteractor
To provide a useful example the mitk::PointSetDataInteractor is annotated with comments that describe the important parts for an implementation
of a DataInteractor.
This step assumes knowlege of the Interaction concept described in \ref DataInteractionPage and some background of the implementation which is described in
\ref DataInteractionPageTechnical. Please refer to these pages before proceeding.
DataInteractor are to inherit from mitk::DataInteractor. Their functionality is implemented in functions that follow this interface:
\code
bool SomeFunctionality(StateMachineAction* , InteractionEvent*);
\endcode
Your functions are connected with actions by implementing the function ConnectActionsAndFunctions(), e.g.
\code
void mitk::ExampleInteractor::ConnectActionsAndFunctions()
{
CONNECT_FUNCTION("addPoint", AddPoint);
CONNECT_FUNCTION("enoughPoints", EnoughPoints);
}
\endcode
Now all that is left it to write a state machine pattern and a config file as is described in the tutorials.
\subsection ExampleInternalEvent Example Interactor using InternalEvent
A useful tool in creating DataInteractors are mitk::InternalEvents which allow to the DataInteractor send signals on its own.
The following will describe how to build a DataInteractor that allows to add points until a certain number of points is reached.
The number of accepted points is provided in the config file as a parameter.
So we start by writing a state machine pattern that add points until it receives an InternalEvent telling it, that enough points
have been added.
\code
<--! dead state, nothing happens any more, once we reached this -->
\endcode
In our config file we set the number of maximal points to 10, and define AddPointClick as a right mouse click with the
ctrl button pressed.
\code
\endcode
The implementation is desribed in the following. \see Step10.h \see Step10.cpp
\dontinclude Step10.h
Implementation of protected functions:
\skipline protected:
\until virtual void ConfigurationChanged();
ConnectActionsAndFunctions - Is inherited from mitk::InteractionStateMachine, here action strings from the xml are connected with
functions in the Interactor (as seen above). In our example this looks like this:
\dontinclude Step10.cpp
\skipline void mitk::ExampleInteractor::ConnectActionsAndFunctions()
\until }
ConfigurationChanged - Is called whenever a new configuration file is loaded (by the mitk::InteractionEventHandler super class),
this function allows to implement initialization code that depends on configuration values. In our example we want to set the limit of
allowed points:
\dontinclude Step10.cpp
\skipline void mitk::ExampleInteractor::ConfigurationChang
\until }
Next the actual functionality of the DataInteractor is implemented, by providing one function per action, following this prototype:
\code
bool FUNCTION_NAME (StateMachineAction* , InteractionEvent*);
\endcode
\dontinclude Step10.h
\skipline private:
\until bool EnoughPoints(StateMac
Each function has to return a boolean value. True if the action has been executed, and false if the action has not been executed.
\dontinclude Step10.cpp
\skipline bool mitk::ExampleInteractor::AddPoint(StateM
\until //-
Here we see an internal event used to signal that the point set reached the maximal number of allowed points.
The event is created and added to the Dispatchers event queue.
\dontinclude Step10.cpp
\skipline // create internal
\until positionEvent->GetSender(
\note That internal events do not need any mapping to event variants. Their signal same is equivalent with the event variant.
There are also two documented classes implementing a DataInteractor and an InteractionEventObserver which can be looked at for further
understanding:
\see mitk::PointSetDataInteractor
\see mitk::DisplayInteractor
Have fun with creating your own interaction and please think about contributing it to MITK!
If you meet any difficulties during this step, don't hesitate to ask on the MITK mailing list mitk-users@lists.sourceforge.net!
People there are kind and will try to help you.
\ref Step09Page "[Previous step]" \ref TutorialPage "[Main tutorial page]"
*/
diff --git a/Documentation/Doxygen/DeveloperManual/Toolkit/ModuleManuals/InteractionMigration.dox b/Documentation/Doxygen/DeveloperManual/Toolkit/ModuleManuals/InteractionMigration.dox
new file mode 100644
index 0000000000..f52a7ff02c
--- /dev/null
+++ b/Documentation/Doxygen/DeveloperManual/Toolkit/ModuleManuals/InteractionMigration.dox
@@ -0,0 +1,178 @@
+/**
+
+\page InteractionMigration Migration Guide to new Interaction Concept
+
+\tableofcontents
+
+
+\section GeneralChanges General Changes
+
+\subsection StatemachineDefinitions
+
+Previously the statemachine pattern along with the event description has been stored in a single file (StateMachine.xml).
+Now the pattern and the events are separated from each other. The statemachine pattern describes the workflow and the configuration
+file describes which specific event triggers an action in the workflow. Every pattern is now put into a single file (for inclusion refer to \ref IncludeFiles ).
+
+The pattern description has to be completely rewritten, but is pretty straight forward based on the old one, how to do this is explained here \ref HowToStateMachine .
+Here an example is shown for a simple state containing a transition and a parameter.
+
+\code
+
+
+
+
+
+
+\endcode
+ Example snippet (old)
+
+
+
+\code
+
+
+
+
+
+\endcode
+ Example snippet (new)
+
+Changes:
+
+ - ID is dropped, states are referenced now by their name
+
- transition now longer have names
+
- NEXT_STATE_ID becomes target
+
- action ids become names, these names are used in the interactor to connect an action with a function
+
- parameters are stored in the configuration file
+
- EVENT_ID is replaced by event_class and event_variant (see below)
+
+
+Event_class describes the class of the event (see \ref EventClassSection ) - the event_variant provides a name that is used in the configuration file
+to give an explicit description of the event (or the globalConfig.xml is loaded as configuration file and standard values are used).
+
+Configuration files for state machines are described here: \ref ConfigFileDescriptionSection .
+
+\subsection InteractorStruture Structure of an Interactor
+
+Actions are now directly connected to functions in the DataInteractors, so the classic switch statement becomes obsolete:
+
+\code
+bool mitk::SomeInteractor::ExecuteAction(Action* action, mitk::StateEvent const* stateEvent)
+{
+ switch (action->GetActionId())
+ {
+ case Action1:
+ ...
+ case Action2:
+ ...
+ }
+}
+\endcode
+
+changes to
+
+\code
+void mitk::ExampleInteractor::ConnectActionsAndFunctions()
+{
+CONNECT_FUNCTION("stringOfActionFromXmlFile", Action1);
+CONNECT_FUNCTION("stringOfActionFromXmlFile2", Action2);
+...
+}
+
+bool Action1(StateMachineAction* , InteractionEvent*)
+{
+...
+}
+...
+\endcode
+
+where each action is implemented as a function. See \ref HowToDataInteractor .
+
+
+\subsection GuardStates Guard States
+
+Formerly there where so called guard states, which cause a transition only if certain conditions are met. These states have been removed,
+as a replacement serve the InternalEvents which can be triggered from within a data interactor. An example showing how to use them is given in \ref ExampleInternalEvent .
+
+\subsection IncludeFiles Register statemachine patterns and configuration w/o the build system
+
+There are different ways to load a statemachine pattern or configuration objects from files.
+If you are working in a module you can use the resources to easily load patterns and configurations.
+To use this place your XML file in the 'Resources/Interactions' folder of the respective module, and add the file path to the corresponding files.cmake in the resource section
+like this:
+\code
+set(RESOURCE_FILES
+Interactions/dummyStatemachine.xml
+)
+\endcode
+
+Loading the statemachine pattern can then be done by simply calling
+\code
+#include "mitkModule.h"
+#include
+
+Module* module = GetModuleContext()->GetModule();
+
+mitk::PointSetDataInteractor::m_CurrentInteractor = mitk::PointSetDataInteractor::New();
+m_CurrentInteractor->LoadStateMachine("dummyStatemachine.xml", module);
+\endcode
+here module is optional, if none is provided the core module is assumed.
+
+The third possibility is to build up a configuration by vector of mitk::PropertyLists, where each item describes an event configuration.
+
+In the following example a configuration is build which defines two event variants using basic properties,
+for a full list of usable properties see mitkInteractionEventConst.h
+\code
+#include "mitkPropertyList.h"
+
+#include "mitkEventConfig.h"
+
+// First event
+mitk::PropertyList::Pointer propertyList1 = mitk::PropertyList::New();
+// Setting the EventClass property to 'MousePressEvent'
+propertyList1->SetStringProperty(mitk::InteractionEventConst::xmlParameterEventClass.c_str(), "MousePressEvent");
+// Setting the Event variant value to 'MousePressEventVariantÄ
+propertyList1->SetStringProperty(mitk::InteractionEventConst::xmlParameterEventVariant.c_str(), "MousePressEventVariant");
+// set control and alt buttons as modifiers
+propertyList1->SetStringProperty("Modifiers","CTRL,ALT");
+// Second event
+mitk::PropertyList::Pointer propertyList2 = mitk::PropertyList::New();
+propertyList2->SetStringProperty(mitk::InteractionEventConst::xmlParameterEventClass.c_str(), "MouseReleaseEvent");
+propertyList2->SetStringProperty(mitk::InteractionEventConst::xmlParameterEventVariant.c_str(), "MouseReleaseEventVariant");
+propertyList2->SetStringProperty("Modifiers","SHIFT");
+
+// putting both descriptions in a vector
+std::vector* configDescription = new std::vector();
+configDescription->push_back(propertyList1);
+configDescription->push_back(propertyList2);
+// create the config object
+mitk::EventConfig newConfig(configDescription);
+\endcode
+
+\section ModifyDisplayInteractorBehavior How to modify the display interactor behavior
+
+Sometimes it may be desirable to change the behaviour of the mitk::DisplayInteractor which controls zooming, panning and scrolling, e.g. when a
+Tool is activated that reacts to the same events. Changing the behavior of the DisplayInteractor (or possibly any other EventHandler) can be achieved from anywhere
+in the code by requesting the InteractionEventObserver and assigning an alternative configuration to it, as demonstrated in this example:
+
+\code
+
+std::ifstream* configStream = new std::ifstream( #path to alternative configuration file# );
+mitk::EventConfig newConfig(configStream);
+
+// Requesting all registered EventObservers
+std::list listEventObserver = GetModuleContext()->GetServiceReferences();
+
+for (std::list::iterator it = listEventObserver.begin(); it != listEventObserver.end(); ++it)
+{
+ DisplayInteractor* displayInteractor = dynamic_cast(GetModuleContext()->GetService(*it));
+ // filtering: only adjust the DisplayInteractor
+ if (displayInteractor != NULL)
+ {
+ displayInteractor->SetEventConfig(newConfig);
+ }
+}
+
+\endcode
+
+*/
diff --git a/Documentation/Doxygen/DeveloperManual/Toolkit/ModuleManuals/MITKModuleManualsList.dox b/Documentation/Doxygen/DeveloperManual/Toolkit/ModuleManuals/MITKModuleManualsList.dox
index f2a4ff42fb..5de9b5cd02 100644
--- a/Documentation/Doxygen/DeveloperManual/Toolkit/ModuleManuals/MITKModuleManualsList.dox
+++ b/Documentation/Doxygen/DeveloperManual/Toolkit/ModuleManuals/MITKModuleManualsList.dox
@@ -1,22 +1,25 @@
/**
\page MITKModuleManualsListPage MITK Module Manuals
\section MITKModuleManualsListPageOverview Overview
The modules are shared libraries that provide functionality that can be used by developers.
\section MITKModuleManualsListPageModuleManualList List of Module Manuals
\li \subpage IGTGeneralModulePage
\li \subpage MitkOpenCL_Overview
\li \subpage SimulationManualPage
\li \subpage GeneratingDeviceModulesPage
\li \subpage mitkPython_Overview
\section MITKModuleManualsListPageAdditionalInformation Additional Information on Certain Modules
\li \ref PlanarPropertiesPage
\li \subpage DiffusionImagingPropertiesPage
\li \subpage ConnectomicsRenderingPropertiesPage
+\section MITKMigrationGuides Migration Guides
+
+ \li \ref InteractionMigration
*/