# HG changeset patch # User Ingo Weinzierl # Date 1328812683 0 # Node ID 07c39470e2cb38730c46b287519700802cfea85c # Parent c321b39b39ab6ecc368082a699be4cc9d5d01d16 Added new model classes that should be used for axes range adaption later. flys-artifacts/trunk@4011 c6561f87-3c4e-4783-a992-168aeb5c3f6f diff -r c321b39b39ab -r 07c39470e2cb flys-artifacts/ChangeLog --- a/flys-artifacts/ChangeLog Thu Feb 09 17:28:31 2012 +0000 +++ b/flys-artifacts/ChangeLog Thu Feb 09 18:38:03 2012 +0000 @@ -1,3 +1,10 @@ +2012-02-09 Ingo Weinzierl + + * src/main/java/de/intevation/flys/jfree/TimeBounds.java, + src/main/java/de/intevation/flys/jfree/DoubleBounds.java, + src/main/java/de/intevation/flys/jfree/Bounds.java: New model classes that + should be used for adapting axes ranges later. + 2012-02-09 Sascha L. Teichmann * src/main/java/de/intevation/flys/artifacts/model/Calculation5.java: diff -r c321b39b39ab -r 07c39470e2cb flys-artifacts/src/main/java/de/intevation/flys/jfree/Bounds.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/jfree/Bounds.java Thu Feb 09 18:38:03 2012 +0000 @@ -0,0 +1,21 @@ +package de.intevation.flys.jfree; + +import java.io.Serializable; + +import org.jfree.chart.axis.ValueAxis; + + +/** + * @author Ingo Weinzierl + */ +public interface Bounds extends Serializable { + + Number getLower(); + + Number getUpper(); + + void applyBounds(ValueAxis axis); + + Bounds combine(Bounds bounds); +} +// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : diff -r c321b39b39ab -r 07c39470e2cb flys-artifacts/src/main/java/de/intevation/flys/jfree/DoubleBounds.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/jfree/DoubleBounds.java Thu Feb 09 18:38:03 2012 +0000 @@ -0,0 +1,64 @@ +package de.intevation.flys.jfree; + +import org.apache.log4j.Logger; + +import org.jfree.chart.axis.ValueAxis; +import org.jfree.data.Range; + + +/** + * @author Ingo Weinzierl + */ +public class DoubleBounds implements Bounds { + + protected double lower; + protected double upper; + + + public DoubleBounds(double lower, double upper) { + this.lower = lower; + this.upper = upper; + } + + + @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)); + } + + + @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 : diff -r c321b39b39ab -r 07c39470e2cb flys-artifacts/src/main/java/de/intevation/flys/jfree/TimeBounds.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/jfree/TimeBounds.java Thu Feb 09 18:38:03 2012 +0000 @@ -0,0 +1,69 @@ +package de.intevation.flys.jfree; + +import java.util.Date; + +import org.apache.log4j.Logger; + +import org.jfree.chart.axis.DateAxis; +import org.jfree.chart.axis.ValueAxis; + + +/** + * @author Ingo Weinzierl + */ +public class TimeBounds implements Bounds { + + protected long lower; + protected long upper; + + + public TimeBounds(long lower, long upper) { + this.lower = lower; + this.upper = upper; + } + + + @Override + public Number getLower() { + return Long.valueOf(lower); + } + + + @Override + public Number getUpper() { + return Long.valueOf(upper); + } + + + @Override + public void applyBounds(ValueAxis axis) { + DateAxis dateAxis = (DateAxis) axis; + + dateAxis.setMinimumDate(new Date(lower)); + dateAxis.setMaximumDate(new Date(upper)); + } + + + @Override + public Bounds combine(Bounds bounds) { + if (bounds == null) { + return this; + } + + TimeBounds other = (TimeBounds) bounds; + + long otherLower = other.getLower().longValue(); + long otherUpper = other.getUpper().longValue(); + + return new TimeBounds( + otherLower < lower ? otherLower : lower, + otherUpper > upper ? otherUpper : upper); + } + + + @Override + public String toString() { + return "TimeBounds=[" + lower + " ; " + upper + "]"; + } +} +// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 :