Mercurial > dive4elements > river
diff artifacts/src/main/java/org/dive4elements/river/artifacts/bundu/bezugswst/BezugswstMissVolCalculationResult3.java @ 9444:ecadc9ed0ba0
Added heights and depths of cross section fields in the bundu bzws calculation and longitudinal section charts
author | mschaefer |
---|---|
date | Tue, 21 Aug 2018 13:41:18 +0200 |
parents | d194c5b24bf8 |
children | e60584f2a531 |
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/bundu/bezugswst/BezugswstMissVolCalculationResult3.java Mon Aug 20 18:50:33 2018 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/bundu/bezugswst/BezugswstMissVolCalculationResult3.java Tue Aug 21 13:41:18 2018 +0200 @@ -1,4 +1,4 @@ -/* Copyright (C) 2017 by Bundesanstalt für Gewässerkunde +/** Copyright (C) 2017 by Bundesanstalt für Gewässerkunde * Software engineering by * Björnsen Beratende Ingenieure GmbH * Dr. Schumacher Ingenieurbüro für Wasser und Umwelt @@ -51,7 +51,8 @@ final Collection<String> lines = new ArrayList<>(20); - lines.add(exportContext.formatRowValue(row, BunduResultType.missStationRange)); + 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)); return lines.toArray(new String[lines.size()]); @@ -60,11 +61,12 @@ @Override public void writeCSVHeader(final ExportContextCSV exportContextCSV, final RiverInfo river) { - final int colSize = 3; + final int colSize = 4; 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); - header.add(exportContextCSV.formatCsvHeader(BunduResultType.missStationRange)); + header.add(exportContextCSV.formatCsvHeader(BunduResultType.missStationRangeFrom)); + header.add(exportContextCSV.formatCsvHeader(BunduResultType.missStationRangeTo)); header.add(exportContextCSV.formatCsvHeader(BunduResultType.missVolumeTotal)); header.add(exportContextCSV.formatCsvHeader(BunduResultType.missMassTotal)); @@ -88,7 +90,8 @@ protected void addJRTableHeader(final ExportContextPDF exportContextPDF, final MetaAndTableJRDataSource source) { /* column headings */ - exportContextPDF.addJRMetadata(source, "station_header", BunduResultType.missStationRange); + exportContextPDF.addJRMetadata(source, "station_header", BunduResultType.missStationRangeFrom); + exportContextPDF.addJRMetadata(source, "station_header", BunduResultType.missStationRangeTo); exportContextPDF.addJRMetadata(source, "channel_miss_volume_header", BunduResultType.missVolumeTotal); exportContextPDF.addJRMetadata(source, "channel_miss_mass_header", BunduResultType.missMassTotal);