Mercurial > dive4elements > river
changeset 138:38b60ebc71b5
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
| author | Ingo Weinzierl <ingo.weinzierl@intevation.de> |
|---|---|
| date | Fri, 18 Mar 2011 09:42:21 +0000 |
| parents | 7f839b81cdde |
| children | 05207cc4a084 |
| files | flys-artifacts/ChangeLog flys-artifacts/doc/conf/artifacts/winfo.xml flys-artifacts/src/main/resources/messages.properties flys-artifacts/src/main/resources/messages_de.properties flys-artifacts/src/main/resources/messages_en.properties |
| diffstat | 5 files changed, 47 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- 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:
--- 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>
--- 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
--- 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
--- 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