Mercurial > dive4elements > river
comparison flys-artifacts/src/main/java/de/intevation/flys/exports/ChartHelper.java @ 2587:bece6f604899
Removed references to Range and replaced those with references to Bounds in ChartGenerators.
flys-artifacts/trunk@4143 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author | Ingo Weinzierl <ingo.weinzierl@intevation.de> |
---|---|
date | Thu, 15 Mar 2012 10:30:03 +0000 |
parents | 02ac373b6d69 |
children | 638b1da85450 |
comparison
equal
deleted
inserted
replaced
2586:8cd6358eb7f8 | 2587:bece6f604899 |
---|---|
1 package de.intevation.flys.exports; | 1 package de.intevation.flys.exports; |
2 | 2 |
3 import org.jfree.data.Range; | 3 import org.jfree.data.Range; |
4 import org.jfree.data.xy.XYDataset; | 4 import org.jfree.data.xy.XYDataset; |
5 import org.jfree.data.xy.XYSeriesCollection; | |
5 import org.jfree.data.time.RegularTimePeriod; | 6 import org.jfree.data.time.RegularTimePeriod; |
6 import org.jfree.data.time.TimeSeriesCollection; | 7 import org.jfree.data.time.TimeSeriesCollection; |
7 import org.jfree.data.time.TimeSeries; | 8 import org.jfree.data.time.TimeSeries; |
8 | 9 |
9 import org.apache.log4j.Logger; | 10 import org.apache.log4j.Logger; |
27 * | 28 * |
28 * @param dataset The dataset which should be evaluated. | 29 * @param dataset The dataset which should be evaluated. |
29 * | 30 * |
30 * @return an array with x and y ranges. | 31 * @return an array with x and y ranges. |
31 */ | 32 */ |
32 public static Range[] getRanges(XYDataset dataset) { | 33 public static Bounds[] getBounds(XYSeriesCollection dataset) { |
33 int seriesCount = dataset != null ? dataset.getSeriesCount() : 0; | 34 int seriesCount = dataset != null ? dataset.getSeriesCount() : 0; |
34 | 35 |
35 if (seriesCount == 0) { | 36 if (seriesCount == 0) { |
36 logger.warn("Dataset is empty or has no Series set."); | 37 logger.warn("Dataset is empty or has no Series set."); |
37 return null; | 38 return null; |
73 } | 74 } |
74 } | 75 } |
75 } | 76 } |
76 | 77 |
77 return foundValue | 78 return foundValue |
78 ? new Range[] { new Range(minX, maxX), new Range(minY, maxY) } | 79 ? new Bounds[] { |
80 new DoubleBounds(minX, maxX), | |
81 new DoubleBounds(minY, maxY) } | |
79 : null; | 82 : null; |
83 } | |
84 | |
85 | |
86 public static Bounds[] getBounds(XYDataset dataset) { | |
87 if (dataset instanceof XYSeriesCollection) { | |
88 return getBounds((XYSeriesCollection) dataset); | |
89 } | |
90 else if(dataset instanceof TimeSeriesCollection) { | |
91 return getBounds((TimeSeriesCollection) dataset); | |
92 } | |
93 else { | |
94 logger.warn("Unknown XYDataset instance: " + dataset.getClass()); | |
95 return null; | |
96 } | |
80 } | 97 } |
81 | 98 |
82 | 99 |
83 public static Bounds[] getBounds(TimeSeriesCollection collection) { | 100 public static Bounds[] getBounds(TimeSeriesCollection collection) { |
84 int seriesCount = collection != null ? collection.getSeriesCount() : 0; | 101 int seriesCount = collection != null ? collection.getSeriesCount() : 0; |