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 @ 2414:b5f5af53a526

Make it compileable again flys-artifacts/trunk@4045 c6561f87-3c4e-4783-a992-168aeb5c3f6f

author	Sascha L. Teichmann <sascha.teichmann@intevation.de>
date	Mon, 13 Feb 2012 17:48:14 +0000
parents	7e0be3e5dfaa
children	5144369d5961

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
419 4de7d9eac10f Display gridlines in charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 414 diff changeset	3 import java.awt.BasicStroke;
369 2ce7b473620e Implemented the chart creation of a longitudinal section chart - W and Q facets. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: diff changeset	4 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	5 import java.awt.Font;
2020 4f7f781e4481 Improved area rendering workflow. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2005 diff changeset	6 import java.awt.Paint;
419 4de7d9eac10f Display gridlines in charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 414 diff changeset	7 import java.awt.Stroke;
369 2ce7b473620e Implemented the chart creation of a longitudinal section chart - W and Q facets. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: diff changeset	8
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	9 import java.text.NumberFormat;
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	10
1679 69929c471646 Improved the creation/rendering of annotations (km favorites, mainvalues). Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1645 diff changeset	11 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	12 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	13 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	14 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	15
69929c471646 Improved the creation/rendering of annotations (km favorites, mainvalues). Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1645 diff changeset	16 import org.w3c.dom.Document;
69929c471646 Improved the creation/rendering of annotations (km favorites, mainvalues). Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1645 diff changeset	17
369 2ce7b473620e Implemented the chart creation of a longitudinal section chart - W and Q facets. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: diff changeset	18 import org.apache.log4j.Logger;
2ce7b473620e Implemented the chart creation of a longitudinal section chart - W and Q facets. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: diff changeset	19
2ce7b473620e Implemented the chart creation of a longitudinal section chart - W and Q facets. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: diff changeset	20 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	21 import org.jfree.chart.JFreeChart;
1679 69929c471646 Improved the creation/rendering of annotations (km favorites, mainvalues). Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1645 diff changeset	22 import org.jfree.chart.LegendItemCollection;
2138 59bb5c895be3 Improved HYK/Zones- handling. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2132 diff changeset	23 import org.jfree.chart.annotations.XYBoxAnnotation;
2161 c68f4f227c09 Somewhat unified Annotation handling, use jfreechart-house-toolkit instead of custom StickyAxisAnnotation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2152 diff changeset	24 import org.jfree.chart.annotations.XYLineAnnotation;
1679 69929c471646 Improved the creation/rendering of annotations (km favorites, mainvalues). Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1645 diff changeset	25 import org.jfree.chart.annotations.XYTextAnnotation;
369 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.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	27 import org.jfree.chart.axis.ValueAxis;
369 2ce7b473620e Implemented the chart creation of a longitudinal section chart - W and Q facets. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: diff changeset	28 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	29 import org.jfree.chart.plot.XYPlot;
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	30 import org.jfree.data.Range;
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	31 import org.jfree.data.general.Series;
923 7ca4a287cd0e #135 Modified the way to store datasets for different chart axes. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 718 diff changeset	32 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	33 import org.jfree.data.xy.XYSeriesCollection;
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	34 import org.jfree.data.xy.XYDataset;
654 bbc966c81809 #90 Removed margins between data area border and curves. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 653 diff changeset	35
bbc966c81809 #90 Removed margins between data area border and curves. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 653 diff changeset	36 import org.jfree.ui.RectangleInsets;
2161 c68f4f227c09 Somewhat unified Annotation handling, use jfreechart-house-toolkit instead of custom StickyAxisAnnotation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2152 diff changeset	37 import org.jfree.ui.TextAnchor;
369 2ce7b473620e Implemented the chart creation of a longitudinal section chart - W and Q facets. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: diff changeset	38
2325 1fcaeced48f2 #485 Fixed broken renaming of chart themes. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2300 diff changeset	39 import de.intevation.artifactdatabase.state.ArtifactAndFacet;
1849 5d5dd44d613e Refactored, move doMainValueAnnotations to XYChartGenerator. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1768 diff changeset	40 import de.intevation.artifactdatabase.state.Facet;
5d5dd44d613e Refactored, move doMainValueAnnotations to XYChartGenerator. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1768 diff changeset	41
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	42 import de.intevation.flys.jfree.Bounds;
1679 69929c471646 Improved the creation/rendering of annotations (km favorites, mainvalues). Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1645 diff changeset	43 import de.intevation.flys.jfree.FLYSAnnotation;
1738 6cdc7a77d3d4 Apply theme attributes to axis annotation. Raimund Renkert <raimund.renkert@intevation.de> parents: 1736 diff changeset	44 import de.intevation.flys.jfree.StickyAxisAnnotation;
2161 c68f4f227c09 Somewhat unified Annotation handling, use jfreechart-house-toolkit instead of custom StickyAxisAnnotation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2152 diff changeset	45 import de.intevation.flys.jfree.CollisionFreeXYTextAnnotation;
2074 a026d005accd Moved JFreeChart specific classes to de.intevation.flys.jfree and added required imports. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2072 diff changeset	46 import de.intevation.flys.jfree.StyledAreaSeriesCollection;
a026d005accd Moved JFreeChart specific classes to de.intevation.flys.jfree and added required imports. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2072 diff changeset	47 import de.intevation.flys.jfree.StyledXYSeries;
369 2ce7b473620e Implemented the chart creation of a longitudinal section chart - W and Q facets. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: diff changeset	48
1754 8e6615ad60b8 Added some simple caching for themes. Only used in sticky annotations by now. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1738 diff changeset	49 import de.intevation.flys.utils.ThemeAccess;
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
2138 59bb5c895be3 Improved HYK/Zones- handling. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2132 diff changeset	51 import de.intevation.flys.artifacts.model.HYKFactory;
59bb5c895be3 Improved HYK/Zones- handling. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2132 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 import org.json.JSONArray;
e2124ca11adb Add manual point handling for many different chart types. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2193 diff changeset	54 import org.json.JSONException;
e2124ca11adb Add manual point handling for many different chart types. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2193 diff changeset	55
e2124ca11adb Add manual point handling for many different chart types. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2193 diff changeset	56
369 2ce7b473620e Implemented the chart creation of a longitudinal section chart - W and Q facets. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: diff changeset	57 /**
2ce7b473620e Implemented the chart creation of a longitudinal section chart - W and Q facets. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: diff changeset	58 * 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	59 *
1940 0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	60 * 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	61 * <ul>
0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	62 * <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	63 * 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	64 * <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	65 * 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	66 * 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	67 * <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	68 * </ul>
0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	69 *
369 2ce7b473620e Implemented the chart creation of a longitudinal section chart - W and Q facets. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: diff changeset	70 * @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	71 */
2ce7b473620e Implemented the chart creation of a longitudinal section chart - W and Q facets. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: diff changeset	72 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	73
2020 4f7f781e4481 Improved area rendering workflow. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2005 diff changeset	74 // TODO Consider storing the renderer here.
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	75 private 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	76 /** 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	77 protected int axisSymbol;
0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	78 /** 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	79 protected List<XYDataset> datasets;
0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	80 /** 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	81 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	82 /** 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	83 protected int plotAxisIndex;
1940 0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	84
0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	85 /** 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	86 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	87 this.axisSymbol = symb;
0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	88 datasets = new ArrayList<XYDataset>();
0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	89 }
0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	90
0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	91 /** 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	92 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	93 // 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	94 if (subRange == null \|\|
eace020067da Further flys/issue420 fix, NaN-guard X axis extent. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1958 diff changeset	95 Double.isNaN(subRange.getLowerBound()) \|\|
eace020067da Further flys/issue420 fix, NaN-guard X axis extent. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1958 diff changeset	96 Double.isNaN(subRange.getUpperBound())) {
eace020067da Further flys/issue420 fix, NaN-guard X axis extent. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1958 diff changeset	97 return;
eace020067da Further flys/issue420 fix, NaN-guard X axis extent. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1958 diff changeset	98 }
1940 0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	99 if (range == null) {
0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	100 range = subRange;
0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	101 return;
0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	102 }
0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	103 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	104 }
0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	105
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	106
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 @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	108 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	109 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	110 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	111 }
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
1940 0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	113 /** 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	114 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	115 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	116 }
0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	117
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	118
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 @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	120 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	121 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	122 }
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	123
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
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 @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	126 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	127 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	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
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	130
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
2020 4f7f781e4481 Improved area rendering workflow. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2005 diff changeset	137 public void addArea(StyledAreaSeriesCollection series) {
4f7f781e4481 Improved area rendering workflow. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2005 diff changeset	138 this.datasets.add(series);
2005 79b15491177a Added simple area registering functions. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2000 diff changeset	139 }
79b15491177a Added simple area registering functions. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2000 diff changeset	140
79b15491177a Added simple area registering functions. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2000 diff changeset	141 /** True if to be renedered 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	142 @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	143 public boolean isArea(XYDataset series) {
2020 4f7f781e4481 Improved area rendering workflow. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2005 diff changeset	144 return (series instanceof StyledAreaSeriesCollection);
2005 79b15491177a Added simple area registering functions. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2000 diff changeset	145 }
79b15491177a Added simple area registering functions. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2000 diff changeset	146
1940 0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	147 /** 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	148 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	149 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	150 }
0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	151
0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	152 /** 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	153 @Override
1940 0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	154 public boolean isEmpty() {
0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	155 return this.datasets.isEmpty();
0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	156 }
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	157
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	158 /** 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	159 @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	160 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	161 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	162 }
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
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 /** 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	165 @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	166 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	167 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	168 }
2005 79b15491177a Added simple area registering functions. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2000 diff changeset	169 } // class AxisDataset
1940 0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	170
2246 99ef93ce18bd Doc added and fix getAxisWalker-issue. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2242 diff changeset	171 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	172
1048 fd5c70973e0b Picky white-space cosmetics. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 924 diff changeset	173 /** 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	174 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	175
1679 69929c471646 Improved the creation/rendering of annotations (km favorites, mainvalues). Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1645 diff changeset	176 /** List of annotations to insert in plot. */
69929c471646 Improved the creation/rendering of annotations (km favorites, mainvalues). Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1645 diff changeset	177 protected List<FLYSAnnotation> annotations;
69929c471646 Improved the creation/rendering of annotations (km favorites, mainvalues). Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1645 diff changeset	178
1685 022f62c75878 Cosmetics. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1684 diff changeset	179 /** The max X range to include all X values of all series for each axis. */
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	180 protected Map<Integer, Range> xRanges;
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	181
1685 022f62c75878 Cosmetics. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1684 diff changeset	182 /** The max Y range to include all Y values of all series for each axis. */
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	183 protected Map<Integer, Range> yRanges;
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	184
419 4de7d9eac10f Display gridlines in charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 414 diff changeset	185
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	186 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	187 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	188
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	189 xRanges = new HashMap<Integer, Range>();
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	190 yRanges = new HashMap<Integer, Range>();
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	191 }
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
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	193
369 2ce7b473620e Implemented the chart creation of a longitudinal section chart - W and Q facets. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: diff changeset	194 /**
1930 de0c2bbb27f9 Cosmetics, docs. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1861 diff changeset	195 * Generate the chart anew (including localized axis and all).
de0c2bbb27f9 Cosmetics, docs. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1861 diff changeset	196 */
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	197 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	198 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	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 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	201 getChartTitle(),
2ce7b473620e Implemented the chart creation of a longitudinal section chart - W and Q facets. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: diff changeset	202 getXAxisLabel(),
2051 4ba5036109d2 Make use of user defined axes labels during chart creation. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2050 diff changeset	203 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	204 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	205 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	206 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	207 false,
2ce7b473620e Implemented the chart creation of a longitudinal section chart - W and Q facets. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: diff changeset	208 false);
2ce7b473620e Implemented the chart creation of a longitudinal section chart - W and Q facets. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: diff changeset	209
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	210 XYPlot plot = (XYPlot) chart.getPlot();
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 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	212 plot.setBackgroundPaint(Color.WHITE);
414 0385bcc4229a Added subtitles to the available charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 375 diff changeset	213 addSubtitles(chart);
419 4de7d9eac10f Display gridlines in charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 414 diff changeset	214 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	215
1940 0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	216 //debugAxis(plot);
0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	217
0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	218 addDatasets(plot);
0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	219
0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	220 //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	221
1935 5b51f5232661 Added handling of empty plots. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1934 diff changeset	222 recoverEmptyPlot(plot);
1940 0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	223 preparePointRanges(plot);
1935 5b51f5232661 Added handling of empty plots. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1934 diff changeset	224
1940 0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	225 //debugAxis(plot);
0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	226
0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	227 localizeAxes(plot);
0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	228 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	229 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	230
2138 59bb5c895be3 Improved HYK/Zones- handling. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2132 diff changeset	231 // 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	232 addAnnotationsToRenderer(plot);
2138 59bb5c895be3 Improved HYK/Zones- handling. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2132 diff changeset	233
1940 0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	234 return chart;
0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	235 }
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	236
1940 0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	237
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	238 @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	239 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	240 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	241 }
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	242
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	243
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	244 @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	245 protected void setXRange(int axis, 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	246 xRanges.put(Integer.valueOf(axis), 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	247 }
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	248
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	249
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	250 @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	251 protected void setYRange(int axis, 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	252 yRanges.put(Integer.valueOf(axis), 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	253 }
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	254
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	255
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	256 @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	257 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	258 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	259 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	260 }
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	261
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	262
1940 0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	263 /**
0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	264 * 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	265 */
0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	266 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	267 logger.debug("Number of datasets: " + plot.getDatasetCount());
0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	268 for (int i = 0; i < plot.getDatasetCount(); i++) {
0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	269 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	270 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	271 continue;
0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	272 }
0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	273 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	274 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	275 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	276 + " " + 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	277 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	278 + " " + 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	279 }
0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	280 }
0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	281
0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	282
0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	283 /**
0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	284 * 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	285 */
0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	286 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	287 logger.debug("...............");
0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	288 for (int i = 0; i < plot.getRangeAxisCount(); i++) {
0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	289 if (plot.getRangeAxis(i) == null)
2005 79b15491177a Added simple area registering functions. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2000 diff changeset	290 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	291 else {
2005 79b15491177a Added simple area registering functions. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2000 diff changeset	292 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	293 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	294 " " + 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	295 "]");
0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	296 }
0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	297
0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	298 }
0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	299 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	300 }
2ce7b473620e Implemented the chart creation of a longitudinal section chart - W and Q facets. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: diff changeset	301
2ce7b473620e Implemented the chart creation of a longitudinal section chart - W and Q facets. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: diff changeset	302
1685 022f62c75878 Cosmetics. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1684 diff changeset	303 /**
2005 79b15491177a Added simple area registering functions. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2000 diff changeset	304 * 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	305 * @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	306 * @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	307 * @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	308 */
2020 4f7f781e4481 Improved area rendering workflow. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2005 diff changeset	309 public void addAreaSeries(StyledAreaSeriesCollection area, int index, boolean visible) {
4f7f781e4481 Improved area rendering workflow. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2005 diff changeset	310 if (area == null) {
2005 79b15491177a Added simple area registering functions. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2000 diff changeset	311 logger.warn("Cannot yet render above/under curve.");
79b15491177a Added simple area registering functions. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2000 diff changeset	312 return;
79b15491177a Added simple area registering functions. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2000 diff changeset	313 }
79b15491177a Added simple area registering functions. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2000 diff changeset	314
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	315 XYAxisDataset axisDataset = (XYAxisDataset) getAxisDataset(index);
2005 79b15491177a Added simple area registering functions. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2000 diff changeset	316
2020 4f7f781e4481 Improved area rendering workflow. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2005 diff changeset	317 if (visible) {
4f7f781e4481 Improved area rendering workflow. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2005 diff changeset	318 axisDataset.addArea(area);
4f7f781e4481 Improved area rendering workflow. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2005 diff changeset	319 }
2005 79b15491177a Added simple area registering functions. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2000 diff changeset	320 else {
79b15491177a Added simple area registering functions. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2000 diff changeset	321 // TODO only range merging.
79b15491177a Added simple area registering functions. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2000 diff changeset	322 }
79b15491177a Added simple area registering functions. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2000 diff changeset	323 //TODO range merging.
79b15491177a Added simple area registering functions. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2000 diff changeset	324 }
79b15491177a Added simple area registering functions. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2000 diff changeset	325
2020 4f7f781e4481 Improved area rendering workflow. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2005 diff changeset	326
2005 79b15491177a Added simple area registering functions. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2000 diff changeset	327 /**
1935 5b51f5232661 Added handling of empty plots. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1934 diff changeset	328 * 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	329 * 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	330 * @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	331 * @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	332 * @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	333 */
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	334 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	335 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	336 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	337 }
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	338
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	339 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	340 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	341
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	342 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	343
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	344 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	345
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	346 if (!visible) {
1940 0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	347 // 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	348 // 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	349 axisDataset.includeYRange(series);
1940 0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	350 }
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	351 }
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	352
1940 0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	353
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	354 /**
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	355 * Effect: extend range of x axis to include given limits.
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	356 * @param range the given ("minimal") range.
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	357 * @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	358 */
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	359 protected void combineXRanges(Range range, int 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	360
1959 eace020067da Further flys/issue420 fix, NaN-guard X axis extent. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1958 diff changeset	361 if (range == null
eace020067da Further flys/issue420 fix, NaN-guard X axis extent. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1958 diff changeset	362 \|\| Double.isNaN(range.getLowerBound())
eace020067da Further flys/issue420 fix, NaN-guard X axis extent. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1958 diff changeset	363 \|\| Double.isNaN(range.getUpperBound())) {
eace020067da Further flys/issue420 fix, NaN-guard X axis extent. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1958 diff changeset	364 return;
eace020067da Further flys/issue420 fix, NaN-guard X axis extent. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1958 diff changeset	365 }
eace020067da Further flys/issue420 fix, NaN-guard X axis extent. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1958 diff changeset	366
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	367 Range old = xRanges.get(index);
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	368
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	369 if (old != null) {
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	370 range = Range.combine(old, range);
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	371 }
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	372
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	373 xRanges.put(index, range);
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	374 }
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	375
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	376
1930 de0c2bbb27f9 Cosmetics, docs. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1861 diff changeset	377 /**
1711 f708120cb7bc Fix flys/issue363 (W-INFO/ Abflusskurve, Extremwert-Rendering). Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1699 diff changeset	378 * Adds annotations to list (if visible is true).
f708120cb7bc Fix flys/issue363 (W-INFO/ Abflusskurve, Extremwert-Rendering). Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1699 diff changeset	379 */
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	380 public void addAnnotations(FLYSAnnotation annotation, boolean visible) {
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	381 if (!visible) {
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	382 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	383 }
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	384
1679 69929c471646 Improved the creation/rendering of annotations (km favorites, mainvalues). Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1645 diff changeset	385 if (annotations == null) {
69929c471646 Improved the creation/rendering of annotations (km favorites, mainvalues). Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1645 diff changeset	386 annotations = new ArrayList<FLYSAnnotation>();
69929c471646 Improved the creation/rendering of annotations (km favorites, mainvalues). Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1645 diff changeset	387 }
69929c471646 Improved the creation/rendering of annotations (km favorites, mainvalues). Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1645 diff changeset	388
69929c471646 Improved the creation/rendering of annotations (km favorites, mainvalues). Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1645 diff changeset	389 annotations.add(annotation);
69929c471646 Improved the creation/rendering of annotations (km favorites, mainvalues). Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1645 diff changeset	390 }
69929c471646 Improved the creation/rendering of annotations (km favorites, mainvalues). Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1645 diff changeset	391
69929c471646 Improved the creation/rendering of annotations (km favorites, mainvalues). Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1645 diff changeset	392
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	393 /**
1935 5b51f5232661 Added handling of empty plots. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1934 diff changeset	394 * 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	395 */
5b51f5232661 Added handling of empty plots. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1934 diff changeset	396 private void recoverEmptyPlot(XYPlot plot) {
5b51f5232661 Added handling of empty plots. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1934 diff changeset	397 if (plot.getRangeAxis() == null) {
5b51f5232661 Added handling of empty plots. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1934 diff changeset	398 logger.debug("debug: No range axis");
2414 b5f5af53a526 Make it compileable again Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2411 diff changeset	399 plot.setRangeAxis(createYAxis(0));
1935 5b51f5232661 Added handling of empty plots. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1934 diff changeset	400 }
923 7ca4a287cd0e #135 Modified the way to store datasets for different chart axes. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 718 diff changeset	401 }
7ca4a287cd0e #135 Modified the way to store datasets for different chart axes. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 718 diff changeset	402
7ca4a287cd0e #135 Modified the way to store datasets for different chart axes. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 718 diff changeset	403
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	404 /**
1940 0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	405 * 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	406 */
1686 e8d1e531687a Bugfix: #114 Enabled rendering charts with a single data point. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1685 diff changeset	407 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	408 for (int i = 0, num = plot.getDomainAxisCount(); i < num; i++) {
1940 0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	409 logger.debug("Check whether to expand a x axis.");
1698 6e935087f6a1 XYChartGenerator: s/new Integer(small)/Integer.valueOf(small)/ Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1688 diff changeset	410 Integer key = Integer.valueOf(i);
1686 e8d1e531687a Bugfix: #114 Enabled rendering charts with a single data point. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1685 diff changeset	411
e8d1e531687a Bugfix: #114 Enabled rendering charts with a single data point. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1685 diff changeset	412 Range r = xRanges.get(key);
1687 19c4cf5163e8 Take care on empty ranges (null) while preparing single point ranges. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1686 diff changeset	413 if (r != null && r.getLowerBound() == r.getUpperBound()) {
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	414 setXRange(key, ChartHelper.expandRange(r, 5));
1686 e8d1e531687a Bugfix: #114 Enabled rendering charts with a single data point. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1685 diff changeset	415 }
e8d1e531687a Bugfix: #114 Enabled rendering charts with a single data point. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1685 diff changeset	416 }
e8d1e531687a Bugfix: #114 Enabled rendering charts with a single data point. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1685 diff changeset	417 }
e8d1e531687a Bugfix: #114 Enabled rendering charts with a single data point. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1685 diff changeset	418
e8d1e531687a Bugfix: #114 Enabled rendering charts with a single data point. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1685 diff changeset	419
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	420 /**
654 bbc966c81809 #90 Removed margins between data area border and curves. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 653 diff changeset	421 * 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	422 * 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	423 * 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	424 * 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	425 * 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	426 *
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	427 * @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	428 */
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	429 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	430 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	431
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	432 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	433 Range yrange = getValueAxisRange();
654 bbc966c81809 #90 Removed margins between data area border and curves. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 653 diff changeset	434
2050 c4e0e433f825 Use axes ranges specified in ChartSettings for zooming in charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2049 diff changeset	435 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	436
c4e0e433f825 Use axes ranges specified in ChartSettings for zooming in charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2049 diff changeset	437 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	438 if (fixedXRange != null) {
c4e0e433f825 Use axes ranges specified in ChartSettings for zooming in charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2049 diff changeset	439 xAxis.setRange(fixedXRange);
c4e0e433f825 Use axes ranges specified in ChartSettings for zooming in charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2049 diff changeset	440 }
c4e0e433f825 Use axes ranges specified in ChartSettings for zooming in charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2049 diff changeset	441 else {
c4e0e433f825 Use axes ranges specified in ChartSettings for zooming in charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2049 diff changeset	442 zoomX(plot, xAxis, xRanges.get(0), xrange);
c4e0e433f825 Use axes ranges specified in ChartSettings for zooming in charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2049 diff changeset	443 }
923 7ca4a287cd0e #135 Modified the way to store datasets for different chart axes. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 718 diff changeset	444
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	445 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	446 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	447
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	448 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	449 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	450
c4e0e433f825 Use axes ranges specified in ChartSettings for zooming in charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2049 diff changeset	451 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	452 if (fixedRange != null) {
c4e0e433f825 Use axes ranges specified in ChartSettings for zooming in charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2049 diff changeset	453 yaxis.setRange(fixedRange);
c4e0e433f825 Use axes ranges specified in ChartSettings for zooming in charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2049 diff changeset	454 continue;
c4e0e433f825 Use axes ranges specified in ChartSettings for zooming in charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2049 diff changeset	455 }
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	456 }
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	457
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	458 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	459 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	460 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	461 }
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	462
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	463 logger.debug("Prepare zoom settings for y axis at index: " + i);
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	464 zoomY(plot, yaxis, yRanges.get(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	465 }
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	466 }
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	467
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	468
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	469 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	470 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	471
cd4fb19ab892 Some API changes in ChartGenerator and XYChartGenerator for fetching user specified zoom values. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2325 diff changeset	472 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	473 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	474 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	475 }
cd4fb19ab892 Some API changes in ChartGenerator and XYChartGenerator for fetching user specified zoom values. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2325 diff changeset	476
cd4fb19ab892 Some API changes in ChartGenerator and XYChartGenerator for fetching user specified zoom values. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2325 diff changeset	477 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	478 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	479 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	480 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	481
cd4fb19ab892 Some API changes in ChartGenerator and XYChartGenerator for fetching user specified zoom values. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2325 diff changeset	482 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	483 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	484 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	485 }
cd4fb19ab892 Some API changes in ChartGenerator and XYChartGenerator for fetching user specified zoom values. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2325 diff changeset	486
cd4fb19ab892 Some API changes in ChartGenerator and XYChartGenerator for fetching user specified zoom values. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2325 diff changeset	487 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	488 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	489 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	490 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	491 }
cd4fb19ab892 Some API changes in ChartGenerator and XYChartGenerator for fetching user specified zoom values. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2325 diff changeset	492
cd4fb19ab892 Some API changes in ChartGenerator and XYChartGenerator for fetching user specified zoom values. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2325 diff changeset	493 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	494 }
cd4fb19ab892 Some API changes in ChartGenerator and XYChartGenerator for fetching user specified zoom values. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2325 diff changeset	495 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	496 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	497 }
cd4fb19ab892 Some API changes in ChartGenerator and XYChartGenerator for fetching user specified zoom values. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2325 diff changeset	498 }
cd4fb19ab892 Some API changes in ChartGenerator and XYChartGenerator for fetching user specified zoom values. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2325 diff changeset	499
cd4fb19ab892 Some API changes in ChartGenerator and XYChartGenerator for fetching user specified zoom values. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2325 diff changeset	500 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	501 }
cd4fb19ab892 Some API changes in ChartGenerator and XYChartGenerator for fetching user specified zoom values. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2325 diff changeset	502
cd4fb19ab892 Some API changes in ChartGenerator and XYChartGenerator for fetching user specified zoom values. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2325 diff changeset	503
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	504 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	505 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	506
5d8d24984819 New abstract methods in ChartGenerator and moved a method from ChartGenerator to XYChartGenerator. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2395 diff changeset	507 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	508 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	509 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	510 }
5d8d24984819 New abstract methods in ChartGenerator and moved a method from ChartGenerator to XYChartGenerator. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2395 diff changeset	511
5d8d24984819 New abstract methods in ChartGenerator and moved a method from ChartGenerator to XYChartGenerator. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2395 diff changeset	512 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	513 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	514 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	515 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	516
5d8d24984819 New abstract methods in ChartGenerator and moved a method from ChartGenerator to XYChartGenerator. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2395 diff changeset	517 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	518 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	519 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	520 }
5d8d24984819 New abstract methods in ChartGenerator and moved a method from ChartGenerator to XYChartGenerator. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2395 diff changeset	521
5d8d24984819 New abstract methods in ChartGenerator and moved a method from ChartGenerator to XYChartGenerator. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2395 diff changeset	522 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	523 ? 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	524 : 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	525 }
5d8d24984819 New abstract methods in ChartGenerator and moved a method from ChartGenerator to XYChartGenerator. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2395 diff changeset	526 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	527 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	528 }
5d8d24984819 New abstract methods in ChartGenerator and moved a method from ChartGenerator to XYChartGenerator. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2395 diff changeset	529 }
5d8d24984819 New abstract methods in ChartGenerator and moved a method from ChartGenerator to XYChartGenerator. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2395 diff changeset	530
5d8d24984819 New abstract methods in ChartGenerator and moved a method from ChartGenerator to XYChartGenerator. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2395 diff changeset	531 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	532 }
5d8d24984819 New abstract methods in ChartGenerator and moved a method from ChartGenerator to XYChartGenerator. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2395 diff changeset	533
5d8d24984819 New abstract methods in ChartGenerator and moved a method from ChartGenerator to XYChartGenerator. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2395 diff changeset	534
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	535 protected boolean zoomX(XYPlot plot, ValueAxis axis, Range range, Range x) {
f3fd8c9b7f51 #157 Computed discharge curve charts always have a lower bound set to 0. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 717 diff changeset	536 return zoom(plot, axis, range, x);
f3fd8c9b7f51 #157 Computed discharge curve charts always have a lower bound set to 0. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 717 diff changeset	537 }
f3fd8c9b7f51 #157 Computed discharge curve charts always have a lower bound set to 0. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 717 diff changeset	538
f3fd8c9b7f51 #157 Computed discharge curve charts always have a lower bound set to 0. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 717 diff changeset	539
f3fd8c9b7f51 #157 Computed discharge curve charts always have a lower bound set to 0. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 717 diff changeset	540 protected boolean zoomY(XYPlot plot, ValueAxis axis, Range range, Range x) {
f3fd8c9b7f51 #157 Computed discharge curve charts always have a lower bound set to 0. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 717 diff changeset	541 return zoom(plot, axis, range, x);
f3fd8c9b7f51 #157 Computed discharge curve charts always have a lower bound set to 0. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 717 diff changeset	542 }
f3fd8c9b7f51 #157 Computed discharge curve charts always have a lower bound set to 0. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 717 diff changeset	543
f3fd8c9b7f51 #157 Computed discharge curve charts always have a lower bound set to 0. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 717 diff changeset	544
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	545 /**
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	546 * 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	547 *
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	548 * @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	549 * @param axis The axis the shoud be modified.
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	550 * @param range 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	551 * @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	552 *
bbc966c81809 #90 Removed margins between data area border and curves. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 653 diff changeset	553 * @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	554 */
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	555 protected boolean zoom(XYPlot plot, ValueAxis axis, Range range, Range x) {
1736 0155cbaba182 XYChartGenerator: Do not crash if no zoom axis given Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1735 diff changeset	556
0155cbaba182 XYChartGenerator: Do not crash if no zoom axis given Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1735 diff changeset	557 if (range == null) {
0155cbaba182 XYChartGenerator: Do not crash if no zoom axis given Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1735 diff changeset	558 return false;
0155cbaba182 XYChartGenerator: Do not crash if no zoom axis given Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1735 diff changeset	559 }
0155cbaba182 XYChartGenerator: Do not crash if no zoom axis given Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1735 diff changeset	560
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	561 if (x != null) {
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	562 double min = range.getLowerBound();
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	563 double max = range.getUpperBound();
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	564 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	565
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	566 Range computed = new Range(
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	567 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	568 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	569
717 be4709640aac #90 Added a margin between chart data and chart axes to avoid displaying curves on the chart border. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 673 diff changeset	570 axis.setRangeWithMargins(computed);
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	571
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	572 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	573
bbc966c81809 #90 Removed margins between data area border and curves. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 653 diff changeset	574 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	575 }
654 bbc966c81809 #90 Removed margins between data area border and curves. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 653 diff changeset	576
717 be4709640aac #90 Added a margin between chart data and chart axes to avoid displaying curves on the chart border. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 673 diff changeset	577 axis.setRangeWithMargins(range);
654 bbc966c81809 #90 Removed margins between data area border and curves. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 653 diff changeset	578 return false;
bbc966c81809 #90 Removed margins between data area border and curves. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 653 diff changeset	579 }
bbc966c81809 #90 Removed margins between data area border and curves. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 653 diff changeset	580
bbc966c81809 #90 Removed margins between data area border and curves. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 653 diff changeset	581
bbc966c81809 #90 Removed margins between data area border and curves. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 653 diff changeset	582 /**
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	583 * This method extracts the minimum and maximum values for x and y axes
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	584 * 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	585 *
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	586 * @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	587 *
bbc966c81809 #90 Removed margins between data area border and curves. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 653 diff changeset	588 * @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	589 */
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	590 @Override
1944 21a4d2c677a1 Changed doOut signature, side effect from blackboard feature (to come). Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1943 diff changeset	591 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	592 logger.debug("getRangesForAxis " + index);
2132 e8fc770d2f8c 'New Chart' for computed discharge curve. Raimund Renkert <raimund.renkert@intevation.de> parents: 2110 diff changeset	593
e8fc770d2f8c 'New Chart' for computed discharge curve. Raimund Renkert <raimund.renkert@intevation.de> parents: 2110 diff changeset	594 Range rx = xRanges.get(Integer.valueOf(0));
e8fc770d2f8c 'New Chart' for computed discharge curve. Raimund Renkert <raimund.renkert@intevation.de> parents: 2110 diff changeset	595 Range ry = yRanges.get(Integer.valueOf(index));
e8fc770d2f8c 'New Chart' for computed discharge curve. Raimund Renkert <raimund.renkert@intevation.de> parents: 2110 diff changeset	596
e8fc770d2f8c 'New Chart' for computed discharge curve. Raimund Renkert <raimund.renkert@intevation.de> parents: 2110 diff changeset	597 if (rx == null) {
e8fc770d2f8c 'New Chart' for computed discharge curve. Raimund Renkert <raimund.renkert@intevation.de> parents: 2110 diff changeset	598 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	599 " Using default values: 0 - 1.");
e8fc770d2f8c 'New Chart' for computed discharge curve. Raimund Renkert <raimund.renkert@intevation.de> parents: 2110 diff changeset	600 rx = new Range(0, 1);
e8fc770d2f8c 'New Chart' for computed discharge curve. Raimund Renkert <raimund.renkert@intevation.de> parents: 2110 diff changeset	601 }
e8fc770d2f8c 'New Chart' for computed discharge curve. Raimund Renkert <raimund.renkert@intevation.de> parents: 2110 diff changeset	602 if (ry == null) {
e8fc770d2f8c 'New Chart' for computed discharge curve. Raimund Renkert <raimund.renkert@intevation.de> parents: 2110 diff changeset	603 logger.warn("Range for y" + index +
e8fc770d2f8c 'New Chart' for computed discharge curve. Raimund Renkert <raimund.renkert@intevation.de> parents: 2110 diff changeset	604 " axis not set. Using default values: 0 - 1.");
e8fc770d2f8c 'New Chart' for computed discharge curve. Raimund Renkert <raimund.renkert@intevation.de> parents: 2110 diff changeset	605 ry = new Range(0, 1);
e8fc770d2f8c 'New Chart' for computed discharge curve. Raimund Renkert <raimund.renkert@intevation.de> parents: 2110 diff changeset	606 }
e8fc770d2f8c 'New Chart' for computed discharge curve. Raimund Renkert <raimund.renkert@intevation.de> parents: 2110 diff changeset	607 return new Range[] {rx, ry};
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	608 }
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	609
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	610
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	611 @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	612 public Bounds getXBounds(int axis) {
5d8d24984819 New abstract methods in ChartGenerator and moved a method from ChartGenerator to XYChartGenerator. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2395 diff changeset	613 // TODO IMPLEMENT ME
5d8d24984819 New abstract methods in ChartGenerator and moved a method from ChartGenerator to XYChartGenerator. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2395 diff changeset	614 throw new RuntimeException(
5d8d24984819 New abstract methods in ChartGenerator and moved a method from ChartGenerator to XYChartGenerator. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2395 diff changeset	615 "XYChartGenerator.getXBounds(int) not implemented");
5d8d24984819 New abstract methods in ChartGenerator and moved a method from ChartGenerator to XYChartGenerator. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2395 diff changeset	616 }
5d8d24984819 New abstract methods in ChartGenerator and moved a method from ChartGenerator to XYChartGenerator. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2395 diff changeset	617
5d8d24984819 New abstract methods in ChartGenerator and moved a method from ChartGenerator to XYChartGenerator. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2395 diff changeset	618
5d8d24984819 New abstract methods in ChartGenerator and moved a method from ChartGenerator to XYChartGenerator. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2395 diff changeset	619 @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	620 protected void setXBounds(int axis, Bounds bounds) {
5d8d24984819 New abstract methods in ChartGenerator and moved a method from ChartGenerator to XYChartGenerator. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2395 diff changeset	621 // TODO IMPLEMENT ME
5d8d24984819 New abstract methods in ChartGenerator and moved a method from ChartGenerator to XYChartGenerator. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2395 diff changeset	622 throw new RuntimeException(
5d8d24984819 New abstract methods in ChartGenerator and moved a method from ChartGenerator to XYChartGenerator. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2395 diff changeset	623 "XYChartGenerator.setXBounds(int,Bounds) not implemented");
5d8d24984819 New abstract methods in ChartGenerator and moved a method from ChartGenerator to XYChartGenerator. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2395 diff changeset	624 }
5d8d24984819 New abstract methods in ChartGenerator and moved a method from ChartGenerator to XYChartGenerator. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2395 diff changeset	625
5d8d24984819 New abstract methods in ChartGenerator and moved a method from ChartGenerator to XYChartGenerator. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2395 diff changeset	626
5d8d24984819 New abstract methods in ChartGenerator and moved a method from ChartGenerator to XYChartGenerator. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2395 diff changeset	627 @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	628 public Bounds getYBounds(int axis) {
5d8d24984819 New abstract methods in ChartGenerator and moved a method from ChartGenerator to XYChartGenerator. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2395 diff changeset	629 // TODO IMPLEMENT ME
5d8d24984819 New abstract methods in ChartGenerator and moved a method from ChartGenerator to XYChartGenerator. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2395 diff changeset	630 throw new RuntimeException(
5d8d24984819 New abstract methods in ChartGenerator and moved a method from ChartGenerator to XYChartGenerator. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2395 diff changeset	631 "XYChartGenerator.getYBounds(int) not implemented");
5d8d24984819 New abstract methods in ChartGenerator and moved a method from ChartGenerator to XYChartGenerator. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2395 diff changeset	632 }
5d8d24984819 New abstract methods in ChartGenerator and moved a method from ChartGenerator to XYChartGenerator. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2395 diff changeset	633
5d8d24984819 New abstract methods in ChartGenerator and moved a method from ChartGenerator to XYChartGenerator. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2395 diff changeset	634
5d8d24984819 New abstract methods in ChartGenerator and moved a method from ChartGenerator to XYChartGenerator. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2395 diff changeset	635 @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	636 protected void setYBounds(int axis, Bounds bounds) {
5d8d24984819 New abstract methods in ChartGenerator and moved a method from ChartGenerator to XYChartGenerator. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2395 diff changeset	637 // TODO IMPLEMENT ME
5d8d24984819 New abstract methods in ChartGenerator and moved a method from ChartGenerator to XYChartGenerator. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2395 diff changeset	638 throw new RuntimeException(
5d8d24984819 New abstract methods in ChartGenerator and moved a method from ChartGenerator to XYChartGenerator. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2395 diff changeset	639 "XYChartGenerator.setYBounds(int,Bounds) not implemented");
5d8d24984819 New abstract methods in ChartGenerator and moved a method from ChartGenerator to XYChartGenerator. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2395 diff changeset	640 }
5d8d24984819 New abstract methods in ChartGenerator and moved a method from ChartGenerator to XYChartGenerator. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2395 diff changeset	641
5d8d24984819 New abstract methods in ChartGenerator and moved a method from ChartGenerator to XYChartGenerator. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2395 diff changeset	642
2138 59bb5c895be3 Improved HYK/Zones- handling. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2132 diff changeset	643 /** Get color for hyk zones by their type (which is the name). */
59bb5c895be3 Improved HYK/Zones- handling. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2132 diff changeset	644 public Paint colorForHYKZone(String zoneName) {
59bb5c895be3 Improved HYK/Zones- handling. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2132 diff changeset	645 if (zoneName.startsWith("R")) {
59bb5c895be3 Improved HYK/Zones- handling. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2132 diff changeset	646 // Brownish.
59bb5c895be3 Improved HYK/Zones- handling. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2132 diff changeset	647 return new Color(153, 60, 0);
59bb5c895be3 Improved HYK/Zones- handling. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2132 diff changeset	648 }
59bb5c895be3 Improved HYK/Zones- handling. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2132 diff changeset	649 else if (zoneName.startsWith("V")) {
59bb5c895be3 Improved HYK/Zones- handling. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2132 diff changeset	650 // Greenish.
59bb5c895be3 Improved HYK/Zones- handling. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2132 diff changeset	651 return new Color(0, 255, 0);
59bb5c895be3 Improved HYK/Zones- handling. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2132 diff changeset	652 }
59bb5c895be3 Improved HYK/Zones- handling. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2132 diff changeset	653 else if (zoneName.startsWith("B")) {
59bb5c895be3 Improved HYK/Zones- handling. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2132 diff changeset	654 // Grayish.
59bb5c895be3 Improved HYK/Zones- handling. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2132 diff changeset	655 return new Color(128, 128, 128);
59bb5c895be3 Improved HYK/Zones- handling. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2132 diff changeset	656 }
59bb5c895be3 Improved HYK/Zones- handling. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2132 diff changeset	657 else if (zoneName.startsWith("H")) {
59bb5c895be3 Improved HYK/Zones- handling. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2132 diff changeset	658 // Blueish.
59bb5c895be3 Improved HYK/Zones- handling. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2132 diff changeset	659 return new Color(0, 0, 255);
59bb5c895be3 Improved HYK/Zones- handling. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2132 diff changeset	660 }
59bb5c895be3 Improved HYK/Zones- handling. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2132 diff changeset	661 else {
59bb5c895be3 Improved HYK/Zones- handling. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2132 diff changeset	662 // Default.
59bb5c895be3 Improved HYK/Zones- handling. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2132 diff changeset	663 logger.debug("Unknown zone type found.");
59bb5c895be3 Improved HYK/Zones- handling. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2132 diff changeset	664 return new Color(255, 0, 0);
59bb5c895be3 Improved HYK/Zones- handling. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2132 diff changeset	665 }
59bb5c895be3 Improved HYK/Zones- handling. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2132 diff changeset	666 }
59bb5c895be3 Improved HYK/Zones- handling. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2132 diff changeset	667
59bb5c895be3 Improved HYK/Zones- handling. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2132 diff changeset	668
2161 c68f4f227c09 Somewhat unified Annotation handling, use jfreechart-house-toolkit instead of custom StickyAxisAnnotation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2152 diff changeset	669 /**
c68f4f227c09 Somewhat unified Annotation handling, use jfreechart-house-toolkit instead of custom StickyAxisAnnotation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2152 diff changeset	670 * Add a text and a line annotation.
c68f4f227c09 Somewhat unified Annotation handling, use jfreechart-house-toolkit instead of custom StickyAxisAnnotation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2152 diff changeset	671 */
c68f4f227c09 Somewhat unified Annotation handling, use jfreechart-house-toolkit instead of custom StickyAxisAnnotation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2152 diff changeset	672 public void addStickyAnnotation(
c68f4f227c09 Somewhat unified Annotation handling, use jfreechart-house-toolkit instead of custom StickyAxisAnnotation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2152 diff changeset	673 StickyAxisAnnotation annotation,
c68f4f227c09 Somewhat unified Annotation handling, use jfreechart-house-toolkit instead of custom StickyAxisAnnotation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2152 diff changeset	674 XYPlot plot,
c68f4f227c09 Somewhat unified Annotation handling, use jfreechart-house-toolkit instead of custom StickyAxisAnnotation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2152 diff changeset	675 Area area,
c68f4f227c09 Somewhat unified Annotation handling, use jfreechart-house-toolkit instead of custom StickyAxisAnnotation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2152 diff changeset	676 ThemeAccess.LineStyle lineStyle,
c68f4f227c09 Somewhat unified Annotation handling, use jfreechart-house-toolkit instead of custom StickyAxisAnnotation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2152 diff changeset	677 ThemeAccess.TextStyle textStyle
c68f4f227c09 Somewhat unified Annotation handling, use jfreechart-house-toolkit instead of custom StickyAxisAnnotation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2152 diff changeset	678 ) {
c68f4f227c09 Somewhat unified Annotation handling, use jfreechart-house-toolkit instead of custom StickyAxisAnnotation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2152 diff changeset	679 // OPTIMIZE pre-calculate area-related values
c68f4f227c09 Somewhat unified Annotation handling, use jfreechart-house-toolkit instead of custom StickyAxisAnnotation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2152 diff changeset	680 final float TEXT_OFF = 0.03f;
c68f4f227c09 Somewhat unified Annotation handling, use jfreechart-house-toolkit instead of custom StickyAxisAnnotation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2152 diff changeset	681 final float LINE_OFF = 0.02f;
c68f4f227c09 Somewhat unified Annotation handling, use jfreechart-house-toolkit instead of custom StickyAxisAnnotation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2152 diff changeset	682
c68f4f227c09 Somewhat unified Annotation handling, use jfreechart-house-toolkit instead of custom StickyAxisAnnotation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2152 diff changeset	683 XYLineAnnotation lineAnnotation = null;
c68f4f227c09 Somewhat unified Annotation handling, use jfreechart-house-toolkit instead of custom StickyAxisAnnotation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2152 diff changeset	684 XYTextAnnotation textAnnotation = null;
c68f4f227c09 Somewhat unified Annotation handling, use jfreechart-house-toolkit instead of custom StickyAxisAnnotation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2152 diff changeset	685
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	686 int rendererIndex = 0;
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	687
2161 c68f4f227c09 Somewhat unified Annotation handling, use jfreechart-house-toolkit instead of custom StickyAxisAnnotation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2152 diff changeset	688 if (annotation.atX()) {
c68f4f227c09 Somewhat unified Annotation handling, use jfreechart-house-toolkit instead of custom StickyAxisAnnotation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2152 diff changeset	689 textAnnotation = new CollisionFreeXYTextAnnotation(
c68f4f227c09 Somewhat unified Annotation handling, use jfreechart-house-toolkit instead of custom StickyAxisAnnotation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2152 diff changeset	690 annotation.getText(), annotation.getPos(), area.ofGround(TEXT_OFF));
c68f4f227c09 Somewhat unified Annotation handling, use jfreechart-house-toolkit instead of custom StickyAxisAnnotation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2152 diff changeset	691 // OPTIMIZE externalize the calculation involving PI.
c68f4f227c09 Somewhat unified Annotation handling, use jfreechart-house-toolkit instead of custom StickyAxisAnnotation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2152 diff changeset	692 textAnnotation.setRotationAngle(270f*Math.PI/180f);
c68f4f227c09 Somewhat unified Annotation handling, use jfreechart-house-toolkit instead of custom StickyAxisAnnotation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2152 diff changeset	693 // Style the line.
c68f4f227c09 Somewhat unified Annotation handling, use jfreechart-house-toolkit instead of custom StickyAxisAnnotation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2152 diff changeset	694 if (lineStyle != null) {
c68f4f227c09 Somewhat unified Annotation handling, use jfreechart-house-toolkit instead of custom StickyAxisAnnotation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2152 diff changeset	695 lineAnnotation = new XYLineAnnotation(annotation.getPos(),
c68f4f227c09 Somewhat unified Annotation handling, use jfreechart-house-toolkit instead of custom StickyAxisAnnotation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2152 diff changeset	696 area.atGround(), annotation.getPos(), area.ofGround(LINE_OFF),
c68f4f227c09 Somewhat unified Annotation handling, use jfreechart-house-toolkit instead of custom StickyAxisAnnotation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2152 diff changeset	697 new BasicStroke(lineStyle.getWidth()),lineStyle.getColor());
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	698 textAnnotation.setRotationAnchor(TextAnchor.CENTER_LEFT);
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	699 textAnnotation.setTextAnchor(TextAnchor.CENTER_LEFT);
2161 c68f4f227c09 Somewhat unified Annotation handling, use jfreechart-house-toolkit instead of custom StickyAxisAnnotation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2152 diff changeset	700 }
c68f4f227c09 Somewhat unified Annotation handling, use jfreechart-house-toolkit instead of custom StickyAxisAnnotation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2152 diff changeset	701 else {
c68f4f227c09 Somewhat unified Annotation handling, use jfreechart-house-toolkit instead of custom StickyAxisAnnotation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2152 diff changeset	702 lineAnnotation = new XYLineAnnotation(annotation.getPos(),
c68f4f227c09 Somewhat unified Annotation handling, use jfreechart-house-toolkit instead of custom StickyAxisAnnotation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2152 diff changeset	703 area.atGround(), annotation.getPos(), area.ofGround(LINE_OFF));
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	704 textAnnotation.setRotationAnchor(TextAnchor.CENTER_LEFT);
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	705 textAnnotation.setTextAnchor(TextAnchor.CENTER_LEFT);
2161 c68f4f227c09 Somewhat unified Annotation handling, use jfreechart-house-toolkit instead of custom StickyAxisAnnotation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2152 diff changeset	706 }
c68f4f227c09 Somewhat unified Annotation handling, use jfreechart-house-toolkit instead of custom StickyAxisAnnotation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2152 diff changeset	707 }
c68f4f227c09 Somewhat unified Annotation handling, use jfreechart-house-toolkit instead of custom StickyAxisAnnotation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2152 diff changeset	708 else {
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	709 // Do the more complicated case where we stick to the Y-Axis.
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	710 // There is one nasty case (duration curves, where annotations
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	711 // might stick to the second y-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	712 XYAxisDataset dataset = (XYAxisDataset) getAxisDataset(
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	713 new Integer(annotation.getAxisSymbol()));
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	714 if (dataset == null) {
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	715 logger.warn("Annotation should stick to unfindable y-axis: "
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	716 + annotation.getAxisSymbol());
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	717 rendererIndex = 0;
2161 c68f4f227c09 Somewhat unified Annotation handling, use jfreechart-house-toolkit instead of custom StickyAxisAnnotation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2152 diff changeset	718 }
c68f4f227c09 Somewhat unified Annotation handling, use jfreechart-house-toolkit instead of custom StickyAxisAnnotation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2152 diff changeset	719 else {
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	720 rendererIndex = dataset.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	721 }
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	722
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	723 if (rendererIndex != 0) {
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	724 // OPTIMIZE: Pass a different area to this function,
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	725 // do the adding to renderer outside (let this
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	726 // function return the annotations).
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	727 // Note that this path is travelled rarely.
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	728 Area area2 = new Area(plot.getDomainAxis(), plot.getRangeAxis(rendererIndex));
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	729 textAnnotation = new CollisionFreeXYTextAnnotation(
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	730 annotation.getText(), area2.ofRight(TEXT_OFF), annotation.getPos());
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	731 textAnnotation.setRotationAnchor(TextAnchor.CENTER_RIGHT);
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	732 textAnnotation.setTextAnchor(TextAnchor.CENTER_RIGHT);
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	733 // Style the line.
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	734 if (lineStyle != null) {
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	735 lineAnnotation = new XYLineAnnotation(area2.ofRight(LINE_OFF),
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	736 annotation.getPos(), area2.atRight(),
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	737 annotation.getPos(), new BasicStroke(lineStyle.getWidth()),
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	738 lineStyle.getColor());
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	739 }
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	740 else {
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	741 lineAnnotation = new XYLineAnnotation(area2.atRight(),
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	742 annotation.getPos(), area2.ofRight(LINE_OFF), annotation.getPos());
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	743 }
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	744 }
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	745 else {
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	746 textAnnotation = new CollisionFreeXYTextAnnotation(
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	747 annotation.getText(), area.ofLeft(TEXT_OFF), annotation.getPos());
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	748 textAnnotation.setRotationAnchor(TextAnchor.CENTER_LEFT);
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	749 textAnnotation.setTextAnchor(TextAnchor.CENTER_LEFT);
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	750 // Style the line.
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	751 if (lineStyle != null) {
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	752 lineAnnotation = new XYLineAnnotation(area.atLeft(),
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	753 annotation.getPos(), area.ofLeft(LINE_OFF),
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	754 annotation.getPos(), new BasicStroke(lineStyle.getWidth()),
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	755 lineStyle.getColor());
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	756 }
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	757 else {
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	758 lineAnnotation = new XYLineAnnotation(area.atLeft(),
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	759 annotation.getPos(), area.ofLeft(LINE_OFF), annotation.getPos());
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	760 }
2161 c68f4f227c09 Somewhat unified Annotation handling, use jfreechart-house-toolkit instead of custom StickyAxisAnnotation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2152 diff changeset	761 }
c68f4f227c09 Somewhat unified Annotation handling, use jfreechart-house-toolkit instead of custom StickyAxisAnnotation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2152 diff changeset	762 }
c68f4f227c09 Somewhat unified Annotation handling, use jfreechart-house-toolkit instead of custom StickyAxisAnnotation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2152 diff changeset	763
c68f4f227c09 Somewhat unified Annotation handling, use jfreechart-house-toolkit instead of custom StickyAxisAnnotation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2152 diff changeset	764 // Style the text.
c68f4f227c09 Somewhat unified Annotation handling, use jfreechart-house-toolkit instead of custom StickyAxisAnnotation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2152 diff changeset	765 if (textStyle != null) {
c68f4f227c09 Somewhat unified Annotation handling, use jfreechart-house-toolkit instead of custom StickyAxisAnnotation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2152 diff changeset	766 textStyle.apply(textAnnotation);
c68f4f227c09 Somewhat unified Annotation handling, use jfreechart-house-toolkit instead of custom StickyAxisAnnotation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2152 diff changeset	767 }
c68f4f227c09 Somewhat unified Annotation handling, use jfreechart-house-toolkit instead of custom StickyAxisAnnotation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2152 diff changeset	768
c68f4f227c09 Somewhat unified Annotation handling, use jfreechart-house-toolkit instead of custom StickyAxisAnnotation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2152 diff changeset	769 // Add the Annotations to renderer.
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	770 plot.getRenderer(rendererIndex).addAnnotation(textAnnotation,
2300 a3dd443976bc Put line and text annotations placed at x and y axes into foreground. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	771 org.jfree.ui.Layer.FOREGROUND);
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	772 plot.getRenderer(rendererIndex).addAnnotation(lineAnnotation,
2300 a3dd443976bc Put line and text annotations placed at x and y axes into foreground. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	773 org.jfree.ui.Layer.FOREGROUND);
2161 c68f4f227c09 Somewhat unified Annotation handling, use jfreechart-house-toolkit instead of custom StickyAxisAnnotation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2152 diff changeset	774 }
c68f4f227c09 Somewhat unified Annotation handling, use jfreechart-house-toolkit instead of custom StickyAxisAnnotation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2152 diff changeset	775
c68f4f227c09 Somewhat unified Annotation handling, use jfreechart-house-toolkit instead of custom StickyAxisAnnotation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2152 diff changeset	776
c68f4f227c09 Somewhat unified Annotation handling, use jfreechart-house-toolkit instead of custom StickyAxisAnnotation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2152 diff changeset	777 /** Add annotations (Sticky, Text and hyk zones). */
c68f4f227c09 Somewhat unified Annotation handling, use jfreechart-house-toolkit instead of custom StickyAxisAnnotation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2152 diff changeset	778 public void addAnnotationsToRenderer(XYPlot plot) {
c68f4f227c09 Somewhat unified Annotation handling, use jfreechart-house-toolkit instead of custom StickyAxisAnnotation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2152 diff changeset	779 logger.debug("XYChartGenerator.addAnnotationsToRenderer");
2138 59bb5c895be3 Improved HYK/Zones- handling. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2132 diff changeset	780
2143 c5d24e0587ce Minor hyk-handling improvements. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2138 diff changeset	781 if (annotations == null) {
c5d24e0587ce Minor hyk-handling improvements. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2138 diff changeset	782 logger.debug("XYChartGenerator.addBoxAnnotations: no annotations.");
c5d24e0587ce Minor hyk-handling improvements. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2138 diff changeset	783 return;
c5d24e0587ce Minor hyk-handling improvements. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2138 diff changeset	784 }
c5d24e0587ce Minor hyk-handling improvements. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2138 diff changeset	785
2152 2336927cb096 Add basic (text) styling for HYKS. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2143 diff changeset	786 // Paints for the boxes/lines.
2138 59bb5c895be3 Improved HYK/Zones- handling. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2132 diff changeset	787 Stroke basicStroke = new BasicStroke(1.0f);
59bb5c895be3 Improved HYK/Zones- handling. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2132 diff changeset	788
2161 c68f4f227c09 Somewhat unified Annotation handling, use jfreechart-house-toolkit instead of custom StickyAxisAnnotation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2152 diff changeset	789 Paint linePaint = new Color(255, 0,0,60);
c68f4f227c09 Somewhat unified Annotation handling, use jfreechart-house-toolkit instead of custom StickyAxisAnnotation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2152 diff changeset	790 Paint fillPaint = new Color(0, 255,0,60);
c68f4f227c09 Somewhat unified Annotation handling, use jfreechart-house-toolkit instead of custom StickyAxisAnnotation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2152 diff changeset	791 Paint tranPaint = new Color(0, 0,0, 0);
2138 59bb5c895be3 Improved HYK/Zones- handling. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2132 diff changeset	792
2161 c68f4f227c09 Somewhat unified Annotation handling, use jfreechart-house-toolkit instead of custom StickyAxisAnnotation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2152 diff changeset	793 // OPTMIMIZE: Pre-calculate positions
c68f4f227c09 Somewhat unified Annotation handling, use jfreechart-house-toolkit instead of custom StickyAxisAnnotation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2152 diff changeset	794 Area area = new Area(
c68f4f227c09 Somewhat unified Annotation handling, use jfreechart-house-toolkit instead of custom StickyAxisAnnotation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2152 diff changeset	795 plot.getDomainAxis(0).getRange(),
c68f4f227c09 Somewhat unified Annotation handling, use jfreechart-house-toolkit instead of custom StickyAxisAnnotation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2152 diff changeset	796 plot.getRangeAxis().getRange());
2138 59bb5c895be3 Improved HYK/Zones- handling. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2132 diff changeset	797
2161 c68f4f227c09 Somewhat unified Annotation handling, use jfreechart-house-toolkit instead of custom StickyAxisAnnotation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2152 diff changeset	798 // Walk over all Annotation sets.
c68f4f227c09 Somewhat unified Annotation handling, use jfreechart-house-toolkit instead of custom StickyAxisAnnotation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2152 diff changeset	799 for (FLYSAnnotation fa: annotations) {
2152 2336927cb096 Add basic (text) styling for HYKS. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2143 diff changeset	800
2336927cb096 Add basic (text) styling for HYKS. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2143 diff changeset	801 // Access text styling, if any.
2336927cb096 Add basic (text) styling for HYKS. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2143 diff changeset	802 Document theme = fa.getTheme();
2336927cb096 Add basic (text) styling for HYKS. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2143 diff changeset	803 ThemeAccess.TextStyle textStyle = null;
2161 c68f4f227c09 Somewhat unified Annotation handling, use jfreechart-house-toolkit instead of custom StickyAxisAnnotation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2152 diff changeset	804 ThemeAccess.LineStyle lineStyle = null;
c68f4f227c09 Somewhat unified Annotation handling, use jfreechart-house-toolkit instead of custom StickyAxisAnnotation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2152 diff changeset	805
c68f4f227c09 Somewhat unified Annotation handling, use jfreechart-house-toolkit instead of custom StickyAxisAnnotation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2152 diff changeset	806 // Get Themeing information and add legend item.
2152 2336927cb096 Add basic (text) styling for HYKS. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2143 diff changeset	807 if (theme != null) {
2336927cb096 Add basic (text) styling for HYKS. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2143 diff changeset	808 ThemeAccess themeAccess = new ThemeAccess(theme);
2336927cb096 Add basic (text) styling for HYKS. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2143 diff changeset	809 textStyle = themeAccess.parseTextStyle();
2161 c68f4f227c09 Somewhat unified Annotation handling, use jfreechart-house-toolkit instead of custom StickyAxisAnnotation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2152 diff changeset	810 lineStyle = themeAccess.parseLineStyle();
2184 fc86fcfe503e Only add one legend item for manual point themes. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2183 diff changeset	811 if (fa.getLabel() != null) {
fc86fcfe503e Only add one legend item for manual point themes. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2183 diff changeset	812 LegendItemCollection lic = new LegendItemCollection();
fc86fcfe503e Only add one legend item for manual point themes. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2183 diff changeset	813 LegendItemCollection old = plot.getFixedLegendItems();
fc86fcfe503e Only add one legend item for manual point themes. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2183 diff changeset	814 lic.add(createLegendItem(theme, fa.getLabel()));
fc86fcfe503e Only add one legend item for manual point themes. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2183 diff changeset	815 // (Re-)Add prior legend entries.
fc86fcfe503e Only add one legend item for manual point themes. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2183 diff changeset	816 if (old != null) {
fc86fcfe503e Only add one legend item for manual point themes. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2183 diff changeset	817 old.addAll(lic);
fc86fcfe503e Only add one legend item for manual point themes. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2183 diff changeset	818 }
fc86fcfe503e Only add one legend item for manual point themes. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2183 diff changeset	819 else {
fc86fcfe503e Only add one legend item for manual point themes. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2183 diff changeset	820 old = lic;
fc86fcfe503e Only add one legend item for manual point themes. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2183 diff changeset	821 }
fc86fcfe503e Only add one legend item for manual point themes. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2183 diff changeset	822 plot.setFixedLegendItems(old);
2161 c68f4f227c09 Somewhat unified Annotation handling, use jfreechart-house-toolkit instead of custom StickyAxisAnnotation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2152 diff changeset	823 }
2152 2336927cb096 Add basic (text) styling for HYKS. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2143 diff changeset	824 }
2336927cb096 Add basic (text) styling for HYKS. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2143 diff changeset	825
2161 c68f4f227c09 Somewhat unified Annotation handling, use jfreechart-house-toolkit instead of custom StickyAxisAnnotation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2152 diff changeset	826 // The 'Sticky' Annotations (at axis, with line and text).
c68f4f227c09 Somewhat unified Annotation handling, use jfreechart-house-toolkit instead of custom StickyAxisAnnotation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2152 diff changeset	827 for (StickyAxisAnnotation sta: fa.getAxisTextAnnotations()) {
c68f4f227c09 Somewhat unified Annotation handling, use jfreechart-house-toolkit instead of custom StickyAxisAnnotation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2152 diff changeset	828 addStickyAnnotation(sta, plot, area, lineStyle, textStyle);
c68f4f227c09 Somewhat unified Annotation handling, use jfreechart-house-toolkit instead of custom StickyAxisAnnotation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2152 diff changeset	829 }
c68f4f227c09 Somewhat unified Annotation handling, use jfreechart-house-toolkit instead of custom StickyAxisAnnotation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2152 diff changeset	830
2411 7e0be3e5dfaa Fix flys/issue490 (text for manual points). Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2409 diff changeset	831 // Other Text Annotations (e.g. labels of manual points).
2161 c68f4f227c09 Somewhat unified Annotation handling, use jfreechart-house-toolkit instead of custom StickyAxisAnnotation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2152 diff changeset	832 for (XYTextAnnotation ta: fa.getTextAnnotations()) {
2193 73490b828a90 Manual Point Theming improved. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2184 diff changeset	833 // Style the text.
73490b828a90 Manual Point Theming improved. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2184 diff changeset	834 if (textStyle != null) {
73490b828a90 Manual Point Theming improved. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2184 diff changeset	835 textStyle.apply(ta);
73490b828a90 Manual Point Theming improved. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2184 diff changeset	836 }
73490b828a90 Manual Point Theming improved. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2184 diff changeset	837 ta.setY(area.above(0.05d, ta.getY()));
2183 a79d5cd26083 Render labels of manual points in a very primitive manner. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2163 diff changeset	838 plot.getRenderer().addAnnotation(ta, org.jfree.ui.Layer.FOREGROUND);
2161 c68f4f227c09 Somewhat unified Annotation handling, use jfreechart-house-toolkit instead of custom StickyAxisAnnotation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2152 diff changeset	839 }
c68f4f227c09 Somewhat unified Annotation handling, use jfreechart-house-toolkit instead of custom StickyAxisAnnotation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2152 diff changeset	840
c68f4f227c09 Somewhat unified Annotation handling, use jfreechart-house-toolkit instead of custom StickyAxisAnnotation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2152 diff changeset	841 // Hyks.
2138 59bb5c895be3 Improved HYK/Zones- handling. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2132 diff changeset	842 for (HYKFactory.Zone zone: fa.getBoxes()) {
2161 c68f4f227c09 Somewhat unified Annotation handling, use jfreechart-house-toolkit instead of custom StickyAxisAnnotation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2152 diff changeset	843 // For each zone, create a box to fill with color, a box to draw
c68f4f227c09 Somewhat unified Annotation handling, use jfreechart-house-toolkit instead of custom StickyAxisAnnotation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2152 diff changeset	844 // the lines and a text to display the type.
2138 59bb5c895be3 Improved HYK/Zones- handling. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2132 diff changeset	845 fillPaint = colorForHYKZone(zone.getName());
59bb5c895be3 Improved HYK/Zones- handling. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2132 diff changeset	846
2161 c68f4f227c09 Somewhat unified Annotation handling, use jfreechart-house-toolkit instead of custom StickyAxisAnnotation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2152 diff changeset	847 XYBoxAnnotation boxA = new XYBoxAnnotation(zone.getFrom(), area.atGround(),
c68f4f227c09 Somewhat unified Annotation handling, use jfreechart-house-toolkit instead of custom StickyAxisAnnotation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2152 diff changeset	848 zone.getTo(), area.ofGround(0.03f), basicStroke, tranPaint, fillPaint);
c68f4f227c09 Somewhat unified Annotation handling, use jfreechart-house-toolkit instead of custom StickyAxisAnnotation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2152 diff changeset	849 XYBoxAnnotation boxB = new XYBoxAnnotation(zone.getFrom(), area.atGround(),
c68f4f227c09 Somewhat unified Annotation handling, use jfreechart-house-toolkit instead of custom StickyAxisAnnotation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2152 diff changeset	850 zone.getTo(), area.atTop(), basicStroke, fillPaint, tranPaint);
2138 59bb5c895be3 Improved HYK/Zones- handling. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2132 diff changeset	851
59bb5c895be3 Improved HYK/Zones- handling. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2132 diff changeset	852 XYTextAnnotation tex = new XYTextAnnotation(zone.getName(),
59bb5c895be3 Improved HYK/Zones- handling. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2132 diff changeset	853 zone.getFrom() + (zone.getTo() - zone.getFrom()) / 2.0d,
2161 c68f4f227c09 Somewhat unified Annotation handling, use jfreechart-house-toolkit instead of custom StickyAxisAnnotation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2152 diff changeset	854 area.ofGround(0.015f));
2152 2336927cb096 Add basic (text) styling for HYKS. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2143 diff changeset	855 if (textStyle != null) {
2336927cb096 Add basic (text) styling for HYKS. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2143 diff changeset	856 textStyle.apply(tex);
2336927cb096 Add basic (text) styling for HYKS. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2143 diff changeset	857 }
2138 59bb5c895be3 Improved HYK/Zones- handling. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2132 diff changeset	858
2161 c68f4f227c09 Somewhat unified Annotation handling, use jfreechart-house-toolkit instead of custom StickyAxisAnnotation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2152 diff changeset	859 plot.getRenderer().addAnnotation(boxA, org.jfree.ui.Layer.BACKGROUND);
c68f4f227c09 Somewhat unified Annotation handling, use jfreechart-house-toolkit instead of custom StickyAxisAnnotation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2152 diff changeset	860 plot.getRenderer().addAnnotation(boxB, org.jfree.ui.Layer.BACKGROUND);
c68f4f227c09 Somewhat unified Annotation handling, use jfreechart-house-toolkit instead of custom StickyAxisAnnotation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2152 diff changeset	861 plot.getRenderer().addAnnotation(tex, org.jfree.ui.Layer.BACKGROUND);
2138 59bb5c895be3 Improved HYK/Zones- handling. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2132 diff changeset	862 }
59bb5c895be3 Improved HYK/Zones- handling. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2132 diff changeset	863 }
59bb5c895be3 Improved HYK/Zones- handling. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2132 diff changeset	864 }
1679 69929c471646 Improved the creation/rendering of annotations (km favorites, mainvalues). Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1645 diff changeset	865
2152 2336927cb096 Add basic (text) styling for HYKS. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2143 diff changeset	866
369 2ce7b473620e Implemented the chart creation of a longitudinal section chart - W and Q facets. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: diff changeset	867 /**
2054 a653295c9ac0 Make use of user defined axes font sizes. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2053 diff changeset	868 * 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	869 * X axis.
a653295c9ac0 Make use of user defined axes font sizes. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2053 diff changeset	870 *
369 2ce7b473620e Implemented the chart creation of a longitudinal section chart - W and Q facets. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: diff changeset	871 * @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	872 */
2ce7b473620e Implemented the chart creation of a longitudinal section chart - W and Q facets. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: diff changeset	873 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	874 ValueAxis xaxis = plot.getDomainAxis();
a653295c9ac0 Make use of user defined axes font sizes. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2053 diff changeset	875
a653295c9ac0 Make use of user defined axes font sizes. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2053 diff changeset	876 ChartSettings chartSettings = getChartSettings();
a653295c9ac0 Make use of user defined axes font sizes. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2053 diff changeset	877 if (chartSettings == null) {
a653295c9ac0 Make use of user defined axes font sizes. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2053 diff changeset	878 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	879 }
2054 a653295c9ac0 Make use of user defined axes font sizes. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2053 diff changeset	880
a653295c9ac0 Make use of user defined axes font sizes. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2053 diff changeset	881 Font labelFont = new Font(
a653295c9ac0 Make use of user defined axes font sizes. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2053 diff changeset	882 DEFAULT_FONT_NAME,
a653295c9ac0 Make use of user defined axes font sizes. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2053 diff changeset	883 Font.BOLD,
a653295c9ac0 Make use of user defined axes font sizes. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2053 diff changeset	884 getXAxisLabelFontSize());
a653295c9ac0 Make use of user defined axes font sizes. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2053 diff changeset	885
a653295c9ac0 Make use of user defined axes font sizes. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2053 diff changeset	886 xaxis.setLabelFont(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	887 }
414 0385bcc4229a Added subtitles to the available charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 375 diff changeset	888
0385bcc4229a Added subtitles to the available charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 375 diff changeset	889
1940 0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	890 /**
0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	891 * Set some Stroke/Grid defaults.
0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	892 */
419 4de7d9eac10f Display gridlines in charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 414 diff changeset	893 protected void adjustPlot(XYPlot plot) {
4de7d9eac10f Display gridlines in charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 414 diff changeset	894 Stroke gridStroke = new BasicStroke(
4de7d9eac10f Display gridlines in charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 414 diff changeset	895 DEFAULT_GRID_LINE_WIDTH,
4de7d9eac10f Display gridlines in charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 414 diff changeset	896 BasicStroke.CAP_BUTT,
4de7d9eac10f Display gridlines in charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 414 diff changeset	897 BasicStroke.JOIN_MITER,
4de7d9eac10f Display gridlines in charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 414 diff changeset	898 3.0f,
4de7d9eac10f Display gridlines in charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 414 diff changeset	899 new float[] { 3.0f },
4de7d9eac10f Display gridlines in charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 414 diff changeset	900 0.0f);
4de7d9eac10f Display gridlines in charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 414 diff changeset	901
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	902 ChartSettings cs = getChartSettings();
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	903 boolean isGridVisible = cs != null ? isGridVisible(cs) : true;
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	904
419 4de7d9eac10f Display gridlines in charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 414 diff changeset	905 plot.setDomainGridlineStroke(gridStroke);
4de7d9eac10f Display gridlines in charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 414 diff changeset	906 plot.setDomainGridlinePaint(DEFAULT_GRID_COLOR);
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	907 plot.setDomainGridlinesVisible(isGridVisible);
419 4de7d9eac10f Display gridlines in charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 414 diff changeset	908
4de7d9eac10f Display gridlines in charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 414 diff changeset	909 plot.setRangeGridlineStroke(gridStroke);
4de7d9eac10f Display gridlines in charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 414 diff changeset	910 plot.setRangeGridlinePaint(DEFAULT_GRID_COLOR);
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	911 plot.setRangeGridlinesVisible(isGridVisible);
654 bbc966c81809 #90 Removed margins between data area border and curves. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 653 diff changeset	912
bbc966c81809 #90 Removed margins between data area border and curves. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 653 diff changeset	913 plot.setAxisOffset(new RectangleInsets(0d, 0d, 0d, 0d));
419 4de7d9eac10f Display gridlines in charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 414 diff changeset	914 }
4de7d9eac10f Display gridlines in charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 414 diff changeset	915
4de7d9eac10f Display gridlines in charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 414 diff changeset	916
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	917 /**
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	918 * 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	919 * 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	920 * 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	921 *
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	922 * @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	923 */
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	924 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	925 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	926 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	927
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	928 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	929 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	930 }
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	931 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	932 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	933 }
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	934 }
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	935
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	936 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	937 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	938
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	939 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	940 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	941 }
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	942 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	943 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	944 }
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	945 }
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	946 }
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	947
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	948
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	949 /**
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	950 * 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	951 * 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	952 *
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	953 * @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	954 */
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	955 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	956 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	957 ((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	958 }
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	959
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	960
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	961 /**
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	962 * 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	963 * 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	964 *
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	965 * @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	966 */
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	967 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	968 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	969 ((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	970 }
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	971
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	972
1932 17e18948fe5e Fix legend and themeing with new multiaxis feature. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1931 diff changeset	973 /**
1861 11c4b1429117 Cosmetics, resolve code duplicate. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1849 diff changeset	974 * Register annotations like MainValues for later plotting
11c4b1429117 Cosmetics, resolve code duplicate. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1849 diff changeset	975 *
11c4b1429117 Cosmetics, resolve code duplicate. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1849 diff changeset	976 * @param o list of annotations (data of facet).
11c4b1429117 Cosmetics, resolve code duplicate. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1849 diff changeset	977 * @param facet The facet. This facet does NOT support any data objects. Use
11c4b1429117 Cosmetics, resolve code duplicate. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1849 diff changeset	978 * FLYSArtifact.getNativeFacet() instead to retrieve a Facet which supports
11c4b1429117 Cosmetics, resolve code duplicate. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1849 diff changeset	979 * data.
11c4b1429117 Cosmetics, resolve code duplicate. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1849 diff changeset	980 * @param theme Theme document for given annotations.
11c4b1429117 Cosmetics, resolve code duplicate. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1849 diff changeset	981 * @param visible The visibility of the annotations.
1849 5d5dd44d613e Refactored, move doMainValueAnnotations to XYChartGenerator. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1768 diff changeset	982 */
5d5dd44d613e Refactored, move doMainValueAnnotations to XYChartGenerator. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1768 diff changeset	983 protected void doAnnotations(
5d5dd44d613e Refactored, move doMainValueAnnotations to XYChartGenerator. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1768 diff changeset	984 FLYSAnnotation annotations,
2325 1fcaeced48f2 #485 Fixed broken renaming of chart themes. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2300 diff changeset	985 ArtifactAndFacet aandf,
1849 5d5dd44d613e Refactored, move doMainValueAnnotations to XYChartGenerator. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1768 diff changeset	986 Document theme,
5d5dd44d613e Refactored, move doMainValueAnnotations to XYChartGenerator. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1768 diff changeset	987 boolean visible
5d5dd44d613e Refactored, move doMainValueAnnotations to XYChartGenerator. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1768 diff changeset	988 ){
2411 7e0be3e5dfaa Fix flys/issue490 (text for manual points). Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2409 diff changeset	989 // Running into trouble here.
1849 5d5dd44d613e Refactored, move doMainValueAnnotations to XYChartGenerator. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1768 diff changeset	990 logger.debug("doAnnotations");
2409 4e82bcd07550 Bugfix: Take care on empty ArtifactAndFacet objects in doAnnotations(). Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2398 diff changeset	991 if (aandf == null) {
4e82bcd07550 Bugfix: Take care on empty ArtifactAndFacet objects in doAnnotations(). Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2398 diff changeset	992 logger.warn(
4e82bcd07550 Bugfix: Take care on empty ArtifactAndFacet objects in doAnnotations(). Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2398 diff changeset	993 "Facet for Annotations is null. " +
4e82bcd07550 Bugfix: Take care on empty ArtifactAndFacet objects in doAnnotations(). Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2398 diff changeset	994 "This should never happen!");
4e82bcd07550 Bugfix: Take care on empty ArtifactAndFacet objects in doAnnotations(). Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2398 diff changeset	995 return;
4e82bcd07550 Bugfix: Take care on empty ArtifactAndFacet objects in doAnnotations(). Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2398 diff changeset	996 }
4e82bcd07550 Bugfix: Take care on empty ArtifactAndFacet objects in doAnnotations(). Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2398 diff changeset	997
2325 1fcaeced48f2 #485 Fixed broken renaming of chart themes. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2300 diff changeset	998 Facet facet = aandf.getFacet();
1849 5d5dd44d613e Refactored, move doMainValueAnnotations to XYChartGenerator. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1768 diff changeset	999
1861 11c4b1429117 Cosmetics, resolve code duplicate. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1849 diff changeset	1000 // Add all annotations to our annotation pool.
1849 5d5dd44d613e Refactored, move doMainValueAnnotations to XYChartGenerator. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1768 diff changeset	1001 annotations.setTheme(theme);
2183 a79d5cd26083 Render labels of manual points in a very primitive manner. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2163 diff changeset	1002 if (facet != null)
2325 1fcaeced48f2 #485 Fixed broken renaming of chart themes. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2300 diff changeset	1003 annotations.setLabel(aandf.getFacetDescription());
1849 5d5dd44d613e Refactored, move doMainValueAnnotations to XYChartGenerator. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1768 diff changeset	1004 addAnnotations(annotations, visible);
5d5dd44d613e Refactored, move doMainValueAnnotations to XYChartGenerator. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1768 diff changeset	1005 }
1986 3632150dbe0b Implemented a ChartSettings with relevant Sections and Attributes for charts (NOTE: Work still in progress). Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1983 diff changeset	1006
3632150dbe0b Implemented a ChartSettings with relevant Sections and Attributes for charts (NOTE: Work still in progress). Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1983 diff changeset	1007
3632150dbe0b Implemented a ChartSettings with relevant Sections and Attributes for charts (NOTE: Work still in progress). Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1983 diff changeset	1008 /**
2206 e2124ca11adb Add manual point handling for many different chart types. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2193 diff changeset	1009 * Do Points out.
e2124ca11adb Add manual point handling for many different chart types. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2193 diff changeset	1010 */
e2124ca11adb Add manual point handling for many different chart types. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2193 diff changeset	1011 protected void doPoints(
e2124ca11adb Add manual point handling for many different chart types. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2193 diff changeset	1012 Object o,
2325 1fcaeced48f2 #485 Fixed broken renaming of chart themes. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2300 diff changeset	1013 ArtifactAndFacet aandf,
2206 e2124ca11adb Add manual point handling for many different chart types. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2193 diff changeset	1014 Document theme,
e2124ca11adb Add manual point handling for many different chart types. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2193 diff changeset	1015 boolean visible,
e2124ca11adb Add manual point handling for many different chart types. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2193 diff changeset	1016 int axisIndex
e2124ca11adb Add manual point handling for many different chart types. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2193 diff changeset	1017 ) {
2325 1fcaeced48f2 #485 Fixed broken renaming of chart themes. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2300 diff changeset	1018 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	1019 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	1020
e2124ca11adb Add manual point handling for many different chart types. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2193 diff changeset	1021 // 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	1022 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	1023
e2124ca11adb Add manual point handling for many different chart types. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2193 diff changeset	1024 try {
e2124ca11adb Add manual point handling for many different chart types. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2193 diff changeset	1025 JSONArray points = new JSONArray((String) o);
e2124ca11adb Add manual point handling for many different chart types. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2193 diff changeset	1026 for (int i = 0; i < points.length(); i++) {
e2124ca11adb Add manual point handling for many different chart types. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2193 diff changeset	1027 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	1028 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	1029 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	1030 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	1031 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	1032 if (!act) {
e2124ca11adb Add manual point handling for many different chart types. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2193 diff changeset	1033 continue;
e2124ca11adb Add manual point handling for many different chart types. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2193 diff changeset	1034 }
e2124ca11adb Add manual point handling for many different chart types. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2193 diff changeset	1035 //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	1036 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	1037 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	1038 }
e2124ca11adb Add manual point handling for many different chart types. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2193 diff changeset	1039 }
e2124ca11adb Add manual point handling for many different chart types. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2193 diff changeset	1040 catch(JSONException e){
e2124ca11adb Add manual point handling for many different chart types. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2193 diff changeset	1041 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	1042 }
e2124ca11adb Add manual point handling for many different chart types. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2193 diff changeset	1043
e2124ca11adb Add manual point handling for many different chart types. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2193 diff changeset	1044 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	1045 annotations.setTextAnnotations(xy);
e2124ca11adb Add manual point handling for many different chart types. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2193 diff changeset	1046
2411 7e0be3e5dfaa Fix flys/issue490 (text for manual points). Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2409 diff changeset	1047 doAnnotations(annotations, aandf, theme, visible);
2206 e2124ca11adb Add manual point handling for many different chart types. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2193 diff changeset	1048 addAxisSeries(series, axisIndex, visible);
e2124ca11adb Add manual point handling for many different chart types. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2193 diff changeset	1049 }
e2124ca11adb Add manual point handling for many different chart types. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2193 diff changeset	1050
e2124ca11adb Add manual point handling for many different chart types. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2193 diff changeset	1051
2161 c68f4f227c09 Somewhat unified Annotation handling, use jfreechart-house-toolkit instead of custom StickyAxisAnnotation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2152 diff changeset	1052 /** Two Ranges that span a rectangular area. */
c68f4f227c09 Somewhat unified Annotation handling, use jfreechart-house-toolkit instead of custom StickyAxisAnnotation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2152 diff changeset	1053 public static class Area {
c68f4f227c09 Somewhat unified Annotation handling, use jfreechart-house-toolkit instead of custom StickyAxisAnnotation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2152 diff changeset	1054 protected Range xRange;
c68f4f227c09 Somewhat unified Annotation handling, use jfreechart-house-toolkit instead of custom StickyAxisAnnotation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2152 diff changeset	1055 protected Range yRange;
c68f4f227c09 Somewhat unified Annotation handling, use jfreechart-house-toolkit instead of custom StickyAxisAnnotation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2152 diff changeset	1056
c68f4f227c09 Somewhat unified Annotation handling, use jfreechart-house-toolkit instead of custom StickyAxisAnnotation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2152 diff changeset	1057 public Area(Range rangeX, Range rangeY) {
c68f4f227c09 Somewhat unified Annotation handling, use jfreechart-house-toolkit instead of custom StickyAxisAnnotation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2152 diff changeset	1058 this.xRange = rangeX;
c68f4f227c09 Somewhat unified Annotation handling, use jfreechart-house-toolkit instead of custom StickyAxisAnnotation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2152 diff changeset	1059 this.yRange = rangeY;
c68f4f227c09 Somewhat unified Annotation handling, use jfreechart-house-toolkit instead of custom StickyAxisAnnotation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2152 diff changeset	1060 }
c68f4f227c09 Somewhat unified Annotation handling, use jfreechart-house-toolkit instead of custom StickyAxisAnnotation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2152 diff changeset	1061
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	1062 public Area(ValueAxis axisX, ValueAxis axisY) {
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	1063 this.xRange = axisX.getRange();
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	1064 this.yRange = axisY.getRange();
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	1065 }
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	1066
2161 c68f4f227c09 Somewhat unified Annotation handling, use jfreechart-house-toolkit instead of custom StickyAxisAnnotation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2152 diff changeset	1067 public double ofLeft(double percent) {
c68f4f227c09 Somewhat unified Annotation handling, use jfreechart-house-toolkit instead of custom StickyAxisAnnotation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2152 diff changeset	1068 return xRange.getLowerBound()
c68f4f227c09 Somewhat unified Annotation handling, use jfreechart-house-toolkit instead of custom StickyAxisAnnotation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2152 diff changeset	1069 + xRange.getLength() * percent;
c68f4f227c09 Somewhat unified Annotation handling, use jfreechart-house-toolkit instead of custom StickyAxisAnnotation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2152 diff changeset	1070 }
c68f4f227c09 Somewhat unified Annotation handling, use jfreechart-house-toolkit instead of custom StickyAxisAnnotation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2152 diff changeset	1071
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	1072 public double ofRight(double percent) {
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	1073 return xRange.getUpperBound()
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	1074 - xRange.getLength() * percent;
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	1075 }
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	1076
2161 c68f4f227c09 Somewhat unified Annotation handling, use jfreechart-house-toolkit instead of custom StickyAxisAnnotation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2152 diff changeset	1077 public double ofGround(double percent) {
c68f4f227c09 Somewhat unified Annotation handling, use jfreechart-house-toolkit instead of custom StickyAxisAnnotation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2152 diff changeset	1078 return yRange.getLowerBound()
c68f4f227c09 Somewhat unified Annotation handling, use jfreechart-house-toolkit instead of custom StickyAxisAnnotation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2152 diff changeset	1079 + yRange.getLength() * percent;
c68f4f227c09 Somewhat unified Annotation handling, use jfreechart-house-toolkit instead of custom StickyAxisAnnotation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2152 diff changeset	1080 }
c68f4f227c09 Somewhat unified Annotation handling, use jfreechart-house-toolkit instead of custom StickyAxisAnnotation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2152 diff changeset	1081
c68f4f227c09 Somewhat unified Annotation handling, use jfreechart-house-toolkit instead of custom StickyAxisAnnotation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2152 diff changeset	1082 public double atTop() {
c68f4f227c09 Somewhat unified Annotation handling, use jfreechart-house-toolkit instead of custom StickyAxisAnnotation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2152 diff changeset	1083 return yRange.getUpperBound();
c68f4f227c09 Somewhat unified Annotation handling, use jfreechart-house-toolkit instead of custom StickyAxisAnnotation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2152 diff changeset	1084 }
c68f4f227c09 Somewhat unified Annotation handling, use jfreechart-house-toolkit instead of custom StickyAxisAnnotation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2152 diff changeset	1085
c68f4f227c09 Somewhat unified Annotation handling, use jfreechart-house-toolkit instead of custom StickyAxisAnnotation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2152 diff changeset	1086 public double atGround() {
c68f4f227c09 Somewhat unified Annotation handling, use jfreechart-house-toolkit instead of custom StickyAxisAnnotation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2152 diff changeset	1087 return yRange.getLowerBound();
c68f4f227c09 Somewhat unified Annotation handling, use jfreechart-house-toolkit instead of custom StickyAxisAnnotation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2152 diff changeset	1088 }
c68f4f227c09 Somewhat unified Annotation handling, use jfreechart-house-toolkit instead of custom StickyAxisAnnotation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2152 diff changeset	1089
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	1090 public double atRight() {
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	1091 return xRange.getUpperBound();
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	1092 }
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	1093
2161 c68f4f227c09 Somewhat unified Annotation handling, use jfreechart-house-toolkit instead of custom StickyAxisAnnotation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2152 diff changeset	1094 public double atLeft() {
c68f4f227c09 Somewhat unified Annotation handling, use jfreechart-house-toolkit instead of custom StickyAxisAnnotation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2152 diff changeset	1095 return xRange.getLowerBound();
c68f4f227c09 Somewhat unified Annotation handling, use jfreechart-house-toolkit instead of custom StickyAxisAnnotation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2152 diff changeset	1096 }
2193 73490b828a90 Manual Point Theming improved. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2184 diff changeset	1097
73490b828a90 Manual Point Theming improved. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2184 diff changeset	1098 public double above(double percent, double base) {
73490b828a90 Manual Point Theming improved. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2184 diff changeset	1099 return base + yRange.getLength() * percent;
73490b828a90 Manual Point Theming improved. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2184 diff changeset	1100 }
2161 c68f4f227c09 Somewhat unified Annotation handling, use jfreechart-house-toolkit instead of custom StickyAxisAnnotation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2152 diff changeset	1101 }
369 2ce7b473620e Implemented the chart creation of a longitudinal section chart - W and Q facets. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: diff changeset	1102 }
2ce7b473620e Implemented the chart creation of a longitudinal section chart - W and Q facets. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: diff changeset	1103 // 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 @ 2414:b5f5af53a526