--- a/flys-artifacts/src/main/java/de/intevation/flys/exports/fixings/FixWQCurveGenerator.java	Thu Aug 16 09:41:53 2012 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/exports/fixings/FixWQCurveGenerator.java	Thu Aug 16 09:49:21 2012 +0000
@@ -132,7 +132,7 @@
                     doc,
                     visible);
         }
-        else if(STATIC_WQ.equals(name)) {
+        if (LONGITUDINAL_W.equals(name) || STATIC_WQ.equals(name)) {
             doWQOut(aaf.getData(context), aaf, doc, visible);
         }
         else if (name.equals(DISCHARGE_CURVE)) {
@@ -274,7 +274,8 @@
         }
     }
 
-   /**
+
+    /**
      * Add W-Annotations to plot.
      * @param wqkms actual data (double[][]).
      * @param theme theme to use.
@@ -303,7 +304,8 @@
             // Assume its WKms.
             logger.debug("Got WKms");
             WKms data = (WKms) wqkms;
-            Double ckm = (Double) context.getContextValue("currentKm");
+
+            Double ckm = (Double) context.getContextValue(CURRENT_KM);
             double location = (ckm != null)
                               ? ckm.doubleValue()
                               : getRange()[0];
@@ -353,6 +355,7 @@
         addAxisSeries(series, YAXIS.W.idx, visible);
     }
 
+
     /**
      * Add WQ Data to plot.
      * @param wqkms data as double[][]
@@ -364,14 +367,27 @@
         boolean          visible
     ) {
         logger.debug("FixWQCurveGenerator: doWQOut");
-        double [][] data = (double [][]) wqkms;
+        if (wqkms instanceof WQKms) {
+            WQKms data = (WQKms) wqkms;
 
-        XYSeries series = new StyledXYSeries(aaf.getFacetDescription(), theme);
-        StyledSeriesBuilder.addPoints(series, data, true);
+            XYSeries series = new StyledXYSeries(aaf.getFacetDescription(), theme);
+            Double ckm = (Double) context.getContextValue(CURRENT_KM);
 
-        addAxisSeries(series, YAXIS.W.idx, visible);
+            StyledSeriesBuilder.addPointsQW(series, data);
+
+            addAxisSeries(series, YAXIS.W.idx, visible);
+        }
+        else {
+            double [][] data = (double [][]) wqkms;
+
+            XYSeries series = new StyledXYSeries(aaf.getFacetDescription(), theme);
+            StyledSeriesBuilder.addPoints(series, data, true);
+
+            addAxisSeries(series, YAXIS.W.idx, visible);
+        }
     }
 
+
     protected void addQWSeries(QW[] qws, ArtifactAndFacet aaf, Document theme, boolean visible) {
          if(qws != null) {
             XYSeries series = new StyledXYSeries(aaf.getFacetDescription(), theme);