--- a/artifacts/src/main/java/org/dive4elements/river/exports/process/DischargeProcessor.java	Mon Oct 20 13:48:51 2014 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/exports/process/DischargeProcessor.java	Mon Oct 20 13:52:15 2014 +0200
@@ -23,8 +23,6 @@
 import org.dive4elements.river.exports.DiagramGenerator;
 import org.dive4elements.river.exports.StyledSeriesBuilder;
 import org.dive4elements.river.jfree.StyledXYSeries;
-import org.dive4elements.river.model.Gauge;
-import org.dive4elements.river.model.River;
 import org.dive4elements.river.themes.ThemeDocument;
 
 
@@ -38,9 +36,6 @@
     /** Station for which the diagram is shown. */
     private double km;
 
-    /** Tolerance for comparison of kilometers. */
-    public static final double KM_EPSILON = 0.001d;
-
     private String yAxisLabel = "";
 
     private String I18N_AXIS_LABEL = "chart.discharge.curve.yaxis.label";
@@ -71,7 +66,6 @@
             doDischargeOut(
                 generator,
                 bundle,
-                bundle.getFacetDescription().trim(),
                 theme,
                 visible);
         }
@@ -86,7 +80,8 @@
     @Override
     public boolean canHandle(String facetType) {
         return DISCHARGE_CURVE.equals(facetType)
-            || GAUGE_DISCHARGE_CURVE.equals(facetType);
+            || GAUGE_DISCHARGE_CURVE.equals(facetType)
+            || COMPUTED_DISCHARGE_Q.equals(facetType);
     }
 
 
@@ -101,11 +96,9 @@
     protected void doDischargeOut(
         DiagramGenerator generator,
         ArtifactAndFacet bundle,
-        String        name,
         ThemeDocument theme,
-        boolean       visible)
-    {
-        log.debug("DischargeCurveGenerator.doDischargeOut");
+        boolean       visible
+    ) {
         CallContext context = generator.getCallContext();
         Map<String, String> metaData = bundle.getFacet().getMetaData(
             bundle.getArtifact(), context);
@@ -114,7 +107,8 @@
         if (skm != null && Math.abs(skm-km) > 0.00001) {
             return;
         }
-        StyledXYSeries series = new StyledXYSeries(name, theme);
+        StyledXYSeries series = new StyledXYSeries(
+            bundle.getFacetDescription().trim(), theme);
         double[][] wqData = new double[2][data.size()];
         for (int i = 0, n = data.size(); i < n; i++) {
             wqData[0][i] = data.getQ(i);
@@ -124,22 +118,6 @@
 
         series.putMetaData(metaData, bundle.getArtifact(), context);
         yAxisLabel = metaData.get("Y");
-
-        String gaugeName = data.getName();
-        RiverAccess access = new RiverAccess((D4EArtifact)bundle.getArtifact());
-        River river = access.getRiver();
-
-        if (river == null) {
-            log.debug("no river found");
-            return;
-        }
-
-        Gauge gauge = river.determineGaugeByName(gaugeName);
-
-        if (gauge == null) {
-            log.debug("no gauge found");
-            return;
-        }
         generator.addAxisSeries(series, axisName, visible);
     }