changeset 2769:de60d1dfdcdf

Let Generators handle slightly more types. flys-artifacts/trunk@4508 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author Felix Wolfsteller <felix.wolfsteller@intevation.de>
date Thu, 24 May 2012 13:57:00 +0000
parents 1ddfb54e5db6
children 9ab82fe0f27b
files flys-artifacts/ChangeLog flys-artifacts/src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java flys-artifacts/src/main/java/de/intevation/flys/exports/ReferenceCurveGenerator.java
diffstat 3 files changed, 24 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/flys-artifacts/ChangeLog	Thu May 24 13:54:37 2012 +0000
+++ b/flys-artifacts/ChangeLog	Thu May 24 13:57:00 2012 +0000
@@ -1,3 +1,11 @@
+2012-05-24	Felix Wolfsteller	<felix.wolfsteller@intevation.de>
+
+	* src/main/java/de/intevation/flys/exports/ReferenceCurveGenerator.java:
+	  Render mainvalues as annotations.
+
+	* src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java:
+	  Render static wkms data.
+
 2012-05-24	Felix Wolfsteller	<felix.wolfsteller@intevation.de>
 
 	* src/main/java/de/intevation/flys/exports/XYChartGenerator.java:
--- a/flys-artifacts/src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java	Thu May 24 13:54:37 2012 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java	Thu May 24 13:57:00 2012 +0000
@@ -142,6 +142,13 @@
                 attr,
                 visible);
         }
+        else if (name.equals(STATIC_WKMS)) {
+            doWAnnotations(
+                artifactFacet.getData(context),
+                artifactFacet,
+                attr,
+                visible);
+        }
         else if (FacetTypes.IS.MANUALPOINTS(name)) {
             doPoints(artifactFacet.getData(context),
                 artifactFacet,
--- a/flys-artifacts/src/main/java/de/intevation/flys/exports/ReferenceCurveGenerator.java	Thu May 24 13:54:37 2012 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/exports/ReferenceCurveGenerator.java	Thu May 24 13:57:00 2012 +0000
@@ -25,6 +25,7 @@
 import de.intevation.flys.artifacts.model.WWAxisTypes;
 
 import de.intevation.flys.jfree.StyledXYSeries;
+import de.intevation.flys.jfree.FLYSAnnotation;
 
 import de.intevation.flys.utils.Formatter;
 
@@ -176,6 +177,14 @@
                 theme,
                 visible);
         }
+        else if (name.equals(MAINVALUES_W)) {
+            doAnnotations(
+                ((FLYSAnnotation) artifactFacet.getData(context)).flipStickyAxis(),
+                artifactFacet,
+                theme,
+                visible);
+        
+        }
         else {
             logger.warn("Unknown facet name: " + name);
         }

http://dive4elements.wald.intevation.org