Mercurial > dive4elements > river
diff flys-artifacts/src/main/java/de/intevation/flys/exports/fixings/DeltaWtExporter.java @ 3397:6d1740533810
FixA: Added discharge column to DeltaW(t) CSV export.
flys-artifacts/trunk@5030 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author | Sascha L. Teichmann <sascha.teichmann@intevation.de> |
---|---|
date | Wed, 18 Jul 2012 09:03:19 +0000 |
parents | 79dd823733e2 |
children | 7f9fe694f8d1 |
line wrap: on
line diff
--- a/flys-artifacts/src/main/java/de/intevation/flys/exports/fixings/DeltaWtExporter.java Wed Jul 18 08:19:03 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/exports/fixings/DeltaWtExporter.java Wed Jul 18 09:03:19 2012 +0000 @@ -25,7 +25,6 @@ import java.text.NumberFormat; import java.util.ArrayList; -import java.util.Date; import java.util.List; import java.util.Locale; @@ -44,6 +43,9 @@ public static final String CSV_DELTA_W_HEADER = "export.fixings.deltawt.csv.header.deltaw"; + public static final String CSV_Q_HEADER = + "export.fixings.deltawt.csv.header.q"; + public static final String CSV_T_HEADER = "export.fixings.deltawt.csv.header.t"; @@ -54,6 +56,8 @@ public static final String DEFAULT_CSV_DELTA_W_HEADER = "\u0394 W [cm]"; + public static final String DEFAULT_CSV_Q_HEADER = "Abfluss [m\u00b3/s]"; + public static final String DEFAULT_CSV_T_HEADER = "Datum"; public static final String DEFAULT_CSV_T_DESC_HEADER = "Beschreibung"; @@ -96,6 +100,7 @@ NumberFormat kmF = getKMFormatter(); NumberFormat dwF = getDeltaWFormatter(); + NumberFormat qF = getQFormatter(); CallMeta meta = context.getMeta(); Locale locale = Resources.getLocale(meta); @@ -107,16 +112,15 @@ String kmS = kmF.format(kmEntry.getKm()); for (QWD qwd: kmEntry.getValue()) { - double deltaW = qwd.getDeltaW(); - Date date = qwd.getDate(); - String desc = qwd.getDescription(); - - String deltaWS = dwF.format(deltaW); - String dateS = dF.format(date); + String desc = qwd.getDescription(); + String deltaWS = dwF.format(qwd.getDeltaW()); + String qS = qF.format(qwd.getQ()); + String dateS = dF.format(qwd.getDate()); writer.writeNext(new String[] { kmS, deltaWS, + qS, dateS, desc != null ? desc : "" }); } @@ -137,16 +141,15 @@ QWD [] qwds = period.getQWDs(); if (qwds != null) { for (QWD qwd: qwds) { - double deltaW = qwd.getDeltaW(); - Date date = qwd.getDate(); - String desc = qwd.getDescription(); - - String deltaWS = dwF.format(deltaW); - String dateS = dF.format(date); + String desc = qwd.getDescription(); + String deltaWS = dwF.format(qwd.getDeltaW()); + String qS = qF.format(qwd.getQ()); + String dateS = dF.format(qwd.getDate()); writer.writeNext(new String[] { kmS, deltaWS, + qS, dateS, desc != null ? desc : "" }); } @@ -166,12 +169,17 @@ return Formatter.getFixDeltaWDeltaW(context); } + protected NumberFormat getQFormatter() { + return Formatter.getFixDeltaWQ(context); + } + protected void writeCSVHeader(CSVWriter writer) { log.debug("DeltaWtExporter.writeCSVHeader"); writer.writeNext(new String[] { msg(CSV_KM_HEADER, DEFAULT_CSV_KM_HEADER), msg(CSV_DELTA_W_HEADER, DEFAULT_CSV_DELTA_W_HEADER), + msg(CSV_Q_HEADER, DEFAULT_CSV_Q_HEADER), msg(CSV_T_HEADER, DEFAULT_CSV_T_HEADER), msg(CSV_T_DESC_HEADER, DEFAULT_CSV_T_DESC_HEADER) });