Mercurial > dive4elements > river

changeset 3058:df4d6b286af8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Added states and transitions for S-Q-relation. Added filter for locations/annotations. flys-artifacts/trunk@4635 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author Raimund Renkert <raimund.renkert@intevation.de>
date Mon, 11 Jun 2012 12:19:46 +0000
parents febc39e77672
children 4f7171ac6153
files flys-artifacts/ChangeLog flys-artifacts/doc/conf/artifacts/minfo.xml flys-artifacts/src/main/java/de/intevation/flys/artifacts/services/DistanceInfoService.java flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/OutliersInput.java flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/PeriodsSelect.java flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/SQRelation.java 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 10 files changed, 160 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/flys-artifacts/ChangeLog	Mon Jun 11 09:58:54 2012 +0000
+++ b/flys-artifacts/ChangeLog	Mon Jun 11 12:19:46 2012 +0000
@@ -1,3 +1,23 @@
+2012-06-11  Raimund Renkert <raimund.renkert@intevation.de>
+
+	* doc/conf/artifacts/minfo.xml:
+	  Added states and transitions for S-Q-relation.
+
+	* src/main/java/de/intevation/flys/artifacts/states/PeriodsSelect.java,
+	  src/main/java/de/intevation/flys/artifacts/states/OutliersInput.java,
+	  src/main/java/de/intevation/flys/artifacts/states/SQRelation.java:
+	  New. States for multiple periods input, outliers input and final
+	  S-Q-relation.
+
+	* src/main/java/de/intevation/flys/artifacts/services/DistanceInfoService.java:
+	  Added name filter for locations.
+
+	* src/main/resources/messages.properties,
+	  src/main/resources/messages_de_DE.properties,
+	  src/main/resources/messages_en.properties,
+	  src/main/resources/messages_de.properties:
+	  Added i18n strings for states.
+
 2012-06-11	Sascha L. Teichmann	<sascha.teihmann@intevation.de>
 
 	* src/main/java/de/intevation/flys/exports/fixings/FixWQCurveGenerator.java:
--- a/flys-artifacts/doc/conf/artifacts/minfo.xml	Mon Jun 11 09:58:54 2012 +0000
+++ b/flys-artifacts/doc/conf/artifacts/minfo.xml	Mon Jun 11 12:19:46 2012 +0000
@@ -27,11 +27,21 @@
             <condition data="calculation_mode" value="calc.bed.middle" operator="equal"/>
         </transition>
 
+        <transition transition="de.intevation.flys.artifacts.transitions.ValueCompareTransition">
+            <from state="state.minfo.calculation_mode"/>
+            <to state="state.minfo.sq.location"/>
+            <condition data="calculation_mode" value="calc.sq.relation" operator="equal"/>
+        </transition>
+
         <state id="state.minfo.distance_only" description="state.minfo.distance_only" state="de.intevation.flys.artifacts.states.DistanceOnlySelect" helpText="help.minfo.distance">
             <data name="ld_from" type="Double" />
             <data name="ld_to"   type="Double" />
         </state>
 
+        <state id="state.minfo.sq.location" description="state.minfo.sq.location" state="de.intevation.flys.artifacts.states.LocationSelect" helpText="help.minfo.sq.loaction">
+            <data name="ld_locations" type="double"/>
+        </state>
+
         <transition transition="de.intevation.flys.artifacts.transitions.ValueCompareTransition">
             <from state="state.minfo.distance_only"/>
             <to state="state.minfo.dischargestate"/>
@@ -44,6 +54,11 @@
             <condition data="calculation_mode" value="calc.bed.middle" operator="equal"/>
         </transition>
 
+        <transition transition="de.intevation.flys.artifacts.transitions.DefaultTransition">
+            <from state="state.minfo.sq.location"/>
+            <to state="state.minfo.sq.periods"/>
+        </transition>
+
         <state id="state.minfo.dischargestate" description="state.minfo.dischargestate" state="de.intevation.flys.artifacts.states.DischargeState" helpText="help.minfo.dischargestate">
             <data name="total.channel" type="intoptions"/>
             <data name="main.channel"  type="intoptions"/>
@@ -53,6 +68,10 @@
             <data name="soundings" type="options"/>
         </state>
 
+        <state id="state.minfo.sq.periods" description="state.minfo.sq.periods" state="de.intevation.flys.artifacts.states.PeriodsSelect">
+            <data name="periods" type="Long[]"/>
+        </state>
+
         <transition transition="de.intevation.flys.artifacts.transitions.DefaultTransition">
             <from state="state.minfo.dischargestate"/>
             <to state="state.minfo.flow_velocity"/>
@@ -63,6 +82,11 @@
             <to state="state.minfo.bedheight_middle"/>
         </transition>
 
+        <transition transition="de.intevation.flys.artifacts.transitions.DefaultTransition">
+            <from state="state.minfo.sq.periods"/>
+            <to state="state.minfo.sq.outliers"/>
+        </transition>
+
         <state id="state.minfo.flow_velocity" description="state.minfo.flow_velocity" state="de.intevation.flys.artifacts.states.FlowVelocityState" helpText="help.minfo.flowvelocity">
             <outputmodes>
                 <outputmode name="flow_velocity" description="output.flow_velocity" mime-type="image/png" type="chart">
@@ -102,6 +126,24 @@
             </outputmodes>
         </state>
 
+        <state id="state.minfo.sq.outliers" description="state.minfo.sq.outliers" state="de.intevation.flys.artifacts.states.OutliersInput" helpText="help.minfo.sq.outliers">
+            <data name="outliers" type="Double"/>
+        </state>
+
+        <transition transition="de.intevation.flys.artifacts.transitions.DefaultTransition">
+            <from state="state.minfo.sq.outliers"/>
+            <to state="state.minfo.sq.relation"/>
+        </transition>
+
+        <state id="state.minfo.sq.relation" description="state.minfo.sq.relation" state="de.intevation.flys.artifacts.states.SQRelation">
+            <outputmodes>
+                <outputmode name="sq_relation" description="output.sq_relation">
+                    <facets>
+                       <facet/>
+                    </facets>
+                </outputmode>
+            </outputmodes>
+        </state>
     </states>
 
 </artifact>
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/services/DistanceInfoService.java	Mon Jun 11 09:58:54 2012 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/services/DistanceInfoService.java	Mon Jun 11 12:19:46 2012 +0000
@@ -89,6 +89,8 @@
         if (name != null) {
             if ("locations".equals(name)) return FastAnnotations.IS_POINT;
             if ("distances".equals(name)) return FastAnnotations.IS_RANGE;
+            if ("measuringpoint".equals(name))
+                return new FastAnnotations.NameFilter("Geschiebemessstelle");
         }
 
         return FastAnnotations.ALL;
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/OutliersInput.java	Mon Jun 11 12:19:46 2012 +0000
@@ -0,0 +1,28 @@
+package de.intevation.flys.artifacts.states;
+
+import org.apache.log4j.Logger;
+
+import de.intevation.flys.artifacts.states.DefaultState;
+
+/**
+ * @author <a href="mailto:raimund.renkert@intevation.de">Raimund Renkert</a>
+ */
+public class OutliersInput extends DefaultState {
+
+    /** The logger used in this class. */
+    private static Logger logger = Logger.getLogger(OutliersInput.class);
+
+
+    /**
+     * The default constructor that initializes an empty State object.
+     */
+    public OutliersInput() {
+    }
+
+    @Override
+    protected String getUIProvider() {
+        return "outliers_input";
+    }
+
+}
+// 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/PeriodsSelect.java	Mon Jun 11 12:19:46 2012 +0000
@@ -0,0 +1,28 @@
+package de.intevation.flys.artifacts.states;
+
+import org.apache.log4j.Logger;
+
+import de.intevation.flys.artifacts.states.DefaultState;
+
+/**
+ * @author <a href="mailto:raimund.renkert@intevation.de">Raimund Renkert</a>
+ */
+public class PeriodsSelect extends DefaultState {
+
+    /** The logger used in this class. */
+    private static Logger logger = Logger.getLogger(PeriodsSelect.class);
+
+
+    /**
+     * The default constructor that initializes an empty State object.
+     */
+    public PeriodsSelect() {
+    }
+
+    @Override
+    protected String getUIProvider() {
+        return "periods_select";
+    }
+
+}
+// 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/SQRelation.java	Mon Jun 11 12:19:46 2012 +0000
@@ -0,0 +1,28 @@
+package de.intevation.flys.artifacts.states;
+
+import org.apache.log4j.Logger;
+
+import de.intevation.flys.artifacts.states.DefaultState;
+
+/**
+ * @author <a href="mailto:raimund.renkert@intevation.de">Raimund Renkert</a>
+ */
+public class SQRelation extends DefaultState {
+
+    /** The logger used in this class. */
+    private static Logger logger = Logger.getLogger(SQRelation.class);
+
+
+    /**
+     * The default constructor that initializes an empty State object.
+     */
+    public SQRelation() {
+    }
+
+    @Override
+    protected String getUIProvider() {
+        return "minfo.sq.relation";
+    }
+
+}
+// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf-8 :
--- a/flys-artifacts/src/main/resources/messages.properties	Mon Jun 11 09:58:54 2012 +0000
+++ b/flys-artifacts/src/main/resources/messages.properties	Mon Jun 11 12:19:46 2012 +0000
@@ -34,6 +34,9 @@
 state.minfo.calculation_mode = Calculation Mode
 state.minfo.distance_only = Range selection
 state.minfo.dischargestate = Selection of discharge state and channel
+state.minfo.sq.location=Location
+state.minfo.sq.periods=Periods
+state.minfo.sq.outliers=Outliers
 
 historical.mode.w = Waterlevel Analyse
 historical.mode.q = Discharge Analyse
--- a/flys-artifacts/src/main/resources/messages_de.properties	Mon Jun 11 09:58:54 2012 +0000
+++ b/flys-artifacts/src/main/resources/messages_de.properties	Mon Jun 11 12:19:46 2012 +0000
@@ -34,6 +34,9 @@
 state.minfo.calculation_mode = Berechnungsart
 state.minfo.distance_only = Wahl der Berechnungsstrecke
 state.minfo.dischargestate = Abflusszustand und Gerinne
+state.minfo.sq.location=Ort
+state.minfo.sq.periods=Zeitraum
+state.minfo.sq.outliers=Ausrei\u00dfer
 
 historical.mode.w = Wasserstandsanalyse
 historical.mode.q = Abflussanalyse
--- a/flys-artifacts/src/main/resources/messages_de_DE.properties	Mon Jun 11 09:58:54 2012 +0000
+++ b/flys-artifacts/src/main/resources/messages_de_DE.properties	Mon Jun 11 12:19:46 2012 +0000
@@ -34,6 +34,9 @@
 state.minfo.calculation_mode = Berechnungsart
 state.minfo.distance_only = Wahl der Berechnungsstrecke
 state.minfo.dischargestate = Abflusszustand und Gerinne
+state.minfo.sq.location=Ort
+state.minfo.sq.periods=Zeitraum
+state.minfo.sq.outliers=Ausrei\u00dfer
 
 historical.mode.w = Wasserstandsanalyse
 historical.mode.q = Abflussanalyse
--- a/flys-artifacts/src/main/resources/messages_en.properties	Mon Jun 11 09:58:54 2012 +0000
+++ b/flys-artifacts/src/main/resources/messages_en.properties	Mon Jun 11 12:19:46 2012 +0000
@@ -34,6 +34,9 @@
 state.minfo.calculation_mode = Calculation Mode
 state.minfo.distance_only = Range selection
 state.minfo.dischargestate = Selection of discharge state and channel
+state.minfo.sq.location=Location
+state.minfo.sq.periods=Periods
+state.minfo.sq.outliers=Outliers
 
 historical.mode.w = Waterlevel Analyse
 historical.mode.q = Discharge Analyse
http://dive4elements.wald.intevation.org