diff artifacts/src/main/java/org/dive4elements/river/exports/fixings/DeltaWtExporter.java @ 9360:ddcd52d239cd

Outliers in fixation calculation are now shown within the other 'B' event themes and get a separate symbol (triangle). Removed old outliers theme. Also consider showpoints property. Also consider pointsize property.
author gernotbelger
date Wed, 01 Aug 2018 17:13:52 +0200
parents a49fe0ebb297
children 9744ce3c3853
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/exports/fixings/DeltaWtExporter.java	Wed Aug 01 13:21:34 2018 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/exports/fixings/DeltaWtExporter.java	Wed Aug 01 17:13:52 2018 +0200
@@ -107,14 +107,12 @@
         }
         final FixAnalysisResult result = (FixAnalysisResult) data;
         this.analysisPeriods.add(result.getAnalysisPeriods());
-        this.referenceEvents.add(result.getReferenced());
+        this.referenceEvents.add(result.getFixings());
     }
 
     @Override
     protected void writeCSVData(final CSVWriter writer) throws IOException {
 
-        final boolean debug = log.isDebugEnabled();
-
         writeCSVHeader(writer);
 
         final TreeMap<Double, ArrayList<String[]>> sorted = getRows();
@@ -154,20 +152,18 @@
 
                 final String kmS = kmF.format(kmEntry.getKm());
                 for (final QWD qwd : kmEntry.getValue()) {
-                    final String deltaWS = dwF.format(qwd.getDeltaW());
-                    final String qS = qF.format(qwd.getQ());
-                    final String wS = wF.format(qwd.getW());
-                    final String dateS = dF.format(qwd.getDate());
-
-                    list.add(new String[] { kmS, dateS, qS, wS, referenceS, deltaWS });
+                    if( !qwd.isOutlier() ) {
+                        final String deltaWS = dwF.format(qwd.getDeltaW());
+                        final String qS = qF.format(qwd.getQ());
+                        final String wS = wF.format(qwd.getW());
+                        final String dateS = dF.format(qwd.getDate());
+    
+                        list.add(new String[] { kmS, dateS, qS, wS, referenceS, deltaWS });
+                    }
                 }
             }
         }
 
-        // if (debug) {
-        // log.debug("AnalysisPeriods: " + this.analysisPeriods.size());
-        // }
-
         final String analysisTemplate = getAnalysisTemplate();
 
         for (final KMIndex<AnalysisPeriod[]> periods : this.analysisPeriods) {

http://dive4elements.wald.intevation.org