Mercurial > dive4elements > river

comparison flys-artifacts/src/main/java/de/intevation/flys/exports/ReferenceCurveExporter.java @ 2329:d999062c20e6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add W(cm) column to csv export of reference curves. flys-artifacts/trunk@4013 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author Felix Wolfsteller <felix.wolfsteller@intevation.de>
date Fri, 10 Feb 2012 08:28:17 +0000
parents 6bbb8295fd64
children 8bacd0ce3704
comparison
equal deleted inserted replaced
2328:0cc0e232fa35 2329:d999062c20e6
46 46
47 47
48 public static final String RC_CSV_KM_HEADER = 48 public static final String RC_CSV_KM_HEADER =
49 "export.reference_curve.csv.header.km"; 49 "export.reference_curve.csv.header.km";
50 50
51 public static final String RC_CSV_W_HEADER = 51 public static final String RC_CSV_W_CM_HEADER =
52 "export.reference_curve.csv.header.w"; 52 "export.reference_curve.csv.header.w.cm";
53
54 public static final String RC_CSV_W_M_HEADER =
55 "export.reference_curve.csv.header.w.m";
53 56
54 public static final String RC_CSV_Q_HEADER = 57 public static final String RC_CSV_Q_HEADER =
55 "export.reference_curve.csv.header.q"; 58 "export.reference_curve.csv.header.q";
56 59
57 public static final String CSV_LOCATION_HEADER = 60 public static final String CSV_LOCATION_HEADER =
58 "export.waterlevel.csv.header.location"; 61 "export.waterlevel.csv.header.location";
59 62
60 public static final String DEFAULT_CSV_LOCATION_HEADER = "Lage"; 63 public static final String DEFAULT_CSV_LOCATION_HEADER = "Lage";
61 64
62 public static final String RC_DEFAULT_CSV_KM_HEADER = "Fluss-Km"; 65 public static final String RC_DEFAULT_CSV_KM_HEADER = "Fluss-Km";
63 public static final String RC_DEFAULT_CSV_W_HEADER = "m"; 66 public static final String RC_DEFAULT_CSV_W_M_HEADER = "m";
67 public static final String RC_DEFAULT_CSV_W_CM_HEADER = "cm";
64 public static final String RC_DEFAULT_CSV_Q_HEADER = "Q"; 68 public static final String RC_DEFAULT_CSV_Q_HEADER = "Q";
65 69
66 public static final String PDF_HEADER_MODE = "export.reference_curve.pdf.mode"; 70 public static final String PDF_HEADER_MODE = "export.reference_curve.pdf.mode";
67 public static final String JASPER_FILE = "export.reference_curve.pdf.file"; 71 public static final String JASPER_FILE = "export.reference_curve.pdf.file";
68 72
156 160
157 // TODO missing 'relative' W(cm). 161 // TODO missing 'relative' W(cm).
158 writer.writeNext(new String[] { 162 writer.writeNext(new String[] {
159 msg(RC_CSV_KM_HEADER, RC_DEFAULT_CSV_KM_HEADER), 163 msg(RC_CSV_KM_HEADER, RC_DEFAULT_CSV_KM_HEADER),
160 msg(CSV_LOCATION_HEADER, DEFAULT_CSV_LOCATION_HEADER), 164 msg(CSV_LOCATION_HEADER, DEFAULT_CSV_LOCATION_HEADER),
161 msg(RC_CSV_W_HEADER, RC_DEFAULT_CSV_W_HEADER), 165 msg(RC_CSV_W_M_HEADER, RC_DEFAULT_CSV_W_M_HEADER),
166 msg(RC_CSV_W_CM_HEADER, RC_DEFAULT_CSV_W_CM_HEADER),
162 msg(RC_CSV_Q_HEADER, RC_DEFAULT_CSV_Q_HEADER), 167 msg(RC_CSV_Q_HEADER, RC_DEFAULT_CSV_Q_HEADER),
163 msg(RC_CSV_KM_HEADER, RC_DEFAULT_CSV_KM_HEADER), 168 msg(RC_CSV_KM_HEADER, RC_DEFAULT_CSV_KM_HEADER),
164 msg(CSV_LOCATION_HEADER, DEFAULT_CSV_LOCATION_HEADER), 169 msg(CSV_LOCATION_HEADER, DEFAULT_CSV_LOCATION_HEADER),
165 msg(RC_CSV_W_HEADER, RC_DEFAULT_CSV_W_HEADER), 170 msg(RC_CSV_W_M_HEADER, RC_DEFAULT_CSV_W_M_HEADER),
171 msg(RC_CSV_W_CM_HEADER, RC_DEFAULT_CSV_W_CM_HEADER),
166 msg(RC_CSV_Q_HEADER, RC_DEFAULT_CSV_Q_HEADER), 172 msg(RC_CSV_Q_HEADER, RC_DEFAULT_CSV_Q_HEADER),
167 }); 173 });
168 } 174 }
169 175
170 176
189 for (int i = 0; i < size; i ++) { 195 for (int i = 0; i < size; i ++) {
190 writer.writeNext(new String[] { 196 writer.writeNext(new String[] {
191 kmf.format(ww.getStartKm()), 197 kmf.format(ww.getStartKm()),
192 startLocationDescription, 198 startLocationDescription,
193 wf.format(ww.getW1(i)), 199 wf.format(ww.getW1(i)),
200 wf.format(ww.getRelHeight1Cm(i)),
194 qf.format(ww.getQ1(i)), // "Q" 201 qf.format(ww.getQ1(i)), // "Q"
195 kmf.format(ww.getEndKm()), 202 kmf.format(ww.getEndKm()),
196 endLocationDescription, 203 endLocationDescription,
197 wf.format(ww.getW2(i)), 204 wf.format(ww.getW2(i)),
205 wf.format(ww.getRelHeight2Cm(i)),
198 qf.format(ww.getQ2(i)) // "Q" 206 qf.format(ww.getQ2(i)) // "Q"
199 }); 207 });
200 } 208 }
201 } 209 }
202 210
http://dive4elements.wald.intevation.org