Mercurial > dive4elements > river
diff artifacts/src/main/java/org/dive4elements/river/exports/minfo/BedDifferenceExporter.java @ 7913:76b5add4f268
Added diff pair column to CSV export of bed height differences. TODO: same for PDF, adjust client.
author | Sascha L. Teichmann <teichmann@intevation.de> |
---|---|
date | Wed, 04 Jun 2014 12:53:28 +0200 |
parents | df9ac27d6b74 |
children | db1a2b14c32d |
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/exports/minfo/BedDifferenceExporter.java Wed Jun 04 12:22:01 2014 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/exports/minfo/BedDifferenceExporter.java Wed Jun 04 12:53:28 2014 +0200 @@ -11,7 +11,7 @@ import java.io.IOException; import java.io.OutputStream; import java.text.NumberFormat; -import java.util.LinkedList; +import java.util.ArrayList; import java.util.List; import java.util.Map; import java.util.HashMap; @@ -56,6 +56,9 @@ private static final String CSV_HEADER_DIFF = "export.minfo.beddifference.diff"; + private static final String CSV_HEADER_DIFF_PAIR = + "export.minfo.beddifference.diff.pair"; + private static final String CSV_HEADER_MORPH1 = "export.minfo.beddifference.morph1"; @@ -86,6 +89,7 @@ for (BedDifferencesResult result : results) { if (result instanceof BedDiffYearResult) { BedDiffYearResult yResult = (BedDiffYearResult) result; + String desc = result.getDiffDescription(); double[][] kms = yResult.getDifferencesData(); double[][] morph1 = yResult.getMorphWidth1Data(); double[][] morph2 = yResult.getMorphWidth2Data(); @@ -94,15 +98,18 @@ kmf.format(kms[0][j]), mf.format(kms[1][j]), mf.format(morph1[1][j]), - mf.format(morph2[1][j])}); + mf.format(morph2[1][j]), + desc }); } } else { double[][] kms = result.getDifferencesData(); + String desc = result.getDiffDescription(); for (int j = 0; j < kms[0].length; j++) { writer.writeNext(new String[] { kmf.format(kms[0][j]), - mf.format(kms[1][j])}); + mf.format(kms[1][j]), + desc }); } } } @@ -157,7 +164,7 @@ protected void writeCSVHeader(CSVWriter writer) { logger.debug("writeCSVHeader()"); - List<String> header = new LinkedList<String>(); + List<String> header = new ArrayList<String>(); if (results != null) { header.add(msg(CSV_HEADER_KM, "km")); header.add(msg(CSV_HEADER_DIFF, "cm")); @@ -166,6 +173,7 @@ header.add(msg(CSV_HEADER_MORPH1, "morph width minuend [m]")); header.add(msg(CSV_HEADER_MORPH2, "morph width subtrahend [m]")); } + header.add(msg(CSV_HEADER_DIFF_PAIR, "difference pair")); } writer.writeNext(header.toArray(new String[header.size()])); }