Mercurial > dive4elements > river
diff artifacts/src/main/java/org/dive4elements/river/artifacts/bundu/bezugswst/BezugswstMissVolCalculationResult3.java @ 9535:3fa8551c3d1b
Fixed error in bundu bzws missing volume calculation for mean bed height;
added various additional output columns (field bed height, field flow depth etc.)
| author | mschaefer |
|---|---|
| date | Fri, 12 Oct 2018 18:49:38 +0200 |
| parents | af163ce96eb4 |
| children |
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/bundu/bezugswst/BezugswstMissVolCalculationResult3.java Thu Oct 11 18:39:21 2018 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/bundu/bezugswst/BezugswstMissVolCalculationResult3.java Fri Oct 12 18:49:38 2018 +0200 @@ -49,19 +49,21 @@ protected String[] formatRow(final AbstractExportContext exportContext, final ResultRow row) { - final Collection<String> lines = new ArrayList<>(4); + final Collection<String> lines = new ArrayList<>(6); lines.add(exportContext.formatRowValue(row, BunduResultType.missStationRangeFrom)); lines.add(exportContext.formatRowValue(row, BunduResultType.missStationRangeTo)); lines.add(exportContext.formatRowValue(row, BunduResultType.missVolumeTotal)); lines.add(exportContext.formatRowValue(row, BunduResultType.missMassTotal)); + lines.add(exportContext.formatRowValue(row, BunduResultType.excavationVolumeTotal)); + lines.add(exportContext.formatRowValue(row, BunduResultType.excavationCostsTotal)); return lines.toArray(new String[lines.size()]); } @Override public void writeCSVHeader(final ExportContextCSV exportContextCSV, final RiverInfo river) { - final int colSize = 4; + final int colSize = 6; exportContextCSV.writeTitleForTabs("bundu.export.csv.title.bezugswst.result3", colSize); // Voraussetzung für Tabs ist, dass der Titel vor den Headern final Collection<String> header = new ArrayList<>(colSize); @@ -69,6 +71,8 @@ header.add(exportContextCSV.formatCsvHeader(BunduResultType.missStationRangeTo)); header.add(exportContextCSV.formatCsvHeader(BunduResultType.missVolumeTotal)); header.add(exportContextCSV.formatCsvHeader(BunduResultType.missMassTotal)); + header.add(exportContextCSV.formatCsvHeader(BunduResultType.excavationVolumeTotal)); + header.add(exportContextCSV.formatCsvHeader(BunduResultType.excavationCostsTotal)); exportContextCSV.writeCSVLine(header.toArray(new String[header.size()])); @@ -94,6 +98,8 @@ exportContextPDF.addJRMetadata(source, "station_to_header", BunduResultType.missStationRangeTo); exportContextPDF.addJRMetadata(source, "channel_miss_volume_header", BunduResultType.missVolumeTotal); exportContextPDF.addJRMetadata(source, "channel_miss_mass_header", BunduResultType.missMassTotal); + exportContextPDF.addJRMetadata(source, "excavation_volume_header", BunduResultType.excavationVolumeTotal); + exportContextPDF.addJRMetadata(source, "excavation_costs_header", BunduResultType.excavationCostsTotal); } } \ No newline at end of file