Mercurial > dive4elements > river

changeset 4055:bbce9e1ef807

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Dummy state model for extreme value analysis.
author Felix Wolfsteller <felix.wolfsteller@intevation.de>
date Mon, 08 Oct 2012 10:32:03 +0200
parents 102050c4fc00
children ae85775dafbb
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_de_DE.properties flys-artifacts/src/main/resources/messages_en.properties
diffstat 6 files changed, 62 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/flys-artifacts/ChangeLog	Mon Oct 08 10:03:51 2012 +0200
+++ b/flys-artifacts/ChangeLog	Mon Oct 08 10:32:03 2012 +0200
@@ -1,3 +1,14 @@
+2012-10-08	Felix Wolfsteller	<felix.wolfsteller@intevation.de>
+
+	* flys-artifacts/doc/conf/artifacts/winfo.xm: Introduce dummyish states for
+	  extreme value analysis.
+
+	* src/main/resources/messages.properties,
+	  src/main/resources/messages_de.properties,
+	  src/main/resources/messages_de_DE.properties,
+	  src/main/resources/messages_en.properties:
+	  i18n.
+
 2012-10-08	Felix Wolfsteller	<felix.wolfsteller@intevation.de>
 
 	* flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/WDifferencesState.java,
--- a/flys-artifacts/doc/conf/artifacts/winfo.xml	Mon Oct 08 10:03:51 2012 +0200
+++ b/flys-artifacts/doc/conf/artifacts/winfo.xml	Mon Oct 08 10:32:03 2012 +0200
@@ -57,6 +57,12 @@
             <condition data="calculation_mode" value="calc.historical.discharge.curve" operator="equal"/>
         </transition>
 
+        <transition transition="de.intevation.flys.artifacts.transitions.ValueCompareTransition">
+            <from state="state.winfo.calculation_mode"/>
+            <to state="state.winfo.location_distance"/>
+            <condition data="calculation_mode" value="calc.extreme.curve" operator="equal"/>
+        </transition>
+
         <transition transition="de.intevation.flys.artifacts.transitions.DefaultTransition">
             <from state="state.winfo.waterlevel_pair_select"/>
             <to state="state.winfo.w_differences"/>
@@ -140,9 +146,16 @@
             <to state="state.winfo.wq_adapted"/>
         </transition>
 
-        <transition transition="de.intevation.flys.artifacts.transitions.DefaultTransition">
+        <transition transition="de.intevation.flys.artifacts.transitions.ValueCompareTransition">
+            <from state="state.winfo.location_distance"/>
+            <to state="state.winfo.function_select"/>
+            <condition data="calculation_mode" value="calc.extreme.curve" operator="equal"/>
+        </transition>
+
+        <transition transition="de.intevation.flys.artifacts.transitions.ValueCompareTransition">
             <from state="state.winfo.location_distance"/>
             <to state="state.winfo.wq"/>
+            <condition data="calculation_mode" value="calc.extreme.curve" operator="notequal"/>
         </transition>
 
         <transition transition="de.intevation.flys.artifacts.transitions.ValueCompareTransition">
@@ -157,6 +170,12 @@
             <condition data="calculation_mode" value="calc.discharge.curve" operator="equal"/>
         </transition>
 
+        <transition transition="de.intevation.flys.artifacts.transitions.ValueCompareTransition">
+            <from state="state.winfo.function_select"/>
+            <to state="state.winfo.extreme.curve"/>
+            <condition data="calculation_mode" value="calc.extreme.curve" operator="equal"/>
+        </transition>
+
         <state id="state.winfo.wq" description="state.winfo.wq" state="de.intevation.flys.artifacts.states.WQSelect" helpText="help.winfo.wsp.wq">
             <data name="wq_isq" type="Boolean" />
             <data name="wq_isfree" type="Boolean" />
@@ -557,5 +576,32 @@
             </outputmodes>
         </state>
 
+        <state id="state.winfo.function_select"
+            description="state.winfo.function_select"
+            state="de.intevation.flys.artifacts.states.fixation.FunctionSelect">
+            <data name="function" type="String"/>
+        </state>
+
+        <state id="state.winfo.extreme.curve" description="state.winfo.extreme.curve" state="de.intevation.flys.artifacts.states.extreme.ExtremeCompute" helpText="https://flys-intern.intevation.de/Flys-3.0">
+            <outputmodes>
+                <outputmode name="longitudinal_section" description="output.longitudinal_section" mime-type="image/png" type="chart">
+                  <facets>
+                    <facet name="longitudinal_section.w" description="facet.longitudinal_section.w"/>
+                    <facet name="longitudinal_section.q" description="facet.longitudinal_section.q"/>
+                    <facet name="w_differences"          description="facet.w_differences"/>
+                    <facet name="other.wqkms.w"          description="W-Type of data" />
+                    <facet name="other.wq"               description="WQ-Type of data" />
+                    <facet name="other.wqkms.q"          description="Q-Type of data" />
+                    <facet name="other.wkms"             description="facet.other.wkms"/>
+                    <facet name="longitudinal_section.manualpoints" description="Manuelle Punkte"/>
+                    <facet name="other.wqkms"            description="facet.other.wqkms"/>
+                    <facet name="heightmarks_points"     description="facet.other.wkms.heightmarks_points"/>
+                    <facet name="longitudinal_section.area"        description="an area"/>
+                    <facet name="longitudinal_section.annotations" description="facet.longitudinal_section.annotations"/>
+                  </facets>
+                </outputmode>
+            </outputmodes>
+        </state>
+
     </states>
 </artifact>
--- a/flys-artifacts/src/main/resources/messages.properties	Mon Oct 08 10:03:51 2012 +0200
+++ b/flys-artifacts/src/main/resources/messages.properties	Mon Oct 08 10:32:03 2012 +0200
@@ -21,6 +21,7 @@
 state.winfo.historicalq.mode = Selecion of analyses
 state.winfo.reference.curve.input.start = Chosen Reference
 state.winfo.reference.curve.input.end = Chosen Evaluation
+state.winfo.function_select = Chosen Function
 state.fix.river = River
 state.fix.calculation.mode = Calculation Mode
 state.fix.location = Distance
--- a/flys-artifacts/src/main/resources/messages_de.properties	Mon Oct 08 10:03:51 2012 +0200
+++ b/flys-artifacts/src/main/resources/messages_de.properties	Mon Oct 08 10:32:03 2012 +0200
@@ -21,6 +21,7 @@
 state.winfo.historicalq.mode = Wahl der Analyseart
 state.winfo.reference.curve.input.start = Bezugsort
 state.winfo.reference.curve.input.end = Zielort(e)
+state.winfo.function_select = Funktion
 state.fix.river = Gew\u00e4sser
 state.fix.calculation.mode = Berechnungsart
 state.fix.location = Strecke
--- a/flys-artifacts/src/main/resources/messages_de_DE.properties	Mon Oct 08 10:03:51 2012 +0200
+++ b/flys-artifacts/src/main/resources/messages_de_DE.properties	Mon Oct 08 10:32:03 2012 +0200
@@ -21,6 +21,7 @@
 state.winfo.historicalq.mode = Wahl der Analyseart
 state.winfo.reference.curve.input.start = Bezugsort
 state.winfo.reference.curve.input.end = Zielort(e)
+state.winfo.function_select = Funktion
 state.fix.river = Gew\u00e4sser
 state.fix.calculation.mode = Berechnungsart
 state.fix.location = Strecke
--- a/flys-artifacts/src/main/resources/messages_en.properties	Mon Oct 08 10:03:51 2012 +0200
+++ b/flys-artifacts/src/main/resources/messages_en.properties	Mon Oct 08 10:32:03 2012 +0200
@@ -21,6 +21,7 @@
 state.winfo.historicalq.mode = Selecion of analyses
 state.winfo.reference.curve.input.start = Chosen Reference
 state.winfo.reference.curve.input.end = Chosen Evaluation
+state.winfo.function_select = Chosen Function
 state.fix.river = River
 state.fix.calculation.mode = Calculation Mode
 state.fix.location = Distance
http://dive4elements.wald.intevation.org