diff artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/tkhstate/TkhExporter.java @ 9105:ae3565385e6a

Some finetuning an Tkh calculation, preparation for wsp calculation with bed height stations only
author gernotbelger
date Tue, 29 May 2018 11:36:42 +0200
parents 7134a4c7d1b6
children 23945061daec
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/tkhstate/TkhExporter.java	Tue May 29 11:35:44 2018 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/tkhstate/TkhExporter.java	Tue May 29 11:36:42 2018 +0200
@@ -53,8 +53,6 @@
 
         // "# Berechnungsgrundlage: Gleichung nach GILL (1971)"
         writeCSVMetaEntry(writer, CSV_META_CALCULATION_FORMULA);
-
-        writer.writeNext(new String[] { "" });
     }
 
     /**
@@ -85,15 +83,25 @@
     }
 
     @Override
-    // FIXME: rename
     protected void writeCSVResultMetadata(final CSVWriter writer, final TkhCalculationResults results, final TkhCalculationResult result) {
 
         final WstInfo wst = result.getWst();
         super.writeCSVWaterlevelMetadata(writer, wst);
-        writer.writeNext(new String[] { "" }); // break line
-        // FIXME:
+
+        // REAMRK:
         // "# W/Pegel [cm]: " (nur bei Eingabe des Wasserstands am Pegel)
         // "# Q (m³/s): " (nur bei Eingabe des Durchflusses)
+        // WaterlevelEXporter does this
+        // final WaterlevelDescriptionBuilder descBuilder = new WaterlevelDescriptionBuilder((D4EArtifact) this.master,
+        // this.context);
+        // final String metadata = descBuilder.getMetadata();
+        // BUT:
+        // - the WINFO results do not contain this info per wst
+        // - the WaterlevelExporter prints this in the global header for all waterlevels, simply based on the input fields
+        // - instead we would want tis information per waterlevel
+        // - the metadata 'Bezeichnung WST' contains exactly the wanted data
+
+        writer.writeNext(new String[] { "" }); // break line
     }
 
     /**
@@ -166,5 +174,4 @@
             getLog().warn("Error generating PDF Report!", je);
         }
     }
-
 }
\ No newline at end of file

http://dive4elements.wald.intevation.org