diff flys-artifacts/src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java @ 2605:15a3684c6bce

#366 Display correct descriptions in legend panel of charts. flys-artifacts/trunk@4183 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author Ingo Weinzierl <ingo.weinzierl@intevation.de>
date Thu, 29 Mar 2012 11:09:26 +0000
parents e123c5643f23
children 5652a851f1b4
line wrap: on
line diff
--- a/flys-artifacts/src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java	Wed Mar 28 12:18:44 2012 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java	Thu Mar 29 11:09:26 2012 +0000
@@ -109,10 +109,10 @@
         Facet facet = artifactFacet.getFacet();
 
         if (name.equals(COMPUTED_DISCHARGE_Q)) {
-            doQOut((WQKms) artifactFacet.getData(context), facet, attr, visible);
+            doQOut((WQKms) artifactFacet.getData(context), artifactFacet, attr, visible);
         }
         else if (name.equals(STATIC_WQ)) {
-            doWQOut(artifactFacet.getData(context), facet, attr, visible);
+            doWQOut(artifactFacet.getData(context), artifactFacet, attr, visible);
         }
         else if (name.equals(STATIC_WQ_ANNOTATIONS)) {
             doWQAnnotations(
@@ -153,14 +153,14 @@
      * @param wqkms data as double[][]
      */
     protected void doWQOut(
-        Object   wqkms,
-        Facet    facet,
-        Document theme,
-        boolean  visible
+        Object           wqkms,
+        ArtifactAndFacet aaf,
+        Document         theme,
+        boolean          visible
     ) {
         double [][] data = (double [][]) wqkms;
 
-        XYSeries series = new StyledXYSeries(facet.getDescription(), theme);
+        XYSeries series = new StyledXYSeries(aaf.getFacetDescription(), theme);
         StyledSeriesBuilder.addPoints(series, data);
 
         addAxisSeries(series, YAXIS.W.idx, visible);
@@ -173,12 +173,12 @@
      * @param theme theme to use.
      */
     protected void doQOut(
-        WQKms    wqkms,
-        Facet    facet,
-        Document theme,
-        boolean  visible
+        WQKms            wqkms,
+        ArtifactAndFacet aaf,
+        Document         theme,
+        boolean          visible
     ) {
-        XYSeries series = new StyledXYSeries(facet.getDescription(), theme);
+        XYSeries series = new StyledXYSeries(aaf.getFacetDescription(), theme);
         StyledSeriesBuilder.addPointsQW(series, wqkms);
 
         addAxisSeries(series, YAXIS.W.idx, visible);

http://dive4elements.wald.intevation.org