--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/Calculation6.java	Wed Oct 24 14:35:59 2012 +0200
+++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/Calculation6.java	Wed Oct 24 14:34:35 2012 +0200
@@ -1,6 +1,7 @@
 package de.intevation.flys.artifacts.model;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 
@@ -55,11 +56,13 @@
             addProblem("cannot.find.hist.q.tables");
         }
 
-        WQTimerange[] wqt = prepareCalculationData(refTable, dts);
+        WQTimerange[] wqt = prepareTimerangeData(refTable, dts);
+        WQKms[] wqs = prepareWQData(dts);
 
         logger.debug("Number of calculation results: " + wqt.length);
 
-        return new CalculationResult(wqt, this);
+        return new CalculationResult(new HistoricalDischargeData(wqt, wqs),
+            this);
     }
 
     protected boolean checkParameters() {
@@ -124,7 +127,7 @@
         return false;
     }
 
-    protected WQTimerange[] prepareCalculationData(DischargeTable refTable,
+    protected WQTimerange[] prepareTimerangeData(DischargeTable refTable,
         List<DischargeTable> dts) {
         if (refTable == null) {
             addProblem("cannot.find.hist.q.reftable");
@@ -135,6 +138,41 @@
         }
     }
 
+    protected WQKms[] prepareWQData(List<DischargeTable> dts) {
+        WQKms[] wqs = new WQKms[dts.size()];
+
+        int idx = 0;
+
+        for (DischargeTable dt : dts) {
+            double[][] values = null;
+
+            if (dt.getKind() == DischargeTables.MASTER) {
+                values = DischargeTables.loadDischargeTableValues(dt,
+                    DischargeTables.MASTER_SCALE);
+
+            }
+            else {
+                values = DischargeTables.loadDischargeTableValues(dt,
+                    DischargeTables.HISTORICAL_SCALE);
+
+            }
+
+            wqs[idx++] = prepareWQ(dt, values);
+        }
+
+        return wqs;
+    }
+
+    protected WQKms prepareWQ(DischargeTable dt, double[][] values) {
+        double km = dt.getGauge().getStation().doubleValue();
+
+        double[] kms = new double[values[0].length];
+        Arrays.fill(kms, km);
+
+        return new HistoricalWQKms(kms, values[1], values[0],
+            String.valueOf(km), dt.getTimeInterval());
+    }
+
     protected WQTimerange[] prepareSimpleData(List<DischargeTable> dts) {
         List<WQTimerange> wqts = new ArrayList<WQTimerange>(values.length);