diff artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/flowdepth/FlowDepthCalculationResult.java @ 9318:7b2b086e45f0

collision pdf details, ResultType refactoring, bezugswst result
author gernotbelger
date Fri, 27 Jul 2018 10:11:23 +0200
parents 740d65e4aa14
children 0c8f170945d7
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/flowdepth/FlowDepthCalculationResult.java	Thu Jul 26 17:37:23 2018 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/flowdepth/FlowDepthCalculationResult.java	Fri Jul 27 10:11:23 2018 +0200
@@ -70,8 +70,8 @@
 
         header.add(exportContextCSV.msgUnitCSV(SInfoResultType.waterlevel, river.getWstUnit()));
         header.add(exportContextCSV.msgUnitCSV(SInfoResultType.discharge));
-        header.add(exportContextCSV.formatCsvHeader(SInfoResultType.waterlevelLabel));
-        header.add(exportContextCSV.formatCsvHeader(SInfoResultType.gaugeLabel));
+        header.add(exportContextCSV.formatCsvHeader(GeneralResultType.waterlevelLabel));
+        header.add(exportContextCSV.formatCsvHeader(GeneralResultType.gaugeLabel));
         header.add(exportContextCSV.formatCsvHeader(SInfoResultType.meanBedHeight));
         header.add(exportContextCSV.formatCsvHeader(SInfoResultType.soundingLabel));
         header.add(exportContextCSV.formatCsvHeader(GeneralResultType.location));
@@ -119,8 +119,8 @@
         exportContextPDF.addJRMetadata(source, "tkh_header", SInfoResultType.tkh);
         exportContextPDF.addJRMetadata(source, "waterlevel_header", SInfoResultType.waterlevel);
         exportContextPDF.addJRMetadata(source, "discharge_header", SInfoResultType.discharge);
-        exportContextPDF.addJRMetadata(source, "waterlevel_name_header", SInfoResultType.waterlevelLabel);
-        exportContextPDF.addJRMetadata(source, "gauge_header", SInfoResultType.gaugeLabel);
+        exportContextPDF.addJRMetadata(source, "waterlevel_name_header", GeneralResultType.waterlevelLabel);
+        exportContextPDF.addJRMetadata(source, "gauge_header", GeneralResultType.gaugeLabel);
         exportContextPDF.addJRMetadata(source, "bedheight_header", SInfoResultType.meanBedHeight);
         exportContextPDF.addJRMetadata(source, "sounding_name_header", SInfoResultType.soundingLabel);
         exportContextPDF.addJRMetadata(source, "location_header", GeneralResultType.location);
@@ -141,8 +141,8 @@
 
         lines.add(exportContext.formatRowValue(row, SInfoResultType.waterlevel));
         lines.add(exportContext.formatRowValue(row, SInfoResultType.discharge));
-        lines.add(exportContext.formatRowValue(row, SInfoResultType.waterlevelLabel));
-        lines.add(exportContext.formatRowValue(row, SInfoResultType.gaugeLabel));
+        lines.add(exportContext.formatRowValue(row, GeneralResultType.waterlevelLabel));
+        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));

http://dive4elements.wald.intevation.org