--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/HistoricalDischargeComputeState.java	Wed Oct 24 14:35:59 2012 +0200
+++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/HistoricalDischargeComputeState.java	Wed Oct 24 14:34:35 2012 +0200
@@ -16,11 +16,18 @@
 import de.intevation.flys.artifacts.model.CalculationResult;
 import de.intevation.flys.artifacts.model.DataFacet;
 import de.intevation.flys.artifacts.model.FacetTypes;
+import de.intevation.flys.artifacts.model.HistoricalDischargeCurveFacet;
+import de.intevation.flys.artifacts.model.HistoricalDischargeData;
 import de.intevation.flys.artifacts.model.HistoricalDischargeDifferenceFacet;
 import de.intevation.flys.artifacts.model.HistoricalDischargeFacet;
+import de.intevation.flys.artifacts.model.HistoricalDischargeWQFacet;
+import de.intevation.flys.artifacts.model.HistoricalWQKms;
 import de.intevation.flys.artifacts.model.HistoricalWQTimerange;
 import de.intevation.flys.artifacts.model.ReportFacet;
+import de.intevation.flys.artifacts.model.WQKms;
 import de.intevation.flys.artifacts.model.WQTimerange;
+import de.intevation.flys.artifacts.resources.Resources;
+import de.intevation.flys.model.TimeInterval;
 
 
 /**
@@ -35,6 +42,8 @@
         .getLogger(HistoricalDischargeComputeState.class);
 
     public static final String DEFAULT_UNIT = "cm";
+    public static final String I18N_WQ_CURVE_FACET_RANGE = "historical_discharge.wq.curve_range";
+    public static final String I18N_WQ_CURVE_FACET_SINCE = "historical_discharge.wq.curve_since";
 
     @Override
     protected void appendItems(Artifact artifact, ElementCreator creator,
@@ -60,19 +69,25 @@
             facets.add(new ReportFacet(ComputeType.ADVANCE, hash, id));
         }
 
-        WQTimerange[] data = (WQTimerange[]) res.getData();
-        if (data == null || data.length == 0) {
-            logger.warn("Historical Discharge calculation has no results!");
-            return res;
+        HistoricalDischargeData data = (HistoricalDischargeData) res.getData();
+        HistoricalDischargeAccess access = new HistoricalDischargeAccess(
+            artifact);
+
+        WQTimerange[] wqts = (WQTimerange[]) data.getWQTimeranges();
+        if (wqts != null && wqts.length > 0) {
+            facets.add(new DataFacet(CSV, "CSV data", ComputeType.ADVANCE,
+                hash, id));
+
+            facets.add(new DataFacet(PDF, "PDF data", ComputeType.ADVANCE,
+                hash, id));
+
+            prepareFacets(facets, wqts, access);
         }
 
-        facets
-            .add(new DataFacet(CSV, "CSV data", ComputeType.ADVANCE, hash, id));
-
-        facets
-            .add(new DataFacet(PDF, "PDF data", ComputeType.ADVANCE, hash, id));
-
-        prepareFacets(facets, data, new HistoricalDischargeAccess(artifact));
+        WQKms[] wqs = (WQKms[]) data.getWQs();
+        if (wqs != null && wqs.length > 0) {
+            prepareWQFacets(context, facets, wqs, access, hash);
+        }
 
         return res;
     }
@@ -116,6 +131,53 @@
         }
     }
 
+    protected void prepareWQFacets(CallContext cc, List<Facet> facets,
+        WQKms[] wqs, HistoricalDischargeAccess access, String hash) {
+        double[] ws = access.getWs();
+        double[] qs = access.getQs();
+
+        for (int k = 0; k < ws.length; k++) {
+            facets.add(new HistoricalDischargeWQFacet(
+                HISTORICAL_DISCHARGE_WQ_W, "W=" + ws[k], ws[k]));
+        }
+
+        for (int k = 0; k < qs.length; k++) {
+            facets.add(new HistoricalDischargeWQFacet(
+                HISTORICAL_DISCHARGE_WQ_W, "Q=" + ws[k], qs[k]));
+        }
+
+        int idx = 0;
+        for (WQKms wqkms : wqs) {
+            String title = null;
+            if (wqkms instanceof HistoricalWQKms) {
+                title = createDischargeCurveTitle(cc, (HistoricalWQKms) wqkms);
+            }
+            else {
+                title = wqkms.getName();
+            }
+
+            facets.add(new HistoricalDischargeCurveFacet(idx,
+                HISTORICAL_DISCHARGE_WQ_CURVE, title, ComputeType.ADVANCE,
+                getID(), hash));
+            idx++;
+        }
+    }
+
+    protected String createDischargeCurveTitle(CallContext cc,
+        HistoricalWQKms wqkms) {
+        TimeInterval timeInterval = wqkms.getTimeInterval();
+
+        if (timeInterval.getStopTime() != null) {
+            return Resources.format(cc.getMeta(), I18N_WQ_CURVE_FACET_RANGE,
+                I18N_WQ_CURVE_FACET_RANGE, timeInterval.getStartTime(),
+                timeInterval.getStopTime());
+        }
+        else {
+            return Resources.format(cc.getMeta(), I18N_WQ_CURVE_FACET_SINCE,
+                I18N_WQ_CURVE_FACET_SINCE, timeInterval.getStartTime());
+        }
+    }
+
     protected String createFacetTitle(WQTimerange wqt) {
         String name = wqt.getName();