dive4elements/river: flys-artifacts/src/main/java/de/intevation/flys/exports/XYChartGenerator.java annotate

annotate flys-artifacts/src/main/java/de/intevation/flys/exports/XYChartGenerator.java @ 3620:1cd6114603d9

Improved logo placement. flys-artifacts/trunk@5296 c6561f87-3c4e-4783-a992-168aeb5c3f6f

author	Felix Wolfsteller <felix.wolfsteller@intevation.de>
date	Wed, 29 Aug 2012 14:33:48 +0000
parents	b7867c03760a
children	6772e9f9b65f

rev	line source
369 2ce7b473620e Implemented the chart creation of a longitudinal section chart - W and Q facets. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: diff changeset	1 package de.intevation.flys.exports;
2ce7b473620e Implemented the chart creation of a longitudinal section chart - W and Q facets. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: diff changeset	2
3257 2aca387333d6 Removed superfluous imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3249 diff changeset	3 import de.intevation.artifactdatabase.state.ArtifactAndFacet;
2aca387333d6 Removed superfluous imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3249 diff changeset	4
2aca387333d6 Removed superfluous imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3249 diff changeset	5 import de.intevation.flys.jfree.Bounds;
2aca387333d6 Removed superfluous imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3249 diff changeset	6 import de.intevation.flys.jfree.CollisionFreeXYTextAnnotation;
2aca387333d6 Removed superfluous imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3249 diff changeset	7 import de.intevation.flys.jfree.DoubleBounds;
2aca387333d6 Removed superfluous imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3249 diff changeset	8 import de.intevation.flys.jfree.FLYSAnnotation;
2aca387333d6 Removed superfluous imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3249 diff changeset	9 import de.intevation.flys.jfree.StyledAreaSeriesCollection;
2aca387333d6 Removed superfluous imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3249 diff changeset	10 import de.intevation.flys.jfree.StyledXYSeries;
2aca387333d6 Removed superfluous imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3249 diff changeset	11
369 2ce7b473620e Implemented the chart creation of a longitudinal section chart - W and Q facets. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: diff changeset	12 import java.awt.Color;
2053 f9a972d375ba Use the user defined font size to set Y axes label fonts sizes. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2052 diff changeset	13 import java.awt.Font;
3616 d4751be54745 Add rather faked image annotations to chart, if property is set accordingly. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3296 diff changeset	14 import javax.swing.ImageIcon;
3257 2aca387333d6 Removed superfluous imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3249 diff changeset	15
1645 4a8251eae217 Bugfix: #68 Set number format of chart plot axes based on the CallMeta instance for each request. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1623 diff changeset	16 import java.text.NumberFormat;
3257 2aca387333d6 Removed superfluous imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3249 diff changeset	17
1679 69929c471646 Improved the creation/rendering of annotations (km favorites, mainvalues). Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1645 diff changeset	18 import java.util.ArrayList;
1684 bdb05dc9b763 Bugfix: #353 Enabled chart's to be drawn with proper axes set even if no data is contained. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1679 diff changeset	19 import java.util.HashMap;
1679 69929c471646 Improved the creation/rendering of annotations (km favorites, mainvalues). Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1645 diff changeset	20 import java.util.List;
1684 bdb05dc9b763 Bugfix: #353 Enabled chart's to be drawn with proper axes set even if no data is contained. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1679 diff changeset	21 import java.util.Map;
1679 69929c471646 Improved the creation/rendering of annotations (km favorites, mainvalues). Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1645 diff changeset	22
369 2ce7b473620e Implemented the chart creation of a longitudinal section chart - W and Q facets. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: diff changeset	23 import org.apache.log4j.Logger;
3249 f76cef888ee1 Fix issue710 - crashing one-point-diagrams. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3242 diff changeset	24
369 2ce7b473620e Implemented the chart creation of a longitudinal section chart - W and Q facets. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: diff changeset	25 import org.jfree.chart.ChartFactory;
2ce7b473620e Implemented the chart creation of a longitudinal section chart - W and Q facets. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: diff changeset	26 import org.jfree.chart.JFreeChart;
2584 5d5457a1bd5f Stubby legend aggregation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2574 diff changeset	27 import org.jfree.chart.LegendItem;
3257 2aca387333d6 Removed superfluous imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3249 diff changeset	28
3616 d4751be54745 Add rather faked image annotations to chart, if property is set accordingly. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3296 diff changeset	29 import org.jfree.chart.annotations.XYAnnotation;
d4751be54745 Add rather faked image annotations to chart, if property is set accordingly. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3296 diff changeset	30 import org.jfree.chart.annotations.XYImageAnnotation;
1679 69929c471646 Improved the creation/rendering of annotations (km favorites, mainvalues). Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1645 diff changeset	31 import org.jfree.chart.annotations.XYTextAnnotation;
3257 2aca387333d6 Removed superfluous imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3249 diff changeset	32
369 2ce7b473620e Implemented the chart creation of a longitudinal section chart - W and Q facets. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: diff changeset	33 import org.jfree.chart.axis.NumberAxis;
652 8fa4c5c9cd1a Charts are zoomed to a specified view if the attribute document for the chart creation contains an x and/or y range. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 423 diff changeset	34 import org.jfree.chart.axis.ValueAxis;
3257 2aca387333d6 Removed superfluous imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3249 diff changeset	35
3064 478e8d9d88ba Add missing imports. Christian Lins <christian.lins@intevation.de> parents: 3063 diff changeset	36 import org.jfree.chart.plot.Marker;
369 2ce7b473620e Implemented the chart creation of a longitudinal section chart - W and Q facets. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: diff changeset	37 import org.jfree.chart.plot.PlotOrientation;
2ce7b473620e Implemented the chart creation of a longitudinal section chart - W and Q facets. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: diff changeset	38 import org.jfree.chart.plot.XYPlot;
3257 2aca387333d6 Removed superfluous imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3249 diff changeset	39
652 8fa4c5c9cd1a Charts are zoomed to a specified view if the attribute document for the chart creation contains an x and/or y range. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 423 diff changeset	40 import org.jfree.data.Range;
3257 2aca387333d6 Removed superfluous imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3249 diff changeset	41
2242 7e8e1d5384c0 Further refactoring of XYChartGenerator / ChartGenerator with the result, that timerange charts are now able to display lines. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2238 diff changeset	42 import org.jfree.data.general.Series;
3257 2aca387333d6 Removed superfluous imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3249 diff changeset	43
3242 1dca41dba135 Move annotation code to base class ChartGenerator Christian Lins <christian.lins@intevation.de> parents: 3227 diff changeset	44 import org.jfree.data.xy.XYDataset;
923 7ca4a287cd0e #135 Modified the way to store datasets for different chart axes. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 718 diff changeset	45 import org.jfree.data.xy.XYSeries;
7ca4a287cd0e #135 Modified the way to store datasets for different chart axes. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 718 diff changeset	46 import org.jfree.data.xy.XYSeriesCollection;
3257 2aca387333d6 Removed superfluous imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3249 diff changeset	47
3242 1dca41dba135 Move annotation code to base class ChartGenerator Christian Lins <christian.lins@intevation.de> parents: 3227 diff changeset	48 import org.json.JSONArray;
1dca41dba135 Move annotation code to base class ChartGenerator Christian Lins <christian.lins@intevation.de> parents: 3227 diff changeset	49 import org.json.JSONException;
369 2ce7b473620e Implemented the chart creation of a longitudinal section chart - W and Q facets. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: diff changeset	50
3257 2aca387333d6 Removed superfluous imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3249 diff changeset	51 import org.w3c.dom.Document;
369 2ce7b473620e Implemented the chart creation of a longitudinal section chart - W and Q facets. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: diff changeset	52
2206 e2124ca11adb Add manual point handling for many different chart types. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2193 diff changeset	53
369 2ce7b473620e Implemented the chart creation of a longitudinal section chart - W and Q facets. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: diff changeset	54 /**
2ce7b473620e Implemented the chart creation of a longitudinal section chart - W and Q facets. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: diff changeset	55 * An abstract base class for creating XY charts.
2ce7b473620e Implemented the chart creation of a longitudinal section chart - W and Q facets. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: diff changeset	56 *
1940 0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	57 * With respect to datasets, ranges and axis, there are following requirements:
0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	58 * <ul>
0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	59 * <li> First in, first drawn: "Early" datasets should be of lower Z-Oder
0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	60 * than later ones (only works per-axis). </li>
0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	61 * <li> Visible axis should initially show the range of all datasets that
0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	62 * show data for this axis (even invisible ones). Motivation: Once
0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	63 * a dataset (theme) has been activated, it should be on screen. </li>
0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	64 * <li> There should always be a Y-Axis on the "left". </li>
0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	65 * </ul>
0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	66 *
369 2ce7b473620e Implemented the chart creation of a longitudinal section chart - W and Q facets. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: diff changeset	67 * @author <a href="mailto:ingo.weinzierl@intevation.de">Ingo Weinzierl</a>
2ce7b473620e Implemented the chart creation of a longitudinal section chart - W and Q facets. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: diff changeset	68 */
2ce7b473620e Implemented the chart creation of a longitudinal section chart - W and Q facets. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: diff changeset	69 public abstract class XYChartGenerator extends ChartGenerator {
2ce7b473620e Implemented the chart creation of a longitudinal section chart - W and Q facets. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: diff changeset	70
3242 1dca41dba135 Move annotation code to base class ChartGenerator Christian Lins <christian.lins@intevation.de> parents: 3227 diff changeset	71 public class XYAxisDataset implements AxisDataset {
1940 0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	72 /** Symbolic integer, but also coding the priority (0 goes first). */
0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	73 protected int axisSymbol;
0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	74 /** List of assigned datasets (in order). */
0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	75 protected List<XYDataset> datasets;
0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	76 /** Range to use to include all given datasets. */
0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	77 protected Range range;
2163 105097966111 Theoretically allow annotations on second y ais. Practically allow Q MainValues on Q Axis in Duration Curves. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2161 diff changeset	78 /** Index of axis in plot. */
105097966111 Theoretically allow annotations on second y ais. Practically allow Q MainValues on Q Axis in Duration Curves. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2161 diff changeset	79 protected int plotAxisIndex;
1940 0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	80
0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	81 /** Create AxisDataset. */
2238 23c7c51df772 Some more refactoring in XYChartGenerator and ChartGenerator; implemented necessary stuff in TimeseriesChartGenerator and return new empty instances of timeseries charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2236 diff changeset	82 public XYAxisDataset(int symb) {
1940 0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	83 this.axisSymbol = symb;
0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	84 datasets = new ArrayList<XYDataset>();
0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	85 }
0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	86
0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	87 /** Merge (or create given range with range so far (if any). */
0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	88 private void mergeRanges(Range subRange) {
1959 eace020067da Further flys/issue420 fix, NaN-guard X axis extent. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1958 diff changeset	89 // Avoid merging NaNs, as they take min/max place forever.
eace020067da Further flys/issue420 fix, NaN-guard X axis extent. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1958 diff changeset	90 if (subRange == null \|\|
eace020067da Further flys/issue420 fix, NaN-guard X axis extent. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1958 diff changeset	91 Double.isNaN(subRange.getLowerBound()) \|\|
eace020067da Further flys/issue420 fix, NaN-guard X axis extent. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1958 diff changeset	92 Double.isNaN(subRange.getUpperBound())) {
eace020067da Further flys/issue420 fix, NaN-guard X axis extent. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1958 diff changeset	93 return;
eace020067da Further flys/issue420 fix, NaN-guard X axis extent. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1958 diff changeset	94 }
1940 0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	95 if (range == null) {
0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	96 range = subRange;
0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	97 return;
0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	98 }
0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	99 range = Range.combine(range, subRange);
0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	100 }
0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	101
2238 23c7c51df772 Some more refactoring in XYChartGenerator and ChartGenerator; implemented necessary stuff in TimeseriesChartGenerator and return new empty instances of timeseries charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2236 diff changeset	102
2710 013882485011 Cosmetics (docs). Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2706 diff changeset	103 /** Add a dataset to internal list for this axis. */
2238 23c7c51df772 Some more refactoring in XYChartGenerator and ChartGenerator; implemented necessary stuff in TimeseriesChartGenerator and return new empty instances of timeseries charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2236 diff changeset	104 @Override
23c7c51df772 Some more refactoring in XYChartGenerator and ChartGenerator; implemented necessary stuff in TimeseriesChartGenerator and return new empty instances of timeseries charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2236 diff changeset	105 public void addDataset(XYDataset dataset) {
23c7c51df772 Some more refactoring in XYChartGenerator and ChartGenerator; implemented necessary stuff in TimeseriesChartGenerator and return new empty instances of timeseries charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2236 diff changeset	106 datasets.add(dataset);
23c7c51df772 Some more refactoring in XYChartGenerator and ChartGenerator; implemented necessary stuff in TimeseriesChartGenerator and return new empty instances of timeseries charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2236 diff changeset	107 includeYRange(((XYSeriesCollection) dataset).getSeries(0));
23c7c51df772 Some more refactoring in XYChartGenerator and ChartGenerator; implemented necessary stuff in TimeseriesChartGenerator and return new empty instances of timeseries charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2236 diff changeset	108 }
23c7c51df772 Some more refactoring in XYChartGenerator and ChartGenerator; implemented necessary stuff in TimeseriesChartGenerator and return new empty instances of timeseries charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2236 diff changeset	109
1940 0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	110 /** Add a dataset, include its range. */
2238 23c7c51df772 Some more refactoring in XYChartGenerator and ChartGenerator; implemented necessary stuff in TimeseriesChartGenerator and return new empty instances of timeseries charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2236 diff changeset	111 public void addDataset(XYSeries series) {
23c7c51df772 Some more refactoring in XYChartGenerator and ChartGenerator; implemented necessary stuff in TimeseriesChartGenerator and return new empty instances of timeseries charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2236 diff changeset	112 addDataset(new XYSeriesCollection(series));
1940 0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	113 }
0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	114
2242 7e8e1d5384c0 Further refactoring of XYChartGenerator / ChartGenerator with the result, that timerange charts are now able to display lines. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2238 diff changeset	115
2710 013882485011 Cosmetics (docs). Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2706 diff changeset	116 /** Set Range for this axis. */
2242 7e8e1d5384c0 Further refactoring of XYChartGenerator / ChartGenerator with the result, that timerange charts are now able to display lines. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2238 diff changeset	117 @Override
7e8e1d5384c0 Further refactoring of XYChartGenerator / ChartGenerator with the result, that timerange charts are now able to display lines. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2238 diff changeset	118 public void setRange(Range range) {
7e8e1d5384c0 Further refactoring of XYChartGenerator / ChartGenerator with the result, that timerange charts are now able to display lines. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2238 diff changeset	119 this.range = range;
7e8e1d5384c0 Further refactoring of XYChartGenerator / ChartGenerator with the result, that timerange charts are now able to display lines. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2238 diff changeset	120 }
7e8e1d5384c0 Further refactoring of XYChartGenerator / ChartGenerator with the result, that timerange charts are now able to display lines. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2238 diff changeset	121
7e8e1d5384c0 Further refactoring of XYChartGenerator / ChartGenerator with the result, that timerange charts are now able to display lines. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2238 diff changeset	122
2710 013882485011 Cosmetics (docs). Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2706 diff changeset	123 /** Get Range for this axis. */
2242 7e8e1d5384c0 Further refactoring of XYChartGenerator / ChartGenerator with the result, that timerange charts are now able to display lines. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2238 diff changeset	124 @Override
7e8e1d5384c0 Further refactoring of XYChartGenerator / ChartGenerator with the result, that timerange charts are now able to display lines. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2238 diff changeset	125 public Range getRange() {
7e8e1d5384c0 Further refactoring of XYChartGenerator / ChartGenerator with the result, that timerange charts are now able to display lines. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2238 diff changeset	126 return range;
7e8e1d5384c0 Further refactoring of XYChartGenerator / ChartGenerator with the result, that timerange charts are now able to display lines. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2238 diff changeset	127 }
7e8e1d5384c0 Further refactoring of XYChartGenerator / ChartGenerator with the result, that timerange charts are now able to display lines. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2238 diff changeset	128
7e8e1d5384c0 Further refactoring of XYChartGenerator / ChartGenerator with the result, that timerange charts are now able to display lines. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2238 diff changeset	129
2710 013882485011 Cosmetics (docs). Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2706 diff changeset	130 /** Get Array of Datasets. */
2242 7e8e1d5384c0 Further refactoring of XYChartGenerator / ChartGenerator with the result, that timerange charts are now able to display lines. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2238 diff changeset	131 @Override
7e8e1d5384c0 Further refactoring of XYChartGenerator / ChartGenerator with the result, that timerange charts are now able to display lines. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2238 diff changeset	132 public XYDataset[] getDatasets() {
7e8e1d5384c0 Further refactoring of XYChartGenerator / ChartGenerator with the result, that timerange charts are now able to display lines. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2238 diff changeset	133 return (XYDataset[])
7e8e1d5384c0 Further refactoring of XYChartGenerator / ChartGenerator with the result, that timerange charts are now able to display lines. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2238 diff changeset	134 datasets.toArray(new XYDataset[datasets.size()]);
7e8e1d5384c0 Further refactoring of XYChartGenerator / ChartGenerator with the result, that timerange charts are now able to display lines. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2238 diff changeset	135 }
7e8e1d5384c0 Further refactoring of XYChartGenerator / ChartGenerator with the result, that timerange charts are now able to display lines. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2238 diff changeset	136
2710 013882485011 Cosmetics (docs). Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2706 diff changeset	137
013882485011 Cosmetics (docs). Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2706 diff changeset	138 /** Add a Dataset that describes an area. */
2020 4f7f781e4481 Improved area rendering workflow. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2005 diff changeset	139 public void addArea(StyledAreaSeriesCollection series) {
4f7f781e4481 Improved area rendering workflow. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2005 diff changeset	140 this.datasets.add(series);
2005 79b15491177a Added simple area registering functions. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2000 diff changeset	141 }
79b15491177a Added simple area registering functions. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2000 diff changeset	142
2574 3598690dc9e2 Fix flys/issue501 (manual points have two legend entries). Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2553 diff changeset	143 // TODO obsolete?
3598690dc9e2 Fix flys/issue501 (manual points have two legend entries). Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2553 diff changeset	144 /** True if to be rendered as area. */
2242 7e8e1d5384c0 Further refactoring of XYChartGenerator / ChartGenerator with the result, that timerange charts are now able to display lines. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2238 diff changeset	145 @Override
7e8e1d5384c0 Further refactoring of XYChartGenerator / ChartGenerator with the result, that timerange charts are now able to display lines. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2238 diff changeset	146 public boolean isArea(XYDataset series) {
2020 4f7f781e4481 Improved area rendering workflow. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2005 diff changeset	147 return (series instanceof StyledAreaSeriesCollection);
2005 79b15491177a Added simple area registering functions. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2000 diff changeset	148 }
79b15491177a Added simple area registering functions. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2000 diff changeset	149
1940 0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	150 /** Adjust range to include given dataset. */
1958 82cefa3f954f Partial fix for flys/issue420 (Mosel/DischargeCurves), do survive empty datasets when calculating axis extents. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1948 diff changeset	151 public void includeYRange(XYSeries dataset) {
1940 0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	152 mergeRanges(new Range(dataset.getMinY(), dataset.getMaxY()));
0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	153 }
0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	154
0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	155 /** True if no datasets given. */
2242 7e8e1d5384c0 Further refactoring of XYChartGenerator / ChartGenerator with the result, that timerange charts are now able to display lines. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2238 diff changeset	156 @Override
1940 0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	157 public boolean isEmpty() {
0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	158 return this.datasets.isEmpty();
0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	159 }
2163 105097966111 Theoretically allow annotations on second y ais. Practically allow Q MainValues on Q Axis in Duration Curves. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2161 diff changeset	160
105097966111 Theoretically allow annotations on second y ais. Practically allow Q MainValues on Q Axis in Duration Curves. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2161 diff changeset	161 /** Set the 'real' axis index that this axis is mapped to. */
2242 7e8e1d5384c0 Further refactoring of XYChartGenerator / ChartGenerator with the result, that timerange charts are now able to display lines. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2238 diff changeset	162 @Override
2163 105097966111 Theoretically allow annotations on second y ais. Practically allow Q MainValues on Q Axis in Duration Curves. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2161 diff changeset	163 public void setPlotAxisIndex(int axisIndex) {
105097966111 Theoretically allow annotations on second y ais. Practically allow Q MainValues on Q Axis in Duration Curves. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2161 diff changeset	164 this.plotAxisIndex = axisIndex;
105097966111 Theoretically allow annotations on second y ais. Practically allow Q MainValues on Q Axis in Duration Curves. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2161 diff changeset	165 }
105097966111 Theoretically allow annotations on second y ais. Practically allow Q MainValues on Q Axis in Duration Curves. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2161 diff changeset	166
105097966111 Theoretically allow annotations on second y ais. Practically allow Q MainValues on Q Axis in Duration Curves. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2161 diff changeset	167 /** Get the 'real' axis index that this axis is mapped to. */
2242 7e8e1d5384c0 Further refactoring of XYChartGenerator / ChartGenerator with the result, that timerange charts are now able to display lines. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2238 diff changeset	168 @Override
2163 105097966111 Theoretically allow annotations on second y ais. Practically allow Q MainValues on Q Axis in Duration Curves. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2161 diff changeset	169 public int getPlotAxisIndex() {
105097966111 Theoretically allow annotations on second y ais. Practically allow Q MainValues on Q Axis in Duration Curves. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2161 diff changeset	170 return this.plotAxisIndex;
105097966111 Theoretically allow annotations on second y ais. Practically allow Q MainValues on Q Axis in Duration Curves. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2161 diff changeset	171 }
2005 79b15491177a Added simple area registering functions. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2000 diff changeset	172 } // class AxisDataset
1940 0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	173
2710 013882485011 Cosmetics (docs). Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2706 diff changeset	174 /** Enumerator over existing axes. */
2246 99ef93ce18bd Doc added and fix getAxisWalker-issue. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2242 diff changeset	175 protected abstract YAxisWalker getYAxisWalker();
2000 e71719483546 Improved the ChartSettings - now, each chart writes proper AxisSections into the ChartSettings. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1997 diff changeset	176
2587 bece6f604899 Removed references to Range and replaced those with references to Bounds in ChartGenerators. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2584 diff changeset	177 public static final int AXIS_SPACE = 5;
bece6f604899 Removed references to Range and replaced those with references to Bounds in ChartGenerators. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2584 diff changeset	178
1048 fd5c70973e0b Picky white-space cosmetics. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 924 diff changeset	179 /** The logger that is used in this generator. */
654 bbc966c81809 #90 Removed margins between data area border and curves. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 653 diff changeset	180 private static Logger logger = Logger.getLogger(XYChartGenerator.class);
369 2ce7b473620e Implemented the chart creation of a longitudinal section chart - W and Q facets. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: diff changeset	181
3064 478e8d9d88ba Add missing imports. Christian Lins <christian.lins@intevation.de> parents: 3063 diff changeset	182 protected List<Marker> domainMarkers = new ArrayList<Marker>();
3076 5642a83420f2 FLYS artifacts: Removed trailing whitespace. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3064 diff changeset	183
3169 b6da650b0718 FixA: Added longitudinal section chart. Raimund Renkert <raimund.renkert@intevation.de> parents: 3160 diff changeset	184 protected List<Marker> valueMarkers = new ArrayList<Marker>();
b6da650b0718 FixA: Added longitudinal section chart. Raimund Renkert <raimund.renkert@intevation.de> parents: 3160 diff changeset	185
1685 022f62c75878 Cosmetics. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1684 diff changeset	186 /** The max X range to include all X values of all series for each axis. */
2587 bece6f604899 Removed references to Range and replaced those with references to Bounds in ChartGenerators. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2584 diff changeset	187 protected Map<Integer, Bounds> xBounds;
1684 bdb05dc9b763 Bugfix: #353 Enabled chart's to be drawn with proper axes set even if no data is contained. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1679 diff changeset	188
1685 022f62c75878 Cosmetics. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1684 diff changeset	189 /** The max Y range to include all Y values of all series for each axis. */
2587 bece6f604899 Removed references to Range and replaced those with references to Bounds in ChartGenerators. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2584 diff changeset	190 protected Map<Integer, Bounds> yBounds;
1684 bdb05dc9b763 Bugfix: #353 Enabled chart's to be drawn with proper axes set even if no data is contained. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1679 diff changeset	191
1931 7c52e9cb2a72 Allow more than two datasets and more flexibility with axes in plots. Based on patch by S. Teichmann. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1930 diff changeset	192 public XYChartGenerator() {
2238 23c7c51df772 Some more refactoring in XYChartGenerator and ChartGenerator; implemented necessary stuff in TimeseriesChartGenerator and return new empty instances of timeseries charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2236 diff changeset	193 super();
23c7c51df772 Some more refactoring in XYChartGenerator and ChartGenerator; implemented necessary stuff in TimeseriesChartGenerator and return new empty instances of timeseries charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2236 diff changeset	194
2587 bece6f604899 Removed references to Range and replaced those with references to Bounds in ChartGenerators. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2584 diff changeset	195 xBounds = new HashMap<Integer, Bounds>();
bece6f604899 Removed references to Range and replaced those with references to Bounds in ChartGenerators. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2584 diff changeset	196 yBounds = new HashMap<Integer, Bounds>();
1931 7c52e9cb2a72 Allow more than two datasets and more flexibility with axes in plots. Based on patch by S. Teichmann. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1930 diff changeset	197 }
7c52e9cb2a72 Allow more than two datasets and more flexibility with axes in plots. Based on patch by S. Teichmann. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1930 diff changeset	198
7c52e9cb2a72 Allow more than two datasets and more flexibility with axes in plots. Based on patch by S. Teichmann. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1930 diff changeset	199
369 2ce7b473620e Implemented the chart creation of a longitudinal section chart - W and Q facets. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: diff changeset	200 /**
1930 de0c2bbb27f9 Cosmetics, docs. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1861 diff changeset	201 * Generate the chart anew (including localized axis and all).
de0c2bbb27f9 Cosmetics, docs. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1861 diff changeset	202 */
653 67c7020f4ed3 Refactored the chart creation in the ChartInfoGenerators. Now, every chart is created by the XYChartGenerator again. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 652 diff changeset	203 public JFreeChart generateChart() {
67c7020f4ed3 Refactored the chart creation in the ChartInfoGenerators. Now, every chart is created by the XYChartGenerator again. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 652 diff changeset	204 logger.debug("XYChartGenerator.generateChart");
67c7020f4ed3 Refactored the chart creation in the ChartInfoGenerators. Now, every chart is created by the XYChartGenerator again. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 652 diff changeset	205
369 2ce7b473620e Implemented the chart creation of a longitudinal section chart - W and Q facets. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: diff changeset	206 JFreeChart chart = ChartFactory.createXYLineChart(
2ce7b473620e Implemented the chart creation of a longitudinal section chart - W and Q facets. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: diff changeset	207 getChartTitle(),
2ce7b473620e Implemented the chart creation of a longitudinal section chart - W and Q facets. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: diff changeset	208 getXAxisLabel(),
2051 4ba5036109d2 Make use of user defined axes labels during chart creation. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2050 diff changeset	209 getYAxisLabel(0),
375 60f63539d004 Ws and Qs of a longitudinal section chart are mapped to an own range axis now. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 369 diff changeset	210 null,
369 2ce7b473620e Implemented the chart creation of a longitudinal section chart - W and Q facets. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: diff changeset	211 PlotOrientation.VERTICAL,
2047 0318fa6f0844 Make use of first attributes specified in the ChartSettings. NOTE: work is still in progress. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2034 diff changeset	212 isLegendVisible(),
369 2ce7b473620e Implemented the chart creation of a longitudinal section chart - W and Q facets. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: diff changeset	213 false,
2ce7b473620e Implemented the chart creation of a longitudinal section chart - W and Q facets. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: diff changeset	214 false);
2ce7b473620e Implemented the chart creation of a longitudinal section chart - W and Q facets. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: diff changeset	215
1931 7c52e9cb2a72 Allow more than two datasets and more flexibility with axes in plots. Based on patch by S. Teichmann. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1930 diff changeset	216 XYPlot plot = (XYPlot) chart.getPlot();
3079 8ad8a227d983 Added model classes for SQ calculation; generate fake results and improved the SQRelationGenerator which now draws the outliers. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 3076 diff changeset	217 plot.setDomainAxis(createXAxis(getXAxisLabel()));
8ad8a227d983 Added model classes for SQ calculation; generate fake results and improved the SQRelationGenerator which now draws the outliers. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 3076 diff changeset	218
369 2ce7b473620e Implemented the chart creation of a longitudinal section chart - W and Q facets. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: diff changeset	219 chart.setBackgroundPaint(Color.WHITE);
1931 7c52e9cb2a72 Allow more than two datasets and more flexibility with axes in plots. Based on patch by S. Teichmann. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1930 diff changeset	220 plot.setBackgroundPaint(Color.WHITE);
414 0385bcc4229a Added subtitles to the available charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 375 diff changeset	221 addSubtitles(chart);
419 4de7d9eac10f Display gridlines in charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 414 diff changeset	222 adjustPlot(plot);
923 7ca4a287cd0e #135 Modified the way to store datasets for different chart axes. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 718 diff changeset	223
1940 0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	224 //debugAxis(plot);
0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	225
0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	226 addDatasets(plot);
0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	227
0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	228 //debugDatasets(plot);
923 7ca4a287cd0e #135 Modified the way to store datasets for different chart axes. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 718 diff changeset	229
3063 33c167d6fff6 Move marker generation to XYChartGenerator Christian Lins <christian.lins@intevation.de> parents: 2998 diff changeset	230 addMarkers(plot);
33c167d6fff6 Move marker generation to XYChartGenerator Christian Lins <christian.lins@intevation.de> parents: 2998 diff changeset	231
1935 5b51f5232661 Added handling of empty plots. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1934 diff changeset	232 recoverEmptyPlot(plot);
1940 0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	233 preparePointRanges(plot);
1935 5b51f5232661 Added handling of empty plots. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1934 diff changeset	234
1940 0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	235 //debugAxis(plot);
0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	236
0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	237 localizeAxes(plot);
0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	238 adjustAxes(plot);
673 b22f21b173a7 Changed the zoom process - the values in the chart request document are percentual values that apply to every axis. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 667 diff changeset	239 autoZoom(plot);
652 8fa4c5c9cd1a Charts are zoomed to a specified view if the attribute document for the chart creation contains an x and/or y range. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 423 diff changeset	240
3249 f76cef888ee1 Fix issue710 - crashing one-point-diagrams. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3242 diff changeset	241 //debugAxis(plot);
f76cef888ee1 Fix issue710 - crashing one-point-diagrams. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3242 diff changeset	242
2138 59bb5c895be3 Improved HYK/Zones- handling. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2132 diff changeset	243 // These have to go after the autozoom.
2161 c68f4f227c09 Somewhat unified Annotation handling, use jfreechart-house-toolkit instead of custom StickyAxisAnnotation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2152 diff changeset	244 addAnnotationsToRenderer(plot);
2138 59bb5c895be3 Improved HYK/Zones- handling. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2132 diff changeset	245
3616 d4751be54745 Add rather faked image annotations to chart, if property is set accordingly. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3296 diff changeset	246 // Add a logo (maybe).
d4751be54745 Add rather faked image annotations to chart, if property is set accordingly. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3296 diff changeset	247 addLogo(plot);
d4751be54745 Add rather faked image annotations to chart, if property is set accordingly. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3296 diff changeset	248
3154 a08538e21b55 Re-enable legend item aggregation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3114 diff changeset	249 aggregateLegendEntries(plot);
2584 5d5457a1bd5f Stubby legend aggregation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2574 diff changeset	250
1940 0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	251 return chart;
0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	252 }
924 f7761914f745 An initial implementation to render chart series based on the XML configuration in themes.xml. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 923 diff changeset	253
1940 0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	254
3616 d4751be54745 Add rather faked image annotations to chart, if property is set accordingly. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3296 diff changeset	255 /** Add a logo as background annotation to plot. */
d4751be54745 Add rather faked image annotations to chart, if property is set accordingly. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3296 diff changeset	256 protected void addLogo(XYPlot plot) {
d4751be54745 Add rather faked image annotations to chart, if property is set accordingly. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3296 diff changeset	257 String logo = showLogo();
d4751be54745 Add rather faked image annotations to chart, if property is set accordingly. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3296 diff changeset	258 if (logo == null) {
d4751be54745 Add rather faked image annotations to chart, if property is set accordingly. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3296 diff changeset	259 logger.debug("No logo to show chosen");
d4751be54745 Add rather faked image annotations to chart, if property is set accordingly. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3296 diff changeset	260 return;
d4751be54745 Add rather faked image annotations to chart, if property is set accordingly. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3296 diff changeset	261 }
d4751be54745 Add rather faked image annotations to chart, if property is set accordingly. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3296 diff changeset	262
d4751be54745 Add rather faked image annotations to chart, if property is set accordingly. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3296 diff changeset	263 ImageIcon imageIcon = null;
3618 b7867c03760a Split logo placement property in two (vertical/horizontal). Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3617 diff changeset	264 if (logo.equals("none")) {
b7867c03760a Split logo placement property in two (vertical/horizontal). Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3617 diff changeset	265 return;
b7867c03760a Split logo placement property in two (vertical/horizontal). Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3617 diff changeset	266 }
3616 d4751be54745 Add rather faked image annotations to chart, if property is set accordingly. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3296 diff changeset	267 if (logo.equals("Intevation")) {
d4751be54745 Add rather faked image annotations to chart, if property is set accordingly. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3296 diff changeset	268 imageIcon = new ImageIcon("/home/felix/Downloads/intevation_logo_120.png");
d4751be54745 Add rather faked image annotations to chart, if property is set accordingly. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3296 diff changeset	269 }
3618 b7867c03760a Split logo placement property in two (vertical/horizontal). Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3617 diff changeset	270 else { // TODO else if ...
3616 d4751be54745 Add rather faked image annotations to chart, if property is set accordingly. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3296 diff changeset	271 imageIcon = new ImageIcon("/home/felix/Downloads/bfg_logo.gif");
d4751be54745 Add rather faked image annotations to chart, if property is set accordingly. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3296 diff changeset	272 }
d4751be54745 Add rather faked image annotations to chart, if property is set accordingly. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3296 diff changeset	273
3617 05deafdcbf39 sloppy logo placement property implementation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3616 diff changeset	274 double xPos = 0d, yPos = 0d;
05deafdcbf39 sloppy logo placement property implementation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3616 diff changeset	275
3618 b7867c03760a Split logo placement property in two (vertical/horizontal). Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3617 diff changeset	276 String placeh = logoHPlace();
b7867c03760a Split logo placement property in two (vertical/horizontal). Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3617 diff changeset	277 String placev = logoVPlace();
3620 1cd6114603d9 Improved logo placement. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3618 diff changeset	278
3618 b7867c03760a Split logo placement property in two (vertical/horizontal). Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3617 diff changeset	279 if (placev == null \|\| placev.equals("none")) {
b7867c03760a Split logo placement property in two (vertical/horizontal). Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3617 diff changeset	280 placev = "top";
3617 05deafdcbf39 sloppy logo placement property implementation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3616 diff changeset	281 }
3618 b7867c03760a Split logo placement property in two (vertical/horizontal). Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3617 diff changeset	282 if (placev.equals("top")) {
3617 05deafdcbf39 sloppy logo placement property implementation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3616 diff changeset	283 yPos = (Double)getYBounds(0).getUpper();
05deafdcbf39 sloppy logo placement property implementation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3616 diff changeset	284 }
3618 b7867c03760a Split logo placement property in two (vertical/horizontal). Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3617 diff changeset	285 else if (placev.equals("bottom")) {
3617 05deafdcbf39 sloppy logo placement property implementation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3616 diff changeset	286 yPos = (Double)getYBounds(0).getLower();
05deafdcbf39 sloppy logo placement property implementation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3616 diff changeset	287 }
3618 b7867c03760a Split logo placement property in two (vertical/horizontal). Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3617 diff changeset	288 else if (placev.equals("center")) {
b7867c03760a Split logo placement property in two (vertical/horizontal). Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3617 diff changeset	289 yPos = ((Double)getYBounds(0).getUpper() + (Double)getYBounds(0).getLower())/2d;
3617 05deafdcbf39 sloppy logo placement property implementation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3616 diff changeset	290 }
3620 1cd6114603d9 Improved logo placement. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3618 diff changeset	291 else {
1cd6114603d9 Improved logo placement. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3618 diff changeset	292 logger.debug("Unknown place-v value: " + placev);
1cd6114603d9 Improved logo placement. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3618 diff changeset	293 }
3618 b7867c03760a Split logo placement property in two (vertical/horizontal). Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3617 diff changeset	294
b7867c03760a Split logo placement property in two (vertical/horizontal). Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3617 diff changeset	295 if (placeh == null \|\| placeh.equals("none")) {
b7867c03760a Split logo placement property in two (vertical/horizontal). Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3617 diff changeset	296 placeh = "center";
b7867c03760a Split logo placement property in two (vertical/horizontal). Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3617 diff changeset	297 }
b7867c03760a Split logo placement property in two (vertical/horizontal). Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3617 diff changeset	298 if (placeh.equals("left")) {
b7867c03760a Split logo placement property in two (vertical/horizontal). Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3617 diff changeset	299 xPos = (Double)getXBounds(0).getLower();
b7867c03760a Split logo placement property in two (vertical/horizontal). Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3617 diff changeset	300 }
b7867c03760a Split logo placement property in two (vertical/horizontal). Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3617 diff changeset	301 else if (placeh.equals("right")) {
3617 05deafdcbf39 sloppy logo placement property implementation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3616 diff changeset	302 xPos = (Double)getXBounds(0).getUpper();
05deafdcbf39 sloppy logo placement property implementation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3616 diff changeset	303 }
3618 b7867c03760a Split logo placement property in two (vertical/horizontal). Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3617 diff changeset	304 else if (placeh.equals("center")) {
b7867c03760a Split logo placement property in two (vertical/horizontal). Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3617 diff changeset	305 xPos = ((Double)getXBounds(0).getUpper() + (Double)getXBounds(0).getLower())/2d;
b7867c03760a Split logo placement property in two (vertical/horizontal). Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3617 diff changeset	306 }
3620 1cd6114603d9 Improved logo placement. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3618 diff changeset	307 else {
1cd6114603d9 Improved logo placement. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3618 diff changeset	308 logger.debug("Unknown place-h value: " + placeh);
1cd6114603d9 Improved logo placement. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3618 diff changeset	309 }
1cd6114603d9 Improved logo placement. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3618 diff changeset	310
3617 05deafdcbf39 sloppy logo placement property implementation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3616 diff changeset	311 logger.debug("logo position: " + xPos + "/" + yPos);
05deafdcbf39 sloppy logo placement property implementation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3616 diff changeset	312
3620 1cd6114603d9 Improved logo placement. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3618 diff changeset	313 org.jfree.ui.RectangleAnchor anchor
1cd6114603d9 Improved logo placement. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3618 diff changeset	314 = org.jfree.ui.RectangleAnchor.TOP;
1cd6114603d9 Improved logo placement. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3618 diff changeset	315 if (placev.equals("top")) {
1cd6114603d9 Improved logo placement. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3618 diff changeset	316 if (placeh.equals("left")) {
1cd6114603d9 Improved logo placement. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3618 diff changeset	317 anchor = org.jfree.ui.RectangleAnchor.TOP_LEFT;
1cd6114603d9 Improved logo placement. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3618 diff changeset	318 }
1cd6114603d9 Improved logo placement. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3618 diff changeset	319 else if (placeh.equals("right")) {
1cd6114603d9 Improved logo placement. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3618 diff changeset	320 anchor = org.jfree.ui.RectangleAnchor.TOP_RIGHT;
1cd6114603d9 Improved logo placement. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3618 diff changeset	321 }
1cd6114603d9 Improved logo placement. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3618 diff changeset	322 else if (placeh.equals("center")) {
1cd6114603d9 Improved logo placement. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3618 diff changeset	323 anchor = org.jfree.ui.RectangleAnchor.TOP;
1cd6114603d9 Improved logo placement. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3618 diff changeset	324 }
1cd6114603d9 Improved logo placement. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3618 diff changeset	325 }
1cd6114603d9 Improved logo placement. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3618 diff changeset	326 else if (placev.equals("bottom")) {
1cd6114603d9 Improved logo placement. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3618 diff changeset	327 if (placeh.equals("left")) {
1cd6114603d9 Improved logo placement. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3618 diff changeset	328 anchor = org.jfree.ui.RectangleAnchor.BOTTOM_LEFT;
1cd6114603d9 Improved logo placement. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3618 diff changeset	329 }
1cd6114603d9 Improved logo placement. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3618 diff changeset	330 else if (placeh.equals("right")) {
1cd6114603d9 Improved logo placement. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3618 diff changeset	331 anchor = org.jfree.ui.RectangleAnchor.BOTTOM_RIGHT;
1cd6114603d9 Improved logo placement. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3618 diff changeset	332 }
1cd6114603d9 Improved logo placement. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3618 diff changeset	333 else if (placeh.equals("center")) {
1cd6114603d9 Improved logo placement. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3618 diff changeset	334 anchor = org.jfree.ui.RectangleAnchor.BOTTOM;
1cd6114603d9 Improved logo placement. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3618 diff changeset	335 }
1cd6114603d9 Improved logo placement. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3618 diff changeset	336 }
1cd6114603d9 Improved logo placement. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3618 diff changeset	337 else if (placev.equals("center")) {
1cd6114603d9 Improved logo placement. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3618 diff changeset	338 if (placeh.equals("left")) {
1cd6114603d9 Improved logo placement. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3618 diff changeset	339 anchor = org.jfree.ui.RectangleAnchor.LEFT;
1cd6114603d9 Improved logo placement. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3618 diff changeset	340 }
1cd6114603d9 Improved logo placement. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3618 diff changeset	341 else if (placeh.equals("right")) {
1cd6114603d9 Improved logo placement. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3618 diff changeset	342 anchor = org.jfree.ui.RectangleAnchor.RIGHT;
1cd6114603d9 Improved logo placement. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3618 diff changeset	343 }
1cd6114603d9 Improved logo placement. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3618 diff changeset	344 else if (placeh.equals("center")) {
1cd6114603d9 Improved logo placement. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3618 diff changeset	345 anchor = org.jfree.ui.RectangleAnchor.CENTER;
1cd6114603d9 Improved logo placement. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3618 diff changeset	346 }
1cd6114603d9 Improved logo placement. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3618 diff changeset	347 }
1cd6114603d9 Improved logo placement. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3618 diff changeset	348
3616 d4751be54745 Add rather faked image annotations to chart, if property is set accordingly. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3296 diff changeset	349 XYAnnotation xyannotation =
3620 1cd6114603d9 Improved logo placement. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3618 diff changeset	350 new XYImageAnnotation(xPos, yPos, imageIcon.getImage(), anchor);
3616 d4751be54745 Add rather faked image annotations to chart, if property is set accordingly. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3296 diff changeset	351 plot.getRenderer().addAnnotation(xyannotation, org.jfree.ui.Layer.BACKGROUND);
d4751be54745 Add rather faked image annotations to chart, if property is set accordingly. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3296 diff changeset	352 }
d4751be54745 Add rather faked image annotations to chart, if property is set accordingly. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3296 diff changeset	353
d4751be54745 Add rather faked image annotations to chart, if property is set accordingly. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3296 diff changeset	354
3079 8ad8a227d983 Added model classes for SQ calculation; generate fake results and improved the SQRelationGenerator which now draws the outliers. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 3076 diff changeset	355 protected NumberAxis createXAxis(String label) {
8ad8a227d983 Added model classes for SQ calculation; generate fake results and improved the SQRelationGenerator which now draws the outliers. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 3076 diff changeset	356 return new NumberAxis(label);
8ad8a227d983 Added model classes for SQ calculation; generate fake results and improved the SQRelationGenerator which now draws the outliers. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 3076 diff changeset	357 }
8ad8a227d983 Added model classes for SQ calculation; generate fake results and improved the SQRelationGenerator which now draws the outliers. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 3076 diff changeset	358
8ad8a227d983 Added model classes for SQ calculation; generate fake results and improved the SQRelationGenerator which now draws the outliers. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 3076 diff changeset	359
2238 23c7c51df772 Some more refactoring in XYChartGenerator and ChartGenerator; implemented necessary stuff in TimeseriesChartGenerator and return new empty instances of timeseries charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2236 diff changeset	360 @Override
2242 7e8e1d5384c0 Further refactoring of XYChartGenerator / ChartGenerator with the result, that timerange charts are now able to display lines. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2238 diff changeset	361 protected Series getSeriesOf(XYDataset dataset, int idx) {
7e8e1d5384c0 Further refactoring of XYChartGenerator / ChartGenerator with the result, that timerange charts are now able to display lines. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2238 diff changeset	362 return ((XYSeriesCollection) dataset).getSeries(idx);
7e8e1d5384c0 Further refactoring of XYChartGenerator / ChartGenerator with the result, that timerange charts are now able to display lines. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2238 diff changeset	363 }
7e8e1d5384c0 Further refactoring of XYChartGenerator / ChartGenerator with the result, that timerange charts are now able to display lines. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2238 diff changeset	364
7e8e1d5384c0 Further refactoring of XYChartGenerator / ChartGenerator with the result, that timerange charts are now able to display lines. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2238 diff changeset	365
7e8e1d5384c0 Further refactoring of XYChartGenerator / ChartGenerator with the result, that timerange charts are now able to display lines. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2238 diff changeset	366 @Override
2238 23c7c51df772 Some more refactoring in XYChartGenerator and ChartGenerator; implemented necessary stuff in TimeseriesChartGenerator and return new empty instances of timeseries charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2236 diff changeset	367 protected AxisDataset createAxisDataset(int idx) {
23c7c51df772 Some more refactoring in XYChartGenerator and ChartGenerator; implemented necessary stuff in TimeseriesChartGenerator and return new empty instances of timeseries charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2236 diff changeset	368 logger.debug("Create new XYAxisDataset for index: " + idx);
23c7c51df772 Some more refactoring in XYChartGenerator and ChartGenerator; implemented necessary stuff in TimeseriesChartGenerator and return new empty instances of timeseries charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2236 diff changeset	369 return new XYAxisDataset(idx);
23c7c51df772 Some more refactoring in XYChartGenerator and ChartGenerator; implemented necessary stuff in TimeseriesChartGenerator and return new empty instances of timeseries charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2236 diff changeset	370 }
23c7c51df772 Some more refactoring in XYChartGenerator and ChartGenerator; implemented necessary stuff in TimeseriesChartGenerator and return new empty instances of timeseries charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2236 diff changeset	371
23c7c51df772 Some more refactoring in XYChartGenerator and ChartGenerator; implemented necessary stuff in TimeseriesChartGenerator and return new empty instances of timeseries charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2236 diff changeset	372
1940 0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	373 /**
0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	374 * Put debug output about datasets.
0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	375 */
0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	376 public void debugDatasets(XYPlot plot) {
0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	377 logger.debug("Number of datasets: " + plot.getDatasetCount());
3087 4a76da133144 Removed repeated x.size() calls from for loops. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3079 diff changeset	378 for (int i = 0, P = plot.getDatasetCount(); i < P; i++) {
1940 0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	379 if (plot.getDataset(i) == null) {
0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	380 logger.debug("Dataset #" + i + " is null");
0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	381 continue;
0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	382 }
0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	383 logger.debug("Dataset #" + i + ":" + plot.getDataset(i));
1958 82cefa3f954f Partial fix for flys/issue420 (Mosel/DischargeCurves), do survive empty datasets when calculating axis extents. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1948 diff changeset	384 XYSeriesCollection series = (XYSeriesCollection) plot.getDataset(i);
82cefa3f954f Partial fix for flys/issue420 (Mosel/DischargeCurves), do survive empty datasets when calculating axis extents. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1948 diff changeset	385 logger.debug("X-Extend of Dataset: " + series.getSeries(0).getMinX()
82cefa3f954f Partial fix for flys/issue420 (Mosel/DischargeCurves), do survive empty datasets when calculating axis extents. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1948 diff changeset	386 + " " + series.getSeries(0).getMaxX());
82cefa3f954f Partial fix for flys/issue420 (Mosel/DischargeCurves), do survive empty datasets when calculating axis extents. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1948 diff changeset	387 logger.debug("Y-Extend of Dataset: " + series.getSeries(0).getMinY()
82cefa3f954f Partial fix for flys/issue420 (Mosel/DischargeCurves), do survive empty datasets when calculating axis extents. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1948 diff changeset	388 + " " + series.getSeries(0).getMaxY());
1940 0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	389 }
0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	390 }
0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	391
0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	392
0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	393 /**
0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	394 * Put debug output about axes.
0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	395 */
0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	396 public void debugAxis(XYPlot plot) {
0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	397 logger.debug("...............");
3087 4a76da133144 Removed repeated x.size() calls from for loops. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3079 diff changeset	398 for (int i = 0, P = plot.getRangeAxisCount(); i < P; i++) {
1940 0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	399 if (plot.getRangeAxis(i) == null)
2005 79b15491177a Added simple area registering functions. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2000 diff changeset	400 logger.debug("Range-Axis #" + i + " == null");
1940 0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	401 else {
2005 79b15491177a Added simple area registering functions. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2000 diff changeset	402 logger.debug("Range-Axis " + i + " != null [" +
1940 0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	403 plot.getRangeAxis(i).getRange().getLowerBound() +
0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	404 " " + plot.getRangeAxis(i).getRange().getUpperBound() +
0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	405 "]");
0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	406 }
3249 f76cef888ee1 Fix issue710 - crashing one-point-diagrams. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3242 diff changeset	407 }
f76cef888ee1 Fix issue710 - crashing one-point-diagrams. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3242 diff changeset	408 for (int i = 0, P = plot.getDomainAxisCount(); i < P; i++) {
f76cef888ee1 Fix issue710 - crashing one-point-diagrams. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3242 diff changeset	409 if (plot.getDomainAxis(i) == null)
f76cef888ee1 Fix issue710 - crashing one-point-diagrams. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3242 diff changeset	410 logger.debug("Domain-Axis #" + i + " == null");
f76cef888ee1 Fix issue710 - crashing one-point-diagrams. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3242 diff changeset	411 else {
f76cef888ee1 Fix issue710 - crashing one-point-diagrams. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3242 diff changeset	412 logger.debug("Domain-Axis " + i + " != null [" +
f76cef888ee1 Fix issue710 - crashing one-point-diagrams. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3242 diff changeset	413 plot.getDomainAxis(i).getRange().getLowerBound() +
f76cef888ee1 Fix issue710 - crashing one-point-diagrams. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3242 diff changeset	414 " " + plot.getDomainAxis(i).getRange().getUpperBound() +
f76cef888ee1 Fix issue710 - crashing one-point-diagrams. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3242 diff changeset	415 "]");
f76cef888ee1 Fix issue710 - crashing one-point-diagrams. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3242 diff changeset	416 }
1940 0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	417 }
0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	418 logger.debug("...............");
369 2ce7b473620e Implemented the chart creation of a longitudinal section chart - W and Q facets. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: diff changeset	419 }
2ce7b473620e Implemented the chart creation of a longitudinal section chart - W and Q facets. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: diff changeset	420
2ce7b473620e Implemented the chart creation of a longitudinal section chart - W and Q facets. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: diff changeset	421
1685 022f62c75878 Cosmetics. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1684 diff changeset	422 /**
2005 79b15491177a Added simple area registering functions. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2000 diff changeset	423 * Registers an area to be drawn.
2163 105097966111 Theoretically allow annotations on second y ais. Practically allow Q MainValues on Q Axis in Duration Curves. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2161 diff changeset	424 * @param area Area to be drawn.
105097966111 Theoretically allow annotations on second y ais. Practically allow Q MainValues on Q Axis in Duration Curves. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2161 diff changeset	425 * @param index 'axis index'
105097966111 Theoretically allow annotations on second y ais. Practically allow Q MainValues on Q Axis in Duration Curves. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2161 diff changeset	426 * @param visible Whether or not to be visible (important for range calculations).
2005 79b15491177a Added simple area registering functions. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2000 diff changeset	427 */
2020 4f7f781e4481 Improved area rendering workflow. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2005 diff changeset	428 public void addAreaSeries(StyledAreaSeriesCollection area, int index, boolean visible) {
4f7f781e4481 Improved area rendering workflow. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2005 diff changeset	429 if (area == null) {
2005 79b15491177a Added simple area registering functions. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2000 diff changeset	430 logger.warn("Cannot yet render above/under curve.");
79b15491177a Added simple area registering functions. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2000 diff changeset	431 return;
79b15491177a Added simple area registering functions. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2000 diff changeset	432 }
79b15491177a Added simple area registering functions. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2000 diff changeset	433
2238 23c7c51df772 Some more refactoring in XYChartGenerator and ChartGenerator; implemented necessary stuff in TimeseriesChartGenerator and return new empty instances of timeseries charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2236 diff changeset	434 XYAxisDataset axisDataset = (XYAxisDataset) getAxisDataset(index);
2005 79b15491177a Added simple area registering functions. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2000 diff changeset	435
2020 4f7f781e4481 Improved area rendering workflow. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2005 diff changeset	436 if (visible) {
4f7f781e4481 Improved area rendering workflow. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2005 diff changeset	437 axisDataset.addArea(area);
4f7f781e4481 Improved area rendering workflow. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2005 diff changeset	438 }
2005 79b15491177a Added simple area registering functions. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2000 diff changeset	439 else {
79b15491177a Added simple area registering functions. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2000 diff changeset	440 // TODO only range merging.
79b15491177a Added simple area registering functions. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2000 diff changeset	441 }
79b15491177a Added simple area registering functions. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2000 diff changeset	442 //TODO range merging.
79b15491177a Added simple area registering functions. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2000 diff changeset	443 }
79b15491177a Added simple area registering functions. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2000 diff changeset	444
2020 4f7f781e4481 Improved area rendering workflow. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2005 diff changeset	445
2005 79b15491177a Added simple area registering functions. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2000 diff changeset	446 /**
1935 5b51f5232661 Added handling of empty plots. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1934 diff changeset	447 * Add given series if visible, if not visible adjust ranges (such that
5b51f5232661 Added handling of empty plots. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1934 diff changeset	448 * all points in data would be plotted once visible).
1931 7c52e9cb2a72 Allow more than two datasets and more flexibility with axes in plots. Based on patch by S. Teichmann. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1930 diff changeset	449 * @param series the dataseries to include in plot.
2163 105097966111 Theoretically allow annotations on second y ais. Practically allow Q MainValues on Q Axis in Duration Curves. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2161 diff changeset	450 * @param index ('symbolic') index of the series and of its axis.
1931 7c52e9cb2a72 Allow more than two datasets and more flexibility with axes in plots. Based on patch by S. Teichmann. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1930 diff changeset	451 * @param visible whether or not the data should be plotted.
7c52e9cb2a72 Allow more than two datasets and more flexibility with axes in plots. Based on patch by S. Teichmann. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1930 diff changeset	452 */
7c52e9cb2a72 Allow more than two datasets and more flexibility with axes in plots. Based on patch by S. Teichmann. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1930 diff changeset	453 public void addAxisSeries(XYSeries series, int index, boolean visible) {
7c52e9cb2a72 Allow more than two datasets and more flexibility with axes in plots. Based on patch by S. Teichmann. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1930 diff changeset	454 if (series == null) {
1684 bdb05dc9b763 Bugfix: #353 Enabled chart's to be drawn with proper axes set even if no data is contained. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1679 diff changeset	455 return;
bdb05dc9b763 Bugfix: #353 Enabled chart's to be drawn with proper axes set even if no data is contained. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1679 diff changeset	456 }
bdb05dc9b763 Bugfix: #353 Enabled chart's to be drawn with proper axes set even if no data is contained. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1679 diff changeset	457
2242 7e8e1d5384c0 Further refactoring of XYChartGenerator / ChartGenerator with the result, that timerange charts are now able to display lines. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2238 diff changeset	458 logger.debug("Y Range of XYSeries: " +
7e8e1d5384c0 Further refactoring of XYChartGenerator / ChartGenerator with the result, that timerange charts are now able to display lines. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2238 diff changeset	459 series.getMinY() + " \| " + series.getMaxY());
7e8e1d5384c0 Further refactoring of XYChartGenerator / ChartGenerator with the result, that timerange charts are now able to display lines. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2238 diff changeset	460
7e8e1d5384c0 Further refactoring of XYChartGenerator / ChartGenerator with the result, that timerange charts are now able to display lines. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2238 diff changeset	461 addAxisDataset(new XYSeriesCollection(series), index, visible);
7e8e1d5384c0 Further refactoring of XYChartGenerator / ChartGenerator with the result, that timerange charts are now able to display lines. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2238 diff changeset	462
2238 23c7c51df772 Some more refactoring in XYChartGenerator and ChartGenerator; implemented necessary stuff in TimeseriesChartGenerator and return new empty instances of timeseries charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2236 diff changeset	463 XYAxisDataset axisDataset = (XYAxisDataset) getAxisDataset(index);
1684 bdb05dc9b763 Bugfix: #353 Enabled chart's to be drawn with proper axes set even if no data is contained. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1679 diff changeset	464
2238 23c7c51df772 Some more refactoring in XYChartGenerator and ChartGenerator; implemented necessary stuff in TimeseriesChartGenerator and return new empty instances of timeseries charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2236 diff changeset	465 if (!visible) {
1940 0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	466 // Do this also when not visible to have axis scaled by default such
0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	467 // that every data-point could be seen (except for annotations).
1958 82cefa3f954f Partial fix for flys/issue420 (Mosel/DischargeCurves), do survive empty datasets when calculating axis extents. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1948 diff changeset	468 axisDataset.includeYRange(series);
1940 0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	469 }
1931 7c52e9cb2a72 Allow more than two datasets and more flexibility with axes in plots. Based on patch by S. Teichmann. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1930 diff changeset	470 }
7c52e9cb2a72 Allow more than two datasets and more flexibility with axes in plots. Based on patch by S. Teichmann. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1930 diff changeset	471
3076 5642a83420f2 FLYS artifacts: Removed trailing whitespace. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3064 diff changeset	472
3063 33c167d6fff6 Move marker generation to XYChartGenerator Christian Lins <christian.lins@intevation.de> parents: 2998 diff changeset	473 /**
33c167d6fff6 Move marker generation to XYChartGenerator Christian Lins <christian.lins@intevation.de> parents: 2998 diff changeset	474 * Add the given vertical marker to the chart.
33c167d6fff6 Move marker generation to XYChartGenerator Christian Lins <christian.lins@intevation.de> parents: 2998 diff changeset	475 */
33c167d6fff6 Move marker generation to XYChartGenerator Christian Lins <christian.lins@intevation.de> parents: 2998 diff changeset	476 public void addDomainMarker(Marker marker) {
33c167d6fff6 Move marker generation to XYChartGenerator Christian Lins <christian.lins@intevation.de> parents: 2998 diff changeset	477 if (marker == null) {
3064 478e8d9d88ba Add missing imports. Christian Lins <christian.lins@intevation.de> parents: 3063 diff changeset	478 return;
3063 33c167d6fff6 Move marker generation to XYChartGenerator Christian Lins <christian.lins@intevation.de> parents: 2998 diff changeset	479 }
33c167d6fff6 Move marker generation to XYChartGenerator Christian Lins <christian.lins@intevation.de> parents: 2998 diff changeset	480
3064 478e8d9d88ba Add missing imports. Christian Lins <christian.lins@intevation.de> parents: 3063 diff changeset	481 domainMarkers.add(marker);
3063 33c167d6fff6 Move marker generation to XYChartGenerator Christian Lins <christian.lins@intevation.de> parents: 2998 diff changeset	482 }
33c167d6fff6 Move marker generation to XYChartGenerator Christian Lins <christian.lins@intevation.de> parents: 2998 diff changeset	483
33c167d6fff6 Move marker generation to XYChartGenerator Christian Lins <christian.lins@intevation.de> parents: 2998 diff changeset	484
3169 b6da650b0718 FixA: Added longitudinal section chart. Raimund Renkert <raimund.renkert@intevation.de> parents: 3160 diff changeset	485 /**
b6da650b0718 FixA: Added longitudinal section chart. Raimund Renkert <raimund.renkert@intevation.de> parents: 3160 diff changeset	486 * Add the given vertical marker to the chart.
b6da650b0718 FixA: Added longitudinal section chart. Raimund Renkert <raimund.renkert@intevation.de> parents: 3160 diff changeset	487 */
b6da650b0718 FixA: Added longitudinal section chart. Raimund Renkert <raimund.renkert@intevation.de> parents: 3160 diff changeset	488 public void addValueMarker(Marker marker) {
b6da650b0718 FixA: Added longitudinal section chart. Raimund Renkert <raimund.renkert@intevation.de> parents: 3160 diff changeset	489 if (marker == null) {
b6da650b0718 FixA: Added longitudinal section chart. Raimund Renkert <raimund.renkert@intevation.de> parents: 3160 diff changeset	490 return;
b6da650b0718 FixA: Added longitudinal section chart. Raimund Renkert <raimund.renkert@intevation.de> parents: 3160 diff changeset	491 }
b6da650b0718 FixA: Added longitudinal section chart. Raimund Renkert <raimund.renkert@intevation.de> parents: 3160 diff changeset	492
b6da650b0718 FixA: Added longitudinal section chart. Raimund Renkert <raimund.renkert@intevation.de> parents: 3160 diff changeset	493 valueMarkers.add(marker);
b6da650b0718 FixA: Added longitudinal section chart. Raimund Renkert <raimund.renkert@intevation.de> parents: 3160 diff changeset	494 }
b6da650b0718 FixA: Added longitudinal section chart. Raimund Renkert <raimund.renkert@intevation.de> parents: 3160 diff changeset	495
b6da650b0718 FixA: Added longitudinal section chart. Raimund Renkert <raimund.renkert@intevation.de> parents: 3160 diff changeset	496
3063 33c167d6fff6 Move marker generation to XYChartGenerator Christian Lins <christian.lins@intevation.de> parents: 2998 diff changeset	497 protected void addMarkers(XYPlot plot) {
33c167d6fff6 Move marker generation to XYChartGenerator Christian Lins <christian.lins@intevation.de> parents: 2998 diff changeset	498 for(Marker marker : domainMarkers) {
3064 478e8d9d88ba Add missing imports. Christian Lins <christian.lins@intevation.de> parents: 3063 diff changeset	499 plot.addDomainMarker(marker);
3063 33c167d6fff6 Move marker generation to XYChartGenerator Christian Lins <christian.lins@intevation.de> parents: 2998 diff changeset	500 }
3169 b6da650b0718 FixA: Added longitudinal section chart. Raimund Renkert <raimund.renkert@intevation.de> parents: 3160 diff changeset	501 for(Marker marker : valueMarkers) {
b6da650b0718 FixA: Added longitudinal section chart. Raimund Renkert <raimund.renkert@intevation.de> parents: 3160 diff changeset	502 plot.addRangeMarker(marker);
b6da650b0718 FixA: Added longitudinal section chart. Raimund Renkert <raimund.renkert@intevation.de> parents: 3160 diff changeset	503 }
3063 33c167d6fff6 Move marker generation to XYChartGenerator Christian Lins <christian.lins@intevation.de> parents: 2998 diff changeset	504 }
33c167d6fff6 Move marker generation to XYChartGenerator Christian Lins <christian.lins@intevation.de> parents: 2998 diff changeset	505
1940 0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	506
1931 7c52e9cb2a72 Allow more than two datasets and more flexibility with axes in plots. Based on patch by S. Teichmann. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1930 diff changeset	507 /**
7c52e9cb2a72 Allow more than two datasets and more flexibility with axes in plots. Based on patch by S. Teichmann. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1930 diff changeset	508 * Effect: extend range of x axis to include given limits.
2587 bece6f604899 Removed references to Range and replaced those with references to Bounds in ChartGenerators. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2584 diff changeset	509 *
3270 4ac581062c40 Fix various documentation issues. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3257 diff changeset	510 * @param bounds the given ("minimal") bounds.
1931 7c52e9cb2a72 Allow more than two datasets and more flexibility with axes in plots. Based on patch by S. Teichmann. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1930 diff changeset	511 * @param index index of axis to be merged.
7c52e9cb2a72 Allow more than two datasets and more flexibility with axes in plots. Based on patch by S. Teichmann. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1930 diff changeset	512 */
2587 bece6f604899 Removed references to Range and replaced those with references to Bounds in ChartGenerators. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2584 diff changeset	513 @Override
bece6f604899 Removed references to Range and replaced those with references to Bounds in ChartGenerators. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2584 diff changeset	514 protected void combineXBounds(Bounds bounds, int index) {
bece6f604899 Removed references to Range and replaced those with references to Bounds in ChartGenerators. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2584 diff changeset	515 if (!(bounds instanceof DoubleBounds)) {
bece6f604899 Removed references to Range and replaced those with references to Bounds in ChartGenerators. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2584 diff changeset	516 logger.warn("Unsupported Bounds type: " + bounds.getClass());
1959 eace020067da Further flys/issue420 fix, NaN-guard X axis extent. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1958 diff changeset	517 return;
eace020067da Further flys/issue420 fix, NaN-guard X axis extent. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1958 diff changeset	518 }
eace020067da Further flys/issue420 fix, NaN-guard X axis extent. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1958 diff changeset	519
2587 bece6f604899 Removed references to Range and replaced those with references to Bounds in ChartGenerators. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2584 diff changeset	520 DoubleBounds dBounds = (DoubleBounds) bounds;
bece6f604899 Removed references to Range and replaced those with references to Bounds in ChartGenerators. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2584 diff changeset	521
bece6f604899 Removed references to Range and replaced those with references to Bounds in ChartGenerators. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2584 diff changeset	522 if (dBounds == null
bece6f604899 Removed references to Range and replaced those with references to Bounds in ChartGenerators. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2584 diff changeset	523 \|\| Double.isNaN((Double) dBounds.getLower())
bece6f604899 Removed references to Range and replaced those with references to Bounds in ChartGenerators. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2584 diff changeset	524 \|\| Double.isNaN((Double) dBounds.getUpper())) {
bece6f604899 Removed references to Range and replaced those with references to Bounds in ChartGenerators. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2584 diff changeset	525 return;
bece6f604899 Removed references to Range and replaced those with references to Bounds in ChartGenerators. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2584 diff changeset	526 }
bece6f604899 Removed references to Range and replaced those with references to Bounds in ChartGenerators. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2584 diff changeset	527
bece6f604899 Removed references to Range and replaced those with references to Bounds in ChartGenerators. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2584 diff changeset	528 Bounds old = getXBounds(index);
1931 7c52e9cb2a72 Allow more than two datasets and more flexibility with axes in plots. Based on patch by S. Teichmann. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1930 diff changeset	529
7c52e9cb2a72 Allow more than two datasets and more flexibility with axes in plots. Based on patch by S. Teichmann. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1930 diff changeset	530 if (old != null) {
2587 bece6f604899 Removed references to Range and replaced those with references to Bounds in ChartGenerators. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2584 diff changeset	531 dBounds = (DoubleBounds) dBounds.combine(old);
1931 7c52e9cb2a72 Allow more than two datasets and more flexibility with axes in plots. Based on patch by S. Teichmann. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1930 diff changeset	532 }
7c52e9cb2a72 Allow more than two datasets and more flexibility with axes in plots. Based on patch by S. Teichmann. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1930 diff changeset	533
2587 bece6f604899 Removed references to Range and replaced those with references to Bounds in ChartGenerators. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2584 diff changeset	534 setXBounds(index, dBounds);
bece6f604899 Removed references to Range and replaced those with references to Bounds in ChartGenerators. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2584 diff changeset	535 }
bece6f604899 Removed references to Range and replaced those with references to Bounds in ChartGenerators. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2584 diff changeset	536
bece6f604899 Removed references to Range and replaced those with references to Bounds in ChartGenerators. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2584 diff changeset	537
bece6f604899 Removed references to Range and replaced those with references to Bounds in ChartGenerators. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2584 diff changeset	538 @Override
bece6f604899 Removed references to Range and replaced those with references to Bounds in ChartGenerators. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2584 diff changeset	539 protected void combineYBounds(Bounds bounds, int index) {
bece6f604899 Removed references to Range and replaced those with references to Bounds in ChartGenerators. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2584 diff changeset	540 if (!(bounds instanceof DoubleBounds)) {
bece6f604899 Removed references to Range and replaced those with references to Bounds in ChartGenerators. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2584 diff changeset	541 logger.warn("Unsupported Bounds type: " + bounds.getClass());
bece6f604899 Removed references to Range and replaced those with references to Bounds in ChartGenerators. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2584 diff changeset	542 return;
bece6f604899 Removed references to Range and replaced those with references to Bounds in ChartGenerators. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2584 diff changeset	543 }
bece6f604899 Removed references to Range and replaced those with references to Bounds in ChartGenerators. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2584 diff changeset	544
bece6f604899 Removed references to Range and replaced those with references to Bounds in ChartGenerators. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2584 diff changeset	545 DoubleBounds dBounds = (DoubleBounds) bounds;
bece6f604899 Removed references to Range and replaced those with references to Bounds in ChartGenerators. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2584 diff changeset	546
bece6f604899 Removed references to Range and replaced those with references to Bounds in ChartGenerators. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2584 diff changeset	547 if (dBounds == null
bece6f604899 Removed references to Range and replaced those with references to Bounds in ChartGenerators. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2584 diff changeset	548 \|\| Double.isNaN((Double) dBounds.getLower())
bece6f604899 Removed references to Range and replaced those with references to Bounds in ChartGenerators. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2584 diff changeset	549 \|\| Double.isNaN((Double) dBounds.getUpper())) {
bece6f604899 Removed references to Range and replaced those with references to Bounds in ChartGenerators. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2584 diff changeset	550 return;
bece6f604899 Removed references to Range and replaced those with references to Bounds in ChartGenerators. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2584 diff changeset	551 }
bece6f604899 Removed references to Range and replaced those with references to Bounds in ChartGenerators. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2584 diff changeset	552
bece6f604899 Removed references to Range and replaced those with references to Bounds in ChartGenerators. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2584 diff changeset	553 Bounds old = getYBounds(index);
bece6f604899 Removed references to Range and replaced those with references to Bounds in ChartGenerators. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2584 diff changeset	554
bece6f604899 Removed references to Range and replaced those with references to Bounds in ChartGenerators. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2584 diff changeset	555 if (old != null) {
bece6f604899 Removed references to Range and replaced those with references to Bounds in ChartGenerators. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2584 diff changeset	556 dBounds = (DoubleBounds) dBounds.combine(old);
bece6f604899 Removed references to Range and replaced those with references to Bounds in ChartGenerators. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2584 diff changeset	557 }
bece6f604899 Removed references to Range and replaced those with references to Bounds in ChartGenerators. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2584 diff changeset	558
bece6f604899 Removed references to Range and replaced those with references to Bounds in ChartGenerators. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2584 diff changeset	559 setYBounds(index, dBounds);
1684 bdb05dc9b763 Bugfix: #353 Enabled chart's to be drawn with proper axes set even if no data is contained. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1679 diff changeset	560 }
bdb05dc9b763 Bugfix: #353 Enabled chart's to be drawn with proper axes set even if no data is contained. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1679 diff changeset	561
bdb05dc9b763 Bugfix: #353 Enabled chart's to be drawn with proper axes set even if no data is contained. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1679 diff changeset	562
1930 de0c2bbb27f9 Cosmetics, docs. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1861 diff changeset	563 /**
1935 5b51f5232661 Added handling of empty plots. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1934 diff changeset	564 * If no data is visible, draw at least empty axis.
5b51f5232661 Added handling of empty plots. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1934 diff changeset	565 */
5b51f5232661 Added handling of empty plots. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1934 diff changeset	566 private void recoverEmptyPlot(XYPlot plot) {
5b51f5232661 Added handling of empty plots. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1934 diff changeset	567 if (plot.getRangeAxis() == null) {
5b51f5232661 Added handling of empty plots. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1934 diff changeset	568 logger.debug("debug: No range axis");
2414 b5f5af53a526 Make it compileable again Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2411 diff changeset	569 plot.setRangeAxis(createYAxis(0));
1935 5b51f5232661 Added handling of empty plots. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1934 diff changeset	570 }
923 7ca4a287cd0e #135 Modified the way to store datasets for different chart axes. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 718 diff changeset	571 }
7ca4a287cd0e #135 Modified the way to store datasets for different chart axes. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 718 diff changeset	572
7ca4a287cd0e #135 Modified the way to store datasets for different chart axes. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 718 diff changeset	573
1931 7c52e9cb2a72 Allow more than two datasets and more flexibility with axes in plots. Based on patch by S. Teichmann. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1930 diff changeset	574 /**
1940 0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	575 * Expands X axes if only a point is shown.
1931 7c52e9cb2a72 Allow more than two datasets and more flexibility with axes in plots. Based on patch by S. Teichmann. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1930 diff changeset	576 */
1686 e8d1e531687a Bugfix: #114 Enabled rendering charts with a single data point. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1685 diff changeset	577 private void preparePointRanges(XYPlot plot) {
e8d1e531687a Bugfix: #114 Enabled rendering charts with a single data point. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1685 diff changeset	578 for (int i = 0, num = plot.getDomainAxisCount(); i < num; i++) {
e8d1e531687a Bugfix: #114 Enabled rendering charts with a single data point. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1685 diff changeset	579
2587 bece6f604899 Removed references to Range and replaced those with references to Bounds in ChartGenerators. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2584 diff changeset	580 Integer key = Integer.valueOf(i);
bece6f604899 Removed references to Range and replaced those with references to Bounds in ChartGenerators. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2584 diff changeset	581 Bounds b = getXBounds(key);
3296 45af081061e7 Added overview output for sq relation. Currently the overview generator is Raimund Renkert <raimund.renkert@intevation.de> parents: 3270 diff changeset	582
2587 bece6f604899 Removed references to Range and replaced those with references to Bounds in ChartGenerators. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2584 diff changeset	583
3249 f76cef888ee1 Fix issue710 - crashing one-point-diagrams. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3242 diff changeset	584 if (b != null && b.getLower().equals(b.getUpper())) {
3296 45af081061e7 Added overview output for sq relation. Currently the overview generator is Raimund Renkert <raimund.renkert@intevation.de> parents: 3270 diff changeset	585 logger.debug("Check whether to expand a x axis.i ("+b.getLower() + "-" + b.getUpper()+")");
3249 f76cef888ee1 Fix issue710 - crashing one-point-diagrams. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3242 diff changeset	586 setXBounds(key, ChartHelper.expandBounds(b, 5));
1686 e8d1e531687a Bugfix: #114 Enabled rendering charts with a single data point. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1685 diff changeset	587 }
e8d1e531687a Bugfix: #114 Enabled rendering charts with a single data point. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1685 diff changeset	588 }
e8d1e531687a Bugfix: #114 Enabled rendering charts with a single data point. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1685 diff changeset	589 }
e8d1e531687a Bugfix: #114 Enabled rendering charts with a single data point. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1685 diff changeset	590
e8d1e531687a Bugfix: #114 Enabled rendering charts with a single data point. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1685 diff changeset	591
1931 7c52e9cb2a72 Allow more than two datasets and more flexibility with axes in plots. Based on patch by S. Teichmann. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1930 diff changeset	592 /**
654 bbc966c81809 #90 Removed margins between data area border and curves. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 653 diff changeset	593 * This method zooms the plot to the specified ranges in the attribute
bbc966c81809 #90 Removed margins between data area border and curves. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 653 diff changeset	594 * document or to the ranges specified by the min/max values in the
bbc966c81809 #90 Removed margins between data area border and curves. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 653 diff changeset	595 * datasets. <b>Note:</b> We determine the range manually if no zoom ranges
bbc966c81809 #90 Removed margins between data area border and curves. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 653 diff changeset	596 * are given, because JFreeCharts auto-zoom adds a margin to the left and
bbc966c81809 #90 Removed margins between data area border and curves. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 653 diff changeset	597 * right of the data area.
653 67c7020f4ed3 Refactored the chart creation in the ChartInfoGenerators. Now, every chart is created by the XYChartGenerator again. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 652 diff changeset	598 *
67c7020f4ed3 Refactored the chart creation in the ChartInfoGenerators. Now, every chart is created by the XYChartGenerator again. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 652 diff changeset	599 * @param plot The XYPlot.
67c7020f4ed3 Refactored the chart creation in the ChartInfoGenerators. Now, every chart is created by the XYChartGenerator again. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 652 diff changeset	600 */
673 b22f21b173a7 Changed the zoom process - the values in the chart request document are percentual values that apply to every axis. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 667 diff changeset	601 protected void autoZoom(XYPlot plot) {
652 8fa4c5c9cd1a Charts are zoomed to a specified view if the attribute document for the chart creation contains an x and/or y range. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 423 diff changeset	602 logger.debug("Zoom to specified ranges.");
654 bbc966c81809 #90 Removed margins between data area border and curves. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 653 diff changeset	603
673 b22f21b173a7 Changed the zoom process - the values in the chart request document are percentual values that apply to every axis. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 667 diff changeset	604 Range xrange = getDomainAxisRange();
b22f21b173a7 Changed the zoom process - the values in the chart request document are percentual values that apply to every axis. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 667 diff changeset	605 Range yrange = getValueAxisRange();
654 bbc966c81809 #90 Removed margins between data area border and curves. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 653 diff changeset	606
2050 c4e0e433f825 Use axes ranges specified in ChartSettings for zooming in charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2049 diff changeset	607 ValueAxis xAxis = plot.getDomainAxis();
c4e0e433f825 Use axes ranges specified in ChartSettings for zooming in charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2049 diff changeset	608
c4e0e433f825 Use axes ranges specified in ChartSettings for zooming in charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2049 diff changeset	609 Range fixedXRange = getRangeForAxisFromSettings("X");
c4e0e433f825 Use axes ranges specified in ChartSettings for zooming in charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2049 diff changeset	610 if (fixedXRange != null) {
c4e0e433f825 Use axes ranges specified in ChartSettings for zooming in charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2049 diff changeset	611 xAxis.setRange(fixedXRange);
c4e0e433f825 Use axes ranges specified in ChartSettings for zooming in charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2049 diff changeset	612 }
c4e0e433f825 Use axes ranges specified in ChartSettings for zooming in charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2049 diff changeset	613 else {
2587 bece6f604899 Removed references to Range and replaced those with references to Bounds in ChartGenerators. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2584 diff changeset	614 zoomX(plot, xAxis, getXBounds(0), xrange);
2050 c4e0e433f825 Use axes ranges specified in ChartSettings for zooming in charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2049 diff changeset	615 }
923 7ca4a287cd0e #135 Modified the way to store datasets for different chart axes. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 718 diff changeset	616
1699 608859aa5a7e Bugfix: #383 Add further y-axes before adjusting the ranges for each y-axis. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1698 diff changeset	617 for (int i = 0, num = plot.getRangeAxisCount(); i < num; i++) {
673 b22f21b173a7 Changed the zoom process - the values in the chart request document are percentual values that apply to every axis. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 667 diff changeset	618 ValueAxis yaxis = plot.getRangeAxis(i);
654 bbc966c81809 #90 Removed margins between data area border and curves. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 653 diff changeset	619
2049 2d5f2bc68cc6 Centralized the creation of new NumberAxis - new NumberAxis instances in FLYS will be from type IdentifiableNumberAxis which subclasses JFreeChart's NumberAxis. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2048 diff changeset	620 if (yaxis instanceof IdentifiableNumberAxis) {
2050 c4e0e433f825 Use axes ranges specified in ChartSettings for zooming in charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2049 diff changeset	621 IdentifiableNumberAxis idAxis = (IdentifiableNumberAxis) yaxis;
c4e0e433f825 Use axes ranges specified in ChartSettings for zooming in charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2049 diff changeset	622
c4e0e433f825 Use axes ranges specified in ChartSettings for zooming in charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2049 diff changeset	623 Range fixedRange = getRangeForAxisFromSettings(idAxis.getId());
c4e0e433f825 Use axes ranges specified in ChartSettings for zooming in charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2049 diff changeset	624 if (fixedRange != null) {
c4e0e433f825 Use axes ranges specified in ChartSettings for zooming in charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2049 diff changeset	625 yaxis.setRange(fixedRange);
c4e0e433f825 Use axes ranges specified in ChartSettings for zooming in charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2049 diff changeset	626 continue;
c4e0e433f825 Use axes ranges specified in ChartSettings for zooming in charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2049 diff changeset	627 }
2049 2d5f2bc68cc6 Centralized the creation of new NumberAxis - new NumberAxis instances in FLYS will be from type IdentifiableNumberAxis which subclasses JFreeChart's NumberAxis. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2048 diff changeset	628 }
2d5f2bc68cc6 Centralized the creation of new NumberAxis - new NumberAxis instances in FLYS will be from type IdentifiableNumberAxis which subclasses JFreeChart's NumberAxis. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2048 diff changeset	629
673 b22f21b173a7 Changed the zoom process - the values in the chart request document are percentual values that apply to every axis. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 667 diff changeset	630 if (yaxis == null) {
1699 608859aa5a7e Bugfix: #383 Add further y-axes before adjusting the ranges for each y-axis. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1698 diff changeset	631 logger.debug("Zoom problem: no Y Axis for index: " + i);
673 b22f21b173a7 Changed the zoom process - the values in the chart request document are percentual values that apply to every axis. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 667 diff changeset	632 continue;
b22f21b173a7 Changed the zoom process - the values in the chart request document are percentual values that apply to every axis. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 667 diff changeset	633 }
b22f21b173a7 Changed the zoom process - the values in the chart request document are percentual values that apply to every axis. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 667 diff changeset	634
1699 608859aa5a7e Bugfix: #383 Add further y-axes before adjusting the ranges for each y-axis. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1698 diff changeset	635 logger.debug("Prepare zoom settings for y axis at index: " + i);
2587 bece6f604899 Removed references to Range and replaced those with references to Bounds in ChartGenerators. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2584 diff changeset	636 zoomY(plot, yaxis, getYBounds(Integer.valueOf(i)), yrange);
654 bbc966c81809 #90 Removed margins between data area border and curves. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 653 diff changeset	637 }
653 67c7020f4ed3 Refactored the chart creation in the ChartInfoGenerators. Now, every chart is created by the XYChartGenerator again. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 652 diff changeset	638 }
652 8fa4c5c9cd1a Charts are zoomed to a specified view if the attribute document for the chart creation contains an x and/or y range. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 423 diff changeset	639
653 67c7020f4ed3 Refactored the chart creation in the ChartInfoGenerators. Now, every chart is created by the XYChartGenerator again. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 652 diff changeset	640
2395 cd4fb19ab892 Some API changes in ChartGenerator and XYChartGenerator for fetching user specified zoom values. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2325 diff changeset	641 protected Range getDomainAxisRange() {
cd4fb19ab892 Some API changes in ChartGenerator and XYChartGenerator for fetching user specified zoom values. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2325 diff changeset	642 String[] ranges = getDomainAxisRangeFromRequest();
cd4fb19ab892 Some API changes in ChartGenerator and XYChartGenerator for fetching user specified zoom values. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2325 diff changeset	643
cd4fb19ab892 Some API changes in ChartGenerator and XYChartGenerator for fetching user specified zoom values. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2325 diff changeset	644 if (ranges == null \|\| ranges.length < 2) {
cd4fb19ab892 Some API changes in ChartGenerator and XYChartGenerator for fetching user specified zoom values. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2325 diff changeset	645 logger.debug("No zoom range for domain axis specified.");
cd4fb19ab892 Some API changes in ChartGenerator and XYChartGenerator for fetching user specified zoom values. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2325 diff changeset	646 return null;
cd4fb19ab892 Some API changes in ChartGenerator and XYChartGenerator for fetching user specified zoom values. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2325 diff changeset	647 }
cd4fb19ab892 Some API changes in ChartGenerator and XYChartGenerator for fetching user specified zoom values. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2325 diff changeset	648
cd4fb19ab892 Some API changes in ChartGenerator and XYChartGenerator for fetching user specified zoom values. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2325 diff changeset	649 if (ranges[0].length() > 0 && ranges[1].length() > 0) {
cd4fb19ab892 Some API changes in ChartGenerator and XYChartGenerator for fetching user specified zoom values. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2325 diff changeset	650 try {
cd4fb19ab892 Some API changes in ChartGenerator and XYChartGenerator for fetching user specified zoom values. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2325 diff changeset	651 double from = Double.parseDouble(ranges[0]);
cd4fb19ab892 Some API changes in ChartGenerator and XYChartGenerator for fetching user specified zoom values. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2325 diff changeset	652 double to = Double.parseDouble(ranges[1]);
cd4fb19ab892 Some API changes in ChartGenerator and XYChartGenerator for fetching user specified zoom values. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2325 diff changeset	653
cd4fb19ab892 Some API changes in ChartGenerator and XYChartGenerator for fetching user specified zoom values. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2325 diff changeset	654 if (from == 0 && to == 0) {
cd4fb19ab892 Some API changes in ChartGenerator and XYChartGenerator for fetching user specified zoom values. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2325 diff changeset	655 logger.debug("No range specified. Lower and upper X == 0");
cd4fb19ab892 Some API changes in ChartGenerator and XYChartGenerator for fetching user specified zoom values. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2325 diff changeset	656 return null;
cd4fb19ab892 Some API changes in ChartGenerator and XYChartGenerator for fetching user specified zoom values. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2325 diff changeset	657 }
cd4fb19ab892 Some API changes in ChartGenerator and XYChartGenerator for fetching user specified zoom values. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2325 diff changeset	658
cd4fb19ab892 Some API changes in ChartGenerator and XYChartGenerator for fetching user specified zoom values. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2325 diff changeset	659 if (from > to) {
cd4fb19ab892 Some API changes in ChartGenerator and XYChartGenerator for fetching user specified zoom values. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2325 diff changeset	660 double tmp = to;
cd4fb19ab892 Some API changes in ChartGenerator and XYChartGenerator for fetching user specified zoom values. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2325 diff changeset	661 to = from;
cd4fb19ab892 Some API changes in ChartGenerator and XYChartGenerator for fetching user specified zoom values. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2325 diff changeset	662 from = tmp;
cd4fb19ab892 Some API changes in ChartGenerator and XYChartGenerator for fetching user specified zoom values. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2325 diff changeset	663 }
cd4fb19ab892 Some API changes in ChartGenerator and XYChartGenerator for fetching user specified zoom values. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2325 diff changeset	664
cd4fb19ab892 Some API changes in ChartGenerator and XYChartGenerator for fetching user specified zoom values. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2325 diff changeset	665 return new Range(from, to);
cd4fb19ab892 Some API changes in ChartGenerator and XYChartGenerator for fetching user specified zoom values. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2325 diff changeset	666 }
cd4fb19ab892 Some API changes in ChartGenerator and XYChartGenerator for fetching user specified zoom values. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2325 diff changeset	667 catch (NumberFormatException nfe) {
cd4fb19ab892 Some API changes in ChartGenerator and XYChartGenerator for fetching user specified zoom values. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2325 diff changeset	668 logger.warn("Wrong values for domain axis range.");
cd4fb19ab892 Some API changes in ChartGenerator and XYChartGenerator for fetching user specified zoom values. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2325 diff changeset	669 }
cd4fb19ab892 Some API changes in ChartGenerator and XYChartGenerator for fetching user specified zoom values. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2325 diff changeset	670 }
cd4fb19ab892 Some API changes in ChartGenerator and XYChartGenerator for fetching user specified zoom values. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2325 diff changeset	671
cd4fb19ab892 Some API changes in ChartGenerator and XYChartGenerator for fetching user specified zoom values. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2325 diff changeset	672 return null;
cd4fb19ab892 Some API changes in ChartGenerator and XYChartGenerator for fetching user specified zoom values. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2325 diff changeset	673 }
cd4fb19ab892 Some API changes in ChartGenerator and XYChartGenerator for fetching user specified zoom values. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2325 diff changeset	674
cd4fb19ab892 Some API changes in ChartGenerator and XYChartGenerator for fetching user specified zoom values. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2325 diff changeset	675
2398 5d8d24984819 New abstract methods in ChartGenerator and moved a method from ChartGenerator to XYChartGenerator. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2395 diff changeset	676 protected Range getValueAxisRange() {
5d8d24984819 New abstract methods in ChartGenerator and moved a method from ChartGenerator to XYChartGenerator. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2395 diff changeset	677 String[] ranges = getValueAxisRangeFromRequest();
5d8d24984819 New abstract methods in ChartGenerator and moved a method from ChartGenerator to XYChartGenerator. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2395 diff changeset	678
5d8d24984819 New abstract methods in ChartGenerator and moved a method from ChartGenerator to XYChartGenerator. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2395 diff changeset	679 if (ranges == null \|\| ranges.length < 2) {
5d8d24984819 New abstract methods in ChartGenerator and moved a method from ChartGenerator to XYChartGenerator. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2395 diff changeset	680 logger.debug("No range specified. Lower and upper Y == 0");
5d8d24984819 New abstract methods in ChartGenerator and moved a method from ChartGenerator to XYChartGenerator. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2395 diff changeset	681 return null;
5d8d24984819 New abstract methods in ChartGenerator and moved a method from ChartGenerator to XYChartGenerator. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2395 diff changeset	682 }
5d8d24984819 New abstract methods in ChartGenerator and moved a method from ChartGenerator to XYChartGenerator. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2395 diff changeset	683
5d8d24984819 New abstract methods in ChartGenerator and moved a method from ChartGenerator to XYChartGenerator. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2395 diff changeset	684 if (ranges[0].length() > 0 && ranges[1].length() > 0) {
5d8d24984819 New abstract methods in ChartGenerator and moved a method from ChartGenerator to XYChartGenerator. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2395 diff changeset	685 try {
5d8d24984819 New abstract methods in ChartGenerator and moved a method from ChartGenerator to XYChartGenerator. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2395 diff changeset	686 double from = Double.parseDouble(ranges[0]);
5d8d24984819 New abstract methods in ChartGenerator and moved a method from ChartGenerator to XYChartGenerator. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2395 diff changeset	687 double to = Double.parseDouble(ranges[1]);
5d8d24984819 New abstract methods in ChartGenerator and moved a method from ChartGenerator to XYChartGenerator. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2395 diff changeset	688
5d8d24984819 New abstract methods in ChartGenerator and moved a method from ChartGenerator to XYChartGenerator. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2395 diff changeset	689 if (from == 0 && to == 0) {
5d8d24984819 New abstract methods in ChartGenerator and moved a method from ChartGenerator to XYChartGenerator. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2395 diff changeset	690 logger.debug("No range specified. Lower and upper Y == 0");
5d8d24984819 New abstract methods in ChartGenerator and moved a method from ChartGenerator to XYChartGenerator. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2395 diff changeset	691 return null;
5d8d24984819 New abstract methods in ChartGenerator and moved a method from ChartGenerator to XYChartGenerator. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2395 diff changeset	692 }
5d8d24984819 New abstract methods in ChartGenerator and moved a method from ChartGenerator to XYChartGenerator. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2395 diff changeset	693
5d8d24984819 New abstract methods in ChartGenerator and moved a method from ChartGenerator to XYChartGenerator. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2395 diff changeset	694 return from > to
5d8d24984819 New abstract methods in ChartGenerator and moved a method from ChartGenerator to XYChartGenerator. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2395 diff changeset	695 ? new Range(to, from)
5d8d24984819 New abstract methods in ChartGenerator and moved a method from ChartGenerator to XYChartGenerator. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2395 diff changeset	696 : new Range(from, to);
5d8d24984819 New abstract methods in ChartGenerator and moved a method from ChartGenerator to XYChartGenerator. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2395 diff changeset	697 }
5d8d24984819 New abstract methods in ChartGenerator and moved a method from ChartGenerator to XYChartGenerator. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2395 diff changeset	698 catch (NumberFormatException nfe) {
5d8d24984819 New abstract methods in ChartGenerator and moved a method from ChartGenerator to XYChartGenerator. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2395 diff changeset	699 logger.warn("Wrong values for value axis range.");
5d8d24984819 New abstract methods in ChartGenerator and moved a method from ChartGenerator to XYChartGenerator. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2395 diff changeset	700 }
5d8d24984819 New abstract methods in ChartGenerator and moved a method from ChartGenerator to XYChartGenerator. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2395 diff changeset	701 }
5d8d24984819 New abstract methods in ChartGenerator and moved a method from ChartGenerator to XYChartGenerator. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2395 diff changeset	702
5d8d24984819 New abstract methods in ChartGenerator and moved a method from ChartGenerator to XYChartGenerator. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2395 diff changeset	703 return null;
5d8d24984819 New abstract methods in ChartGenerator and moved a method from ChartGenerator to XYChartGenerator. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2395 diff changeset	704 }
5d8d24984819 New abstract methods in ChartGenerator and moved a method from ChartGenerator to XYChartGenerator. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2395 diff changeset	705
5d8d24984819 New abstract methods in ChartGenerator and moved a method from ChartGenerator to XYChartGenerator. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2395 diff changeset	706
2587 bece6f604899 Removed references to Range and replaced those with references to Bounds in ChartGenerators. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2584 diff changeset	707 protected boolean zoomX(XYPlot plot, ValueAxis axis, Bounds bounds, Range x) {
bece6f604899 Removed references to Range and replaced those with references to Bounds in ChartGenerators. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2584 diff changeset	708 return zoom(plot, axis, bounds, x);
718 f3fd8c9b7f51 #157 Computed discharge curve charts always have a lower bound set to 0. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 717 diff changeset	709 }
f3fd8c9b7f51 #157 Computed discharge curve charts always have a lower bound set to 0. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 717 diff changeset	710
f3fd8c9b7f51 #157 Computed discharge curve charts always have a lower bound set to 0. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 717 diff changeset	711
2587 bece6f604899 Removed references to Range and replaced those with references to Bounds in ChartGenerators. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2584 diff changeset	712 protected boolean zoomY(XYPlot plot, ValueAxis axis, Bounds bounds, Range x) {
bece6f604899 Removed references to Range and replaced those with references to Bounds in ChartGenerators. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2584 diff changeset	713 return zoom(plot, axis, bounds, x);
718 f3fd8c9b7f51 #157 Computed discharge curve charts always have a lower bound set to 0. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 717 diff changeset	714 }
f3fd8c9b7f51 #157 Computed discharge curve charts always have a lower bound set to 0. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 717 diff changeset	715
f3fd8c9b7f51 #157 Computed discharge curve charts always have a lower bound set to 0. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 717 diff changeset	716
653 67c7020f4ed3 Refactored the chart creation in the ChartInfoGenerators. Now, every chart is created by the XYChartGenerator again. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 652 diff changeset	717 /**
67c7020f4ed3 Refactored the chart creation in the ChartInfoGenerators. Now, every chart is created by the XYChartGenerator again. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 652 diff changeset	718 * Zooms the x axis to the range specified in the attribute document.
67c7020f4ed3 Refactored the chart creation in the ChartInfoGenerators. Now, every chart is created by the XYChartGenerator again. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 652 diff changeset	719 *
1958 82cefa3f954f Partial fix for flys/issue420 (Mosel/DischargeCurves), do survive empty datasets when calculating axis extents. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1948 diff changeset	720 * @param plot The XYPlot.
82cefa3f954f Partial fix for flys/issue420 (Mosel/DischargeCurves), do survive empty datasets when calculating axis extents. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1948 diff changeset	721 * @param axis The axis the shoud be modified.
3270 4ac581062c40 Fix various documentation issues. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3257 diff changeset	722 * @param bounds The whole range specified by a dataset.
1958 82cefa3f954f Partial fix for flys/issue420 (Mosel/DischargeCurves), do survive empty datasets when calculating axis extents. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1948 diff changeset	723 * @param x A user defined range (null permitted).
654 bbc966c81809 #90 Removed margins between data area border and curves. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 653 diff changeset	724 *
bbc966c81809 #90 Removed margins between data area border and curves. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 653 diff changeset	725 * @return true, if a zoom range was specified, otherwise false.
653 67c7020f4ed3 Refactored the chart creation in the ChartInfoGenerators. Now, every chart is created by the XYChartGenerator again. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 652 diff changeset	726 */
2587 bece6f604899 Removed references to Range and replaced those with references to Bounds in ChartGenerators. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2584 diff changeset	727 protected boolean zoom(XYPlot plot, ValueAxis axis, Bounds bounds, Range x) {
1736 0155cbaba182 XYChartGenerator: Do not crash if no zoom axis given Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1735 diff changeset	728
2587 bece6f604899 Removed references to Range and replaced those with references to Bounds in ChartGenerators. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2584 diff changeset	729 if (bounds == null) {
1736 0155cbaba182 XYChartGenerator: Do not crash if no zoom axis given Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1735 diff changeset	730 return false;
0155cbaba182 XYChartGenerator: Do not crash if no zoom axis given Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1735 diff changeset	731 }
0155cbaba182 XYChartGenerator: Do not crash if no zoom axis given Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1735 diff changeset	732
673 b22f21b173a7 Changed the zoom process - the values in the chart request document are percentual values that apply to every axis. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 667 diff changeset	733 if (x != null) {
2587 bece6f604899 Removed references to Range and replaced those with references to Bounds in ChartGenerators. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2584 diff changeset	734 double min = bounds.getLower().doubleValue();
bece6f604899 Removed references to Range and replaced those with references to Bounds in ChartGenerators. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2584 diff changeset	735 double max = bounds.getUpper().doubleValue();
bece6f604899 Removed references to Range and replaced those with references to Bounds in ChartGenerators. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2584 diff changeset	736
bece6f604899 Removed references to Range and replaced those with references to Bounds in ChartGenerators. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2584 diff changeset	737 if (logger.isDebugEnabled()) {
bece6f604899 Removed references to Range and replaced those with references to Bounds in ChartGenerators. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2584 diff changeset	738 logger.debug("Minimum is: " + min);
bece6f604899 Removed references to Range and replaced those with references to Bounds in ChartGenerators. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2584 diff changeset	739 logger.debug("Maximum is: " + max);
bece6f604899 Removed references to Range and replaced those with references to Bounds in ChartGenerators. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2584 diff changeset	740 logger.debug("Lower zoom is: " + x.getLowerBound());
bece6f604899 Removed references to Range and replaced those with references to Bounds in ChartGenerators. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2584 diff changeset	741 logger.debug("Upper zoom is: " + x.getUpperBound());
bece6f604899 Removed references to Range and replaced those with references to Bounds in ChartGenerators. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2584 diff changeset	742 }
bece6f604899 Removed references to Range and replaced those with references to Bounds in ChartGenerators. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2584 diff changeset	743
673 b22f21b173a7 Changed the zoom process - the values in the chart request document are percentual values that apply to every axis. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 667 diff changeset	744 double diff = max > min ? max - min : min - max;
652 8fa4c5c9cd1a Charts are zoomed to a specified view if the attribute document for the chart creation contains an x and/or y range. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 423 diff changeset	745
2587 bece6f604899 Removed references to Range and replaced those with references to Bounds in ChartGenerators. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2584 diff changeset	746 DoubleBounds computed = new DoubleBounds(
673 b22f21b173a7 Changed the zoom process - the values in the chart request document are percentual values that apply to every axis. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 667 diff changeset	747 min + x.getLowerBound() * diff,
b22f21b173a7 Changed the zoom process - the values in the chart request document are percentual values that apply to every axis. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 667 diff changeset	748 min + x.getUpperBound() * diff);
b22f21b173a7 Changed the zoom process - the values in the chart request document are percentual values that apply to every axis. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 667 diff changeset	749
2587 bece6f604899 Removed references to Range and replaced those with references to Bounds in ChartGenerators. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2584 diff changeset	750 computed.applyBounds(axis, AXIS_SPACE);
673 b22f21b173a7 Changed the zoom process - the values in the chart request document are percentual values that apply to every axis. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 667 diff changeset	751
b22f21b173a7 Changed the zoom process - the values in the chart request document are percentual values that apply to every axis. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 667 diff changeset	752 logger.debug("Zoom axis to: " + computed);
654 bbc966c81809 #90 Removed margins between data area border and curves. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 653 diff changeset	753
bbc966c81809 #90 Removed margins between data area border and curves. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 653 diff changeset	754 return true;
652 8fa4c5c9cd1a Charts are zoomed to a specified view if the attribute document for the chart creation contains an x and/or y range. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 423 diff changeset	755 }
654 bbc966c81809 #90 Removed margins between data area border and curves. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 653 diff changeset	756
2587 bece6f604899 Removed references to Range and replaced those with references to Bounds in ChartGenerators. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2584 diff changeset	757 bounds.applyBounds(axis, AXIS_SPACE);
654 bbc966c81809 #90 Removed margins between data area border and curves. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 653 diff changeset	758 return false;
bbc966c81809 #90 Removed margins between data area border and curves. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 653 diff changeset	759 }
bbc966c81809 #90 Removed margins between data area border and curves. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 653 diff changeset	760
bbc966c81809 #90 Removed margins between data area border and curves. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 653 diff changeset	761
bbc966c81809 #90 Removed margins between data area border and curves. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 653 diff changeset	762 /**
2710 013882485011 Cosmetics (docs). Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2706 diff changeset	763 * Extract the minimum and maximum values for x and y axes
1684 bdb05dc9b763 Bugfix: #353 Enabled chart's to be drawn with proper axes set even if no data is contained. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1679 diff changeset	764 * which are stored in <i>xRanges</i> and <i>yRanges</i>.
654 bbc966c81809 #90 Removed margins between data area border and curves. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 653 diff changeset	765 *
1684 bdb05dc9b763 Bugfix: #353 Enabled chart's to be drawn with proper axes set even if no data is contained. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1679 diff changeset	766 * @param index The index of the y-Axis.
654 bbc966c81809 #90 Removed margins between data area border and curves. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 653 diff changeset	767 *
bbc966c81809 #90 Removed margins between data area border and curves. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 653 diff changeset	768 * @return a Range[] as follows: [x-Range, y-Range].
bbc966c81809 #90 Removed margins between data area border and curves. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 653 diff changeset	769 */
2261 6aeb71517136 Registered an Info generator for historical discharge curves; made some adaptions in XYChartGenerator, ChartGenerator and TimeseriesChartGenerator. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2246 diff changeset	770 @Override
1944 21a4d2c677a1 Changed doOut signature, side effect from blackboard feature (to come). Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1943 diff changeset	771 public Range[] getRangesForAxis(int index) {
21a4d2c677a1 Changed doOut signature, side effect from blackboard feature (to come). Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1943 diff changeset	772 logger.debug("getRangesForAxis " + index);
2132 e8fc770d2f8c 'New Chart' for computed discharge curve. Raimund Renkert <raimund.renkert@intevation.de> parents: 2110 diff changeset	773
2587 bece6f604899 Removed references to Range and replaced those with references to Bounds in ChartGenerators. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2584 diff changeset	774 Bounds rx = getXBounds(Integer.valueOf(0));
bece6f604899 Removed references to Range and replaced those with references to Bounds in ChartGenerators. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2584 diff changeset	775 Bounds ry = getYBounds(Integer.valueOf(index));
2132 e8fc770d2f8c 'New Chart' for computed discharge curve. Raimund Renkert <raimund.renkert@intevation.de> parents: 2110 diff changeset	776
e8fc770d2f8c 'New Chart' for computed discharge curve. Raimund Renkert <raimund.renkert@intevation.de> parents: 2110 diff changeset	777 if (rx == null) {
e8fc770d2f8c 'New Chart' for computed discharge curve. Raimund Renkert <raimund.renkert@intevation.de> parents: 2110 diff changeset	778 logger.warn("Range for x axis not set." +
e8fc770d2f8c 'New Chart' for computed discharge curve. Raimund Renkert <raimund.renkert@intevation.de> parents: 2110 diff changeset	779 " Using default values: 0 - 1.");
2587 bece6f604899 Removed references to Range and replaced those with references to Bounds in ChartGenerators. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2584 diff changeset	780 rx = new DoubleBounds(0, 1);
2132 e8fc770d2f8c 'New Chart' for computed discharge curve. Raimund Renkert <raimund.renkert@intevation.de> parents: 2110 diff changeset	781 }
e8fc770d2f8c 'New Chart' for computed discharge curve. Raimund Renkert <raimund.renkert@intevation.de> parents: 2110 diff changeset	782 if (ry == null) {
e8fc770d2f8c 'New Chart' for computed discharge curve. Raimund Renkert <raimund.renkert@intevation.de> parents: 2110 diff changeset	783 logger.warn("Range for y" + index +
e8fc770d2f8c 'New Chart' for computed discharge curve. Raimund Renkert <raimund.renkert@intevation.de> parents: 2110 diff changeset	784 " axis not set. Using default values: 0 - 1.");
2587 bece6f604899 Removed references to Range and replaced those with references to Bounds in ChartGenerators. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2584 diff changeset	785 ry = new DoubleBounds(0, 1);
2132 e8fc770d2f8c 'New Chart' for computed discharge curve. Raimund Renkert <raimund.renkert@intevation.de> parents: 2110 diff changeset	786 }
2587 bece6f604899 Removed references to Range and replaced those with references to Bounds in ChartGenerators. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2584 diff changeset	787
bece6f604899 Removed references to Range and replaced those with references to Bounds in ChartGenerators. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2584 diff changeset	788 return new Range[] {
bece6f604899 Removed references to Range and replaced those with references to Bounds in ChartGenerators. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2584 diff changeset	789 new Range(rx.getLower().doubleValue(), rx.getUpper().doubleValue()),
bece6f604899 Removed references to Range and replaced those with references to Bounds in ChartGenerators. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2584 diff changeset	790 new Range(ry.getLower().doubleValue(), ry.getUpper().doubleValue())
bece6f604899 Removed references to Range and replaced those with references to Bounds in ChartGenerators. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2584 diff changeset	791 };
652 8fa4c5c9cd1a Charts are zoomed to a specified view if the attribute document for the chart creation contains an x and/or y range. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 423 diff changeset	792 }
8fa4c5c9cd1a Charts are zoomed to a specified view if the attribute document for the chart creation contains an x and/or y range. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 423 diff changeset	793
8fa4c5c9cd1a Charts are zoomed to a specified view if the attribute document for the chart creation contains an x and/or y range. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 423 diff changeset	794
2710 013882485011 Cosmetics (docs). Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2706 diff changeset	795 /** Get X (usually horizontal) extent for given axis. */
2398 5d8d24984819 New abstract methods in ChartGenerator and moved a method from ChartGenerator to XYChartGenerator. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2395 diff changeset	796 @Override
5d8d24984819 New abstract methods in ChartGenerator and moved a method from ChartGenerator to XYChartGenerator. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2395 diff changeset	797 public Bounds getXBounds(int axis) {
2587 bece6f604899 Removed references to Range and replaced those with references to Bounds in ChartGenerators. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2584 diff changeset	798 return xBounds.get(axis);
2398 5d8d24984819 New abstract methods in ChartGenerator and moved a method from ChartGenerator to XYChartGenerator. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2395 diff changeset	799 }
5d8d24984819 New abstract methods in ChartGenerator and moved a method from ChartGenerator to XYChartGenerator. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2395 diff changeset	800
5d8d24984819 New abstract methods in ChartGenerator and moved a method from ChartGenerator to XYChartGenerator. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2395 diff changeset	801
2710 013882485011 Cosmetics (docs). Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2706 diff changeset	802 /** Set X (usually horizontal) extent for given axis. */
2398 5d8d24984819 New abstract methods in ChartGenerator and moved a method from ChartGenerator to XYChartGenerator. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2395 diff changeset	803 @Override
5d8d24984819 New abstract methods in ChartGenerator and moved a method from ChartGenerator to XYChartGenerator. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2395 diff changeset	804 protected void setXBounds(int axis, Bounds bounds) {
3249 f76cef888ee1 Fix issue710 - crashing one-point-diagrams. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3242 diff changeset	805 if (bounds.getLower() == bounds.getUpper()) {
f76cef888ee1 Fix issue710 - crashing one-point-diagrams. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3242 diff changeset	806 xBounds.put(axis, ChartHelper.expandBounds(bounds, 5d));
f76cef888ee1 Fix issue710 - crashing one-point-diagrams. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3242 diff changeset	807 }
f76cef888ee1 Fix issue710 - crashing one-point-diagrams. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3242 diff changeset	808 else {
f76cef888ee1 Fix issue710 - crashing one-point-diagrams. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3242 diff changeset	809 xBounds.put(axis, bounds);
f76cef888ee1 Fix issue710 - crashing one-point-diagrams. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3242 diff changeset	810 }
2398 5d8d24984819 New abstract methods in ChartGenerator and moved a method from ChartGenerator to XYChartGenerator. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2395 diff changeset	811 }
5d8d24984819 New abstract methods in ChartGenerator and moved a method from ChartGenerator to XYChartGenerator. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2395 diff changeset	812
5d8d24984819 New abstract methods in ChartGenerator and moved a method from ChartGenerator to XYChartGenerator. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2395 diff changeset	813
2710 013882485011 Cosmetics (docs). Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2706 diff changeset	814 /** Get Y (usually vertical) extent for given axis. */
2398 5d8d24984819 New abstract methods in ChartGenerator and moved a method from ChartGenerator to XYChartGenerator. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2395 diff changeset	815 @Override
5d8d24984819 New abstract methods in ChartGenerator and moved a method from ChartGenerator to XYChartGenerator. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2395 diff changeset	816 public Bounds getYBounds(int axis) {
2587 bece6f604899 Removed references to Range and replaced those with references to Bounds in ChartGenerators. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2584 diff changeset	817 return yBounds.get(axis);
2398 5d8d24984819 New abstract methods in ChartGenerator and moved a method from ChartGenerator to XYChartGenerator. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2395 diff changeset	818 }
5d8d24984819 New abstract methods in ChartGenerator and moved a method from ChartGenerator to XYChartGenerator. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2395 diff changeset	819
5d8d24984819 New abstract methods in ChartGenerator and moved a method from ChartGenerator to XYChartGenerator. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2395 diff changeset	820
2710 013882485011 Cosmetics (docs). Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2706 diff changeset	821 /** Set Y (usually vertical) extent for given axis. */
2398 5d8d24984819 New abstract methods in ChartGenerator and moved a method from ChartGenerator to XYChartGenerator. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2395 diff changeset	822 @Override
5d8d24984819 New abstract methods in ChartGenerator and moved a method from ChartGenerator to XYChartGenerator. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2395 diff changeset	823 protected void setYBounds(int axis, Bounds bounds) {
2587 bece6f604899 Removed references to Range and replaced those with references to Bounds in ChartGenerators. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2584 diff changeset	824 yBounds.put(axis, bounds);
2398 5d8d24984819 New abstract methods in ChartGenerator and moved a method from ChartGenerator to XYChartGenerator. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2395 diff changeset	825 }
5d8d24984819 New abstract methods in ChartGenerator and moved a method from ChartGenerator to XYChartGenerator. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2395 diff changeset	826
5d8d24984819 New abstract methods in ChartGenerator and moved a method from ChartGenerator to XYChartGenerator. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2395 diff changeset	827
369 2ce7b473620e Implemented the chart creation of a longitudinal section chart - W and Q facets. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: diff changeset	828 /**
2054 a653295c9ac0 Make use of user defined axes font sizes. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2053 diff changeset	829 * Adjusts the axes of a plot. This method sets the <i>labelFont</i> of the
a653295c9ac0 Make use of user defined axes font sizes. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2053 diff changeset	830 * X axis.
a653295c9ac0 Make use of user defined axes font sizes. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2053 diff changeset	831 *
369 2ce7b473620e Implemented the chart creation of a longitudinal section chart - W and Q facets. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: diff changeset	832 * @param plot The XYPlot of the chart.
2ce7b473620e Implemented the chart creation of a longitudinal section chart - W and Q facets. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: diff changeset	833 */
2ce7b473620e Implemented the chart creation of a longitudinal section chart - W and Q facets. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: diff changeset	834 protected void adjustAxes(XYPlot plot) {
2054 a653295c9ac0 Make use of user defined axes font sizes. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2053 diff changeset	835 ValueAxis xaxis = plot.getDomainAxis();
a653295c9ac0 Make use of user defined axes font sizes. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2053 diff changeset	836
a653295c9ac0 Make use of user defined axes font sizes. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2053 diff changeset	837 ChartSettings chartSettings = getChartSettings();
a653295c9ac0 Make use of user defined axes font sizes. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2053 diff changeset	838 if (chartSettings == null) {
a653295c9ac0 Make use of user defined axes font sizes. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2053 diff changeset	839 return;
1931 7c52e9cb2a72 Allow more than two datasets and more flexibility with axes in plots. Based on patch by S. Teichmann. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1930 diff changeset	840 }
2054 a653295c9ac0 Make use of user defined axes font sizes. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2053 diff changeset	841
a653295c9ac0 Make use of user defined axes font sizes. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2053 diff changeset	842 Font labelFont = new Font(
a653295c9ac0 Make use of user defined axes font sizes. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2053 diff changeset	843 DEFAULT_FONT_NAME,
a653295c9ac0 Make use of user defined axes font sizes. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2053 diff changeset	844 Font.BOLD,
a653295c9ac0 Make use of user defined axes font sizes. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2053 diff changeset	845 getXAxisLabelFontSize());
a653295c9ac0 Make use of user defined axes font sizes. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2053 diff changeset	846
a653295c9ac0 Make use of user defined axes font sizes. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2053 diff changeset	847 xaxis.setLabelFont(labelFont);
2590 d75b427da50a #522 Modified axes creation: label and tick label fonts will now always be the same. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2587 diff changeset	848 xaxis.setTickLabelFont(labelFont);
369 2ce7b473620e Implemented the chart creation of a longitudinal section chart - W and Q facets. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: diff changeset	849 }
414 0385bcc4229a Added subtitles to the available charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 375 diff changeset	850
0385bcc4229a Added subtitles to the available charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 375 diff changeset	851
1940 0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	852 /**
1645 4a8251eae217 Bugfix: #68 Set number format of chart plot axes based on the CallMeta instance for each request. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1623 diff changeset	853 * This method walks over all axes (domain and range) of <i>plot</i> and
4a8251eae217 Bugfix: #68 Set number format of chart plot axes based on the CallMeta instance for each request. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1623 diff changeset	854 * calls localizeDomainAxis() for domain axes or localizeRangeAxis() for
4a8251eae217 Bugfix: #68 Set number format of chart plot axes based on the CallMeta instance for each request. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1623 diff changeset	855 * range axes.
4a8251eae217 Bugfix: #68 Set number format of chart plot axes based on the CallMeta instance for each request. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1623 diff changeset	856 *
4a8251eae217 Bugfix: #68 Set number format of chart plot axes based on the CallMeta instance for each request. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1623 diff changeset	857 * @param plot The XYPlot.
4a8251eae217 Bugfix: #68 Set number format of chart plot axes based on the CallMeta instance for each request. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1623 diff changeset	858 */
4a8251eae217 Bugfix: #68 Set number format of chart plot axes based on the CallMeta instance for each request. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1623 diff changeset	859 private void localizeAxes(XYPlot plot) {
4a8251eae217 Bugfix: #68 Set number format of chart plot axes based on the CallMeta instance for each request. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1623 diff changeset	860 for (int i = 0, num = plot.getDomainAxisCount(); i < num; i++) {
4a8251eae217 Bugfix: #68 Set number format of chart plot axes based on the CallMeta instance for each request. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1623 diff changeset	861 ValueAxis axis = plot.getDomainAxis(i);
4a8251eae217 Bugfix: #68 Set number format of chart plot axes based on the CallMeta instance for each request. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1623 diff changeset	862
4a8251eae217 Bugfix: #68 Set number format of chart plot axes based on the CallMeta instance for each request. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1623 diff changeset	863 if (axis != null) {
4a8251eae217 Bugfix: #68 Set number format of chart plot axes based on the CallMeta instance for each request. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1623 diff changeset	864 localizeDomainAxis(axis);
4a8251eae217 Bugfix: #68 Set number format of chart plot axes based on the CallMeta instance for each request. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1623 diff changeset	865 }
4a8251eae217 Bugfix: #68 Set number format of chart plot axes based on the CallMeta instance for each request. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1623 diff changeset	866 else {
4a8251eae217 Bugfix: #68 Set number format of chart plot axes based on the CallMeta instance for each request. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1623 diff changeset	867 logger.warn("Domain axis at " + i + " is null.");
4a8251eae217 Bugfix: #68 Set number format of chart plot axes based on the CallMeta instance for each request. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1623 diff changeset	868 }
4a8251eae217 Bugfix: #68 Set number format of chart plot axes based on the CallMeta instance for each request. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1623 diff changeset	869 }
4a8251eae217 Bugfix: #68 Set number format of chart plot axes based on the CallMeta instance for each request. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1623 diff changeset	870
4a8251eae217 Bugfix: #68 Set number format of chart plot axes based on the CallMeta instance for each request. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1623 diff changeset	871 for (int i = 0, num = plot.getRangeAxisCount(); i < num; i++) {
4a8251eae217 Bugfix: #68 Set number format of chart plot axes based on the CallMeta instance for each request. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1623 diff changeset	872 ValueAxis axis = plot.getRangeAxis(i);
4a8251eae217 Bugfix: #68 Set number format of chart plot axes based on the CallMeta instance for each request. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1623 diff changeset	873
4a8251eae217 Bugfix: #68 Set number format of chart plot axes based on the CallMeta instance for each request. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1623 diff changeset	874 if (axis != null) {
4a8251eae217 Bugfix: #68 Set number format of chart plot axes based on the CallMeta instance for each request. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1623 diff changeset	875 localizeRangeAxis(axis);
4a8251eae217 Bugfix: #68 Set number format of chart plot axes based on the CallMeta instance for each request. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1623 diff changeset	876 }
4a8251eae217 Bugfix: #68 Set number format of chart plot axes based on the CallMeta instance for each request. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1623 diff changeset	877 else {
4a8251eae217 Bugfix: #68 Set number format of chart plot axes based on the CallMeta instance for each request. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1623 diff changeset	878 logger.warn("Range axis at " + i + " is null.");
4a8251eae217 Bugfix: #68 Set number format of chart plot axes based on the CallMeta instance for each request. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1623 diff changeset	879 }
4a8251eae217 Bugfix: #68 Set number format of chart plot axes based on the CallMeta instance for each request. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1623 diff changeset	880 }
4a8251eae217 Bugfix: #68 Set number format of chart plot axes based on the CallMeta instance for each request. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1623 diff changeset	881 }
4a8251eae217 Bugfix: #68 Set number format of chart plot axes based on the CallMeta instance for each request. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1623 diff changeset	882
4a8251eae217 Bugfix: #68 Set number format of chart plot axes based on the CallMeta instance for each request. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1623 diff changeset	883
4a8251eae217 Bugfix: #68 Set number format of chart plot axes based on the CallMeta instance for each request. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1623 diff changeset	884 /**
4a8251eae217 Bugfix: #68 Set number format of chart plot axes based on the CallMeta instance for each request. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1623 diff changeset	885 * Overrides the NumberFormat with the NumberFormat for the current locale
4a8251eae217 Bugfix: #68 Set number format of chart plot axes based on the CallMeta instance for each request. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1623 diff changeset	886 * that is provided by getLocale().
4a8251eae217 Bugfix: #68 Set number format of chart plot axes based on the CallMeta instance for each request. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1623 diff changeset	887 *
4a8251eae217 Bugfix: #68 Set number format of chart plot axes based on the CallMeta instance for each request. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1623 diff changeset	888 * @param domainAxis The domain axis that needs localization.
4a8251eae217 Bugfix: #68 Set number format of chart plot axes based on the CallMeta instance for each request. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1623 diff changeset	889 */
4a8251eae217 Bugfix: #68 Set number format of chart plot axes based on the CallMeta instance for each request. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1623 diff changeset	890 protected void localizeDomainAxis(ValueAxis domainAxis) {
4a8251eae217 Bugfix: #68 Set number format of chart plot axes based on the CallMeta instance for each request. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1623 diff changeset	891 NumberFormat nf = NumberFormat.getInstance(getLocale());
4a8251eae217 Bugfix: #68 Set number format of chart plot axes based on the CallMeta instance for each request. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1623 diff changeset	892 ((NumberAxis) domainAxis).setNumberFormatOverride(nf);
4a8251eae217 Bugfix: #68 Set number format of chart plot axes based on the CallMeta instance for each request. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1623 diff changeset	893 }
4a8251eae217 Bugfix: #68 Set number format of chart plot axes based on the CallMeta instance for each request. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1623 diff changeset	894
4a8251eae217 Bugfix: #68 Set number format of chart plot axes based on the CallMeta instance for each request. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1623 diff changeset	895
4a8251eae217 Bugfix: #68 Set number format of chart plot axes based on the CallMeta instance for each request. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1623 diff changeset	896 /**
4a8251eae217 Bugfix: #68 Set number format of chart plot axes based on the CallMeta instance for each request. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1623 diff changeset	897 * Overrides the NumberFormat with the NumberFormat for the current locale
4a8251eae217 Bugfix: #68 Set number format of chart plot axes based on the CallMeta instance for each request. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1623 diff changeset	898 * that is provided by getLocale().
4a8251eae217 Bugfix: #68 Set number format of chart plot axes based on the CallMeta instance for each request. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1623 diff changeset	899 *
3270 4ac581062c40 Fix various documentation issues. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3257 diff changeset	900 * @param rangeAxis The domain axis that needs localization.
1645 4a8251eae217 Bugfix: #68 Set number format of chart plot axes based on the CallMeta instance for each request. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1623 diff changeset	901 */
4a8251eae217 Bugfix: #68 Set number format of chart plot axes based on the CallMeta instance for each request. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1623 diff changeset	902 protected void localizeRangeAxis(ValueAxis rangeAxis) {
4a8251eae217 Bugfix: #68 Set number format of chart plot axes based on the CallMeta instance for each request. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1623 diff changeset	903 NumberFormat nf = NumberFormat.getInstance(getLocale());
4a8251eae217 Bugfix: #68 Set number format of chart plot axes based on the CallMeta instance for each request. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1623 diff changeset	904 ((NumberAxis) rangeAxis).setNumberFormatOverride(nf);
4a8251eae217 Bugfix: #68 Set number format of chart plot axes based on the CallMeta instance for each request. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1623 diff changeset	905 }
4a8251eae217 Bugfix: #68 Set number format of chart plot axes based on the CallMeta instance for each request. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1623 diff changeset	906
4a8251eae217 Bugfix: #68 Set number format of chart plot axes based on the CallMeta instance for each request. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1623 diff changeset	907
1932 17e18948fe5e Fix legend and themeing with new multiaxis feature. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1931 diff changeset	908 /**
2206 e2124ca11adb Add manual point handling for many different chart types. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2193 diff changeset	909 * Do Points out.
e2124ca11adb Add manual point handling for many different chart types. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2193 diff changeset	910 */
e2124ca11adb Add manual point handling for many different chart types. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2193 diff changeset	911 protected void doPoints(
e2124ca11adb Add manual point handling for many different chart types. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2193 diff changeset	912 Object o,
2325 1fcaeced48f2 #485 Fixed broken renaming of chart themes. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2300 diff changeset	913 ArtifactAndFacet aandf,
2206 e2124ca11adb Add manual point handling for many different chart types. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2193 diff changeset	914 Document theme,
e2124ca11adb Add manual point handling for many different chart types. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2193 diff changeset	915 boolean visible,
e2124ca11adb Add manual point handling for many different chart types. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2193 diff changeset	916 int axisIndex
e2124ca11adb Add manual point handling for many different chart types. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2193 diff changeset	917 ) {
2325 1fcaeced48f2 #485 Fixed broken renaming of chart themes. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2300 diff changeset	918 String seriesName = aandf.getFacetDescription();
2206 e2124ca11adb Add manual point handling for many different chart types. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2193 diff changeset	919 XYSeries series = new StyledXYSeries(seriesName, theme);
e2124ca11adb Add manual point handling for many different chart types. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2193 diff changeset	920
e2124ca11adb Add manual point handling for many different chart types. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2193 diff changeset	921 // Add text annotations for single points.
e2124ca11adb Add manual point handling for many different chart types. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2193 diff changeset	922 List<XYTextAnnotation> xy = new ArrayList<XYTextAnnotation>();
e2124ca11adb Add manual point handling for many different chart types. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2193 diff changeset	923
e2124ca11adb Add manual point handling for many different chart types. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2193 diff changeset	924 try {
e2124ca11adb Add manual point handling for many different chart types. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2193 diff changeset	925 JSONArray points = new JSONArray((String) o);
3087 4a76da133144 Removed repeated x.size() calls from for loops. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3079 diff changeset	926 for (int i = 0, P = points.length(); i < P; i++) {
2206 e2124ca11adb Add manual point handling for many different chart types. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2193 diff changeset	927 JSONArray array = points.getJSONArray(i);
e2124ca11adb Add manual point handling for many different chart types. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2193 diff changeset	928 double x = array.getDouble(0);
e2124ca11adb Add manual point handling for many different chart types. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2193 diff changeset	929 double y = array.getDouble(1);
e2124ca11adb Add manual point handling for many different chart types. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2193 diff changeset	930 String name = array.getString(2);
e2124ca11adb Add manual point handling for many different chart types. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2193 diff changeset	931 boolean act = array.getBoolean(3);
e2124ca11adb Add manual point handling for many different chart types. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2193 diff changeset	932 if (!act) {
e2124ca11adb Add manual point handling for many different chart types. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2193 diff changeset	933 continue;
e2124ca11adb Add manual point handling for many different chart types. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2193 diff changeset	934 }
e2124ca11adb Add manual point handling for many different chart types. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2193 diff changeset	935 //logger.debug(" x " + x + " y " + y );
e2124ca11adb Add manual point handling for many different chart types. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2193 diff changeset	936 series.add(x, y, false);
e2124ca11adb Add manual point handling for many different chart types. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2193 diff changeset	937 xy.add(new CollisionFreeXYTextAnnotation(name, x, y));
e2124ca11adb Add manual point handling for many different chart types. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2193 diff changeset	938 }
e2124ca11adb Add manual point handling for many different chart types. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2193 diff changeset	939 }
e2124ca11adb Add manual point handling for many different chart types. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2193 diff changeset	940 catch(JSONException e){
e2124ca11adb Add manual point handling for many different chart types. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2193 diff changeset	941 logger.error("Could not decode json.");
e2124ca11adb Add manual point handling for many different chart types. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2193 diff changeset	942 }
3076 5642a83420f2 FLYS artifacts: Removed trailing whitespace. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3064 diff changeset	943
2206 e2124ca11adb Add manual point handling for many different chart types. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2193 diff changeset	944 FLYSAnnotation annotations = new FLYSAnnotation(null, null, null, theme);
e2124ca11adb Add manual point handling for many different chart types. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2193 diff changeset	945 annotations.setTextAnnotations(xy);
e2124ca11adb Add manual point handling for many different chart types. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2193 diff changeset	946
2574 3598690dc9e2 Fix flys/issue501 (manual points have two legend entries). Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2553 diff changeset	947 // Do not generate second legend entry. (null was passed for the aand before).
3598690dc9e2 Fix flys/issue501 (manual points have two legend entries). Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2553 diff changeset	948 doAnnotations(annotations, null, theme, visible);
2206 e2124ca11adb Add manual point handling for many different chart types. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2193 diff changeset	949 addAxisSeries(series, axisIndex, visible);
e2124ca11adb Add manual point handling for many different chart types. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2193 diff changeset	950 }
e2124ca11adb Add manual point handling for many different chart types. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2193 diff changeset	951
e2124ca11adb Add manual point handling for many different chart types. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2193 diff changeset	952
2584 5d5457a1bd5f Stubby legend aggregation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2574 diff changeset	953 /**
5d5457a1bd5f Stubby legend aggregation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2574 diff changeset	954 * Create a hash from a legenditem.
5d5457a1bd5f Stubby legend aggregation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2574 diff changeset	955 * This hash can then be used to merge legend items labels.
5d5457a1bd5f Stubby legend aggregation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2574 diff changeset	956 * @return hash for given legenditem to identify mergeables.
5d5457a1bd5f Stubby legend aggregation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2574 diff changeset	957 */
5d5457a1bd5f Stubby legend aggregation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2574 diff changeset	958 public static String legendItemHash(LegendItem li) {
5d5457a1bd5f Stubby legend aggregation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2574 diff changeset	959 // TODO Do proper implementation. Ensure that only mergable sets are created.
5d5457a1bd5f Stubby legend aggregation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2574 diff changeset	960 // getFillPaint()
5d5457a1bd5f Stubby legend aggregation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2574 diff changeset	961 // getFillPaintTransformer()
5d5457a1bd5f Stubby legend aggregation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2574 diff changeset	962 // getLabel()
5d5457a1bd5f Stubby legend aggregation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2574 diff changeset	963 // getLine()
5d5457a1bd5f Stubby legend aggregation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2574 diff changeset	964 // getLinePaint()
5d5457a1bd5f Stubby legend aggregation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2574 diff changeset	965 // getLineStroke()
5d5457a1bd5f Stubby legend aggregation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2574 diff changeset	966 // getOutlinePaint()
3076 5642a83420f2 FLYS artifacts: Removed trailing whitespace. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3064 diff changeset	967 // getOutlineStroke()
2584 5d5457a1bd5f Stubby legend aggregation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2574 diff changeset	968 // Shape getShape()
5d5457a1bd5f Stubby legend aggregation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2574 diff changeset	969 // String getToolTipText()
5d5457a1bd5f Stubby legend aggregation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2574 diff changeset	970 // String getURLText()
5d5457a1bd5f Stubby legend aggregation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2574 diff changeset	971 // boolean isLineVisible()
5d5457a1bd5f Stubby legend aggregation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2574 diff changeset	972 // boolean isShapeFilled()
5d5457a1bd5f Stubby legend aggregation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2574 diff changeset	973 // boolean isShapeOutlineVisible()
5d5457a1bd5f Stubby legend aggregation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2574 diff changeset	974 // boolean isShapeVisible()
2711 fa8ae7dbcb72 More stable legend item aggregation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2710 diff changeset	975 String hash = li.getLinePaint().toString();
fa8ae7dbcb72 More stable legend item aggregation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2710 diff changeset	976 String label = li.getLabel();
fa8ae7dbcb72 More stable legend item aggregation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2710 diff changeset	977 if (label.startsWith("W (") \|\| label.startsWith("W(")) {
fa8ae7dbcb72 More stable legend item aggregation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2710 diff changeset	978 hash += "-W-";
fa8ae7dbcb72 More stable legend item aggregation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2710 diff changeset	979 }
fa8ae7dbcb72 More stable legend item aggregation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2710 diff changeset	980 else if (label.startsWith("Q(") \|\| label.startsWith("Q (")) {
fa8ae7dbcb72 More stable legend item aggregation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2710 diff changeset	981 hash += "-Q-";
fa8ae7dbcb72 More stable legend item aggregation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2710 diff changeset	982 }
fa8ae7dbcb72 More stable legend item aggregation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2710 diff changeset	983
fa8ae7dbcb72 More stable legend item aggregation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2710 diff changeset	984 // WQ.java holds example of using regex Matcher/Pattern.
fa8ae7dbcb72 More stable legend item aggregation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2710 diff changeset	985
fa8ae7dbcb72 More stable legend item aggregation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2710 diff changeset	986 return hash;
2584 5d5457a1bd5f Stubby legend aggregation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2574 diff changeset	987 }
5d5457a1bd5f Stubby legend aggregation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2574 diff changeset	988
369 2ce7b473620e Implemented the chart creation of a longitudinal section chart - W and Q facets. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: diff changeset	989 }
2ce7b473620e Implemented the chart creation of a longitudinal section chart - W and Q facets. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: diff changeset	990 // vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 :

Mercurial > dive4elements > river

annotate flys-artifacts/src/main/java/de/intevation/flys/exports/XYChartGenerator.java @ 3620:1cd6114603d9