Mercurial > dive4elements > gnv-client
changeset 1084:81ac8d2f6cb7
Limited the parameterization of timeseries, horizontalprofiles and verticalprofiles so that just a single vector can be selected at the same time.
gnv-artifacts/trunk@1186 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author | Ingo Weinzierl <ingo.weinzierl@intevation.de> |
---|---|
date | Wed, 09 Jun 2010 12:54:08 +0000 (2010-06-09) |
parents | 14370090a018 |
children | ec512e7992c6 |
files | gnv-artifacts/ChangeLog gnv-artifacts/doc/conf/products/horizontalprofile/conf_mesh.xml gnv-artifacts/doc/conf/products/timeseries/conf_mesh.xml gnv-artifacts/doc/conf/products/timeseries/conf_timeseriespoint.xml gnv-artifacts/doc/conf/products/verticalprofile/conf_mesh.xml gnv-artifacts/doc/conf/products/verticalprofile/conf_timeseriespoint.xml |
diffstat | 6 files changed, 64 insertions(+), 36 deletions(-) [+] |
line wrap: on
line diff
--- a/gnv-artifacts/ChangeLog Wed Jun 09 10:07:07 2010 +0000 +++ b/gnv-artifacts/ChangeLog Wed Jun 09 12:54:08 2010 +0000 @@ -1,3 +1,13 @@ +2010-06-09 Ingo Weinzierl <ingo.weinzierl@intevation.de> + + * doc/conf/products/timeseries/conf_mesh.xml, + doc/conf/products/timeseries/conf_timeseriespoint.xml, + doc/conf/products/horizontalprofile/conf_mesh.xml, + doc/conf/products/verticalprofile/conf_mesh.xml, + doc/conf/products/verticalprofile/conf_timeseriespoint.xml: Limited + parameterization so that just a single vector can be selected at the same + time. + 2010-06-09 Ingo Weinzierl <ingo.weinzierl@intevation.de> * src/main/java/de/intevation/gnv/state/profile/vertical/VerticalProfileVectorOutputState.java:
--- a/gnv-artifacts/doc/conf/products/horizontalprofile/conf_mesh.xml Wed Jun 09 10:07:07 2010 +0000 +++ b/gnv-artifacts/doc/conf/products/horizontalprofile/conf_mesh.xml Wed Jun 09 12:54:08 2010 +0000 @@ -274,14 +274,14 @@ <state id="horizontalprofile_meshpoint_depth_vector" description="horizontalprofile_meshpoint_depth" state="de.intevation.gnv.state.DefaultState"> <queryID>horizontalprofile_meshpoint_depth</queryID> <dataname>depthid</dataname> - <data-multiselect>true</data-multiselect> + <data-multiselect>false</data-multiselect> <inputvalues> <inputvalue name="meshid" type="Integer" multiselect="false" usedinquery="1"/> <inputvalue name="mesh_point" type="Integer" multiselect="false" usedinquery="2"/> <inputvalue name="axisid" type="AttributeName" multiselect="false" usedinquery="0"/> <inputvalue name="parameterid" type="Integer" multiselect="true" useinquery="0"/> <inputvalue name="fisname" type="String" multiselect="false" usedinquery="0"/> - <inputvalue name="depthid" type="Integer" multiselect="true" usedinquery="0"/> + <inputvalue name="depthid" type="Integer" multiselect="false" usedinquery="0"/> </inputvalues> </state> @@ -354,7 +354,7 @@ <state id="horizontalprofile_mesh_date_vector" description="horizontalprofile_mesh_date" state="de.intevation.gnv.state.DefaultState"> <queryID>verticalprofile_mesh_date_vector</queryID> <dataname>dateid</dataname> - <data-multiselect>true</data-multiselect> + <data-multiselect>false</data-multiselect> <inputvalues> <inputvalue name="meshid" type="Integer" multiselect="false" usedinquery="1"/> <inputvalue name="mesh_point" type="Integer" multiselect="false" usedinquery="0"/> @@ -363,7 +363,7 @@ <inputvalue name="depthid" type="Integer" multiselect="true" usedinquery="0"/> <inputvalue name="fisname" type="String" multiselect="false" usedinquery="0"/> <inputvalue name="yearid" type="String" multiselect="true" usedinquery="1"/> - <inputvalue name="dateid" type="Date" multiselect="true" usedinquery="0"/> + <inputvalue name="dateid" type="Date" multiselect="false" usedinquery="0"/> </inputvalues> </state>
--- a/gnv-artifacts/doc/conf/products/timeseries/conf_mesh.xml Wed Jun 09 10:07:07 2010 +0000 +++ b/gnv-artifacts/doc/conf/products/timeseries/conf_mesh.xml Wed Jun 09 12:54:08 2010 +0000 @@ -178,25 +178,9 @@ <transition transition="de.intevation.gnv.transition.DefaultTransition"> <from state="timeseries_meshpoint"/> - <to state="timeseries_meshpoint_depth"/> + <to state="timeseries_meshpoint_vector_scalar"/> </transition> - <state id="timeseries_meshpoint_depth" description="timeseries_meshpoint_depth" state="de.intevation.gnv.state.DefaultState"> - <queryID>timeseries_meshpoint_depth</queryID> - <dataname>depthid</dataname> - <data-multiselect>true</data-multiselect> - <inputvalues> - <inputvalue name="meshid" type="Integer" multiselect="false"/> - <inputvalue name="mesh_point" type="Integer" multiselect="false" usedinquery="2"/> - <inputvalue name="fisname" type="String" multiselect="false" usedinquery="0"/> - <inputvalue name="depthid" type="Integer" multiselect="false" usedinquery="0"/> - </inputvalues> - </state> - - <transition transition="de.intevation.gnv.transition.DefaultTransition"> - <from state="timeseries_meshpoint_depth"/> - <to state="timeseries_meshpoint_vector_scalar"/> - </transition> <state id="timeseries_meshpoint_vector_scalar" description="timeseries_meshpoint_vector_scalar" state="de.intevation.gnv.state.SwitchModeState"> <dataname>vectorscalar</dataname> @@ -230,7 +214,6 @@ <data-multiselect>true</data-multiselect> <inputvalues> <inputvalue name="meshid" type="Integer" multiselect="false" usedinquery="1"/> - <inputvalue name="depthid" type="Integer" multiselect="false" usedinquery="0"/> <inputvalue name="mesh_point" type="Integer" multiselect="false" usedinquery="0"/> <inputvalue name="fisname" type="String" multiselect="false" usedinquery="0"/> <inputvalue name="parameterid" type="Integer" multiselect="false" usedinquery="0"/> @@ -241,10 +224,9 @@ <queryID>timeseries_mesh_parameter_vector</queryID> <dataname>parameterid</dataname> <presettings-name>parameter</presettings-name> - <data-multiselect>true</data-multiselect> + <data-multiselect>false</data-multiselect> <inputvalues> <inputvalue name="meshid" type="Integer" multiselect="false" usedinquery="1"/> - <inputvalue name="depthid" type="Integer" multiselect="false" usedinquery="0"/> <inputvalue name="mesh_point" type="Integer" multiselect="false" usedinquery="0"/> <inputvalue name="fisname" type="String" multiselect="false" usedinquery="0"/> <inputvalue name="parameterid" type="Integer" multiselect="false" usedinquery="0"/> @@ -253,11 +235,47 @@ <transition transition="de.intevation.gnv.transition.DefaultTransition"> <from state="timeseries_meshpoint_parameter"/> - <to state="timeseries_meshpoint_interval"/> + <to state="timeseries_meshpoint_depth"/> </transition> <transition transition="de.intevation.gnv.transition.DefaultTransition"> <from state="timeseries_meshpoint_parameter_vector"/> + <to state="timeseries_meshpoint_depth_vector"/> + </transition> + + <state id="timeseries_meshpoint_depth" description="timeseries_meshpoint_depth" state="de.intevation.gnv.state.DefaultState"> + <queryID>timeseries_meshpoint_depth</queryID> + <dataname>depthid</dataname> + <data-multiselect>true</data-multiselect> + <inputvalues> + <inputvalue name="meshid" type="Integer" multiselect="false"/> + <inputvalue name="mesh_point" type="Integer" multiselect="false" usedinquery="2"/> + <inputvalue name="fisname" type="String" multiselect="false" usedinquery="0"/> + <inputvalue name="depthid" type="Integer" multiselect="false" usedinquery="0"/> + <inputvalue name="parameterid" type="Integer" multiselect="false" usedinquery="0"/> + </inputvalues> + </state> + + <state id="timeseries_meshpoint_depth_vector" description="timeseries_meshpoint_depth" state="de.intevation.gnv.state.DefaultState"> + <queryID>timeseries_meshpoint_depth</queryID> + <dataname>depthid</dataname> + <data-multiselect>false</data-multiselect> + <inputvalues> + <inputvalue name="meshid" type="Integer" multiselect="false"/> + <inputvalue name="mesh_point" type="Integer" multiselect="false" usedinquery="2"/> + <inputvalue name="fisname" type="String" multiselect="false" usedinquery="0"/> + <inputvalue name="depthid" type="Integer" multiselect="false" usedinquery="0"/> + <inputvalue name="parameterid" type="Integer" multiselect="false" usedinquery="0"/> + </inputvalues> + </state> + + <transition transition="de.intevation.gnv.transition.DefaultTransition"> + <from state="timeseries_meshpoint_depth"/> + <to state="timeseries_meshpoint_interval"/> + </transition> + + <transition transition="de.intevation.gnv.transition.DefaultTransition"> + <from state="timeseries_meshpoint_depth_vector"/> <to state="timeseries_meshpoint_interval_vector"/> </transition>
--- a/gnv-artifacts/doc/conf/products/timeseries/conf_timeseriespoint.xml Wed Jun 09 10:07:07 2010 +0000 +++ b/gnv-artifacts/doc/conf/products/timeseries/conf_timeseriespoint.xml Wed Jun 09 12:54:08 2010 +0000 @@ -203,11 +203,11 @@ <queryID>timeseries_parameter_vector</queryID> <dataname>parameterid</dataname> <presettings-name>parameter</presettings-name> - <data-multiselect>true</data-multiselect> + <data-multiselect>false</data-multiselect> <inputvalues> <inputvalue name="featureid" type="Integer" multiselect="false"/> <inputvalue name="fisname" type="String" multiselect="false" usedinquery="0"/> - <inputvalue name="parameterid" type="Integer" multiselect="true" usedinquery="0"/> + <inputvalue name="parameterid" type="Integer" multiselect="false" usedinquery="0"/> </inputvalues> </state> @@ -233,15 +233,15 @@ </inputvalues> </state> - <state id="timeseries_depth_height_vector" description="timeseries_depth_height_vector" state="de.intevation.gnv.state.MeasurementState"> + <state id="timeseries_depth_height_vector" description="timeseries_depth_height_vector" state="de.intevation.gnv.state.DefaultState"> <queryID>timeseries_depth_height_vector</queryID> <dataname>measurementid</dataname> - <data-multiselect>true</data-multiselect> + <data-multiselect>false</data-multiselect> <inputvalues> <inputvalue name="featureid" type="Integer" multiselect="false"/> <inputvalue name="parameterid" type="Integer" multiselect="true"/> <inputvalue name="fisname" type="String" multiselect="false" usedinquery="0"/> - <inputvalue name="measurementid" type="Integer" multiselect="true" usedinquery="0"/> + <inputvalue name="measurementid" type="Integer" multiselect="false" usedinquery="0"/> </inputvalues> </state>
--- a/gnv-artifacts/doc/conf/products/verticalprofile/conf_mesh.xml Wed Jun 09 10:07:07 2010 +0000 +++ b/gnv-artifacts/doc/conf/products/verticalprofile/conf_mesh.xml Wed Jun 09 12:54:08 2010 +0000 @@ -341,7 +341,7 @@ <state id="verticalprofile_mesh_date_vector" description="verticalprofile_mesh_date" state="de.intevation.gnv.state.DefaultState"> <queryID>verticalprofile_mesh_date_vector</queryID> <dataname>dateid</dataname> - <data-multiselect>true</data-multiselect> + <data-multiselect>false</data-multiselect> <inputvalues> <inputvalue name="meshid" type="Integer" multiselect="false" usedinquery="1"/> <inputvalue name="mesh_point" type="Integer" multiselect="false" usedinquery="0"/> @@ -350,7 +350,7 @@ <inputvalue name="mindepthid" type="Double" multiselect="false" usedinquery="0"/> <inputvalue name="maxdepthid" type="Double" multiselect="false" usedinquery="0"/> <inputvalue name="yearid" type="String" multiselect="true" usedinquery="1"/> - <inputvalue name="dateid" type="Date" multiselect="true" usedinquery="0"/> + <inputvalue name="dateid" type="Date" multiselect="false" usedinquery="0"/> </inputvalues> </state>
--- a/gnv-artifacts/doc/conf/products/verticalprofile/conf_timeseriespoint.xml Wed Jun 09 10:07:07 2010 +0000 +++ b/gnv-artifacts/doc/conf/products/verticalprofile/conf_timeseriespoint.xml Wed Jun 09 12:54:08 2010 +0000 @@ -151,11 +151,11 @@ <queryID>verticalprofile_parameter_vector</queryID> <dataname>parameterid</dataname> <presettings-name>parameter</presettings-name> - <data-multiselect>true</data-multiselect> + <data-multiselect>false</data-multiselect> <inputvalues> <inputvalue name="featureid" type="Integer" multiselect="false" usedinquery="1"/> <inputvalue name="fisname" type="String" multiselect="false" usedinquery="0"/> - <inputvalue name="parameterid" type="Integer" multiselect="true" usedinquery="0"/> + <inputvalue name="parameterid" type="Integer" multiselect="false" usedinquery="0"/> </inputvalues> </state> @@ -219,13 +219,13 @@ <state id="verticalprofile_date_vector" description="verticalprofile_date" state="de.intevation.gnv.state.DefaultState"> <queryID>verticalprofile_date_vector</queryID> <dataname>dateid</dataname> - <data-multiselect>true</data-multiselect> + <data-multiselect>false</data-multiselect> <inputvalues> <inputvalue name="featureid" type="Integer" multiselect="false" usedinquery="1"/> <inputvalue name="parameterid" type="Integer" multiselect="true" usedinquery="1"/> <inputvalue name="yearid" type="String" multiselect="true" usedinquery="1"/> <inputvalue name="fisname" type="String" multiselect="false" usedinquery="0"/> - <inputvalue name="dateid" type="Date" multiselect="true" usedinquery="0"/> + <inputvalue name="dateid" type="Date" multiselect="false" usedinquery="0"/> </inputvalues> </state>