changeset 2255:eab357067e06

W/Q input values in historical discharge curves may now by from type double. flys-artifacts/trunk@3906 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author Ingo Weinzierl <ingo.weinzierl@intevation.de>
date Fri, 03 Feb 2012 15:22:56 +0000 (2012-02-03)
parents ee7e774ed5b4
children dd93a8e1377a
files flys-artifacts/ChangeLog flys-artifacts/doc/conf/artifacts/winfo.xml flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/HistoricalDischargeState.java
diffstat 3 files changed, 10 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/flys-artifacts/ChangeLog	Fri Feb 03 14:57:10 2012 +0000
+++ b/flys-artifacts/ChangeLog	Fri Feb 03 15:22:56 2012 +0000
@@ -1,3 +1,11 @@
+2012-02-03  Ingo Weinzierl <ingo@intevation.de>
+
+	* doc/conf/artifacts/winfo.xml: Adapted the data type of W/Q input values
+	  for historical discharge curve calculation (intarray -> doublearray).
+
+	* src/main/java/de/intevation/flys/artifacts/states/HistoricalDischargeState.java:
+	  Adapted the data type of W/Q input values.
+
 2012-02-03	Sascha L. Teichmann	<sascha.teichmann@intevation.de>
 
 	* src/main/java/de/intevation/flys/artifacts/states/EnterLocationState.java:
--- a/flys-artifacts/doc/conf/artifacts/winfo.xml	Fri Feb 03 14:57:10 2012 +0000
+++ b/flys-artifacts/doc/conf/artifacts/winfo.xml	Fri Feb 03 15:22:56 2012 +0000
@@ -478,7 +478,7 @@
 
         <state id="state.winfo.historicalq.mode" description="state.winfo.historicalq.mode" state="de.intevation.flys.artifacts.states.HistoricalDischargeState">
             <data name="historical_mode" type="intoptions" />
-            <data name="historical_values" type="intarray" />
+            <data name="historical_values" type="doublearray" />
         </state>
 
         <transition transition="de.intevation.flys.artifacts.transitions.DefaultTransition">
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/HistoricalDischargeState.java	Fri Feb 03 14:57:10 2012 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/HistoricalDischargeState.java	Fri Feb 03 15:22:56 2012 +0000
@@ -48,7 +48,7 @@
             select.setAttributeNS(
                 ArtifactNamespaceContext.NAMESPACE_URI,
                 "art:type",
-                "intarray");
+                "doublearray");
         }
         else if (name != null && name.equals(DATA_MODE)) {
             select.setAttributeNS(

http://dive4elements.wald.intevation.org