comparison artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/flowdepth/FlowDepthCalculationResult.java @ 9351:0c8f170945d7

no tkh bug fixed
author gernotbelger
date Tue, 31 Jul 2018 17:17:03 +0200
parents 7b2b086e45f0
children ba1e2e8f05d1
comparison
equal deleted inserted replaced
9347:08f46ccd37ba 9351:0c8f170945d7
53 public BedHeightInfo getSounding() { 53 public BedHeightInfo getSounding() {
54 return this.sounding; 54 return this.sounding;
55 } 55 }
56 56
57 @Override 57 @Override
58 public void writeCSVHeader(final ExportContextCSV exportContextCSV, final RiverInfo river) { 58 public void writeCSVHeader(final ExportContextCSV exportContext, final RiverInfo river) {
59 // getLog().info("FlowDepthExporter.writeCSVHeader"); 59 // getLog().info("FlowDepthExporter.writeCSVHeader");
60 60
61 final Collection<String> header = new ArrayList<>(11); 61 final Collection<String> header = new ArrayList<>(11);
62 62
63 header.add(exportContextCSV.formatCsvHeader(GeneralResultType.station)); 63 header.add(exportContext.formatCsvHeader(GeneralResultType.station));
64 header.add(exportContextCSV.msgUnitCSV(SInfoResultType.flowdepth)); 64 header.add(exportContext.msgUnitCSV(SInfoResultType.flowdepth));
65 65
66 if (this.hasTkh()) { 66 if (((FlowDepthCalculationResults) exportContext.getResults()).hasTkh()) {
67 header.add(exportContextCSV.msgUnitCSV(SInfoResultType.flowdepthtkh)); 67 header.add(exportContext.msgUnitCSV(SInfoResultType.flowdepthtkh));
68 header.add(exportContextCSV.msgUnitCSV(SInfoResultType.tkh)); 68 header.add(exportContext.msgUnitCSV(SInfoResultType.tkh));
69 } 69 }
70 70
71 header.add(exportContextCSV.msgUnitCSV(SInfoResultType.waterlevel, river.getWstUnit())); 71 header.add(exportContext.msgUnitCSV(SInfoResultType.waterlevel, river.getWstUnit()));
72 header.add(exportContextCSV.msgUnitCSV(SInfoResultType.discharge)); 72 header.add(exportContext.msgUnitCSV(SInfoResultType.discharge));
73 header.add(exportContextCSV.formatCsvHeader(GeneralResultType.waterlevelLabel)); 73 header.add(exportContext.formatCsvHeader(GeneralResultType.waterlevelLabel));
74 header.add(exportContextCSV.formatCsvHeader(GeneralResultType.gaugeLabel)); 74 header.add(exportContext.formatCsvHeader(GeneralResultType.gaugeLabel));
75 header.add(exportContextCSV.formatCsvHeader(SInfoResultType.meanBedHeight)); 75 header.add(exportContext.formatCsvHeader(SInfoResultType.meanBedHeight));
76 header.add(exportContextCSV.formatCsvHeader(SInfoResultType.soundingLabel)); 76 header.add(exportContext.formatCsvHeader(SInfoResultType.soundingLabel));
77 header.add(exportContextCSV.formatCsvHeader(GeneralResultType.location)); 77 header.add(exportContext.formatCsvHeader(GeneralResultType.location));
78 78
79 exportContextCSV.writeCSVLine(header.toArray(new String[header.size()])); 79 exportContext.writeCSVLine(header.toArray(new String[header.size()]));
80 80
81 } 81 }
82 82
83 @Override 83 @Override
84 protected void writeCSVResultMetadata(final ExportContextCSV exportContextCSV) { 84 protected void writeCSVResultMetadata(final ExportContextCSV exportContextCSV) {
132 132
133 lines.add(exportContext.formatRowValue(row, GeneralResultType.station)); 133 lines.add(exportContext.formatRowValue(row, GeneralResultType.station));
134 lines.add(exportContext.formatRowValue(row, SInfoResultType.flowdepth)); 134 lines.add(exportContext.formatRowValue(row, SInfoResultType.flowdepth));
135 final FlowDepthCalculationResults results = exportContext.getResults(); 135 final FlowDepthCalculationResults results = exportContext.getResults();
136 136
137 if (mode == ExportMode.pdf || results.isUseTkh()) { 137 // REMARK: for csv: only remove tkh columns, if no result has tkh
138 // for pdf: adding by default is necessary. If there is no tkh, columns will be removed later in the exporter.
139 if (mode == ExportMode.pdf || results.hasTkh()) {
138 lines.add(exportContext.formatRowValue(row, SInfoResultType.flowdepthtkh)); 140 lines.add(exportContext.formatRowValue(row, SInfoResultType.flowdepthtkh));
139 lines.add(exportContext.formatRowValue(row, SInfoResultType.tkh)); 141 lines.add(exportContext.formatRowValue(row, SInfoResultType.tkh));
140 } 142 }
141 143
142 lines.add(exportContext.formatRowValue(row, SInfoResultType.waterlevel)); 144 lines.add(exportContext.formatRowValue(row, SInfoResultType.waterlevel));

http://dive4elements.wald.intevation.org