--- a/flys-artifacts/src/main/java/de/intevation/flys/exports/fixings/FixDerivedCurveGenerator.java	Fri Jun 29 13:42:06 2012 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/exports/fixings/FixDerivedCurveGenerator.java	Fri Jun 29 15:40:43 2012 +0000
@@ -9,14 +9,11 @@
 
 import de.intevation.flys.exports.ChartGenerator;
 
-import de.intevation.flys.jfree.Function2DAdapter;
+import de.intevation.flys.jfree.JFreeUtil;
+import de.intevation.flys.jfree.StyledXYSeries;
 
 import org.apache.log4j.Logger;
 
-import org.jfree.data.general.DatasetUtilities;
-
-import org.jfree.data.xy.XYSeries;
-
 import org.w3c.dom.Document;
 
 /**
@@ -70,21 +67,22 @@
         FixFunction func = (FixFunction)facet.getData(
             aaf.getArtifact(), context);
 
-        if(func != null) {
-            double maxQ = func.getMaxQ();
+        if (func == null) {
+            logger.warn("doOut: Facet does not contain FixFunction");
+            return;
+        }
 
-            if(maxQ > 0) {
-                XYSeries series = DatasetUtilities.sampleFunction2DToSeries(
-                    new Function2DAdapter(func.getFunction()),
-                    0,              // start
-                    maxQ, // end
-                    500,            // number of samples
-                    aaf.getFacetDescription());
-                addAxisSeries(series, 0, visible);
-            }
-        }
-        else {
-            logger.debug("doOut: func == null");
+        double maxQ = func.getMaxQ();
+
+        if (maxQ > 0) {
+            StyledXYSeries series = JFreeUtil.sampleFunction2D(
+                func.getFunction(),
+                doc,
+                aaf.getFacetDescription(),
+                500,   // number of samples
+                0.0 ,  // start
+                maxQ); // end
+            addAxisSeries(series, 0, visible);
         }
     }