--- a/artifacts/src/main/java/org/dive4elements/river/exports/sq/SQRelationExporter.java	Mon Mar 16 10:00:39 2015 +0100
+++ b/artifacts/src/main/java/org/dive4elements/river/exports/sq/SQRelationExporter.java	Mon Mar 16 11:35:19 2015 +0100
@@ -1,4 +1,4 @@
-/* Copyright (C) 2011, 2012, 2013 by Bundesanstalt für Gewässerkunde
+/* Copyright (C) 2011, 2012, 2013, 2015 by Bundesanstalt für Gewässerkunde
  * Software engineering by Intevation GmbH
  *
  * This file is Free Software under the GNU AGPL (>=v3)
@@ -21,6 +21,7 @@
 import net.sf.jasperreports.engine.JasperExportManager;
 import net.sf.jasperreports.engine.JasperFillManager;
 import net.sf.jasperreports.engine.JasperPrint;
+import net.sf.jasperreports.engine.JRPrintPage;
 import net.sf.jasperreports.engine.JRException;
 
 import au.com.bytecode.opencsv.CSVWriter;
@@ -32,6 +33,7 @@
 import org.dive4elements.river.artifacts.model.sq.SQResult;
 import org.dive4elements.river.artifacts.model.sq.SQ;
 import org.dive4elements.river.artifacts.model.sq.SQRelationJRDataSource;
+import org.dive4elements.river.artifacts.model.sq.SQMeasurementsJRDataSource;
 import org.dive4elements.river.artifacts.model.Parameters;
 import org.dive4elements.river.artifacts.model.DateRange;
 import org.dive4elements.river.artifacts.access.SQRelationAccess;
@@ -175,6 +177,9 @@
     public static final String JASPER_FILE =
         "export.sqrelation.pdf.file";
 
+    public static final String JASPER_MEASUREMENTS_FILE =
+        "export.sqrelation.measurements.pdf.file";
+
     protected List<SQResult []> data;
 
     public SQRelationExporter() {
@@ -239,12 +244,12 @@
 
         for (SQResult [] results: data) {
             for (SQResult result: results) {
-                writer.writeAll(data2StringArrays(result));
+                writer.writeAll(data2StringArrays(result, true));
             }
         }
     }
 
-    protected List<String[]> data2StringArrays(SQResult result) {
+    protected List<String[]> data2StringArrays(SQResult result, boolean includeMeasurements) {
         String km = Formatter.getSQRelationKM(context
                     ).format(result.getKm());
         List<String[]> retval = new ArrayList<String[]>();
@@ -283,7 +288,26 @@
             o  = String.valueOf(fraction.totalNumOutliers());
             t  = String.valueOf(fraction.numMeasurements());
 
-            for (SQ sq: fraction.getMeasurements()) {
+            if (includeMeasurements) {
+                for (SQ sq: fraction.getMeasurements()) {
+                    retval.add(new String[] {
+                        km,
+                        name,
+                        a,
+                        b,
+                        sd, // 4
+                        max_q, // 5
+                        r2, // 6
+                        t, // 7
+                        o, // 8
+                        c_duan, // 9
+                        c_ferguson, // 10
+                        sqAFormatter.format(sq.getS()),
+                        fZeroFormatter.format(sq.getQ()),
+                        df.format(sq.getDate())
+                    });
+                }
+            } else {
                 retval.add(new String[] {
                     km,
                     name,
@@ -295,10 +319,7 @@
                     t, // 7
                     o, // 8
                     c_duan, // 9
-                    c_ferguson, // 10
-                    sqAFormatter.format(sq.getS()),
-                    fZeroFormatter.format(sq.getQ()),
-                    df.format(sq.getDate())
+                    c_ferguson // 10
                 });
             }
 
@@ -313,7 +334,7 @@
         addMetaData(source);
         for (SQResult [] results: data) {
             for (SQResult result: results) {
-                for (String[] res: data2StringArrays(result)) {
+                for (String[] res: data2StringArrays(result, false)) {
                     source.addData(res);
                 }
             }
@@ -321,6 +342,44 @@
         return source;
     }
 
+    protected SQMeasurementsJRDataSource createMeasurementJRData() {
+        SQMeasurementsJRDataSource source = new SQMeasurementsJRDataSource();
+        NumberFormat fZeroFormatter = Formatter.getFormatter(context, 0, 0);
+        NumberFormat fEightFormatter = Formatter.getFormatter(context, 0, 8);
+        DateFormat df = DateFormat.getDateInstance(DateFormat.SHORT,
+                Resources.getLocale(context.getMeta()));
+
+        for (SQResult [] results: data) {
+            for (SQResult result: results) {
+                for (int i = 0; i < SQResult.NUMBER_FRACTIONS; ++i) {
+                    String name = result.getFractionName(i);
+                    SQFractionResult fraction = result.getFraction(i);
+                    for (SQ sq: fraction.getMeasurements()) {
+                        source.addData(new String[] {
+                            name,
+                            fEightFormatter.format(sq.getS()),
+                            fZeroFormatter.format(sq.getQ()),
+                            df.format(sq.getDate()),
+                            null
+                        });
+                    }
+                    for (int j = 0; j < fraction.numIterations(); j++) {
+                        for (SQ sq: fraction.getOutliers(j)) {
+                            source.addData(new String[] {
+                                name,
+                                fEightFormatter.format(sq.getS()),
+                                fZeroFormatter.format(sq.getQ()),
+                                df.format(sq.getDate()),
+                                Integer.toString(j + 1)
+                            });
+                        }
+                    }
+                }
+            }
+        }
+        return source;
+    }
+
     protected void addMetaData(SQRelationJRDataSource source) {
         CallMeta meta = context.getMeta();
 
@@ -373,11 +432,16 @@
     protected void writePDF(OutputStream out) {
         log.debug("write PDF");
         SQRelationJRDataSource source = createJRData();
+        SQMeasurementsJRDataSource measureSource = createMeasurementJRData();
 
         String jasperFile = Resources.getMsg(
-                                context.getMeta(),
-                                JASPER_FILE,
-                                "/jasper/sqrelation_en.jasper");
+                context.getMeta(),
+                JASPER_FILE,
+                "/jasper/sqrelation_en.jasper");
+        String jasperMeasurementsFile = Resources.getMsg(
+                context.getMeta(),
+                JASPER_MEASUREMENTS_FILE,
+                "/jasper/sqmeasurements_en.jasper");
         String confPath = Config.getConfigDirectory().toString();
 
 
@@ -385,11 +449,22 @@
         parameters.put("ReportTitle", Resources.getMsg(
                     context.getMeta(), PDF_TITLE, "Exported Data"));
         try {
-            JasperPrint print = JasperFillManager.fillReport(
+            /* Page numbers start have a built in offset of 1 so this
+             * is fine. */
+            JasperPrint p2 = JasperFillManager.fillReport(
+                confPath + jasperMeasurementsFile,
+                parameters,
+                measureSource);
+            parameters.put("MEASUREMENT_PAGE_NUM", p2.getPages().size());
+            JasperPrint p1 = JasperFillManager.fillReport(
                 confPath + jasperFile,
                 parameters,
                 source);
-            JasperExportManager.exportReportToPdfStream(print, out);
+            for (Object page: p2.getPages()) {
+                JRPrintPage object = (JRPrintPage)page;
+                p1.addPage(object);
+            }
+            JasperExportManager.exportReportToPdfStream(p1, out);
         }
         catch(JRException je) {
             log.warn("Error generating PDF Report!", je);