--- a/flys-artifacts/src/main/java/de/intevation/flys/exports/fixings/FixDerivedCurveGenerator.java	Fri Jun 15 12:42:13 2012 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/exports/fixings/FixDerivedCurveGenerator.java	Sun Jun 17 20:45:01 2012 +0000
@@ -4,6 +4,7 @@
 
 import de.intevation.flys.artifacts.model.FacetTypes;
 
+import de.intevation.flys.artifacts.model.fixings.FixDerivateFacet;
 import de.intevation.flys.artifacts.model.fixings.FixFunction;
 
 import de.intevation.flys.exports.ChartGenerator;
@@ -66,19 +67,23 @@
     public void doOut(ArtifactAndFacet aaf, Document doc, boolean visible) {
         logger.debug("doOut");
 
-        FixFunction func = (FixFunction)aaf.getData(context);
-        if(func.getMaxQ() > 0) {
+        FixDerivateFacet facet = (FixDerivateFacet)aaf.getFacet();
+        FixFunction func = (FixFunction)facet.getData(
+            aaf.getArtifact(), context, getCurrentKmFromRequest());
+        
+        double maxQ = func.getMaxQ();
+        maxQ = Math.min(2000.0, Math.abs(maxQ));
+        maxQ += maxQ * 0.05;
+        
+        if(maxQ > 0) {
             XYSeries series = DatasetUtilities.sampleFunction2DToSeries(
                 new Function2DAdapter(func.getFunction()),
                 0,              // start
-                func.getMaxQ(), // end
+                maxQ, // end
                 500,            // number of samples
                 aaf.getFacetDescription());
             addAxisSeries(series, 0, visible);
         }
-        else {
-            logger.warn("doOut: func.getMaxQ() returns 0");
-        }
     }