--- a/artifacts/doc/conf/artifacts/sinfo.xml	Mon Feb 26 18:10:03 2018 +0100
+++ b/artifacts/doc/conf/artifacts/sinfo.xml	Tue Feb 27 18:06:52 2018 +0100
@@ -1,89 +1,131 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <artifact name="sinfo">
 
-    <states>
-        <state id="state.sinfo.river" description="state.sinfo.river" state="org.dive4elements.river.artifacts.states.RiverSelect" helpText="help.state.sinfo.river">
-            <data name="river" type="String" />
-        </state>
- 
-        <transition transition="org.dive4elements.river.artifacts.transitions.DefaultTransition">
-                <from state="state.sinfo.river"/>
-                <to state="state.sinfo.calculation_mode"/>
-        </transition>
-
-        <state id="state.sinfo.calculation_mode" description="state.sinfo.calculation_mode" state="org.dive4elements.river.artifacts.sinfo.CalculationSelectSinfo" helpText="help.state.sinfo.calculation_mode">
-            <data name="calculation_mode" type="String"/>
-        </state>
-
-        <!-- Fliesstiefen -->
-        <transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition">
-            <from state="state.sinfo.calculation_mode"/>
-            <to state="state.sinfo.distance_only"/>
-            <condition data="calculation_mode" value="sinfo_calc_flow_depth" operator="equal"/>
-        </transition>
-
-        <state id="state.sinfo.distance_only" description="state.sinfo.distance_only" state="org.dive4elements.river.artifacts.states.DistanceOnlySelect" helpText="help.state.sinfo.distance_only">
-            <data name="ld_from" type="Double" />
-            <data name="ld_to"   type="Double" />
-        </state>
-
-        <transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition">
-            <from state="state.sinfo.distance_only"/>
-            <to state="state.sinfo.waterlevel_soundings_select"/>
-            <condition data="calculation_mode" value="sinfo_calc_flow_depth" operator="equal"/>
-        </transition>
-
-        <state id="state.sinfo.waterlevel_soundings_select" description="state.sinfo.waterlevel_soundings_select" state="org.dive4elements.river.artifacts.sinfo.flowdepth.FlowDepthPairSelectState" helpText="help.state.sinfo.waterlevel_soundings_select">
-            <data name="diffids" type="String" />
-        </state>
-
-        <transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition">
-            <from state="state.sinfo.waterlevel_soundings_select"/>
-            <to state="state.sinfo.use_transport_bodies"/>
-            <condition data="calculation_mode" value="sinfo_calc_flow_depth" operator="equal"/>
-        </transition>
+  <states>
+    <state id="state.sinfo.river" description="state.sinfo.river" state="org.dive4elements.river.artifacts.states.RiverSelect" helpText="help.state.sinfo.river">
+      <data name="river" type="String"/>
+    </state>
 
-        <!-- FIXME: Nur Anzeigen, wenn Transportkörperhöhen vorliegen! -->
-        <state id="state.sinfo.use_transport_bodies" description="state.sinfo.use_transport_bodies" state="org.dive4elements.river.artifacts.sinfo.flowdepth.UseTransportBodiesChoice" helpText="help.state.sinfo.use_transport_bodies">
-            <data name="use_transport_bodies" type="Boolean" />
-        </state>
-
-        <transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition">
-            <from state="state.sinfo.use_transport_bodies"/>
-            <to state="state.sinfo.flow_depth"/>
-            <condition data="calculation_mode" value="sinfo_calc_flow_depth" operator="equal"/>
-        </transition>
-
-        <state id="state.sinfo.flow_depth" description="state.sinfo.flow_depth" state="org.dive4elements.river.artifacts.sinfo.flowdepth.FlowDepthState" helpText="help.state.sinfo.flow_depth">
-            <outputmodes>
-                <outputmode name="sinfo_flow_depth" description="output.flow_depth" mime-type="image/png" type="chart">
-                    <facets>
-                        <!-- REMARK: id's that ends with 'filtered' are handled differently ' -->
-                        <facet name="sinfo_flow_depth.filtered" description="Facet for mean flow depth, filtered by current zoom state"/>
-                        <facet name="sinfo_flow_depth.tkh.filtered" description="Facet for mean flow depth including tkh, filtered by current zoom state"/>
-                        
-                        <facet name="sinfo_flow_depth.tkh" description="Facet for tkh"/>
+    <transition transition="org.dive4elements.river.artifacts.transitions.DefaultTransition">
+      <from state="state.sinfo.river"/>
+      <to state="state.sinfo.calculation_mode"/>
+    </transition>
 
-                        <facet name="longitudinal_section.annotations" description="facet.longitudinal_section.annotations"/>
-                    </facets>
-                </outputmode>
+    <state id="state.sinfo.calculation_mode" description="state.sinfo.calculation_mode" state="org.dive4elements.river.artifacts.sinfo.CalculationSelectSinfo" helpText="help.state.sinfo.calculation_mode">
+      <data name="calculation_mode" type="String"/>
+    </state>
 
-                <outputmode name="sinfo_flowdepth_export" description="output.sinfo_flowdepth_export" mime-type="text/plain" type="export">
-                  <facets>
-                    <facet name="csv" description="facet.sinfo_flowdepth_export.csv" />
-                    <facet name="pdf" description="facet.sinfo_flowdepth_export.pdf" />
-                  </facets>
-                </outputmode>
+    <!-- Calculation Mode: Fließtiefen (Flow Depth) -->
+    <transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition">
+      <from state="state.sinfo.calculation_mode"/>
+      <to state="state.sinfo.distance_only"/>
+      <condition data="calculation_mode" value="sinfo_calc_flow_depth" operator="equal"/>
+    </transition>
 
-                <outputmode name="sinfo_flowdepth_report" description="output.sinfo_flowdepth_report" mime-type="text/xml" type="report">
-                  <facets>
-                    <facet name="report" description="facet.sinfo_flowdepth_report"/>
-                  </facets>
-                </outputmode>
+    <state id="state.sinfo.distance_only" description="state.sinfo.distance_only" state="org.dive4elements.river.artifacts.states.DistanceOnlySelect" helpText="help.state.sinfo.distance_only">
+      <data name="ld_from" type="Double"/>
+      <data name="ld_to" type="Double"/>
+    </state>
 
-            </outputmodes>
-        </state>        
+    <transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition">
+      <from state="state.sinfo.distance_only"/>
+      <to state="state.sinfo.waterlevel_soundings_select"/>
+      <condition data="calculation_mode" value="sinfo_calc_flow_depth" operator="equal"/>
+    </transition>
 
-    </states>
+    <state id="state.sinfo.waterlevel_soundings_select" description="state.sinfo.waterlevel_soundings_select" state="org.dive4elements.river.artifacts.sinfo.flowdepth.FlowDepthPairSelectState" helpText="help.state.sinfo.waterlevel_soundings_select">
+      <data name="diffids" type="String"/>
+    </state>
+
+    <transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition">
+      <from state="state.sinfo.waterlevel_soundings_select"/>
+      <to state="state.sinfo.use_transport_bodies"/>
+      <condition data="calculation_mode" value="sinfo_calc_flow_depth" operator="equal"/>
+    </transition>
+
+    <!-- FIXME: Nur Anzeigen, wenn Transportkörperhöhen vorliegen! -->
+    <state id="state.sinfo.use_transport_bodies" description="state.sinfo.use_transport_bodies" state="org.dive4elements.river.artifacts.sinfo.flowdepth.UseTransportBodiesChoice" helpText="help.state.sinfo.use_transport_bodies">
+      <data name="use_transport_bodies" type="Boolean"/>
+    </state>
+
+    <transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition">
+      <from state="state.sinfo.use_transport_bodies"/>
+      <to state="state.sinfo.flow_depth"/>
+      <condition data="calculation_mode" value="sinfo_calc_flow_depth" operator="equal"/>
+    </transition>
+
+    <state id="state.sinfo.flow_depth" description="state.sinfo.flow_depth" state="org.dive4elements.river.artifacts.sinfo.flowdepth.FlowDepthState" helpText="help.state.sinfo.flow_depth">
+      <outputmodes>
+        <outputmode name="sinfo_flow_depth" description="output.flow_depth" mime-type="image/png" type="chart">
+          <facets>
+            <!-- REMARK: id's that ends with 'filtered' are handled differently ' -->
+            <facet name="sinfo_flow_depth.filtered" description="Facet for mean flow depth, filtered by current zoom state"/>
+            <facet name="sinfo_flow_depth.tkh.filtered" description="Facet for mean flow depth including tkh, filtered by current zoom state"/>
+
+            <facet name="sinfo_flow_depth.tkh" description="Facet for tkh"/>
+
+            <facet name="longitudinal_section.annotations" description="facet.longitudinal_section.annotations"/>
+          </facets>
+        </outputmode>
+
+        <outputmode name="sinfo_flowdepth_export" description="output.sinfo_flowdepth_export" mime-type="text/plain" type="export">
+          <facets>
+            <facet name="csv" description="facet.sinfo_flowdepth_export.csv"/>
+            <facet name="pdf" description="facet.sinfo_flowdepth_export.pdf"/>
+          </facets>
+        </outputmode>
+
+        <outputmode name="sinfo_flowdepth_report" description="output.sinfo_flowdepth_report" mime-type="text/xml" type="report">
+          <facets>
+            <facet name="report" description="facet.sinfo_flowdepth_report"/>
+          </facets>
+        </outputmode>
+      </outputmodes>
+    </state>
+
+    <!-- Calculation Mode: Transportkörperhöhen -->
+    <transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition">
+      <from state="state.sinfo.calculation_mode"/>
+      <to state="state.sinfo.distance"/>
+      <condition data="calculation_mode" value="sinfo_calc_transport_bodies_heights" operator="equal"/>
+    </transition>
+
+    <state id="state.sinfo.distance" description="state.sinfo.distance" state="org.dive4elements.river.artifacts.states.DistanceSelect" helpText="help.state.sinfo.distance">
+      <data name="ld_from" type="Double"/>
+      <data name="ld_to" type="Double"/>
+      <data name="ld_step" type="Double"/>
+    </state>
+
+    <transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition">
+      <from state="state.sinfo.distance"/>
+      <to state="state.sinfo.wq"/>
+      <condition data="calculation_mode" value="sinfo_calc_transport_bodies_heights" operator="equal"/>
+    </transition>
+
+    <state id="state.sinfo.wq" description="state.winfo.wq" state="org.dive4elements.river.artifacts.states.WQSelect" helpText="help.state.sinfo.wq">
+      <data name="wq_isq" type="Boolean"/>
+      <data name="wq_isfree" type="Boolean"/>
+      <data name="wq_isrange" type="Boolean"/>
+      <data name="wq_from" type="Double"/>
+      <data name="wq_to" type="Double"/>
+      <data name="wq_step" type="Double"/>
+      <data name="wq_single" type="Double[]"/>
+    </state>
+
+    <transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition">
+      <from state="state.sinfo.wq"/>
+      <to state="state.sinfo.transport_bodies_heights"/>
+      <condition data="calculation_mode" value="sinfo_calc_transport_bodies_heights" operator="equal"/>
+    </transition>
+
+    <state id="state.sinfo.transport_bodies_heights" description="state.sinfo.transport_bodies_heights" state="org.dive4elements.river.artifacts.sinfo.tkh.TkhState" helpText="help.state.sinfo.transport_bodies_heights">
+      <outputmodes>
+        <!-- <outputmode name="sinfo_flow_depth" description="output.flow_depth" mime-type="image/png" type="chart"> <facets> <facet name="sinfo_flow_depth.filtered" description="Facet for mean flow depth, filtered by current zoom state"/> <facet name="sinfo_flow_depth.tkh.filtered" description="Facet for mean flow depth including tkh, filtered by current zoom state"/> <facet name="sinfo_flow_depth.tkh" description="Facet for tkh"/> <facet name="longitudinal_section.annotations" description="facet.longitudinal_section.annotations"/> 
+          </facets> </outputmode> <outputmode name="sinfo_flowdepth_export" description="output.sinfo_flowdepth_export" mime-type="text/plain" type="export"> <facets> <facet name="csv" description="facet.sinfo_flowdepth_export.csv"/> <facet name="pdf" description="facet.sinfo_flowdepth_export.pdf"/> </facets> </outputmode> <outputmode name="sinfo_flowdepth_report" description="output.sinfo_flowdepth_report" mime-type="text/xml" type="report"> <facets> <facet name="report" description="facet.sinfo_flowdepth_report"/> 
+          </facets> </outputmode> -->
+      </outputmodes>
+    </state>
+
+  </states>
 
 </artifact>
\ No newline at end of file