Mercurial > dive4elements > gnv-client

changeset 752:7bc3d9f0cf3c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Modified the Workflow for Horizontalcrosssections so that the Inputvalues of the Mapviewer-Interface take affect. gnv-artifacts/trunk@795 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author Tim Englich <tim.englich@intevation.de>
date Fri, 19 Mar 2010 08:34:40 +0000
parents 2998a9ea0c0c
children 53d4a2229e2c
files gnv-artifacts/ChangeLog gnv-artifacts/doc/conf/products/horizontalcrosssection/conf_mesh.xml
diffstat 2 files changed, 87 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/gnv-artifacts/ChangeLog	Fri Mar 19 08:32:47 2010 +0000
+++ b/gnv-artifacts/ChangeLog	Fri Mar 19 08:34:40 2010 +0000
@@ -1,3 +1,11 @@
+2010-03-19  Tim Englich  <tim.englich@intevation.de>
+
+	* doc/conf/products/horizontalcrosssection/conf_mesh.xml: 
+	  Modified the Workflow for Horizontalcrosssections so that the Inputvalues 
+	  of the Mapviewer-Interface take affect. E.g. The Regionfilter will not be 
+	  displaied if an Polygon was send by the Mapviewer. Also the Input of an 
+	  Polygon will be skipped if a Polygon was send by the MapViewer.
+
 2010-03-19  Tim Englich  <tim.englich@intevation.de>
 
 	* doc/conf/products/horizontalprofile/conf_mesh.xml: 
--- a/gnv-artifacts/doc/conf/products/horizontalcrosssection/conf_mesh.xml	Fri Mar 19 08:32:47 2010 +0000
+++ b/gnv-artifacts/doc/conf/products/horizontalcrosssection/conf_mesh.xml	Fri Mar 19 08:34:40 2010 +0000
@@ -1,7 +1,46 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <artifact name="horizontalCrossSectionMesh">
     <states>
-        <state id="horizontalcrosssection_area" description="horizontalcrosssection_area_one" state="de.intevation.gnv.state.DefaultState">
+        <state id="horizontalcrosssection_mesh_mapviewerswitch" description="horizontalcrosssection_mesh_area_one" state="de.intevation.gnv.state.DefaultAutoResumeState">
+            <!-- Empty State which will be used to integrate the switch for a 
+                 standalone and an mapviewer based call. -->
+            <inputvalues>
+                <inputvalue name="sourceid" type="Integer" multiselect="false" usedinquery="0"/>
+                <inputvalue name="fisname" type="String" multiselect="false" usedinquery="0"/>
+            </inputvalues>
+        </state>
+        
+        <transition transition="de.intevation.gnv.transition.PresettingsValueCompareTransition">
+            <from state="horizontalcrosssection_mesh_mapviewerswitch"/>
+            <to state="horizontalcrosssection_mesh_area"/>
+            <condition inputvalue="geometry" value="POLYGON" operator="notequal"/>
+        </transition>
+        
+        <transition transition="de.intevation.gnv.transition.PresettingsValueCompareTransition">
+            <from state="horizontalcrosssection_mesh_mapviewerswitch"/>
+            <to state="horizontalcrosssection_mesh_with_wkt"/>
+            <condition inputvalue="geometry" value="POLYGON" operator="equal"/>
+        </transition>
+        
+        <state id="horizontalcrosssection_mesh_with_wkt" description="timeseries_mesh" state="de.intevation.gnv.state.PreSettingsTransferState">
+            <queryID>verticalprofile_mesh_with_wkt</queryID>
+            <dataname>meshid</dataname>
+            <data-multiselect>false</data-multiselect>
+            <presettings-transfer presetting="geometry" inputvalue="mesh_polygon"/>
+            <inputvalues>
+                <inputvalue name="sourceid" type="Integer" multiselect="false" usedinquery="1"/>
+                <inputvalue name="fisname" type="String" multiselect="false" usedinquery="0"/>
+                <inputvalue name="mesh_polygon" type="String" multiselect="false" usedinquery="1"/>
+                <inputvalue name="meshid" type="Integer" multiselect="false" usedinquery="0"/>
+            </inputvalues>
+        </state>
+       
+        <transition transition="de.intevation.gnv.transition.DefaultTransition">
+            <from state="horizontalcrosssection_mesh_with_wkt"/>
+            <to state="horizontalcrosssection_meshpoint_depth"/>
+        </transition>
+    
+        <state id="horizontalcrosssection_mesh_area" description="horizontalcrosssection_mesh_area_one" state="de.intevation.gnv.state.DefaultState">
             <queryID>area_filter</queryID>
             <dataname>areaid</dataname>
             <data-multiselect>false</data-multiselect>
@@ -14,17 +53,17 @@
         </state>
         
         <transition transition="de.intevation.gnv.transition.ValueCompareTransition">
-            <from state="horizontalcrosssection_area"/>
-            <to state="horizontalcrosssection_subarea"/>
+            <from state="horizontalcrosssection_mesh_area"/>
+            <to state="horizontalcrosssection_mesh_subarea"/>
             <condition inputvalue="areaid" value="n/n" operator="notequal"/>
         </transition>
         <transition transition="de.intevation.gnv.transition.ValueCompareTransition">
-            <from state="horizontalcrosssection_area"/>
+            <from state="horizontalcrosssection_mesh_area"/>
             <to state="horizontalcrosssection_mesh_without_geom"/>
             <condition inputvalue="areaid" value="n/n" operator="equal"/>
         </transition>
         
-        <state id="horizontalcrosssection_subarea" description="horizontalcrosssection_area_one" state="de.intevation.gnv.state.DefaultState">
+        <state id="horizontalcrosssection_mesh_subarea" description="horizontalcrosssection_mesh_area_one" state="de.intevation.gnv.state.DefaultState">
             <queryID>subarea_filter</queryID>
             <dataname>subareaid</dataname>
             <data-multiselect>false</data-multiselect>
@@ -37,7 +76,7 @@
         </state>
         
         <transition transition="de.intevation.gnv.transition.DefaultTransition">
-            <from state="horizontalcrosssection_subarea"/>
+            <from state="horizontalcrosssection_mesh_subarea"/>
             <to state="horizontalcrosssection_mesh"/>
         </transition>
         
@@ -53,9 +92,16 @@
             </inputvalues>
         </state>
         
-        <transition transition="de.intevation.gnv.transition.DefaultTransition">
+        <transition transition="de.intevation.gnv.transition.PresettingsValueCompareTransition">
             <from state="horizontalcrosssection_mesh_without_geom"/>
             <to state="verticalcrosssection_mesh_polygon"/>
+            <condition inputvalue="geometry" value="POLYGON" operator="notequal"/>
+        </transition>
+        
+        <transition transition="de.intevation.gnv.transition.PresettingsValueCompareTransition">
+            <from state="horizontalcrosssection_mesh_without_geom"/>
+            <to state="horizontalcrosssection_meshpoint_depth_presettings"/>
+            <condition inputvalue="geometry" value="POLYGON" operator="equal"/>
         </transition>
         
         <state id="horizontalcrosssection_mesh" description="horizontalcrosssection_mesh" state="de.intevation.gnv.state.DefaultState">
@@ -70,9 +116,16 @@
             </inputvalues>
         </state>
         
-        <transition transition="de.intevation.gnv.transition.DefaultTransition">
+        <transition transition="de.intevation.gnv.transition.PresettingsValueCompareTransition">
             <from state="horizontalcrosssection_mesh"/>
             <to state="verticalcrosssection_mesh_polygon"/>
+            <condition inputvalue="geometry" value="POLYGON" operator="notequal"/>
+        </transition>
+        
+        <transition transition="de.intevation.gnv.transition.PresettingsValueCompareTransition">
+            <from state="horizontalcrosssection_mesh"/>
+            <to state="horizontalcrosssection_meshpoint_depth_presettings"/>
+            <condition inputvalue="geometry" value="POLYGON" operator="equal"/>
         </transition>
         
         <state id="verticalcrosssection_mesh_polygon" description="verticalcrosssection_mesh_polygon" state="de.intevation.gnv.state.SingleInputState">
@@ -90,6 +143,24 @@
             <to state="horizontalcrosssection_meshpoint_depth"/>
         </transition>
         
+        <state id="horizontalcrosssection_meshpoint_depth_presettings" description="horizontalcrosssection_meshpoint_depth" state="de.intevation.gnv.state.PreSettingsTransferState">
+            <queryID>horizontalcrosssection_meshpoint_depth</queryID>
+            <dataname>depthid</dataname>
+            <data-multiselect>false</data-multiselect>
+            <presettings-transfer presetting="geometry" inputvalue="mesh_polygon"/>
+            <inputvalues>
+                 <inputvalue name="meshid" type="Integer" multiselect="false" usedinquery="1"/>
+                 <inputvalue name="fisname" type="String" multiselect="false" usedinquery="0"/>
+                 <inputvalue name="depthid" type="Integer" multiselect="false" usedinquery="0"/>
+                 <inputvalue name="mesh_polygon" type="String" multiselect="false" usedinquery="0"/>
+            </inputvalues>
+        </state>
+        
+        <transition transition="de.intevation.gnv.transition.DefaultTransition">
+            <from state="horizontalcrosssection_meshpoint_depth_presettings"/>
+            <to state="horizontalcrosssection_meshpoint_parameter"/>
+        </transition>
+        
         <state id="horizontalcrosssection_meshpoint_depth" description="horizontalcrosssection_meshpoint_depth" state="de.intevation.gnv.state.DefaultState">
             <queryID>horizontalcrosssection_meshpoint_depth</queryID>
             <dataname>depthid</dataname>
http://dive4elements.wald.intevation.org