Mercurial > dive4elements > gnv-client

diff gnv-artifacts/doc/conf/products/horizontalprofile/conf_instantaneouspoint.xml @ 325:3eff9241ea1e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Refactoring of the Transitionmodel. Now each Transition is responsible to allocate the Data which is required to describe or feed it. gnv-artifacts/trunk@390 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author Tim Englich <tim.englich@intevation.de>
date Tue, 01 Dec 2009 15:58:02 +0000
parents 57a2bf630854
children e964a3d8f7bc
line wrap: on
line diff
--- a/gnv-artifacts/doc/conf/products/horizontalprofile/conf_instantaneouspoint.xml	Mon Nov 30 15:08:47 2009 +0000
+++ b/gnv-artifacts/doc/conf/products/horizontalprofile/conf_instantaneouspoint.xml	Tue Dec 01 15:58:02 2009 +0000
@@ -8,12 +8,15 @@
              <data-noselect>true</data-noselect>
             <reachableTransitions>
                    <transition>horizontalprofile_instantaneouspoint_subarea</transition>
+                   <transition>horizontalprofile_instantaneouspoint_vehicle_without_geom</transition>
             </reachableTransitions>
             <inputvalues>
                 <inputvalue name="sourceid" type="Integer" multiselect="false" usedinquery="0"/>
                 <inputvalue name="fisname" type="String" multiselect="false" usedinquery="0"/>
+                <inputvalue name="areaid" type="Integer" multiselect="false" usedinquery="0"/>
             </inputvalues>
         </transition>
+        
         <transition id="horizontalprofile_instantaneouspoint_subarea" description="horizontalprofile_instantaneouspoint_subarea" transition="de.intevation.gnv.transition.DefaultTransition">
             <queryID>subarea_filter</queryID>
             <dataname>subareaid</dataname>
@@ -21,24 +24,11 @@
             <reachableTransitions>
                    <transition>horizontalprofile_instantaneouspoint_vehicle</transition>
             </reachableTransitions>
-            <alternativeTransition>
-                <transition id="horizontalprofile_instantaneouspoint_vehicle_without_geom" description="horizontalprofile_instantaneouspoint_vehicle_without_geom" transition="de.intevation.gnv.transition.DefaultTransition">
-                    <queryID>horizontalprofile_instantaneouspoint_vehicle</queryID>
-                    <dataname>vehicleid</dataname>
-                    <data-multiselect>false</data-multiselect>
-                    <reachableTransitions>
-                        <transition>horizontalprofile_instantaneouspoint_cruise</transition>
-                    </reachableTransitions>
-                    <inputvalues>
-                        <inputvalue name="sourceid" type="Integer" multiselect="false"/>
-                        <inputvalue name="fisname" type="String" multiselect="false" usedinquery="0"/>
-                    </inputvalues>
-                </transition>
-            </alternativeTransition>
             <inputvalues>
                 <inputvalue name="sourceid" type="Integer" multiselect="false" usedinquery="0"/>
                 <inputvalue name="fisname" type="String" multiselect="false" usedinquery="0"/>
                 <inputvalue name="areaid" type="Integer" multiselect="false" usedinquery="1"/>
+                <inputvalue name="subareaid" type="Integer" multiselect="false" usedinquery="0"/>
             </inputvalues>
        </transition>
         
@@ -54,6 +44,7 @@
                <inputvalue name="sourceid" type="Integer" multiselect="false"/>
                <inputvalue name="fisname" type="String" multiselect="false" usedinquery="0"/>
                <inputvalue name="subareaid" type="Integer" multiselect="false" usedinquery="1"/>
+               <inputvalue name="vehicleid" type="Integer" multiselect="false" usedinquery="0"/>
            </inputvalues>
        </transition>
        <transition id="horizontalprofile_instantaneouspoint_cruise_with_area" description="horizontalprofile_instantaneouspoint_cruise_with_area" transition="de.intevation.gnv.transition.DefaultTransition">
@@ -68,6 +59,7 @@
                <inputvalue name="vehicleid" type="Integer" multiselect="false"/>
                <inputvalue name="fisname" type="String" multiselect="false" usedinquery="0"/>
                <inputvalue name="subareaid" type="Integer" multiselect="false" usedinquery="1"/>
+               <inputvalue name="cruiseid" type="Integer" multiselect="false" usedinquery="0" />
            </inputvalues>
        </transition>
        <transition id="horizontalprofile_instantaneouspoint_track_with_area" description="horizontalprofile_instantaneouspoint_track_with_area" transition="de.intevation.gnv.transition.DefaultTransition">
@@ -81,10 +73,25 @@
                <inputvalue name="cruiseid" type="Integer" multiselect="false" usedinquery="1" />
                <inputvalue name="subareaid" type="Integer" multiselect="false" usedinquery="1"/>
                <inputvalue name="fisname" type="String" multiselect="false" usedinquery="0"/>
+               <inputvalue name="trackid" type="Integer" multiselect="false" usedinquery="0" />
            </inputvalues>
        </transition>
        <!-- Ende Sonderfall Ablaufsteuerung mit Anwendung des Gebietsfilters  -->
        
+       <transition id="horizontalprofile_instantaneouspoint_vehicle_without_geom" description="horizontalprofile_instantaneouspoint_vehicle_without_geom" transition="de.intevation.gnv.transition.DefaultTransition">
+           <queryID>horizontalprofile_instantaneouspoint_vehicle</queryID>
+           <dataname>vehicleid</dataname>
+           <data-multiselect>false</data-multiselect>
+           <reachableTransitions>
+               <transition>horizontalprofile_instantaneouspoint_cruise</transition>
+           </reachableTransitions>
+           <inputvalues>
+               <inputvalue name="sourceid" type="Integer" multiselect="false"/>
+               <inputvalue name="fisname" type="String" multiselect="false" usedinquery="0"/>
+               <inputvalue name="vehicleid" type="Integer" multiselect="false"  usedinquery="0"/>
+           </inputvalues>
+       </transition>
+       
        <transition id="horizontalprofile_instantaneouspoint_cruise" description="horizontalprofile_instantaneouspoint_cruise" transition="de.intevation.gnv.transition.DefaultTransition">
            <queryID>horizontalprofile_instantaneouspoint_cruise</queryID>
            <dataname>cruiseid</dataname>
@@ -96,6 +103,7 @@
                <inputvalue name="vehicleid" type="Integer" multiselect="false"/>
                <inputvalue name="sourceid" type="Integer" multiselect="false"/>
                <inputvalue name="fisname" type="String" multiselect="false" usedinquery="0"/>
+               <inputvalue name="cruiseid" type="Integer" multiselect="false" usedinquery="0" />
            </inputvalues>
        </transition>
        <transition id="horizontalprofile_instantaneouspoint_track" description="horizontalprofile_instantaneouspoint_track" transition="de.intevation.gnv.transition.DefaultTransition">
@@ -108,6 +116,7 @@
            <inputvalues>
                <inputvalue name="cruiseid" type="Integer" multiselect="false" usedinquery="1" />
                <inputvalue name="fisname" type="String" multiselect="false" usedinquery="0"/>
+               <inputvalue name="trackid" type="Integer" multiselect="false" usedinquery="0" />
            </inputvalues>
        </transition>
        <transition id="horizontalprofile_instantaneouspoint_surveyinfo" description="horizontalprofile_instantaneouspoint_surveyinfo" transition="de.intevation.gnv.transition.DefaultTransition">
@@ -121,6 +130,7 @@
                <inputvalue name="cruiseid" type="Integer" multiselect="false" usedinquery="0" />
                <inputvalue name="trackid" type="Integer" multiselect="false" usedinquery="1" />
                <inputvalue name="fisname" type="String" multiselect="false" usedinquery="0"/>
+               <inputvalue name="surveyid" type="Integer" multiselect="false" usedinquery="0" />
            </inputvalues>
        </transition>
        <transition id="horizontalprofile_instantaneouspoint_parameter" description="horizontalprofile_instantaneouspoint_parameter" transition="de.intevation.gnv.transition.DefaultTransition">
@@ -135,6 +145,7 @@
                <inputvalue name="trackid" type="Integer" multiselect="false" usedinquery="0" />
                <inputvalue name="surveyid" type="Integer" multiselect="false" usedinquery="1" />
                <inputvalue name="fisname" type="String" multiselect="false" usedinquery="0"/>
+               <inputvalue name="parameterid" type="Integer" multiselect="true" usedinquery="0" />
            </inputvalues>
        </transition>
        <transition id="horizontalprofile_instantaneouspoint_depth" description="horizontalprofile_instantaneouspoint_depth" transition="de.intevation.gnv.transition.DefaultTransition">
@@ -150,6 +161,7 @@
                <inputvalue name="surveyid" type="Integer" multiselect="false" usedinquery="1" />
                <inputvalue name="parameterid" type="Integer" multiselect="true" usedinquery="0" />
                <inputvalue name="fisname" type="String" multiselect="false" usedinquery="0"/>
+               <inputvalue name="measurementid" type="Double" multiselect="true" usedinquery="0" />
            </inputvalues>
        </transition>
        <transition id="horizontalprofile_instantaneouspoint_calculate_results" description="horizontalprofile_instantaneouspoint_calculate_results" transition="de.intevation.gnv.transition.profile.horizontal.HorizontalProfileOutputTransition">
http://dive4elements.wald.intevation.org