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 @ 2395:cd4fb19ab892

Some API changes in ChartGenerator and XYChartGenerator for fetching user specified zoom values. flys-artifacts/trunk@4021 c6561f87-3c4e-4783-a992-168aeb5c3f6f

author	Ingo Weinzierl <ingo.weinzierl@intevation.de>
date	Fri, 10 Feb 2012 08:56:19 +0000
parents	1fcaeced48f2
children	5d8d24984819

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
1679 69929c471646 Improved the creation/rendering of annotations (km favorites, mainvalues). Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1645 diff changeset	42 import de.intevation.flys.jfree.FLYSAnnotation;
1738 6cdc7a77d3d4 Apply theme attributes to axis annotation. Raimund Renkert <raimund.renkert@intevation.de> parents: 1736 diff changeset	43 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	44 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	45 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	46 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	47
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	48 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	49
2138 59bb5c895be3 Improved HYK/Zones- handling. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2132 diff changeset	50 import de.intevation.flys.artifacts.model.HYKFactory;
59bb5c895be3 Improved HYK/Zones- handling. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2132 diff changeset	51
2206 e2124ca11adb Add manual point handling for many different chart types. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2193 diff changeset	52 import org.json.JSONArray;
e2124ca11adb Add manual point handling for many different chart types. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2193 diff changeset	53 import org.json.JSONException;
e2124ca11adb Add manual point handling for many different chart types. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2193 diff changeset	54
e2124ca11adb Add manual point handling for many different chart types. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2193 diff changeset	55
369 2ce7b473620e Implemented the chart creation of a longitudinal section chart - W and Q facets. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: diff changeset	56 /**
2ce7b473620e Implemented the chart creation of a longitudinal section chart - W and Q facets. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: diff changeset	57 * 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	58 *
1940 0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	59 * 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	60 * <ul>
0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	61 * <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	62 * 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	63 * <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	64 * 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	65 * 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	66 * <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	67 * </ul>
0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	68 *
369 2ce7b473620e Implemented the chart creation of a longitudinal section chart - W and Q facets. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: diff changeset	69 * @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	70 */
2ce7b473620e Implemented the chart creation of a longitudinal section chart - W and Q facets. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: diff changeset	71 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	72
2020 4f7f781e4481 Improved area rendering workflow. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2005 diff changeset	73 // 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	74 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	75 /** 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	76 protected int axisSymbol;
0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	77 /** 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	78 protected List<XYDataset> datasets;
0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	79 /** 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	80 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	81 /** 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	82 protected int plotAxisIndex;
1940 0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	83
0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	84 /** 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	85 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	86 this.axisSymbol = symb;
0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	87 datasets = new ArrayList<XYDataset>();
0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	88 }
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 /** 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	91 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	92 // 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	93 if (subRange == null \|\|
eace020067da Further flys/issue420 fix, NaN-guard X axis extent. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1958 diff changeset	94 Double.isNaN(subRange.getLowerBound()) \|\|
eace020067da Further flys/issue420 fix, NaN-guard X axis extent. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1958 diff changeset	95 Double.isNaN(subRange.getUpperBound())) {
eace020067da Further flys/issue420 fix, NaN-guard X axis extent. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1958 diff changeset	96 return;
eace020067da Further flys/issue420 fix, NaN-guard X axis extent. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1958 diff changeset	97 }
1940 0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	98 if (range == null) {
0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	99 range = subRange;
0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	100 return;
0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	101 }
0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	102 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	103 }
0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	104
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	105
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 @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	107 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	108 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	109 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	110 }
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
1940 0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	112 /** 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	113 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	114 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	115 }
0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	116
2242 7e8e1d5384c0 Further refactoring of XYChartGenerator / ChartGenerator with the result, that timerange charts are now able to display lines. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2238 diff changeset	117
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 @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	119 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	120 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	121 }
7e8e1d5384c0 Further refactoring of XYChartGenerator / ChartGenerator with the result, that timerange charts are now able to display lines. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2238 diff changeset	122
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 @Override
7e8e1d5384c0 Further refactoring of XYChartGenerator / ChartGenerator with the result, that timerange charts are now able to display lines. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2238 diff changeset	125 public Range getRange() {
7e8e1d5384c0 Further refactoring of XYChartGenerator / ChartGenerator with the result, that timerange charts are now able to display lines. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2238 diff changeset	126 return range;
7e8e1d5384c0 Further refactoring of XYChartGenerator / ChartGenerator with the result, that timerange charts are now able to display lines. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2238 diff changeset	127 }
7e8e1d5384c0 Further refactoring of XYChartGenerator / ChartGenerator with the result, that timerange charts are now able to display lines. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2238 diff changeset	128
7e8e1d5384c0 Further refactoring of XYChartGenerator / ChartGenerator with the result, that timerange charts are now able to display lines. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2238 diff changeset	129
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 @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	131 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	132 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	133 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	134 }
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
2020 4f7f781e4481 Improved area rendering workflow. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2005 diff changeset	136 public void addArea(StyledAreaSeriesCollection series) {
4f7f781e4481 Improved area rendering workflow. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2005 diff changeset	137 this.datasets.add(series);
2005 79b15491177a Added simple area registering functions. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2000 diff changeset	138 }
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 /** 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	141 @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	142 public boolean isArea(XYDataset series) {
2020 4f7f781e4481 Improved area rendering workflow. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2005 diff changeset	143 return (series instanceof StyledAreaSeriesCollection);
2005 79b15491177a Added simple area registering functions. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2000 diff changeset	144 }
79b15491177a Added simple area registering functions. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2000 diff changeset	145
1940 0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	146 /** 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	147 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	148 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	149 }
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 /** 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	152 @Override
1940 0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	153 public boolean isEmpty() {
0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	154 return this.datasets.isEmpty();
0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	155 }
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	156
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 /** 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	158 @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	159 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	160 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	161 }
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 /** 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	164 @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	165 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	166 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	167 }
2005 79b15491177a Added simple area registering functions. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2000 diff changeset	168 } // class AxisDataset
1940 0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	169
2246 99ef93ce18bd Doc added and fix getAxisWalker-issue. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2242 diff changeset	170 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	171
1048 fd5c70973e0b Picky white-space cosmetics. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 924 diff changeset	172 /** 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	173 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	174
1679 69929c471646 Improved the creation/rendering of annotations (km favorites, mainvalues). Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1645 diff changeset	175 /** 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	176 protected List<FLYSAnnotation> annotations;
69929c471646 Improved the creation/rendering of annotations (km favorites, mainvalues). Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1645 diff changeset	177
1685 022f62c75878 Cosmetics. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1684 diff changeset	178 /** 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	179 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	180
1685 022f62c75878 Cosmetics. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1684 diff changeset	181 /** 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	182 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	183
419 4de7d9eac10f Display gridlines in charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 414 diff changeset	184
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	185 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	186 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	187
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	188 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	189 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	190 }
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
369 2ce7b473620e Implemented the chart creation of a longitudinal section chart - W and Q facets. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: diff changeset	193 /**
1930 de0c2bbb27f9 Cosmetics, docs. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1861 diff changeset	194 * Generate the chart anew (including localized axis and all).
de0c2bbb27f9 Cosmetics, docs. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1861 diff changeset	195 */
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	196 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	197 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	198
369 2ce7b473620e Implemented the chart creation of a longitudinal section chart - W and Q facets. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: diff changeset	199 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	200 getChartTitle(),
2ce7b473620e Implemented the chart creation of a longitudinal section chart - W and Q facets. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: diff changeset	201 getXAxisLabel(),
2051 4ba5036109d2 Make use of user defined axes labels during chart creation. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2050 diff changeset	202 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	203 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	204 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	205 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	206 false,
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
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	209 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	210 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	211 plot.setBackgroundPaint(Color.WHITE);
414 0385bcc4229a Added subtitles to the available charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 375 diff changeset	212 addSubtitles(chart);
419 4de7d9eac10f Display gridlines in charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 414 diff changeset	213 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	214
1940 0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	215 //debugAxis(plot);
0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	216
0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	217 addDatasets(plot);
0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	218
0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	219 //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	220
1935 5b51f5232661 Added handling of empty plots. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1934 diff changeset	221 recoverEmptyPlot(plot);
1940 0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	222 preparePointRanges(plot);
1935 5b51f5232661 Added handling of empty plots. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1934 diff changeset	223
1940 0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	224 //debugAxis(plot);
0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	225
0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	226 localizeAxes(plot);
0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	227 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	228 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	229
2138 59bb5c895be3 Improved HYK/Zones- handling. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2132 diff changeset	230 // 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	231 addAnnotationsToRenderer(plot);
2138 59bb5c895be3 Improved HYK/Zones- handling. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2132 diff changeset	232
1940 0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	233 return chart;
0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	234 }
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	235
1940 0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	236
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	237 @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	238 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	239 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	240 }
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 @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	244 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	245 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	246 }
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 @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	250 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	251 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	252 }
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 @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	256 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	257 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	258 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	259 }
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
1940 0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	262 /**
0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	263 * 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	264 */
0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	265 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	266 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	267 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	268 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	269 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	270 continue;
0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	271 }
0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	272 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	273 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	274 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	275 + " " + 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	276 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	277 + " " + 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	278 }
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 * 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	284 */
0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	285 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	286 logger.debug("...............");
0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	287 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	288 if (plot.getRangeAxis(i) == null)
2005 79b15491177a Added simple area registering functions. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2000 diff changeset	289 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	290 else {
2005 79b15491177a Added simple area registering functions. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2000 diff changeset	291 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	292 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	293 " " + 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	294 "]");
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 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	299 }
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
1685 022f62c75878 Cosmetics. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1684 diff changeset	302 /**
2005 79b15491177a Added simple area registering functions. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2000 diff changeset	303 * 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	304 * @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	305 * @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	306 * @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	307 */
2020 4f7f781e4481 Improved area rendering workflow. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2005 diff changeset	308 public void addAreaSeries(StyledAreaSeriesCollection area, int index, boolean visible) {
4f7f781e4481 Improved area rendering workflow. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2005 diff changeset	309 if (area == null) {
2005 79b15491177a Added simple area registering functions. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2000 diff changeset	310 logger.warn("Cannot yet render above/under curve.");
79b15491177a Added simple area registering functions. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2000 diff changeset	311 return;
79b15491177a Added simple area registering functions. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2000 diff changeset	312 }
79b15491177a Added simple area registering functions. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2000 diff changeset	313
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	314 XYAxisDataset axisDataset = (XYAxisDataset) getAxisDataset(index);
2005 79b15491177a Added simple area registering functions. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2000 diff changeset	315
2020 4f7f781e4481 Improved area rendering workflow. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2005 diff changeset	316 if (visible) {
4f7f781e4481 Improved area rendering workflow. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2005 diff changeset	317 axisDataset.addArea(area);
4f7f781e4481 Improved area rendering workflow. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2005 diff changeset	318 }
2005 79b15491177a Added simple area registering functions. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2000 diff changeset	319 else {
79b15491177a Added simple area registering functions. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2000 diff changeset	320 // TODO only range merging.
79b15491177a Added simple area registering functions. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2000 diff changeset	321 }
79b15491177a Added simple area registering functions. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2000 diff changeset	322 //TODO range merging.
79b15491177a Added simple area registering functions. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2000 diff changeset	323 }
79b15491177a Added simple area registering functions. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2000 diff changeset	324
2020 4f7f781e4481 Improved area rendering workflow. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2005 diff changeset	325
2005 79b15491177a Added simple area registering functions. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2000 diff changeset	326 /**
1935 5b51f5232661 Added handling of empty plots. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1934 diff changeset	327 * 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	328 * 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	329 * @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	330 * @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	331 * @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	332 */
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 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	334 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	335 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	336 }
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
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	338 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	339 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	340
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 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	342
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	343 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	344
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	345 if (!visible) {
1940 0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	346 // 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	347 // 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	348 axisDataset.includeYRange(series);
1940 0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	349 }
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	350 }
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
1940 0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	352
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	353 /**
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 * 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	355 * @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	356 * @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	357 */
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	358 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	359
1959 eace020067da Further flys/issue420 fix, NaN-guard X axis extent. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1958 diff changeset	360 if (range == null
eace020067da Further flys/issue420 fix, NaN-guard X axis extent. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1958 diff changeset	361 \|\| Double.isNaN(range.getLowerBound())
eace020067da Further flys/issue420 fix, NaN-guard X axis extent. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1958 diff changeset	362 \|\| Double.isNaN(range.getUpperBound())) {
eace020067da Further flys/issue420 fix, NaN-guard X axis extent. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1958 diff changeset	363 return;
eace020067da Further flys/issue420 fix, NaN-guard X axis extent. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1958 diff changeset	364 }
eace020067da Further flys/issue420 fix, NaN-guard X axis extent. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1958 diff changeset	365
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	366 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	367
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 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	369 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	370 }
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 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	373 }
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
1930 de0c2bbb27f9 Cosmetics, docs. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1861 diff changeset	376 /**
1711 f708120cb7bc Fix flys/issue363 (W-INFO/ Abflusskurve, Extremwert-Rendering). Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1699 diff changeset	377 * 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	378 */
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	379 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	380 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	381 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	382 }
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
1679 69929c471646 Improved the creation/rendering of annotations (km favorites, mainvalues). Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1645 diff changeset	384 if (annotations == null) {
69929c471646 Improved the creation/rendering of annotations (km favorites, mainvalues). Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1645 diff changeset	385 annotations = new ArrayList<FLYSAnnotation>();
69929c471646 Improved the creation/rendering of annotations (km favorites, mainvalues). Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1645 diff changeset	386 }
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 annotations.add(annotation);
69929c471646 Improved the creation/rendering of annotations (km favorites, mainvalues). Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1645 diff changeset	389 }
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
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	392 /**
1935 5b51f5232661 Added handling of empty plots. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1934 diff changeset	393 * 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	394 */
5b51f5232661 Added handling of empty plots. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1934 diff changeset	395 private void recoverEmptyPlot(XYPlot plot) {
5b51f5232661 Added handling of empty plots. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1934 diff changeset	396 if (plot.getRangeAxis() == null) {
5b51f5232661 Added handling of empty plots. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1934 diff changeset	397 logger.debug("debug: No range axis");
5b51f5232661 Added handling of empty plots. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1934 diff changeset	398 plot.setRangeAxis(createYAxis(0));
5b51f5232661 Added handling of empty plots. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1934 diff changeset	399 }
923 7ca4a287cd0e #135 Modified the way to store datasets for different chart axes. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 718 diff changeset	400 }
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
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	403 /**
1940 0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	404 * 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	405 */
1686 e8d1e531687a Bugfix: #114 Enabled rendering charts with a single data point. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1685 diff changeset	406 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	407 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	408 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	409 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	410
e8d1e531687a Bugfix: #114 Enabled rendering charts with a single data point. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1685 diff changeset	411 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	412 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	413 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	414 }
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
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	419 /**
654 bbc966c81809 #90 Removed margins between data area border and curves. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 653 diff changeset	420 * 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	421 * 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	422 * 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	423 * 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	424 * 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	425 *
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 * @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	427 */
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	428 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	429 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	430
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	431 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	432 Range yrange = getValueAxisRange();
654 bbc966c81809 #90 Removed margins between data area border and curves. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 653 diff changeset	433
2050 c4e0e433f825 Use axes ranges specified in ChartSettings for zooming in charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2049 diff changeset	434 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	435
c4e0e433f825 Use axes ranges specified in ChartSettings for zooming in charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2049 diff changeset	436 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	437 if (fixedXRange != null) {
c4e0e433f825 Use axes ranges specified in ChartSettings for zooming in charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2049 diff changeset	438 xAxis.setRange(fixedXRange);
c4e0e433f825 Use axes ranges specified in ChartSettings for zooming in charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2049 diff changeset	439 }
c4e0e433f825 Use axes ranges specified in ChartSettings for zooming in charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2049 diff changeset	440 else {
c4e0e433f825 Use axes ranges specified in ChartSettings for zooming in charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2049 diff changeset	441 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	442 }
923 7ca4a287cd0e #135 Modified the way to store datasets for different chart axes. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 718 diff changeset	443
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	444 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	445 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	446
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	447 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	448 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	449
c4e0e433f825 Use axes ranges specified in ChartSettings for zooming in charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2049 diff changeset	450 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	451 if (fixedRange != null) {
c4e0e433f825 Use axes ranges specified in ChartSettings for zooming in charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2049 diff changeset	452 yaxis.setRange(fixedRange);
c4e0e433f825 Use axes ranges specified in ChartSettings for zooming in charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2049 diff changeset	453 continue;
c4e0e433f825 Use axes ranges specified in ChartSettings for zooming in charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2049 diff changeset	454 }
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	455 }
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
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	457 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	458 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	459 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	460 }
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
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	462 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	463 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	464 }
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	465 }
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	466
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	467
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	468 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	469 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	470
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 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	472 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	473 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	474 }
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 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	477 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	478 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	479 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	480
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 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	482 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	483 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	484 }
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 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	487 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	488 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	489 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	490 }
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 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	493 }
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 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	495 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	496 }
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 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	500 }
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
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	503 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	504 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	505 }
f3fd8c9b7f51 #157 Computed discharge curve charts always have a lower bound set to 0. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 717 diff changeset	506
f3fd8c9b7f51 #157 Computed discharge curve charts always have a lower bound set to 0. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 717 diff changeset	507
f3fd8c9b7f51 #157 Computed discharge curve charts always have a lower bound set to 0. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 717 diff changeset	508 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	509 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	510 }
f3fd8c9b7f51 #157 Computed discharge curve charts always have a lower bound set to 0. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 717 diff changeset	511
f3fd8c9b7f51 #157 Computed discharge curve charts always have a lower bound set to 0. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 717 diff changeset	512
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	513 /**
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	514 * 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	515 *
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	516 * @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	517 * @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	518 * @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	519 * @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	520 *
bbc966c81809 #90 Removed margins between data area border and curves. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 653 diff changeset	521 * @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	522 */
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	523 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	524
0155cbaba182 XYChartGenerator: Do not crash if no zoom axis given Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1735 diff changeset	525 if (range == null) {
0155cbaba182 XYChartGenerator: Do not crash if no zoom axis given Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1735 diff changeset	526 return false;
0155cbaba182 XYChartGenerator: Do not crash if no zoom axis given Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1735 diff changeset	527 }
0155cbaba182 XYChartGenerator: Do not crash if no zoom axis given Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1735 diff changeset	528
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	529 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	530 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	531 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	532 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	533
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	534 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	535 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	536 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	537
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	538 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	539
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	540 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	541
bbc966c81809 #90 Removed margins between data area border and curves. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 653 diff changeset	542 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	543 }
654 bbc966c81809 #90 Removed margins between data area border and curves. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 653 diff changeset	544
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	545 axis.setRangeWithMargins(range);
654 bbc966c81809 #90 Removed margins between data area border and curves. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 653 diff changeset	546 return false;
bbc966c81809 #90 Removed margins between data area border and curves. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 653 diff changeset	547 }
bbc966c81809 #90 Removed margins between data area border and curves. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 653 diff changeset	548
bbc966c81809 #90 Removed margins between data area border and curves. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 653 diff changeset	549
bbc966c81809 #90 Removed margins between data area border and curves. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 653 diff changeset	550 /**
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	551 * 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	552 * 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	553 *
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	554 * @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	555 *
bbc966c81809 #90 Removed margins between data area border and curves. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 653 diff changeset	556 * @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	557 */
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	558 @Override
1944 21a4d2c677a1 Changed doOut signature, side effect from blackboard feature (to come). Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1943 diff changeset	559 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	560 logger.debug("getRangesForAxis " + index);
2132 e8fc770d2f8c 'New Chart' for computed discharge curve. Raimund Renkert <raimund.renkert@intevation.de> parents: 2110 diff changeset	561
e8fc770d2f8c 'New Chart' for computed discharge curve. Raimund Renkert <raimund.renkert@intevation.de> parents: 2110 diff changeset	562 Range rx = xRanges.get(Integer.valueOf(0));
e8fc770d2f8c 'New Chart' for computed discharge curve. Raimund Renkert <raimund.renkert@intevation.de> parents: 2110 diff changeset	563 Range ry = yRanges.get(Integer.valueOf(index));
e8fc770d2f8c 'New Chart' for computed discharge curve. Raimund Renkert <raimund.renkert@intevation.de> parents: 2110 diff changeset	564
e8fc770d2f8c 'New Chart' for computed discharge curve. Raimund Renkert <raimund.renkert@intevation.de> parents: 2110 diff changeset	565 if (rx == null) {
e8fc770d2f8c 'New Chart' for computed discharge curve. Raimund Renkert <raimund.renkert@intevation.de> parents: 2110 diff changeset	566 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	567 " Using default values: 0 - 1.");
e8fc770d2f8c 'New Chart' for computed discharge curve. Raimund Renkert <raimund.renkert@intevation.de> parents: 2110 diff changeset	568 rx = new Range(0, 1);
e8fc770d2f8c 'New Chart' for computed discharge curve. Raimund Renkert <raimund.renkert@intevation.de> parents: 2110 diff changeset	569 }
e8fc770d2f8c 'New Chart' for computed discharge curve. Raimund Renkert <raimund.renkert@intevation.de> parents: 2110 diff changeset	570 if (ry == null) {
e8fc770d2f8c 'New Chart' for computed discharge curve. Raimund Renkert <raimund.renkert@intevation.de> parents: 2110 diff changeset	571 logger.warn("Range for y" + index +
e8fc770d2f8c 'New Chart' for computed discharge curve. Raimund Renkert <raimund.renkert@intevation.de> parents: 2110 diff changeset	572 " 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	573 ry = new Range(0, 1);
e8fc770d2f8c 'New Chart' for computed discharge curve. Raimund Renkert <raimund.renkert@intevation.de> parents: 2110 diff changeset	574 }
e8fc770d2f8c 'New Chart' for computed discharge curve. Raimund Renkert <raimund.renkert@intevation.de> parents: 2110 diff changeset	575 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	576 }
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	577
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	578
2138 59bb5c895be3 Improved HYK/Zones- handling. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2132 diff changeset	579 /** 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	580 public Paint colorForHYKZone(String zoneName) {
59bb5c895be3 Improved HYK/Zones- handling. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2132 diff changeset	581 if (zoneName.startsWith("R")) {
59bb5c895be3 Improved HYK/Zones- handling. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2132 diff changeset	582 // Brownish.
59bb5c895be3 Improved HYK/Zones- handling. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2132 diff changeset	583 return new Color(153, 60, 0);
59bb5c895be3 Improved HYK/Zones- handling. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2132 diff changeset	584 }
59bb5c895be3 Improved HYK/Zones- handling. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2132 diff changeset	585 else if (zoneName.startsWith("V")) {
59bb5c895be3 Improved HYK/Zones- handling. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2132 diff changeset	586 // Greenish.
59bb5c895be3 Improved HYK/Zones- handling. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2132 diff changeset	587 return new Color(0, 255, 0);
59bb5c895be3 Improved HYK/Zones- handling. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2132 diff changeset	588 }
59bb5c895be3 Improved HYK/Zones- handling. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2132 diff changeset	589 else if (zoneName.startsWith("B")) {
59bb5c895be3 Improved HYK/Zones- handling. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2132 diff changeset	590 // Grayish.
59bb5c895be3 Improved HYK/Zones- handling. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2132 diff changeset	591 return new Color(128, 128, 128);
59bb5c895be3 Improved HYK/Zones- handling. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2132 diff changeset	592 }
59bb5c895be3 Improved HYK/Zones- handling. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2132 diff changeset	593 else if (zoneName.startsWith("H")) {
59bb5c895be3 Improved HYK/Zones- handling. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2132 diff changeset	594 // Blueish.
59bb5c895be3 Improved HYK/Zones- handling. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2132 diff changeset	595 return new Color(0, 0, 255);
59bb5c895be3 Improved HYK/Zones- handling. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2132 diff changeset	596 }
59bb5c895be3 Improved HYK/Zones- handling. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2132 diff changeset	597 else {
59bb5c895be3 Improved HYK/Zones- handling. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2132 diff changeset	598 // Default.
59bb5c895be3 Improved HYK/Zones- handling. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2132 diff changeset	599 logger.debug("Unknown zone type found.");
59bb5c895be3 Improved HYK/Zones- handling. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2132 diff changeset	600 return new Color(255, 0, 0);
59bb5c895be3 Improved HYK/Zones- handling. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2132 diff changeset	601 }
59bb5c895be3 Improved HYK/Zones- handling. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2132 diff changeset	602 }
59bb5c895be3 Improved HYK/Zones- handling. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2132 diff changeset	603
59bb5c895be3 Improved HYK/Zones- handling. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2132 diff changeset	604
2161 c68f4f227c09 Somewhat unified Annotation handling, use jfreechart-house-toolkit instead of custom StickyAxisAnnotation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2152 diff changeset	605 /**
c68f4f227c09 Somewhat unified Annotation handling, use jfreechart-house-toolkit instead of custom StickyAxisAnnotation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2152 diff changeset	606 * 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	607 */
c68f4f227c09 Somewhat unified Annotation handling, use jfreechart-house-toolkit instead of custom StickyAxisAnnotation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2152 diff changeset	608 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	609 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	610 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	611 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	612 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	613 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	614 ) {
c68f4f227c09 Somewhat unified Annotation handling, use jfreechart-house-toolkit instead of custom StickyAxisAnnotation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2152 diff changeset	615 // 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	616 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	617 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	618
c68f4f227c09 Somewhat unified Annotation handling, use jfreechart-house-toolkit instead of custom StickyAxisAnnotation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2152 diff changeset	619 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	620 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	621
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	622 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	623
2161 c68f4f227c09 Somewhat unified Annotation handling, use jfreechart-house-toolkit instead of custom StickyAxisAnnotation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2152 diff changeset	624 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	625 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	626 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	627 // 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	628 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	629 // 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	630 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	631 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	632 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	633 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	634 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	635 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	636 }
c68f4f227c09 Somewhat unified Annotation handling, use jfreechart-house-toolkit instead of custom StickyAxisAnnotation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2152 diff changeset	637 else {
c68f4f227c09 Somewhat unified Annotation handling, use jfreechart-house-toolkit instead of custom StickyAxisAnnotation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2152 diff changeset	638 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	639 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	640 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	641 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	642 }
c68f4f227c09 Somewhat unified Annotation handling, use jfreechart-house-toolkit instead of custom StickyAxisAnnotation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2152 diff changeset	643 }
c68f4f227c09 Somewhat unified Annotation handling, use jfreechart-house-toolkit instead of custom StickyAxisAnnotation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2152 diff changeset	644 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	645 // 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	646 // 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	647 // 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	648 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	649 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	650 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	651 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	652 + 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	653 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	654 }
c68f4f227c09 Somewhat unified Annotation handling, use jfreechart-house-toolkit instead of custom StickyAxisAnnotation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2152 diff changeset	655 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	656 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	657 }
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	658
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	659 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	660 // 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	661 // 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	662 // 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	663 // 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	664 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	665 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	666 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	667 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	668 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	669 // 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	670 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	671 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	672 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	673 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	674 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	675 }
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	676 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	677 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	678 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	679 }
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	680 }
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	681 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	682 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	683 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	684 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	685 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	686 // 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	687 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	688 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	689 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	690 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	691 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	692 }
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	693 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	694 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	695 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	696 }
2161 c68f4f227c09 Somewhat unified Annotation handling, use jfreechart-house-toolkit instead of custom StickyAxisAnnotation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2152 diff changeset	697 }
c68f4f227c09 Somewhat unified Annotation handling, use jfreechart-house-toolkit instead of custom StickyAxisAnnotation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2152 diff changeset	698 }
c68f4f227c09 Somewhat unified Annotation handling, use jfreechart-house-toolkit instead of custom StickyAxisAnnotation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2152 diff changeset	699
c68f4f227c09 Somewhat unified Annotation handling, use jfreechart-house-toolkit instead of custom StickyAxisAnnotation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2152 diff changeset	700 // 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	701 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	702 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	703 }
c68f4f227c09 Somewhat unified Annotation handling, use jfreechart-house-toolkit instead of custom StickyAxisAnnotation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2152 diff changeset	704
c68f4f227c09 Somewhat unified Annotation handling, use jfreechart-house-toolkit instead of custom StickyAxisAnnotation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2152 diff changeset	705 // 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	706 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	707 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	708 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	709 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	710 }
c68f4f227c09 Somewhat unified Annotation handling, use jfreechart-house-toolkit instead of custom StickyAxisAnnotation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2152 diff changeset	711
c68f4f227c09 Somewhat unified Annotation handling, use jfreechart-house-toolkit instead of custom StickyAxisAnnotation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2152 diff changeset	712
c68f4f227c09 Somewhat unified Annotation handling, use jfreechart-house-toolkit instead of custom StickyAxisAnnotation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2152 diff changeset	713 /** 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	714 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	715 logger.debug("XYChartGenerator.addAnnotationsToRenderer");
2138 59bb5c895be3 Improved HYK/Zones- handling. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2132 diff changeset	716
2143 c5d24e0587ce Minor hyk-handling improvements. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2138 diff changeset	717 if (annotations == null) {
c5d24e0587ce Minor hyk-handling improvements. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2138 diff changeset	718 logger.debug("XYChartGenerator.addBoxAnnotations: no annotations.");
c5d24e0587ce Minor hyk-handling improvements. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2138 diff changeset	719 return;
c5d24e0587ce Minor hyk-handling improvements. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2138 diff changeset	720 }
c5d24e0587ce Minor hyk-handling improvements. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2138 diff changeset	721
2152 2336927cb096 Add basic (text) styling for HYKS. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2143 diff changeset	722 // Paints for the boxes/lines.
2138 59bb5c895be3 Improved HYK/Zones- handling. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2132 diff changeset	723 Stroke basicStroke = new BasicStroke(1.0f);
59bb5c895be3 Improved HYK/Zones- handling. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2132 diff changeset	724
2161 c68f4f227c09 Somewhat unified Annotation handling, use jfreechart-house-toolkit instead of custom StickyAxisAnnotation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2152 diff changeset	725 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	726 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	727 Paint tranPaint = new Color(0, 0,0, 0);
2138 59bb5c895be3 Improved HYK/Zones- handling. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2132 diff changeset	728
2161 c68f4f227c09 Somewhat unified Annotation handling, use jfreechart-house-toolkit instead of custom StickyAxisAnnotation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2152 diff changeset	729 // 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	730 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	731 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	732 plot.getRangeAxis().getRange());
2138 59bb5c895be3 Improved HYK/Zones- handling. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2132 diff changeset	733
2161 c68f4f227c09 Somewhat unified Annotation handling, use jfreechart-house-toolkit instead of custom StickyAxisAnnotation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2152 diff changeset	734 // 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	735 for (FLYSAnnotation fa: annotations) {
2152 2336927cb096 Add basic (text) styling for HYKS. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2143 diff changeset	736
2336927cb096 Add basic (text) styling for HYKS. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2143 diff changeset	737 // Access text styling, if any.
2336927cb096 Add basic (text) styling for HYKS. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2143 diff changeset	738 Document theme = fa.getTheme();
2336927cb096 Add basic (text) styling for HYKS. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2143 diff changeset	739 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	740 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	741
c68f4f227c09 Somewhat unified Annotation handling, use jfreechart-house-toolkit instead of custom StickyAxisAnnotation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2152 diff changeset	742 // 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	743 if (theme != null) {
2336927cb096 Add basic (text) styling for HYKS. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2143 diff changeset	744 ThemeAccess themeAccess = new ThemeAccess(theme);
2336927cb096 Add basic (text) styling for HYKS. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2143 diff changeset	745 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	746 lineStyle = themeAccess.parseLineStyle();
2184 fc86fcfe503e Only add one legend item for manual point themes. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2183 diff changeset	747 if (fa.getLabel() != null) {
fc86fcfe503e Only add one legend item for manual point themes. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2183 diff changeset	748 LegendItemCollection lic = new LegendItemCollection();
fc86fcfe503e Only add one legend item for manual point themes. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2183 diff changeset	749 LegendItemCollection old = plot.getFixedLegendItems();
fc86fcfe503e Only add one legend item for manual point themes. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2183 diff changeset	750 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	751 // (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	752 if (old != null) {
fc86fcfe503e Only add one legend item for manual point themes. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2183 diff changeset	753 old.addAll(lic);
fc86fcfe503e Only add one legend item for manual point themes. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2183 diff changeset	754 }
fc86fcfe503e Only add one legend item for manual point themes. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2183 diff changeset	755 else {
fc86fcfe503e Only add one legend item for manual point themes. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2183 diff changeset	756 old = lic;
fc86fcfe503e Only add one legend item for manual point themes. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2183 diff changeset	757 }
fc86fcfe503e Only add one legend item for manual point themes. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2183 diff changeset	758 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	759 }
2152 2336927cb096 Add basic (text) styling for HYKS. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2143 diff changeset	760 }
2336927cb096 Add basic (text) styling for HYKS. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2143 diff changeset	761
2161 c68f4f227c09 Somewhat unified Annotation handling, use jfreechart-house-toolkit instead of custom StickyAxisAnnotation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2152 diff changeset	762 // 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	763 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	764 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	765 }
c68f4f227c09 Somewhat unified Annotation handling, use jfreechart-house-toolkit instead of custom StickyAxisAnnotation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2152 diff changeset	766
2183 a79d5cd26083 Render labels of manual points in a very primitive manner. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2163 diff changeset	767 // Other Text Annotations.
2161 c68f4f227c09 Somewhat unified Annotation handling, use jfreechart-house-toolkit instead of custom StickyAxisAnnotation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2152 diff changeset	768 for (XYTextAnnotation ta: fa.getTextAnnotations()) {
2193 73490b828a90 Manual Point Theming improved. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2184 diff changeset	769 // Style the text.
73490b828a90 Manual Point Theming improved. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2184 diff changeset	770 if (textStyle != null) {
73490b828a90 Manual Point Theming improved. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2184 diff changeset	771 textStyle.apply(ta);
73490b828a90 Manual Point Theming improved. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2184 diff changeset	772 }
73490b828a90 Manual Point Theming improved. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2184 diff changeset	773 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	774 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	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 // Hyks.
2138 59bb5c895be3 Improved HYK/Zones- handling. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2132 diff changeset	778 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	779 // 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	780 // 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	781 fillPaint = colorForHYKZone(zone.getName());
59bb5c895be3 Improved HYK/Zones- handling. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2132 diff changeset	782
2161 c68f4f227c09 Somewhat unified Annotation handling, use jfreechart-house-toolkit instead of custom StickyAxisAnnotation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2152 diff changeset	783 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	784 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	785 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	786 zone.getTo(), area.atTop(), basicStroke, fillPaint, tranPaint);
2138 59bb5c895be3 Improved HYK/Zones- handling. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2132 diff changeset	787
59bb5c895be3 Improved HYK/Zones- handling. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2132 diff changeset	788 XYTextAnnotation tex = new XYTextAnnotation(zone.getName(),
59bb5c895be3 Improved HYK/Zones- handling. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2132 diff changeset	789 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	790 area.ofGround(0.015f));
2152 2336927cb096 Add basic (text) styling for HYKS. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2143 diff changeset	791 if (textStyle != null) {
2336927cb096 Add basic (text) styling for HYKS. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2143 diff changeset	792 textStyle.apply(tex);
2336927cb096 Add basic (text) styling for HYKS. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2143 diff changeset	793 }
2138 59bb5c895be3 Improved HYK/Zones- handling. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2132 diff changeset	794
2161 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.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	796 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	797 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	798 }
59bb5c895be3 Improved HYK/Zones- handling. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2132 diff changeset	799 }
59bb5c895be3 Improved HYK/Zones- handling. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2132 diff changeset	800 }
1679 69929c471646 Improved the creation/rendering of annotations (km favorites, mainvalues). Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1645 diff changeset	801
2152 2336927cb096 Add basic (text) styling for HYKS. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2143 diff changeset	802
369 2ce7b473620e Implemented the chart creation of a longitudinal section chart - W and Q facets. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: diff changeset	803 /**
2054 a653295c9ac0 Make use of user defined axes font sizes. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2053 diff changeset	804 * 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	805 * X axis.
a653295c9ac0 Make use of user defined axes font sizes. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2053 diff changeset	806 *
369 2ce7b473620e Implemented the chart creation of a longitudinal section chart - W and Q facets. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: diff changeset	807 * @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	808 */
2ce7b473620e Implemented the chart creation of a longitudinal section chart - W and Q facets. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: diff changeset	809 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	810 ValueAxis xaxis = plot.getDomainAxis();
a653295c9ac0 Make use of user defined axes font sizes. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2053 diff changeset	811
a653295c9ac0 Make use of user defined axes font sizes. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2053 diff changeset	812 ChartSettings chartSettings = getChartSettings();
a653295c9ac0 Make use of user defined axes font sizes. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2053 diff changeset	813 if (chartSettings == null) {
a653295c9ac0 Make use of user defined axes font sizes. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2053 diff changeset	814 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	815 }
2054 a653295c9ac0 Make use of user defined axes font sizes. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2053 diff changeset	816
a653295c9ac0 Make use of user defined axes font sizes. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2053 diff changeset	817 Font labelFont = new Font(
a653295c9ac0 Make use of user defined axes font sizes. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2053 diff changeset	818 DEFAULT_FONT_NAME,
a653295c9ac0 Make use of user defined axes font sizes. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2053 diff changeset	819 Font.BOLD,
a653295c9ac0 Make use of user defined axes font sizes. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2053 diff changeset	820 getXAxisLabelFontSize());
a653295c9ac0 Make use of user defined axes font sizes. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2053 diff changeset	821
a653295c9ac0 Make use of user defined axes font sizes. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2053 diff changeset	822 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	823 }
414 0385bcc4229a Added subtitles to the available charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 375 diff changeset	824
0385bcc4229a Added subtitles to the available charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 375 diff changeset	825
1940 0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	826 /**
0d12e70766c8 Refactored XYChartGenerator to have better working multi-axes features. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1935 diff changeset	827 * 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	828 */
419 4de7d9eac10f Display gridlines in charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 414 diff changeset	829 protected void adjustPlot(XYPlot plot) {
4de7d9eac10f Display gridlines in charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 414 diff changeset	830 Stroke gridStroke = new BasicStroke(
4de7d9eac10f Display gridlines in charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 414 diff changeset	831 DEFAULT_GRID_LINE_WIDTH,
4de7d9eac10f Display gridlines in charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 414 diff changeset	832 BasicStroke.CAP_BUTT,
4de7d9eac10f Display gridlines in charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 414 diff changeset	833 BasicStroke.JOIN_MITER,
4de7d9eac10f Display gridlines in charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 414 diff changeset	834 3.0f,
4de7d9eac10f Display gridlines in charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 414 diff changeset	835 new float[] { 3.0f },
4de7d9eac10f Display gridlines in charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 414 diff changeset	836 0.0f);
4de7d9eac10f Display gridlines in charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 414 diff changeset	837
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	838 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	839 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	840
419 4de7d9eac10f Display gridlines in charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 414 diff changeset	841 plot.setDomainGridlineStroke(gridStroke);
4de7d9eac10f Display gridlines in charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 414 diff changeset	842 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	843 plot.setDomainGridlinesVisible(isGridVisible);
419 4de7d9eac10f Display gridlines in charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 414 diff changeset	844
4de7d9eac10f Display gridlines in charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 414 diff changeset	845 plot.setRangeGridlineStroke(gridStroke);
4de7d9eac10f Display gridlines in charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 414 diff changeset	846 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	847 plot.setRangeGridlinesVisible(isGridVisible);
654 bbc966c81809 #90 Removed margins between data area border and curves. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 653 diff changeset	848
bbc966c81809 #90 Removed margins between data area border and curves. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 653 diff changeset	849 plot.setAxisOffset(new RectangleInsets(0d, 0d, 0d, 0d));
419 4de7d9eac10f Display gridlines in charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 414 diff changeset	850 }
4de7d9eac10f Display gridlines in charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 414 diff changeset	851
4de7d9eac10f Display gridlines in charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 414 diff changeset	852
1645 4a8251eae217 Bugfix: #68 Set number format of chart plot axes based on the CallMeta instance for each request. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1623 diff changeset	853 /**
4a8251eae217 Bugfix: #68 Set number format of chart plot axes based on the CallMeta instance for each request. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1623 diff changeset	854 * 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	855 * 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	856 * 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	857 *
4a8251eae217 Bugfix: #68 Set number format of chart plot axes based on the CallMeta instance for each request. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1623 diff changeset	858 * @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	859 */
4a8251eae217 Bugfix: #68 Set number format of chart plot axes based on the CallMeta instance for each request. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1623 diff changeset	860 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	861 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	862 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	863
4a8251eae217 Bugfix: #68 Set number format of chart plot axes based on the CallMeta instance for each request. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1623 diff changeset	864 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	865 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	866 }
4a8251eae217 Bugfix: #68 Set number format of chart plot axes based on the CallMeta instance for each request. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1623 diff changeset	867 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	868 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	869 }
4a8251eae217 Bugfix: #68 Set number format of chart plot axes based on the CallMeta instance for each request. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1623 diff changeset	870 }
4a8251eae217 Bugfix: #68 Set number format of chart plot axes based on the CallMeta instance for each request. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1623 diff changeset	871
4a8251eae217 Bugfix: #68 Set number format of chart plot axes based on the CallMeta instance for each request. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1623 diff changeset	872 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	873 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	874
4a8251eae217 Bugfix: #68 Set number format of chart plot axes based on the CallMeta instance for each request. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1623 diff changeset	875 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	876 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	877 }
4a8251eae217 Bugfix: #68 Set number format of chart plot axes based on the CallMeta instance for each request. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1623 diff changeset	878 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	879 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	880 }
4a8251eae217 Bugfix: #68 Set number format of chart plot axes based on the CallMeta instance for each request. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1623 diff changeset	881 }
4a8251eae217 Bugfix: #68 Set number format of chart plot axes based on the CallMeta instance for each request. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1623 diff changeset	882 }
4a8251eae217 Bugfix: #68 Set number format of chart plot axes based on the CallMeta instance for each request. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1623 diff changeset	883
4a8251eae217 Bugfix: #68 Set number format of chart plot axes based on the CallMeta instance for each request. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1623 diff changeset	884
4a8251eae217 Bugfix: #68 Set number format of chart plot axes based on the CallMeta instance for each request. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1623 diff changeset	885 /**
4a8251eae217 Bugfix: #68 Set number format of chart plot axes based on the CallMeta instance for each request. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1623 diff changeset	886 * 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	887 * 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	888 *
4a8251eae217 Bugfix: #68 Set number format of chart plot axes based on the CallMeta instance for each request. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1623 diff changeset	889 * @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	890 */
4a8251eae217 Bugfix: #68 Set number format of chart plot axes based on the CallMeta instance for each request. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1623 diff changeset	891 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	892 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	893 ((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	894 }
4a8251eae217 Bugfix: #68 Set number format of chart plot axes based on the CallMeta instance for each request. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1623 diff changeset	895
4a8251eae217 Bugfix: #68 Set number format of chart plot axes based on the CallMeta instance for each request. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1623 diff changeset	896
4a8251eae217 Bugfix: #68 Set number format of chart plot axes based on the CallMeta instance for each request. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1623 diff changeset	897 /**
4a8251eae217 Bugfix: #68 Set number format of chart plot axes based on the CallMeta instance for each request. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1623 diff changeset	898 * 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	899 * 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	900 *
4a8251eae217 Bugfix: #68 Set number format of chart plot axes based on the CallMeta instance for each request. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1623 diff changeset	901 * @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	902 */
4a8251eae217 Bugfix: #68 Set number format of chart plot axes based on the CallMeta instance for each request. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1623 diff changeset	903 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	904 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	905 ((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	906 }
4a8251eae217 Bugfix: #68 Set number format of chart plot axes based on the CallMeta instance for each request. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1623 diff changeset	907
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	908
1932 17e18948fe5e Fix legend and themeing with new multiaxis feature. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1931 diff changeset	909 /**
1861 11c4b1429117 Cosmetics, resolve code duplicate. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1849 diff changeset	910 * Register annotations like MainValues for later plotting
11c4b1429117 Cosmetics, resolve code duplicate. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1849 diff changeset	911 *
11c4b1429117 Cosmetics, resolve code duplicate. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1849 diff changeset	912 * @param o list of annotations (data of facet).
11c4b1429117 Cosmetics, resolve code duplicate. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1849 diff changeset	913 * @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	914 * FLYSArtifact.getNativeFacet() instead to retrieve a Facet which supports
11c4b1429117 Cosmetics, resolve code duplicate. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1849 diff changeset	915 * data.
11c4b1429117 Cosmetics, resolve code duplicate. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1849 diff changeset	916 * @param theme Theme document for given annotations.
11c4b1429117 Cosmetics, resolve code duplicate. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1849 diff changeset	917 * @param visible The visibility of the annotations.
1849 5d5dd44d613e Refactored, move doMainValueAnnotations to XYChartGenerator. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1768 diff changeset	918 */
5d5dd44d613e Refactored, move doMainValueAnnotations to XYChartGenerator. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1768 diff changeset	919 protected void doAnnotations(
5d5dd44d613e Refactored, move doMainValueAnnotations to XYChartGenerator. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1768 diff changeset	920 FLYSAnnotation annotations,
2325 1fcaeced48f2 #485 Fixed broken renaming of chart themes. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2300 diff changeset	921 ArtifactAndFacet aandf,
1849 5d5dd44d613e Refactored, move doMainValueAnnotations to XYChartGenerator. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1768 diff changeset	922 Document theme,
5d5dd44d613e Refactored, move doMainValueAnnotations to XYChartGenerator. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1768 diff changeset	923 boolean visible
5d5dd44d613e Refactored, move doMainValueAnnotations to XYChartGenerator. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1768 diff changeset	924 ){
5d5dd44d613e Refactored, move doMainValueAnnotations to XYChartGenerator. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1768 diff changeset	925 logger.debug("doAnnotations");
2325 1fcaeced48f2 #485 Fixed broken renaming of chart themes. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2300 diff changeset	926 Facet facet = aandf.getFacet();
1849 5d5dd44d613e Refactored, move doMainValueAnnotations to XYChartGenerator. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1768 diff changeset	927
1861 11c4b1429117 Cosmetics, resolve code duplicate. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1849 diff changeset	928 // Add all annotations to our annotation pool.
1849 5d5dd44d613e Refactored, move doMainValueAnnotations to XYChartGenerator. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1768 diff changeset	929 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	930 if (facet != null)
2325 1fcaeced48f2 #485 Fixed broken renaming of chart themes. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2300 diff changeset	931 annotations.setLabel(aandf.getFacetDescription());
1849 5d5dd44d613e Refactored, move doMainValueAnnotations to XYChartGenerator. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1768 diff changeset	932 addAnnotations(annotations, visible);
5d5dd44d613e Refactored, move doMainValueAnnotations to XYChartGenerator. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1768 diff changeset	933 }
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	934
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	935
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	936 /**
2206 e2124ca11adb Add manual point handling for many different chart types. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2193 diff changeset	937 * Do Points out.
e2124ca11adb Add manual point handling for many different chart types. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2193 diff changeset	938 */
e2124ca11adb Add manual point handling for many different chart types. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2193 diff changeset	939 protected void doPoints(
e2124ca11adb Add manual point handling for many different chart types. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2193 diff changeset	940 Object o,
2325 1fcaeced48f2 #485 Fixed broken renaming of chart themes. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2300 diff changeset	941 ArtifactAndFacet aandf,
2206 e2124ca11adb Add manual point handling for many different chart types. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2193 diff changeset	942 Document theme,
e2124ca11adb Add manual point handling for many different chart types. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2193 diff changeset	943 boolean visible,
e2124ca11adb Add manual point handling for many different chart types. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2193 diff changeset	944 int axisIndex
e2124ca11adb Add manual point handling for many different chart types. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2193 diff changeset	945 ) {
2325 1fcaeced48f2 #485 Fixed broken renaming of chart themes. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2300 diff changeset	946 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	947 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	948
e2124ca11adb Add manual point handling for many different chart types. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2193 diff changeset	949 // 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	950 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	951
e2124ca11adb Add manual point handling for many different chart types. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2193 diff changeset	952 try {
e2124ca11adb Add manual point handling for many different chart types. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2193 diff changeset	953 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	954 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	955 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	956 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	957 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	958 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	959 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	960 if (!act) {
e2124ca11adb Add manual point handling for many different chart types. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2193 diff changeset	961 continue;
e2124ca11adb Add manual point handling for many different chart types. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2193 diff changeset	962 }
e2124ca11adb Add manual point handling for many different chart types. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2193 diff changeset	963 //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	964 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	965 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	966 }
e2124ca11adb Add manual point handling for many different chart types. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2193 diff changeset	967 }
e2124ca11adb Add manual point handling for many different chart types. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2193 diff changeset	968 catch(JSONException e){
e2124ca11adb Add manual point handling for many different chart types. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2193 diff changeset	969 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	970 }
e2124ca11adb Add manual point handling for many different chart types. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2193 diff changeset	971
e2124ca11adb Add manual point handling for many different chart types. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2193 diff changeset	972 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	973 annotations.setTextAnnotations(xy);
e2124ca11adb Add manual point handling for many different chart types. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2193 diff changeset	974
e2124ca11adb Add manual point handling for many different chart types. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2193 diff changeset	975 doAnnotations(annotations, null, theme, visible);
e2124ca11adb Add manual point handling for many different chart types. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2193 diff changeset	976 addAxisSeries(series, axisIndex, visible);
e2124ca11adb Add manual point handling for many different chart types. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2193 diff changeset	977 }
e2124ca11adb Add manual point handling for many different chart types. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2193 diff changeset	978
e2124ca11adb Add manual point handling for many different chart types. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2193 diff changeset	979
2161 c68f4f227c09 Somewhat unified Annotation handling, use jfreechart-house-toolkit instead of custom StickyAxisAnnotation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2152 diff changeset	980 /** 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	981 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	982 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	983 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	984
c68f4f227c09 Somewhat unified Annotation handling, use jfreechart-house-toolkit instead of custom StickyAxisAnnotation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2152 diff changeset	985 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	986 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	987 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	988 }
c68f4f227c09 Somewhat unified Annotation handling, use jfreechart-house-toolkit instead of custom StickyAxisAnnotation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2152 diff changeset	989
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	990 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	991 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	992 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	993 }
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	994
2161 c68f4f227c09 Somewhat unified Annotation handling, use jfreechart-house-toolkit instead of custom StickyAxisAnnotation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2152 diff changeset	995 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	996 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	997 + 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	998 }
c68f4f227c09 Somewhat unified Annotation handling, use jfreechart-house-toolkit instead of custom StickyAxisAnnotation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2152 diff changeset	999
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	1000 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	1001 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	1002 - 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	1003 }
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	1004
2161 c68f4f227c09 Somewhat unified Annotation handling, use jfreechart-house-toolkit instead of custom StickyAxisAnnotation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2152 diff changeset	1005 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	1006 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	1007 + 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	1008 }
c68f4f227c09 Somewhat unified Annotation handling, use jfreechart-house-toolkit instead of custom StickyAxisAnnotation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2152 diff changeset	1009
c68f4f227c09 Somewhat unified Annotation handling, use jfreechart-house-toolkit instead of custom StickyAxisAnnotation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2152 diff changeset	1010 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	1011 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	1012 }
c68f4f227c09 Somewhat unified Annotation handling, use jfreechart-house-toolkit instead of custom StickyAxisAnnotation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2152 diff changeset	1013
c68f4f227c09 Somewhat unified Annotation handling, use jfreechart-house-toolkit instead of custom StickyAxisAnnotation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2152 diff changeset	1014 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	1015 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	1016 }
c68f4f227c09 Somewhat unified Annotation handling, use jfreechart-house-toolkit instead of custom StickyAxisAnnotation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2152 diff changeset	1017
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	1018 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	1019 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	1020 }
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	1021
2161 c68f4f227c09 Somewhat unified Annotation handling, use jfreechart-house-toolkit instead of custom StickyAxisAnnotation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2152 diff changeset	1022 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	1023 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	1024 }
2193 73490b828a90 Manual Point Theming improved. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2184 diff changeset	1025
73490b828a90 Manual Point Theming improved. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2184 diff changeset	1026 public double above(double percent, double base) {
73490b828a90 Manual Point Theming improved. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2184 diff changeset	1027 return base + yRange.getLength() * percent;
73490b828a90 Manual Point Theming improved. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2184 diff changeset	1028 }
2161 c68f4f227c09 Somewhat unified Annotation handling, use jfreechart-house-toolkit instead of custom StickyAxisAnnotation. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 2152 diff changeset	1029 }
369 2ce7b473620e Implemented the chart creation of a longitudinal section chart - W and Q facets. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: diff changeset	1030 }
2ce7b473620e Implemented the chart creation of a longitudinal section chart - W and Q facets. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: diff changeset	1031 // 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 @ 2395:cd4fb19ab892