Mercurial > dive4elements > river
diff artifacts/src/main/java/org/dive4elements/river/artifacts/model/fixings/FixReferenceEventsFacet.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 | a3f318347707 |
| children | 9744ce3c3853 |
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/fixings/FixReferenceEventsFacet.java Wed Aug 01 13:21:34 2018 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/fixings/FixReferenceEventsFacet.java Wed Aug 01 17:13:52 2018 +0200 @@ -61,24 +61,12 @@ final FixResult result = (FixResult) res.getData(); final double currentKm = getCurrentKm(context); - if (log.isDebugEnabled()) { + if (log.isDebugEnabled()) log.debug("current km in FRE: " + currentKm); - } /* first search in referenced */ - final KMIndex<QWD[]> referenced = result.getReferenced(); - final QWD foundReferenced = find(referenced, currentKm); - if (foundReferenced != null) - return foundReferenced; - - // FIXME -// /* also search in outliers, should be mutually exclusive, because outliers got removed from referenced */ -// final KMIndex<QWD[]> outliers = result.getOutliers(); -// final QWD foundOutlier = find(outliers, currentKm); -// if (foundOutlier != null) -// return foundOutlier; - - return null; + final KMIndex<QWD[]> referenced = result.getFixings(); + return find(referenced, currentKm); } private QWD find(final KMIndex<QWD[]> kmQWs, final double currentKm) {