# HG changeset patch
# User Ingo Weinzierl <ingo.weinzierl@intevation.de>
# Date 1316012286 0
# Node ID 23eb122c8ec1c856ce7f1b4666c5ee47fcfe67b7
# Parent  a3108f0a2fe7e7879e7e7f59b742b1a66c34ea0c
Prepared the winfo artifact for floodmap calculations (now selectable in the UI).

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

diff -r a3108f0a2fe7 -r 23eb122c8ec1 flys-artifacts/ChangeLog
--- a/flys-artifacts/ChangeLog	Wed Sep 14 10:04:19 2011 +0000
+++ b/flys-artifacts/ChangeLog	Wed Sep 14 14:58:06 2011 +0000
@@ -1,3 +1,15 @@
+2011-09-14  Ingo Weinzierl <ingo@intevation.de>
+
+	* src/main/java/de/intevation/flys/artifacts/states/DGMSelect.java: This
+	  state now desires the UIProvider 'dem_datacage_panel'.
+
+	* src/main/java/de/intevation/flys/artifacts/states/WaterlevelSelectState.java:
+	  New. This state is used to define the desired UIProvider
+	  'wsp_datacage_panel'.
+
+	* doc/conf/artifacts/winfo.xml: Added a new way to start a WSPLGEN
+	  calculation when choosing the calculation type 'floodmap'.
+
 2011-09-14  Ingo Weinzierl <ingo@intevation.de>
 
 	* src/main/java/de/intevation/flys/collections/AttributeWriter.java: Merge
diff -r a3108f0a2fe7 -r 23eb122c8ec1 flys-artifacts/doc/conf/artifacts/winfo.xml
--- a/flys-artifacts/doc/conf/artifacts/winfo.xml	Wed Sep 14 10:04:19 2011 +0000
+++ b/flys-artifacts/doc/conf/artifacts/winfo.xml	Wed Sep 14 14:58:06 2011 +0000
@@ -23,6 +23,12 @@
 
         <transition transition="de.intevation.flys.artifacts.transitions.ValueCompareTransition">
             <from state="state.winfo.calculation_mode"/>
+            <to state="state.winfo.distance"/>
+            <condition data="calculation_mode" value="calc.flood.map" operator="equal"/>
+        </transition>
+
+        <transition transition="de.intevation.flys.artifacts.transitions.ValueCompareTransition">
+            <from state="state.winfo.calculation_mode"/>
             <to state="state.winfo.location"/>
             <condition data="calculation_mode" value="calc.discharge.curve" operator="equal"/>
         </transition>
@@ -72,6 +78,12 @@
             </outputmodes>
         </state>
 
+        <transition transition="de.intevation.flys.artifacts.transitions.ValueCompareTransition">
+            <from state="state.winfo.distance"/>
+            <to state="state.winfo.uesk.wsp"/>
+            <condition data="calculation_mode" value="calc.flood.map" operator="equal"/>
+        </transition>
+
         <state id="state.winfo.location_distance" description="state.winfo.location_distance" state="de.intevation.flys.artifacts.states.LocationDistanceSelect">
             <data name="ld_mode" type="String" />
             <data name="ld_locations" type="Double[]" />
@@ -257,6 +269,15 @@
             <to state="state.winfo.uesk.dgm"/>
         </transition>
 
+        <state id="state.winfo.uesk.wsp" description="state.winfo.uesk.wsp" state="de.intevation.flys.artifacts.states.WaterlevelSelectState">
+            <data name="wsp" type="String" />
+        </state>
+
+        <transition transition="de.intevation.flys.artifacts.transitions.DefaultTransition">
+            <from state="state.winfo.uesk.wsp"/>
+            <to state="state.winfo.uesk.dgm"/>
+        </transition>
+
         <state id="state.winfo.uesk.dgm" description="state.winfo.uesk.dgm" state="de.intevation.flys.artifacts.states.DGMSelect">
             <data name="dgm" type="String" />
         </state>
diff -r a3108f0a2fe7 -r 23eb122c8ec1 flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/DGMSelect.java
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/DGMSelect.java	Wed Sep 14 10:04:19 2011 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/DGMSelect.java	Wed Sep 14 14:58:06 2011 +0000
@@ -7,7 +7,7 @@
 
     @Override
     protected String getUIProvider() {
-        return "datacage_panel";
+        return "dgm_datacage_panel";
     }
 }
 // vim:set ts=4 sw=4 si et sta sts=4 fenc=utf-8 :
diff -r a3108f0a2fe7 -r 23eb122c8ec1 flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/WaterlevelSelectState.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/WaterlevelSelectState.java	Wed Sep 14 14:58:06 2011 +0000
@@ -0,0 +1,13 @@
+package de.intevation.flys.artifacts.states;
+
+/**
+ * @author <a href="mailto:ingo.weinzierl@intevation.de">Ingo Weinzierl</a>
+ */
+public class WaterlevelSelectState extends DefaultState {
+
+    @Override
+    protected String getUIProvider() {
+        return "wsp_datacage_panel";
+    }
+}
+// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf-8 :