Mercurial > dive4elements > river
changeset 1172:23eb122c8ec1
Prepared the winfo artifact for floodmap calculations (now selectable in the UI).
flys-artifacts/trunk@2750 c6561f87-3c4e-4783-a992-168aeb5c3f6f
| author | Ingo Weinzierl <ingo.weinzierl@intevation.de> |
|---|---|
| date | Wed, 14 Sep 2011 14:58:06 +0000 |
| parents | a3108f0a2fe7 |
| children | 2490d6ef394e |
| files | flys-artifacts/ChangeLog flys-artifacts/doc/conf/artifacts/winfo.xml flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/DGMSelect.java flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/WaterlevelSelectState.java |
| diffstat | 4 files changed, 47 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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
--- 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>
--- 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 :
--- /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 :