diff artifacts/src/main/java/org/dive4elements/river/artifacts/model/fixings/FixLongitudinalReferenceFacet.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 5e38e2924c07
children 9744ce3c3853
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/fixings/FixLongitudinalReferenceFacet.java	Wed Aug 01 13:21:34 2018 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/fixings/FixLongitudinalReferenceFacet.java	Wed Aug 01 17:13:52 2018 +0200
@@ -79,7 +79,7 @@
 
             FixAnalysisResult result = (FixAnalysisResult) res.getData();
 
-            KMIndex<QWD []> kmReference = result.getReferenced();
+            KMIndex<QWD []> kmReference = result.getFixings();
 
             if (kmReference == null) {
                 log.warn("No references found.");
@@ -87,25 +87,25 @@
             }
 
             int qwdNdx = index & 255;
-            KMIndex<QWD> resReference =
-                    new KMIndex<QWD>();
+            
+            final KMIndex<QWD> resReference = new KMIndex<>();
+            
             for (KMIndex.Entry<QWD[]> entry: kmReference) {
                 QWD[] qwds = entry.getValue();
                 for(int i = 0; i < qwds.length; i++) {
-                    if(qwds[i].getIndex() == qwdNdx) {
+                    if(qwds[i].getIndex() == qwdNdx && !qwds[i].isOutlier() ) {
                         resReference.add(entry.getKm(), qwds[i]);
                     }
                 }
             }
+
             return resReference;
         }
-        else {
-            log.warn("Artifact is no instance of D4EArtifact.");
-            return null;
-        }
+        
+        log.warn("Artifact is no instance of D4EArtifact.");
+        return null;
     }
 
-
     /**
      * Create a deep copy of this Facet.
      * @return a deep copy.
@@ -117,5 +117,4 @@
         copy.set(this);
         return copy;
     }
-}
-// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 :
+}
\ No newline at end of file

http://dive4elements.wald.intevation.org