Mercurial > dive4elements > river
view artifacts/src/main/java/org/dive4elements/river/jfree/DoubleBounds.java @ 8748:36d7bda0b47a
(issue1788) Fix area split if there are no NaN's in the data
The split algorithmn splits in a way that it always creates
at least two datasets. One before the NaN, one after the NaN.
This is broken in case the dataset does not contain any NaN
value as it resulted in two identical datasets. This changed
the display and resulted in a broken area calculation.
I've also added some commented out debug code that was helpful
tracking down this problem.
author | Andre Heinecke <andre.heinecke@intevation.de> |
---|---|
date | Mon, 08 Jun 2015 16:53:54 +0200 |
parents | ac7cb15e1946 |
children | e5f688820951 |
line wrap: on
line source
/* Copyright (C) 2011, 2012, 2013 by Bundesanstalt für Gewässerkunde * Software engineering by Intevation GmbH * * This file is Free Software under the GNU AGPL (>=v3) * and comes with ABSOLUTELY NO WARRANTY! Check out the * documentation coming with Dive4Elements River for details. */ package org.dive4elements.river.jfree; import org.jfree.chart.axis.ValueAxis; import org.jfree.chart.axis.LogarithmicAxis; import org.jfree.data.Range; /** * @author <a href="mailto:ingo.weinzierl@intevation.de">Ingo Weinzierl</a> */ public class DoubleBounds implements Bounds { protected double lower; protected double upper; /** * Default constructor. <b>A DoubleBounds has always set lower < * upper!</b> */ public DoubleBounds(double lower, double upper) { this.lower = Math.min(lower, upper); this.upper = Math.max(lower, upper); } public DoubleBounds(Range range) { this.lower = range.getLowerBound(); this.upper = range.getUpperBound(); } @Override public Number getLower() { return Double.valueOf(lower); } @Override public Number getUpper() { return Double.valueOf(upper); } @Override public void applyBounds(ValueAxis axis) { axis.setRange(new Range(lower, upper)); } /** * Set extended range to ValueAxis. * @param percent how many percent to extend (in each direction, * thus 10 percent on [0,100] -> [-10,110]. */ @Override public void applyBounds(ValueAxis axis, int percent) { double space = (upper - lower) / 100 * percent; if (axis instanceof LogarithmicAxis) { axis.setRange(new Range(Math.max(lower-space, 0.0001), Math.max(upper+space, 0.0002))); } else { axis.setRange(new Range(lower-space, upper+space)); } } @Override public Bounds combine(Bounds bounds) { if (bounds == null) { return this; } DoubleBounds other = (DoubleBounds) bounds; double otherLower = other.getLower().doubleValue(); double otherUpper = other.getUpper().doubleValue(); return new DoubleBounds( otherLower < lower ? otherLower : lower, otherUpper > upper ? otherUpper : upper); } @Override public String toString() { return "DoubleBounds=[" + lower + " ; " + upper + "]"; } } // vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 :