Mercurial > dive4elements > river
diff artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/flowdepth/FlowDepthCalculationResult.java @ 9365:ba1e2e8f05d1
sinfo.flowdepth Results.isShowRefGauge==false->spalte ausblenden; result.isShowRefGauge==false&&results.isShowRefGauge==true->result.refGauge=""
| author | gernotbelger |
|---|---|
| date | Thu, 02 Aug 2018 15:02:27 +0200 |
| parents | 0c8f170945d7 |
| children | 4cccbd32b680 |
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/flowdepth/FlowDepthCalculationResult.java Thu Aug 02 11:47:49 2018 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/flowdepth/FlowDepthCalculationResult.java Thu Aug 02 15:02:27 2018 +0200 @@ -58,7 +58,7 @@ public void writeCSVHeader(final ExportContextCSV exportContext, final RiverInfo river) { // getLog().info("FlowDepthExporter.writeCSVHeader"); - final Collection<String> header = new ArrayList<>(11); + final Collection<String> header = new ArrayList<>(15); header.add(exportContext.formatCsvHeader(GeneralResultType.station)); header.add(exportContext.msgUnitCSV(SInfoResultType.flowdepth)); @@ -71,7 +71,11 @@ header.add(exportContext.msgUnitCSV(SInfoResultType.waterlevel, river.getWstUnit())); header.add(exportContext.msgUnitCSV(SInfoResultType.discharge)); header.add(exportContext.formatCsvHeader(GeneralResultType.waterlevelLabel)); - header.add(exportContext.formatCsvHeader(GeneralResultType.gaugeLabel)); + + if (((FlowDepthCalculationResults) exportContext.getResults()).isShowRefGauges()) { + header.add(exportContext.formatCsvHeader(GeneralResultType.gaugeLabel)); + } + header.add(exportContext.formatCsvHeader(SInfoResultType.meanBedHeight)); header.add(exportContext.formatCsvHeader(SInfoResultType.soundingLabel)); header.add(exportContext.formatCsvHeader(GeneralResultType.location)); @@ -144,7 +148,11 @@ lines.add(exportContext.formatRowValue(row, SInfoResultType.waterlevel)); lines.add(exportContext.formatRowValue(row, SInfoResultType.discharge)); lines.add(exportContext.formatRowValue(row, GeneralResultType.waterlevelLabel)); - lines.add(exportContext.formatRowValue(row, GeneralResultType.gaugeLabel)); + + if (mode == ExportMode.pdf || results.isShowRefGauges()) { + lines.add(exportContext.formatRowValue(row, GeneralResultType.gaugeLabel)); + } + lines.add(exportContext.formatRowValue(row, SInfoResultType.meanBedHeight)); lines.add(exportContext.formatRowValue(row, SInfoResultType.soundingLabel)); lines.add(exportContext.formatRowValue(row, GeneralResultType.location));