Mercurial > dive4elements > river
changeset 2270:e92545d2069e
Win fight against svn, added further i18n and slightly more data in reference-curve/csv export.
flys-artifacts/trunk@3927 c6561f87-3c4e-4783-a992-168aeb5c3f6f
| author | Felix Wolfsteller <felix.wolfsteller@intevation.de> |
|---|---|
| date | Mon, 06 Feb 2012 14:02:04 +0000 |
| parents | 8f4a1cbe9bb6 |
| children | 3973a2451cf7 |
| files | flys-artifacts/ChangeLog flys-artifacts/src/main/java/de/intevation/flys/exports/ReferenceCurveExporter.java |
| diffstat | 2 files changed, 15 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/flys-artifacts/ChangeLog Mon Feb 06 14:00:27 2012 +0000 +++ b/flys-artifacts/ChangeLog Mon Feb 06 14:02:04 2012 +0000 @@ -1,6 +1,6 @@ 2012-02-06 Felix Wolfsteller <felix.wolfsteller@intevation.de> - * src/main/java/de/intevation/flys/exports/ReferenceCurveGenerator.java: + * src/main/java/de/intevation/flys/exports/ReferenceCurveExporter.java: Added further i18n stubs and slightly more data. 2012-02-06 Sascha L. Teichmann <sascha.teichmann@intevation.de>
--- a/flys-artifacts/src/main/java/de/intevation/flys/exports/ReferenceCurveExporter.java Mon Feb 06 14:00:27 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/exports/ReferenceCurveExporter.java Mon Feb 06 14:02:04 2012 +0000 @@ -51,6 +51,9 @@ public static final String RC_CSV_W_HEADER = "export.reference_curve.csv.header.w"; + public static final String RC_CSV_Q_HEADER = + "export.reference_curve.csv.header.q"; + /* For each Bezugs and Ziel-ort (of which there might be multiples): Lage, Bezeichnung, Q, W (cm), W(NN+m). @@ -58,6 +61,7 @@ public static final String RC_DEFAULT_CSV_KM_HEADER = "Fluss-Km"; public static final String RC_DEFAULT_CSV_W_HEADER = "m"; + public static final String RC_DEFAULT_CSV_Q_HEADER = "Q"; public static final String PDF_HEADER_MODE = "export.reference_curve.pdf.mode"; public static final String JASPER_FILE = "export.reference_curve.pdf.file"; @@ -148,7 +152,11 @@ writer.writeNext(new String[] { msg(RC_CSV_KM_HEADER, RC_DEFAULT_CSV_KM_HEADER), - msg(RC_CSV_W_HEADER, RC_DEFAULT_CSV_W_HEADER) + msg(RC_CSV_W_HEADER, RC_DEFAULT_CSV_W_HEADER), + msg(RC_CSV_Q_HEADER, RC_DEFAULT_CSV_Q_HEADER), + msg(RC_CSV_KM_HEADER, RC_DEFAULT_CSV_KM_HEADER), + msg(RC_CSV_W_HEADER, RC_DEFAULT_CSV_W_HEADER), + msg(RC_CSV_Q_HEADER, RC_DEFAULT_CSV_Q_HEADER), }); } @@ -165,7 +173,11 @@ // TODO: start/end ... start/end .. writer.writeNext(new String[] { kmf.format(ww.getStartKm()), - wf.format(ww.getW(i)) + wf.format(ww.getW1(i)), + "", // "Q" + kmf.format(ww.getEndKm()), + wf.format(ww.getW2(i)), + "" // "Q" }); } }