diff flys-artifacts/src/main/java/de/intevation/flys/exports/ReferenceCurveExporter.java @ 2631:87085ccea466

Issue 528, 637. Added columns for 'W at gauge' and fixed column header. flys-artifacts/trunk@4227 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author Raimund Renkert <raimund.renkert@intevation.de>
date Fri, 13 Apr 2012 07:44:25 +0000
parents 26cd4dfafdf1
children e63969c173e9
line wrap: on
line diff
--- a/flys-artifacts/src/main/java/de/intevation/flys/exports/ReferenceCurveExporter.java	Fri Apr 13 07:40:22 2012 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/exports/ReferenceCurveExporter.java	Fri Apr 13 07:44:25 2012 +0000
@@ -56,7 +56,7 @@
         "export.reference_curve.csv.header.w.m";
 
     public static final String RC_CSV_Q_HEADER =
-        "export.reference_curve.csv.header.q";
+        "export.reference_curve.csv.header.w.q";
 
     public static final String CSV_LOCATION_HEADER =
         "export.waterlevel.csv.header.location";
@@ -66,10 +66,13 @@
     public static final String RC_DEFAULT_CSV_KM_HEADER = "Fluss-Km";
     public static final String RC_DEFAULT_CSV_W_M_HEADER  = "W (m + NHN)";
     public static final String RC_DEFAULT_CSV_W_CM_HEADER  = "W (cm am Pegel)";
-    public static final String RC_DEFAULT_CSV_Q_HEADER  = "gleichw. Q (m/s)";
+    public static final String RC_DEFAULT_CSV_Q_HEADER  = "gleichw. Q (m\u00b3/s)";
 
     public static final String PDF_HEADER_MODE = "export.reference_curve.pdf.mode";
     public static final String JASPER_FILE = "export.reference_curve.pdf.file";
+    public static final String JASPER_FILE_GAUGE = "export.reference_curve.pdf.file.gauge";
+    public static final String JASPER_FILE_GAUGE_END = "export.reference_curve.pdf.file.gauge.end";
+    public static final String JASPER_FILE_GAUGE_START_END = "export.reference_curve.pdf.file.gauge.start.end";
 
     /** The storage that contains all WKms objects for the different facets. */
     protected List<WWQQ[]> data;
@@ -257,9 +260,20 @@
     protected void writePDF(OutputStream out) {
         WWQQJRDataSource source = createJRData();
 
+        String filename = JASPER_FILE;
+        if (startAtGauge && endAtGauge) {
+            filename = JASPER_FILE_GAUGE_START_END;
+        }
+        else if (startAtGauge) {
+            filename = JASPER_FILE_GAUGE;
+        }
+        else if (endAtGauge) {
+            filename = JASPER_FILE_GAUGE_END;
+        }
+
         String jasperFile = Resources.getMsg(
                                 context.getMeta(),
-                                JASPER_FILE,
+                                filename,
                                 "/jasper/reference_en.jasper");
         String confPath = Config.getConfigDirectory().toString();
 
@@ -326,8 +340,15 @@
         String endLocationDescription = FLYSUtils.getLocationDescription(
             flys, ww.getEndKm());
 
-        // TODO missing 'relative' W(cm).
         for (int i = 0; i < size; i ++) {
+            String start = "-";
+            String end = "-";
+            if (startAtGauge) {
+                start = wf.format(ww.getRelHeight1Cm(i));
+            }
+            if (ww.endAtGauge()) {
+                end = wf.format(ww.getRelHeight2Cm(i));
+            }
             source.addData(new String[] {
                 kmf.format(ww.getStartKm()),
                 startLocationDescription,
@@ -336,7 +357,9 @@
                 kmf.format(ww.getEndKm()),
                 endLocationDescription,
                 wf.format(ww.getW2(i)),
-                qf.format(ww.getQ2(i)) // "Q"
+                qf.format(ww.getQ2(i)), // "Q"
+                start,
+                end
             });
         }
     }

http://dive4elements.wald.intevation.org