Mercurial > dive4elements > river

changeset 8564:d1640df656ee

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(Issue1755) Add distance step selection to bed quality artifact
author Andre Heinecke <andre.heinecke@intevation.de>
date Mon, 16 Feb 2015 18:03:09 +0100
parents 59b4f6cf1cf4
children ea17665c5aad
files artifacts/doc/conf/artifacts/minfo.xml artifacts/src/main/resources/messages.properties artifacts/src/main/resources/messages_de.properties artifacts/src/main/resources/messages_de_DE.properties artifacts/src/main/resources/messages_en.properties
diffstat 5 files changed, 17 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/artifacts/doc/conf/artifacts/minfo.xml	Mon Feb 16 17:09:14 2015 +0100
+++ b/artifacts/doc/conf/artifacts/minfo.xml	Mon Feb 16 18:03:09 2015 +0100
@@ -41,7 +41,7 @@
 
         <transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition">
             <from state="state.minfo.calculation_mode"/>
-            <to state="state.minfo.bed.location"/>
+            <to state="state.minfo.distance"/>
             <condition data="calculation_mode" value="calc.bed.quality" operator="equal"/>
         </transition>
 
@@ -50,15 +50,16 @@
             <data name="ld_to"   type="Double" />
         </state>
 
+        <state id="state.minfo.distance" description="state.minfo.distance" state="org.dive4elements.river.artifacts.states.DistanceSelect" helpText="help.state.minfo.distance">
+            <data name="ld_from" type="Double" />
+            <data name="ld_to"   type="Double" />
+            <data name="ld_step" type="Double" />
+        </state>
+
         <state id="state.minfo.sq.location" description="state.minfo.sq.location" state="org.dive4elements.river.artifacts.states.LocationSelect" helpText="help.state.minfo.sq.location">
             <data name="ld_locations" type="double"/>
         </state>
 
-        <state id="state.minfo.bed.location" description="state.minfo.bed.location" state="org.dive4elements.river.artifacts.states.DistanceOnlySelect" helpText="help.state.minfo.bed.location">
-            <data name="ld_from" type="Double" />
-            <data name="ld_to" type="Double" />
-        </state>
-
         <transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition">
             <from state="state.minfo.distance_only"/>
             <to state="state.minfo.dischargestate"/>
@@ -83,8 +84,9 @@
         </transition>
 
         <transition transition="org.dive4elements.river.artifacts.transitions.DefaultTransition">
-            <from state="state.minfo.bed.location"/>
+            <from state="state.minfo.distance"/>
             <to state="state.minfo.bed.periods"/>
+            <condition data="calculation_mode" value="calc.bed.quality" operator="equal"/>
         </transition>
 
         <state id="state.minfo.dischargestate" description="state.minfo.dischargestate" state="org.dive4elements.river.artifacts.states.DischargeState" helpText="help.state.minfo.dischargestate">
--- a/artifacts/src/main/resources/messages.properties	Mon Feb 16 17:09:14 2015 +0100
+++ b/artifacts/src/main/resources/messages.properties	Mon Feb 16 18:03:09 2015 +0100
@@ -44,6 +44,7 @@
 
 state.minfo.river = River
 state.minfo.calculation_mode = Calculation Mode
+state.minfo.distance = Range selection
 state.minfo.distance_only = Range selection
 state.minfo.dischargestate = Selection of discharge state and channel
 state.minfo.sq.location=Location
@@ -609,6 +610,7 @@
 help.state.minfo.river=${help.url}/OnlineHilfe/MINFO#help.state.minfo.river
 help.state.minfo.calculation_mode=${help.url}/OnlineHilfe/MINFO#help.state.minfo.calculation_mode
 help.state.minfo.distance_only=${help.url}/OnlineHilfe/MINFO#help.state.minfo.distance_only
+help.state.minfo.distance=${help.url}/OnlineHilfe/MINFO#help.state.minfo.distance
 help.state.minfo.bed.year_epoch=${help.url}/OnlineHilfe/MINFO#help.state.minfo.bed.year_epoch
 help.state.minfo.sq.location=${help.url}/OnlineHilfe/MINFO#help.state.minfo.sq.location
 help.state.minfo.bed.location=${help.url}/OnlineHilfe/MINFO#help.state.minfo.bed.location
--- a/artifacts/src/main/resources/messages_de.properties	Mon Feb 16 17:09:14 2015 +0100
+++ b/artifacts/src/main/resources/messages_de.properties	Mon Feb 16 18:03:09 2015 +0100
@@ -44,6 +44,7 @@
 
 state.minfo.river = Gew\u00e4sser
 state.minfo.calculation_mode = Berechnungsart
+state.minfo.distance = Wahl der Berechnungsstrecke
 state.minfo.distance_only = Wahl der Berechnungsstrecke
 state.minfo.dischargestate = Abflusszustand und Gerinne
 state.minfo.sq.location=Ort
@@ -613,6 +614,7 @@
 help.state.minfo.river=${help.url}/OnlineHilfe/MINFO#help.state.minfo.river
 help.state.minfo.calculation_mode=${help.url}/OnlineHilfe/MINFO#help.state.minfo.calculation_mode
 help.state.minfo.distance_only=${help.url}/OnlineHilfe/MINFO#help.state.minfo.distance_only
+help.state.minfo.distance=${help.url}/OnlineHilfe/MINFO#help.state.minfo.distance
 help.state.minfo.bed.year_epoch=${help.url}/OnlineHilfe/MINFO#help.state.minfo.bed.year_epoch
 help.state.minfo.sq.location=${help.url}/OnlineHilfe/MINFO#help.state.minfo.sq.location
 help.state.minfo.bed.location=${help.url}/OnlineHilfe/MINFO#help.state.minfo.bed.location
--- a/artifacts/src/main/resources/messages_de_DE.properties	Mon Feb 16 17:09:14 2015 +0100
+++ b/artifacts/src/main/resources/messages_de_DE.properties	Mon Feb 16 18:03:09 2015 +0100
@@ -44,6 +44,7 @@
 
 state.minfo.river = Gew\u00e4sser
 state.minfo.calculation_mode = Berechnungsart
+state.minfo.distance = Wahl der Berechnungsstrecke
 state.minfo.distance_only = Wahl der Berechnungsstrecke
 state.minfo.dischargestate = Abflusszustand und Gerinne
 state.minfo.sq.location=Ort
@@ -608,6 +609,7 @@
 help.state.minfo.river=${help.url}/OnlineHilfe/MINFO#help.state.minfo.river
 help.state.minfo.calculation_mode=${help.url}/OnlineHilfe/MINFO#help.state.minfo.calculation_mode
 help.state.minfo.distance_only=${help.url}/OnlineHilfe/MINFO#help.state.minfo.distance_only
+help.state.minfo.distance=${help.url}/OnlineHilfe/MINFO#help.state.minfo.distance
 help.state.minfo.bed.year_epoch=${help.url}/OnlineHilfe/MINFO#help.state.minfo.bed.year_epoch
 help.state.minfo.sq.location=${help.url}/OnlineHilfe/MINFO#help.state.minfo.sq.location
 help.state.minfo.bed.location=${help.url}/OnlineHilfe/MINFO#help.state.minfo.bed.location
--- a/artifacts/src/main/resources/messages_en.properties	Mon Feb 16 17:09:14 2015 +0100
+++ b/artifacts/src/main/resources/messages_en.properties	Mon Feb 16 18:03:09 2015 +0100
@@ -44,6 +44,7 @@
 
 state.minfo.river = River
 state.minfo.calculation_mode = Calculation Mode
+state.minfo.distance = Range selection
 state.minfo.distance_only = Range selection
 state.minfo.dischargestate = Selection of discharge state and channel
 state.minfo.sq.location=Location
@@ -612,6 +613,7 @@
 help.state.minfo.river=${help.url}/OnlineHilfe/MINFO#help.state.minfo.river
 help.state.minfo.calculation_mode=${help.url}/OnlineHilfe/MINFO#help.state.minfo.calculation_mode
 help.state.minfo.distance_only=${help.url}/OnlineHilfe/MINFO#help.state.minfo.distance_only
+help.state.minfo.distance=${help.url}/OnlineHilfe/MINFO#help.state.minfo.distance
 help.state.minfo.bed.year_epoch=${help.url}/OnlineHilfe/MINFO#help.state.minfo.bed.year_epoch
 help.state.minfo.sq.location=${help.url}/OnlineHilfe/MINFO#help.state.minfo.sq.location
 help.state.minfo.bed.location=${help.url}/OnlineHilfe/MINFO#help.state.minfo.bed.location
http://dive4elements.wald.intevation.org