# HG changeset patch
# User Sascha L. Teichmann <sascha.teichmann@intevation.de>
# Date 1328543851 0
# Node ID 08bb95e1fc41e3ee2f18d5fe8a51a586a87d5d11
# Parent  3f3e4f94171b1ce4726b0123deada1328bc08895
"Bezugslinienverfahren": Fetch axis types from call context.

flys-artifacts/trunk@3937 c6561f87-3c4e-4783-a992-168aeb5c3f6f

diff -r 3f3e4f94171b -r 08bb95e1fc41 flys-artifacts/ChangeLog
--- a/flys-artifacts/ChangeLog	Mon Feb 06 15:42:27 2012 +0000
+++ b/flys-artifacts/ChangeLog	Mon Feb 06 15:57:31 2012 +0000
@@ -1,3 +1,13 @@
+2012-02-06	Sascha L. Teichmann	<sascha.teichmann@intevation.de>
+
+	* src/main/java/de/intevation/flys/artifacts/model/WWAxisTypes.java:
+	  Added optional boolean flag to indicated if the data should be 'normalized'.
+	  TODO: Build the cascading normalising function call chain.
+
+	* src/main/java/de/intevation/flys/exports/NormalizedReferenceCurveGenerator.java,
+	  src/main/java/de/intevation/flys/exports/ReferenceCurveGenerator.java:
+	  Fetch WWAxisTypes from call context to do the right scaling.
+
 2012-02-06  Raimund Renkert <raimund.renkert@intevation.de>
 
 	Added service for discharge infos at a specific gauge.
diff -r 3f3e4f94171b -r 08bb95e1fc41 flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/WWAxisTypes.java
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/WWAxisTypes.java	Mon Feb 06 15:42:27 2012 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/WWAxisTypes.java	Mon Feb 06 15:57:31 2012 +0000
@@ -40,6 +40,12 @@
     }
 
     public WW.ApplyFunctionIterator transform(WW ww) {
+        return transform(ww, false);
+    }
+
+    public WW.ApplyFunctionIterator transform(WW ww, boolean normalized) {
+        // TODO: Do normalising.
+
         Function function1 = inCm1
             ? new LinearFilterFunction(100d, -ww.getStartDatum())
             : Identity.IDENTITY;
diff -r 3f3e4f94171b -r 08bb95e1fc41 flys-artifacts/src/main/java/de/intevation/flys/exports/NormalizedReferenceCurveGenerator.java
--- a/flys-artifacts/src/main/java/de/intevation/flys/exports/NormalizedReferenceCurveGenerator.java	Mon Feb 06 15:42:27 2012 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/exports/NormalizedReferenceCurveGenerator.java	Mon Feb 06 15:57:31 2012 +0000
@@ -200,10 +200,13 @@
     ) {
         WW ww = (WW)data;
 
-        // TODO: Fetch from black board instead!
-        WWAxisTypes wwat = new WWAxisTypes(ww);
+        Object obj = context.getContextValue("reference.curve.axis.scale");
 
-        ApplyFunctionIterator iter = wwat.transform(ww);
+        WWAxisTypes wwat = obj instanceof WWAxisTypes
+            ? (WWAxisTypes)obj
+            : new WWAxisTypes(ww);
+
+        ApplyFunctionIterator iter = wwat.transform(ww, true);
 
         XYSeries series = new StyledXYSeries(
             ww.getName(), false, theme);
diff -r 3f3e4f94171b -r 08bb95e1fc41 flys-artifacts/src/main/java/de/intevation/flys/exports/ReferenceCurveGenerator.java
--- a/flys-artifacts/src/main/java/de/intevation/flys/exports/ReferenceCurveGenerator.java	Mon Feb 06 15:42:27 2012 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/exports/ReferenceCurveGenerator.java	Mon Feb 06 15:57:31 2012 +0000
@@ -200,8 +200,11 @@
     ) {
         WW ww = (WW)data;
 
-        // TODO: Fetch from black board instead!
-        WWAxisTypes wwat = new WWAxisTypes(ww);
+        Object obj = context.getContextValue("reference.curve.axis.scale");
+
+        WWAxisTypes wwat = obj instanceof WWAxisTypes
+            ? (WWAxisTypes)obj
+            : new WWAxisTypes(ww);
 
         ApplyFunctionIterator iter = wwat.transform(ww);