Mercurial > dive4elements > river
diff artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/tkhstate/TkhExporter.java @ 8949:09e4a4909814
Distinguish between csv and pdf column headers
author | gernotbelger |
---|---|
date | Wed, 14 Mar 2018 18:34:34 +0100 |
parents | a4f1ac81f26d |
children | 7c1611b5a59e |
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/tkhstate/TkhExporter.java Wed Mar 14 14:10:32 2018 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/tkhstate/TkhExporter.java Wed Mar 14 18:34:34 2018 +0100 @@ -38,9 +38,6 @@ private static final String CSV_META_CALCULATION_FORMULA = "sinfo.export.tkh.calculation.formula"; - // FIXME: use pgetPdfHeader instead of getCsvHeader - private static final String CSV_MEAN_BED_HEIGHT_HEADER_SHORT = "sinfo.export.flow_depth.csv.header.mean_bed_height.short"; - private static final String JASPER_FILE = "/jasper/sinfo.flowdepth.jasper"; @Override @@ -144,20 +141,21 @@ super.addJRMetaDataDefaults(source, results); /* column headings */ - source.addMetaData("station_header", msg( SInfoResultType.station.getCsvHeader())); - source.addMetaData("tkh_header", msg(SInfoResultType.tkh.getCsvHeader())); - source.addMetaData("bedheight_header", msg(SInfoResultType.meanBedHeight.getCsvHeader())); - source.addMetaData("waterlevel_header", msg(SInfoResultType.waterlevel.getCsvHeader())); - source.addMetaData("discharge_header", msg(SInfoResultType.discharge.getCsvHeader())); + source.addMetaData("station_header", SInfoResultType.station.getPdfHeader(this.context.getMeta())); + source.addMetaData("tkh_header", SInfoResultType.tkh.getPdfHeader(this.context.getMeta())); + source.addMetaData("bedheight_header", SInfoResultType.meanBedHeight.getPdfHeader(this.context.getMeta())); + source.addMetaData("waterlevel_header", SInfoResultType.waterlevel.getPdfHeader(this.context.getMeta())); + source.addMetaData("discharge_header", SInfoResultType.discharge.getPdfHeader(this.context.getMeta())); // REMARK: actually the column makes no sense if description header is null. But (software symmetry...) WINFO also // writes an empty column into the pdf in that case (most probably to avoid the need for two jasper templates). final String descriptionHeader = results.getDescriptionHeader(); - final String waterlevelNameHeader = descriptionHeader == null ? msg(SInfoResultType.waterlevelLabel.getCsvHeader()) : descriptionHeader; + final String waterlevelNameHeader = descriptionHeader == null ? SInfoResultType.waterlevelLabel.getPdfHeader(this.context.getMeta()) + : descriptionHeader; source.addMetaData("waterlevel_name_header", waterlevelNameHeader); - source.addMetaData("gauge_header", msg(SInfoResultType.gaugeLabel.getCsvHeader())); - source.addMetaData("location_header", msg(SInfoResultType.location.getCsvHeader())); + source.addMetaData("gauge_header", SInfoResultType.gaugeLabel.getPdfHeader(this.context.getMeta())); + source.addMetaData("location_header", SInfoResultType.location.getPdfHeader(this.context.getMeta())); } @Override