# HG changeset patch
# User Ingo Weinzierl <ingo.weinzierl@intevation.de>
# Date 1300441341 0
# Node ID 38b60ebc71b5dd70daa08f6ec29d2d375e6d5926
# Parent  7f839b81cdde25b3e4f2c06bed37b00ac6f8f637
Added new states to insert location/distance and w/q data in the config of a WINFO artifact.

flys-artifacts/trunk@1515 c6561f87-3c4e-4783-a992-168aeb5c3f6f

diff -r 7f839b81cdde -r 38b60ebc71b5 flys-artifacts/ChangeLog
--- a/flys-artifacts/ChangeLog	Fri Mar 18 09:38:11 2011 +0000
+++ b/flys-artifacts/ChangeLog	Fri Mar 18 09:42:21 2011 +0000
@@ -1,3 +1,13 @@
+2011-03-18  Ingo Weinzierl <ingo@intevation.de>
+
+	* doc/conf/artifacts/winfo.xml: Added new states for entering a
+	  location/distance and w/q.
+
+	* src/main/resources/messages.properties,
+	  src/main/resources/messages_en.properties,
+	  src/main/resources/messages_de.properties: New string for the
+	  location/distance and w/q input states.
+
 2011-03-18  Ingo Weinzierl <ingo@intevation.de>
 
 	* src/main/java/de/intevation/flys/artifacts/states/WQSelect.java:
diff -r 7f839b81cdde -r 38b60ebc71b5 flys-artifacts/doc/conf/artifacts/winfo.xml
--- a/flys-artifacts/doc/conf/artifacts/winfo.xml	Fri Mar 18 09:38:11 2011 +0000
+++ b/flys-artifacts/doc/conf/artifacts/winfo.xml	Fri Mar 18 09:42:21 2011 +0000
@@ -15,5 +15,36 @@
             <data name="calculation_mode"  type="String" />
         </state>
 
+        <transition transition="de.intevation.flys.artifacts.transitions.DefaultTransition">
+            <from state="state.winfo.calculation_mode"/>
+            <to state="state.winfo.location_distance"/>
+        </transition>
+
+        <state id="state.winfo.location_distance" description="state.winfo.location_distance" state="de.intevation.flys.artifacts.states.LocationDistanceSelect">
+            <data name="ld_from" type="Double" />
+            <data name="ld_to" type="Double" />
+            <data name="ld_step" type="Double" />
+        </state>
+
+        <transition transition="de.intevation.flys.artifacts.transitions.DefaultTransition">
+            <from state="state.winfo.location_distance"/>
+            <to state="state.winfo.wq"/>
+        </transition>
+
+        <state id="state.winfo.wq" description="state.winfo.wq" state="de.intevation.flys.artifacts.states.WQSelect">
+            <data name="wq_mode" type="String" />
+            <data name="wq_from" type="Double" />
+            <data name="wq_to" type="Double" />
+            <data name="wq_step" type="Double" />
+        </state>
+
+        <transition transition="de.intevation.flys.artifacts.transitions.DefaultTransition">
+            <from state="state.winfo.wq"/>
+            <to state="state.winfo.calculation"/>
+        </transition>
+
+        <state id="state.winfo.calculation" description="state.winfo.wq" state="de.intevation.flys.artifacts.states.WQSelect">
+        </state>
+
     </states>
 </artifact>
diff -r 7f839b81cdde -r 38b60ebc71b5 flys-artifacts/src/main/resources/messages.properties
--- a/flys-artifacts/src/main/resources/messages.properties	Fri Mar 18 09:38:11 2011 +0000
+++ b/flys-artifacts/src/main/resources/messages.properties	Fri Mar 18 09:42:21 2011 +0000
@@ -1,5 +1,7 @@
 state.winfo.river = River
 state.winfo.calculation_mode = Calculation Mode
+state.winfo.location_distance = Location or distance selection
+state.winfo.wq = Input for W/Q data
 
 river = River
 calculation_mode = Calculation Mode
diff -r 7f839b81cdde -r 38b60ebc71b5 flys-artifacts/src/main/resources/messages_de.properties
--- a/flys-artifacts/src/main/resources/messages_de.properties	Fri Mar 18 09:38:11 2011 +0000
+++ b/flys-artifacts/src/main/resources/messages_de.properties	Fri Mar 18 09:42:21 2011 +0000
@@ -1,5 +1,7 @@
 state.winfo.river = Fluss
 state.winfo.calculation_mode = Berechnungsart
+state.winfo.location_distance = Wahl des Berechnungsortes/strecke
+state.winfo.wq = Eingabe für W/Q Daten
 
 river = Fluss
 calculation_mode = Berechnungsart
diff -r 7f839b81cdde -r 38b60ebc71b5 flys-artifacts/src/main/resources/messages_en.properties
--- a/flys-artifacts/src/main/resources/messages_en.properties	Fri Mar 18 09:38:11 2011 +0000
+++ b/flys-artifacts/src/main/resources/messages_en.properties	Fri Mar 18 09:42:21 2011 +0000
@@ -1,5 +1,7 @@
 state.winfo.river = River
 state.winfo.calculation_mode = Calculation Mode
+state.winfo.location_distance = Location or distance selection
+state.winfo.wq = Input for W/Q data
 
 river = River
 calculation_mode = Calculation Mode