--- a/flys-artifacts/src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java	Thu Feb 09 15:48:13 2012 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java	Thu Feb 09 15:59:49 2012 +0000
@@ -115,7 +115,11 @@
             doWQOut(artifactFacet.getData(context), facet, attr, visible);
         }
         else if (name.equals(STATIC_WQ_ANNOTATIONS)) {
-            doWQAnnotations(artifactFacet.getData(context), facet, attr, visible);
+            doWQAnnotations(
+                artifactFacet.getData(context),
+                artifactFacet,
+                attr,
+                visible);
         }
         else if (name.equals(COMPUTED_DISCHARGE_MAINVALUES_Q)
                 || name.equals(MAINVALUES_Q)
@@ -123,14 +127,18 @@
                 || name.equals(MAINVALUES_W)
         ) {
             doAnnotations((FLYSAnnotation)
-                artifactFacet.getData(context), facet, attr, visible);
+                artifactFacet.getData(context), artifactFacet, attr, visible);
         }
         else if (name.equals(STATIC_WKMS_INTERPOL)) {
-            doWAnnotations(artifactFacet.getData(context), facet, attr, visible);
+            doWAnnotations(
+                artifactFacet.getData(context),
+                artifactFacet,
+                attr,
+                visible);
         }
         else if (FacetTypes.IS.MANUALPOINTS(name)) {
             doPoints(artifactFacet.getData(context),
-                artifactFacet.getFacetDescription(),
+                artifactFacet,
                 attr, visible, YAXIS.W.idx);
         }
         else {
@@ -183,21 +191,21 @@
      */
     protected void doWQAnnotations(
         Object   wqkms,
-        Facet    facet,
+        ArtifactAndFacet aandf,
         Document theme,
         boolean  visible
     ) {
         List<StickyAxisAnnotation> xy = new ArrayList<StickyAxisAnnotation>();
         double [][] data = (double [][]) wqkms;
         for (int i = 0; i< data[0].length; i++) {
-            xy.add(new StickyAxisAnnotation(facet.getDescription(),
+            xy.add(new StickyAxisAnnotation(aandf.getFacetDescription(),
                 (float) data[0][i], StickyAxisAnnotation.SimpleAxis.X_AXIS));
-            xy.add(new StickyAxisAnnotation(facet.getDescription(),
+            xy.add(new StickyAxisAnnotation(aandf.getFacetDescription(),
                 (float) data[1][i], StickyAxisAnnotation.SimpleAxis.Y_AXIS));
         }
 
-        doAnnotations(new FLYSAnnotation(facet.getDescription(), xy),
-            facet, theme, visible);
+        doAnnotations(new FLYSAnnotation(aandf.getFacetDescription(), xy),
+            aandf, theme, visible);
     }
 
 
@@ -208,19 +216,21 @@
      */
     protected void doWAnnotations(
         Object   wqkms,
-        Facet    facet,
+        ArtifactAndFacet aandf,
         Document theme,
         boolean  visible
     ) {
+        Facet facet = aandf.getFacet();
+
         List<StickyAxisAnnotation> xy = new ArrayList<StickyAxisAnnotation>();
         double [][] data = (double [][]) wqkms;
         for (int i = 0; i< data[0].length; i++) {
-            xy.add(new StickyAxisAnnotation(facet.getDescription(),
+            xy.add(new StickyAxisAnnotation(aandf.getFacetDescription(),
                 (float) data[1][i], StickyAxisAnnotation.SimpleAxis.Y_AXIS));
         }
 
         doAnnotations(new FLYSAnnotation(facet.getDescription(), xy),
-            facet, theme, visible);
+            aandf, theme, visible);
     }
 }
 // vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 :