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 @ 1934:e4a516ca2e86

When having axis in diagrams, always have one on the left. flys-artifacts/trunk@3315 c6561f87-3c4e-4783-a992-168aeb5c3f6f

author	Felix Wolfsteller <felix.wolfsteller@intevation.de>
date	Fri, 25 Nov 2011 08:42:44 +0000
parents	17e18948fe5e
children	5b51f5232661

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;
419 4de7d9eac10f Display gridlines in charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 414 diff changeset	5 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	6
2ce7b473620e Implemented the chart creation of a longitudinal section chart - W and Q facets. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: diff changeset	7 import java.io.IOException;
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;
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	13 import java.util.TreeMap;
1679 69929c471646 Improved the creation/rendering of annotations (km favorites, mainvalues). Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1645 diff changeset	14 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	15 import java.util.Map;
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	16 import java.util.SortedMap;
1679 69929c471646 Improved the creation/rendering of annotations (km favorites, mainvalues). Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1645 diff changeset	17
69929c471646 Improved the creation/rendering of annotations (km favorites, mainvalues). Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1645 diff changeset	18 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	19
369 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.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	21
2ce7b473620e Implemented the chart creation of a longitudinal section chart - W and Q facets. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: diff changeset	22 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	23 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	24 import org.jfree.chart.LegendItem;
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.LegendItemCollection;
69929c471646 Improved the creation/rendering of annotations (km favorites, mainvalues). Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1645 diff changeset	26 import org.jfree.chart.annotations.XYTextAnnotation;
1934 e4a516ca2e86 When having axis in diagrams, always have one on the left. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1932 diff changeset	27 import org.jfree.chart.axis.AxisLocation;
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.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	29 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	30 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	31 import org.jfree.chart.plot.XYPlot;
1679 69929c471646 Improved the creation/rendering of annotations (km favorites, mainvalues). Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1645 diff changeset	32 import org.jfree.chart.renderer.xy.XYItemRenderer;
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	33 import org.jfree.chart.renderer.xy.XYLineAndShapeRenderer;
652 8fa4c5c9cd1a Charts are zoomed to a specified view if the attribute document for the chart creation contains an x and/or y range. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 423 diff changeset	34 import org.jfree.data.Range;
923 7ca4a287cd0e #135 Modified the way to store datasets for different chart axes. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 718 diff changeset	35 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	36 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	37 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	38
bbc966c81809 #90 Removed margins between data area border and curves. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 653 diff changeset	39 import org.jfree.ui.RectangleInsets;
369 2ce7b473620e Implemented the chart creation of a longitudinal section chart - W and Q facets. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: diff changeset	40
1849 5d5dd44d613e Refactored, move doMainValueAnnotations to XYChartGenerator. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1768 diff changeset	41 import de.intevation.artifactdatabase.state.Facet;
5d5dd44d613e Refactored, move doMainValueAnnotations to XYChartGenerator. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1768 diff changeset	42
369 2ce7b473620e Implemented the chart creation of a longitudinal section chart - W and Q facets. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: diff changeset	43 import de.intevation.flys.exports.ChartExportHelper;
1679 69929c471646 Improved the creation/rendering of annotations (km favorites, mainvalues). Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1645 diff changeset	44 import de.intevation.flys.jfree.FLYSAnnotation;
1738 6cdc7a77d3d4 Apply theme attributes to axis annotation. Raimund Renkert <raimund.renkert@intevation.de> parents: 1736 diff changeset	45 import de.intevation.flys.jfree.StickyAxisAnnotation;
369 2ce7b473620e Implemented the chart creation of a longitudinal section chart - W and Q facets. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: diff changeset	46
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	47 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	48
2ce7b473620e Implemented the chart creation of a longitudinal section chart - W and Q facets. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: diff changeset	49 /**
2ce7b473620e Implemented the chart creation of a longitudinal section chart - W and Q facets. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: diff changeset	50 * 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	51 *
2ce7b473620e Implemented the chart creation of a longitudinal section chart - W and Q facets. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: diff changeset	52 * @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	53 */
2ce7b473620e Implemented the chart creation of a longitudinal section chart - W and Q facets. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: diff changeset	54 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	55
1048 fd5c70973e0b Picky white-space cosmetics. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 924 diff changeset	56 /** 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	57 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	58
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	59 /** Map of datasets ("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	60 protected SortedMap<Integer, List<XYDataset>> datasets;
923 7ca4a287cd0e #135 Modified the way to store datasets for different chart axes. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 718 diff changeset	61
1679 69929c471646 Improved the creation/rendering of annotations (km favorites, mainvalues). Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1645 diff changeset	62 /** 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	63 protected List<FLYSAnnotation> annotations;
69929c471646 Improved the creation/rendering of annotations (km favorites, mainvalues). Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1645 diff changeset	64
1685 022f62c75878 Cosmetics. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1684 diff changeset	65 /** 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	66 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	67
1685 022f62c75878 Cosmetics. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1684 diff changeset	68 /** 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	69 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	70
419 4de7d9eac10f Display gridlines in charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 414 diff changeset	71 public static final Color DEFAULT_GRID_COLOR = Color.GRAY;
4de7d9eac10f Display gridlines in charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 414 diff changeset	72 public static final float DEFAULT_GRID_LINE_WIDTH = 0.3f;
4de7d9eac10f Display gridlines in charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 414 diff changeset	73
4de7d9eac10f Display gridlines in charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 414 diff changeset	74
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	75 public XYChartGenerator() {
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	76 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	77 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	78 datasets = new TreeMap<Integer, List<XYDataset>>();
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	79 }
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	80
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	81
369 2ce7b473620e Implemented the chart creation of a longitudinal section chart - W and Q facets. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: diff changeset	82 /**
2ce7b473620e Implemented the chart creation of a longitudinal section chart - W and Q facets. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: diff changeset	83 * Returns the title of a chart.
2ce7b473620e Implemented the chart creation of a longitudinal section chart - W and Q facets. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: diff changeset	84 *
2ce7b473620e Implemented the chart creation of a longitudinal section chart - W and Q facets. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: diff changeset	85 * @return the title of a chart.
2ce7b473620e Implemented the chart creation of a longitudinal section chart - W and Q facets. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: diff changeset	86 */
2ce7b473620e Implemented the chart creation of a longitudinal section chart - W and Q facets. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: diff changeset	87 protected abstract String getChartTitle();
2ce7b473620e Implemented the chart creation of a longitudinal section chart - W and Q facets. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: diff changeset	88
2ce7b473620e Implemented the chart creation of a longitudinal section chart - W and Q facets. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: diff changeset	89 /**
2ce7b473620e Implemented the chart creation of a longitudinal section chart - W and Q facets. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: diff changeset	90 * Returns the X-Axis label of a chart.
2ce7b473620e Implemented the chart creation of a longitudinal section chart - W and Q facets. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: diff changeset	91 *
2ce7b473620e Implemented the chart creation of a longitudinal section chart - W and Q facets. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: diff changeset	92 * @return the X-Axis label of a chart.
2ce7b473620e Implemented the chart creation of a longitudinal section chart - W and Q facets. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: diff changeset	93 */
2ce7b473620e Implemented the chart creation of a longitudinal section chart - W and Q facets. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: diff changeset	94 protected abstract String getXAxisLabel();
2ce7b473620e Implemented the chart creation of a longitudinal section chart - W and Q facets. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: diff changeset	95
2ce7b473620e Implemented the chart creation of a longitudinal section chart - W and Q facets. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: diff changeset	96 /**
2ce7b473620e Implemented the chart creation of a longitudinal section chart - W and Q facets. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: diff changeset	97 * Returns the Y-Axis label of a chart.
2ce7b473620e Implemented the chart creation of a longitudinal section chart - W and Q facets. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: diff changeset	98 *
2ce7b473620e Implemented the chart creation of a longitudinal section chart - W and Q facets. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: diff changeset	99 * @return the Y-Axis label of a chart.
2ce7b473620e Implemented the chart creation of a longitudinal section chart - W and Q facets. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: diff changeset	100 */
2ce7b473620e Implemented the chart creation of a longitudinal section chart - W and Q facets. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: diff changeset	101 protected abstract String getYAxisLabel();
2ce7b473620e Implemented the chart creation of a longitudinal section chart - W and Q facets. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: diff changeset	102
2ce7b473620e Implemented the chart creation of a longitudinal section chart - W and Q facets. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: diff changeset	103
2ce7b473620e Implemented the chart creation of a longitudinal section chart - W and Q facets. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: diff changeset	104 public void generate()
2ce7b473620e Implemented the chart creation of a longitudinal section chart - W and Q facets. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: diff changeset	105 throws IOException
2ce7b473620e Implemented the chart creation of a longitudinal section chart - W and Q facets. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: diff changeset	106 {
2ce7b473620e Implemented the chart creation of a longitudinal section chart - W and Q facets. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: diff changeset	107 logger.debug("XYChartGenerator.generate");
2ce7b473620e Implemented the chart creation of a longitudinal section chart - W and Q facets. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: diff changeset	108
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	109 JFreeChart chart = 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	110
1735 5966a20fc72c Enabled support for PDF and SVG chart exports. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1711 diff changeset	111 String format = getFormat();
5966a20fc72c Enabled support for PDF and SVG chart exports. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1711 diff changeset	112 int[] size = getSize();
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	113
1930 de0c2bbb27f9 Cosmetics, docs. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1861 diff changeset	114 context.putContextValue("chart.width", size[0]);
1735 5966a20fc72c Enabled support for PDF and SVG chart exports. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1711 diff changeset	115 context.putContextValue("chart.height", size[1]);
5966a20fc72c Enabled support for PDF and SVG chart exports. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1711 diff changeset	116
5966a20fc72c Enabled support for PDF and SVG chart exports. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1711 diff changeset	117 if (format.equals(ChartExportHelper.FORMAT_PNG)) {
5966a20fc72c Enabled support for PDF and SVG chart exports. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1711 diff changeset	118 context.putContextValue("chart.image.format", "png");
5966a20fc72c Enabled support for PDF and SVG chart exports. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1711 diff changeset	119
5966a20fc72c Enabled support for PDF and SVG chart exports. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1711 diff changeset	120 ChartExportHelper.exportImage(
5966a20fc72c Enabled support for PDF and SVG chart exports. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1711 diff changeset	121 out,
5966a20fc72c Enabled support for PDF and SVG chart exports. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1711 diff changeset	122 chart,
5966a20fc72c Enabled support for PDF and SVG chart exports. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1711 diff changeset	123 context);
5966a20fc72c Enabled support for PDF and SVG chart exports. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1711 diff changeset	124 }
5966a20fc72c Enabled support for PDF and SVG chart exports. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1711 diff changeset	125 else if (format.equals(ChartExportHelper.FORMAT_PDF)) {
1930 de0c2bbb27f9 Cosmetics, docs. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1861 diff changeset	126 context.putContextValue("chart.marginLeft", 5f);
de0c2bbb27f9 Cosmetics, docs. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1861 diff changeset	127 context.putContextValue("chart.marginRight", 5f);
de0c2bbb27f9 Cosmetics, docs. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1861 diff changeset	128 context.putContextValue("chart.marginTop", 5f);
1735 5966a20fc72c Enabled support for PDF and SVG chart exports. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1711 diff changeset	129 context.putContextValue("chart.marginBottom", 5f);
5966a20fc72c Enabled support for PDF and SVG chart exports. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1711 diff changeset	130 context.putContextValue(
5966a20fc72c Enabled support for PDF and SVG chart exports. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1711 diff changeset	131 "chart.page.format",
5966a20fc72c Enabled support for PDF and SVG chart exports. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1711 diff changeset	132 ChartExportHelper.DEFAULT_PAGE_SIZE);
5966a20fc72c Enabled support for PDF and SVG chart exports. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1711 diff changeset	133
5966a20fc72c Enabled support for PDF and SVG chart exports. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1711 diff changeset	134 ChartExportHelper.exportPDF(
5966a20fc72c Enabled support for PDF and SVG chart exports. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1711 diff changeset	135 out,
5966a20fc72c Enabled support for PDF and SVG chart exports. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1711 diff changeset	136 chart,
5966a20fc72c Enabled support for PDF and SVG chart exports. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1711 diff changeset	137 context);
5966a20fc72c Enabled support for PDF and SVG chart exports. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1711 diff changeset	138 }
5966a20fc72c Enabled support for PDF and SVG chart exports. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1711 diff changeset	139 else if (format.equals(ChartExportHelper.FORMAT_SVG)) {
5966a20fc72c Enabled support for PDF and SVG chart exports. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1711 diff changeset	140 context.putContextValue(
5966a20fc72c Enabled support for PDF and SVG chart exports. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1711 diff changeset	141 "chart.encoding",
5966a20fc72c Enabled support for PDF and SVG chart exports. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1711 diff changeset	142 ChartExportHelper.DEFAULT_ENCODING);
5966a20fc72c Enabled support for PDF and SVG chart exports. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1711 diff changeset	143
5966a20fc72c Enabled support for PDF and SVG chart exports. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1711 diff changeset	144 ChartExportHelper.exportSVG(
5966a20fc72c Enabled support for PDF and SVG chart exports. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1711 diff changeset	145 out,
5966a20fc72c Enabled support for PDF and SVG chart exports. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1711 diff changeset	146 chart,
5966a20fc72c Enabled support for PDF and SVG chart exports. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1711 diff changeset	147 context);
5966a20fc72c Enabled support for PDF and SVG chart exports. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1711 diff changeset	148 }
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	149 }
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	150
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	151
1930 de0c2bbb27f9 Cosmetics, docs. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1861 diff changeset	152 /**
de0c2bbb27f9 Cosmetics, docs. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1861 diff changeset	153 * Generate the chart anew (including localized axis and all).
de0c2bbb27f9 Cosmetics, docs. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1861 diff changeset	154 */
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	155 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	156 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	157
369 2ce7b473620e Implemented the chart creation of a longitudinal section chart - W and Q facets. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: diff changeset	158 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	159 getChartTitle(),
2ce7b473620e Implemented the chart creation of a longitudinal section chart - W and Q facets. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: diff changeset	160 getXAxisLabel(),
2ce7b473620e Implemented the chart creation of a longitudinal section chart - W and Q facets. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: diff changeset	161 getYAxisLabel(),
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	162 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	163 PlotOrientation.VERTICAL,
2ce7b473620e Implemented the chart creation of a longitudinal section chart - W and Q facets. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: diff changeset	164 true,
2ce7b473620e Implemented the chart creation of a longitudinal section chart - W and Q facets. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: diff changeset	165 false,
2ce7b473620e Implemented the chart creation of a longitudinal section chart - W and Q facets. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: diff changeset	166 false);
2ce7b473620e Implemented the chart creation of a longitudinal section chart - W and Q facets. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: diff changeset	167
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	168 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	169 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	170 plot.setBackgroundPaint(Color.WHITE);
419 4de7d9eac10f Display gridlines in charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 414 diff changeset	171
923 7ca4a287cd0e #135 Modified the way to store datasets for different chart axes. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 718 diff changeset	172 addDatasets(plot);
1679 69929c471646 Improved the creation/rendering of annotations (km favorites, mainvalues). Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1645 diff changeset	173 addAnnotations(plot);
414 0385bcc4229a Added subtitles to the available charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 375 diff changeset	174 addSubtitles(chart);
419 4de7d9eac10f Display gridlines in charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 414 diff changeset	175 adjustPlot(plot);
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	176 localizeAxes(plot);
923 7ca4a287cd0e #135 Modified the way to store datasets for different chart axes. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 718 diff changeset	177
7ca4a287cd0e #135 Modified the way to store datasets for different chart axes. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 718 diff changeset	178 removeEmptyRangeAxes(plot);
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	179 createAxes(plot);
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	180 adjustAxes(plot);
923 7ca4a287cd0e #135 Modified the way to store datasets for different chart axes. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 718 diff changeset	181
1686 e8d1e531687a Bugfix: #114 Enabled rendering charts with a single data point. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1685 diff changeset	182 preparePointRanges(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	183 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	184
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	185 applyThemes(plot);
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	186
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	187 return chart;
369 2ce7b473620e Implemented the chart creation of a longitudinal section chart - W and Q facets. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: diff changeset	188 }
2ce7b473620e Implemented the chart creation of a longitudinal section chart - W and Q facets. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: diff changeset	189
2ce7b473620e Implemented the chart creation of a longitudinal section chart - W and Q facets. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: diff changeset	190
1685 022f62c75878 Cosmetics. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1684 diff changeset	191 /**
1931 7c52e9cb2a72 Allow more than two datasets and more flexibility with axes in plots. Based on patch by S. Teichmann. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1930 diff changeset	192 * Add datasets to plot.
1685 022f62c75878 Cosmetics. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1684 diff changeset	193 * @param plot plot to add datasets to.
022f62c75878 Cosmetics. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1684 diff changeset	194 */
923 7ca4a287cd0e #135 Modified the way to store datasets for different chart axes. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 718 diff changeset	195 protected void addDatasets(XYPlot plot) {
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	196 int count = 0;
7c52e9cb2a72 Allow more than two datasets and more flexibility with axes in plots. Based on patch by S. Teichmann. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1930 diff changeset	197 for (Map.Entry<Integer, List<XYDataset>> entry: datasets.entrySet()) {
7c52e9cb2a72 Allow more than two datasets and more flexibility with axes in plots. Based on patch by S. Teichmann. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1930 diff changeset	198 List<Integer> axisList = new ArrayList<Integer>(1);
7c52e9cb2a72 Allow more than two datasets and more flexibility with axes in plots. Based on patch by S. Teichmann. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1930 diff changeset	199 axisList.add(entry.getKey());
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	200 for (XYDataset dataset: entry.getValue()) {
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	201 int index = count++;
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	202 plot.setDataset(index, dataset);
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	203 plot.mapDatasetToRangeAxes(index, axisList);
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	204 }
923 7ca4a287cd0e #135 Modified the way to store datasets for different chart axes. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 718 diff changeset	205 }
7ca4a287cd0e #135 Modified the way to store datasets for different chart axes. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 718 diff changeset	206 }
7ca4a287cd0e #135 Modified the way to store datasets for different chart axes. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 718 diff changeset	207
7ca4a287cd0e #135 Modified the way to store datasets for different chart axes. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 718 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 /**
7c52e9cb2a72 Allow more than two datasets and more flexibility with axes in plots. Based on patch by S. Teichmann. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1930 diff changeset	210 * Add given series.
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 * @param series the dataseries to include in plot.
7c52e9cb2a72 Allow more than two datasets and more flexibility with axes in plots. Based on patch by S. Teichmann. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1930 diff changeset	212 * @param index index of the series and of its axis.
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	213 * @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	214 */
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	215 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	216 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	217 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	218 }
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	219
1931 7c52e9cb2a72 Allow more than two datasets and more flexibility with axes in plots. Based on patch by S. Teichmann. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1930 diff changeset	220 if (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	221 XYSeriesCollection collection = new XYSeriesCollection(series);
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	222
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	223 List<XYDataset> dataset = datasets.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	224
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	225 if (dataset == 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	226 dataset = new ArrayList<XYDataset>();
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	227 datasets.put(index, dataset);
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	228 }
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	229
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	230 dataset.add(collection);
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	231 }
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	232
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	233 // Do this also when not visible to have axis scaled by default such
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	234 // that every data-point could be seen (except for annotations).
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	235 combineXRanges(new Range(series.getMinX(), series.getMaxX()), 0);
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	236 combineYRanges(new Range(series.getMinY(), series.getMaxY()), 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	237 }
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	238
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	239 /**
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	240 * 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	241 * @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	242 * @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	243 */
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	244 private void combineXRanges(Range range, int 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	245
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	246 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	247
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	248 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	249 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	250 }
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	251
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	252 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	253 }
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	254
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	255
1930 de0c2bbb27f9 Cosmetics, docs. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1861 diff changeset	256 /**
de0c2bbb27f9 Cosmetics, docs. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1861 diff changeset	257 * @param range the new range.
de0c2bbb27f9 Cosmetics, docs. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1861 diff changeset	258 */
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	259 private void combineYRanges(Range range, int index) {
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	260
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	261 Range old = yRanges.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	262
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	263 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	264 range = Range.combine(old, 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	265 }
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	266
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	267 yRanges.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	268 }
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	269
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	270
1711 f708120cb7bc Fix flys/issue363 (W-INFO/ Abflusskurve, Extremwert-Rendering). Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1699 diff changeset	271 /**
f708120cb7bc Fix flys/issue363 (W-INFO/ Abflusskurve, Extremwert-Rendering). Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1699 diff changeset	272 * 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	273 */
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	274 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	275 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	276 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	277 }
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	278
1679 69929c471646 Improved the creation/rendering of annotations (km favorites, mainvalues). Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1645 diff changeset	279 if (annotations == null) {
69929c471646 Improved the creation/rendering of annotations (km favorites, mainvalues). Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1645 diff changeset	280 annotations = new ArrayList<FLYSAnnotation>();
69929c471646 Improved the creation/rendering of annotations (km favorites, mainvalues). Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1645 diff changeset	281 }
69929c471646 Improved the creation/rendering of annotations (km favorites, mainvalues). Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1645 diff changeset	282
69929c471646 Improved the creation/rendering of annotations (km favorites, mainvalues). Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1645 diff changeset	283 annotations.add(annotation);
69929c471646 Improved the creation/rendering of annotations (km favorites, mainvalues). Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1645 diff changeset	284 }
69929c471646 Improved the creation/rendering of annotations (km favorites, mainvalues). Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1645 diff changeset	285
69929c471646 Improved the creation/rendering of annotations (km favorites, mainvalues). Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1645 diff changeset	286
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	287 /**
1934 e4a516ca2e86 When having axis in diagrams, always have one on the left. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1932 diff changeset	288 * Create y-axes, ensure that the first axis (with data) is on the left.
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	289 */
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	290 public void createAxes(XYPlot plot) {
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	291 logger.debug("XYChartGenerator.createAxes");
1934 e4a516ca2e86 When having axis in diagrams, always have one on the left. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1932 diff changeset	292
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	293 Integer last = datasets.lastKey();
1934 e4a516ca2e86 When having axis in diagrams, always have one on the left. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1932 diff changeset	294 int i = 0;
e4a516ca2e86 When having axis in diagrams, always have one on the left. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1932 diff changeset	295 int firstVisible = 0;
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	296
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	297 if (last != null) {
1934 e4a516ca2e86 When having axis in diagrams, always have one on the left. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1932 diff changeset	298 firstVisible = i = last;
e4a516ca2e86 When having axis in diagrams, always have one on the left. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1932 diff changeset	299 for (; i >= 0; --i) {
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	300 if (datasets.containsKey(i)) {
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	301 plot.setRangeAxis(i, createYAxis(i));
1934 e4a516ca2e86 When having axis in diagrams, always have one on the left. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1932 diff changeset	302 firstVisible = i;
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	303 }
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	304 }
1934 e4a516ca2e86 When having axis in diagrams, always have one on the left. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1932 diff changeset	305 plot.setRangeAxisLocation(firstVisible, AxisLocation.TOP_OR_LEFT);
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	306 }
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	307 }
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	308
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	309 /**
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	310 * Create Y (range) axis for given 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	311 * Shall be overriden by subclasses.
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	312 */
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	313 protected NumberAxis createYAxis(int 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	314 NumberAxis axis = new NumberAxis("default axis");
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	315 return axis;
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	316 }
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	317
923 7ca4a287cd0e #135 Modified the way to store datasets for different chart axes. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 718 diff changeset	318 private void removeEmptyRangeAxes(XYPlot plot) {
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	319 Integer last = datasets.lastKey();
923 7ca4a287cd0e #135 Modified the way to store datasets for different chart axes. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 718 diff changeset	320
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	321 if (last != 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	322 for (int i = last-1; i >= 0; --i) {
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	323 if (!datasets.containsKey(i)) {
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	324 plot.setRangeAxis(i, 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	325 }
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	326 }
923 7ca4a287cd0e #135 Modified the way to store datasets for different chart axes. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 718 diff changeset	327 }
7ca4a287cd0e #135 Modified the way to store datasets for different chart axes. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 718 diff changeset	328 }
7ca4a287cd0e #135 Modified the way to store datasets for different chart axes. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 718 diff changeset	329
7ca4a287cd0e #135 Modified the way to store datasets for different chart axes. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 718 diff changeset	330
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 /**
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 * Expands X and Y axes if only a point is shown.
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 */
1686 e8d1e531687a Bugfix: #114 Enabled rendering charts with a single data point. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1685 diff changeset	334 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	335 for (int i = 0, num = plot.getDomainAxisCount(); i < num; i++) {
1698 6e935087f6a1 XYChartGenerator: s/new Integer(small)/Integer.valueOf(small)/ Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1688 diff changeset	336 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	337
e8d1e531687a Bugfix: #114 Enabled rendering charts with a single data point. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1685 diff changeset	338 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	339 if (r != null && r.getLowerBound() == r.getUpperBound()) {
1686 e8d1e531687a Bugfix: #114 Enabled rendering charts with a single data point. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1685 diff changeset	340 xRanges.put(key, expandRange(r, 5));
e8d1e531687a Bugfix: #114 Enabled rendering charts with a single data point. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1685 diff changeset	341 }
e8d1e531687a Bugfix: #114 Enabled rendering charts with a single data point. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1685 diff changeset	342 }
e8d1e531687a Bugfix: #114 Enabled rendering charts with a single data point. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1685 diff changeset	343
e8d1e531687a Bugfix: #114 Enabled rendering charts with a single data point. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1685 diff changeset	344 for (int i = 0, num = plot.getRangeAxisCount(); i < num; i++) {
1698 6e935087f6a1 XYChartGenerator: s/new Integer(small)/Integer.valueOf(small)/ Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1688 diff changeset	345 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	346
e8d1e531687a Bugfix: #114 Enabled rendering charts with a single data point. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1685 diff changeset	347 Range r = yRanges.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	348 if (r != null && r.getLowerBound() == r.getUpperBound()) {
1686 e8d1e531687a Bugfix: #114 Enabled rendering charts with a single data point. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1685 diff changeset	349 yRanges.put(key, expandRange(r, 5));
e8d1e531687a Bugfix: #114 Enabled rendering charts with a single data point. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1685 diff changeset	350 }
e8d1e531687a Bugfix: #114 Enabled rendering charts with a single data point. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1685 diff changeset	351 }
e8d1e531687a Bugfix: #114 Enabled rendering charts with a single data point. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1685 diff changeset	352 }
e8d1e531687a Bugfix: #114 Enabled rendering charts with a single data point. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1685 diff changeset	353
e8d1e531687a Bugfix: #114 Enabled rendering charts with a single data point. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1685 diff changeset	354
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	355 /**
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 * Expand range by percent.
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 */
1686 e8d1e531687a Bugfix: #114 Enabled rendering charts with a single data point. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1685 diff changeset	358 public static Range expandRange(Range range, double percent) {
e8d1e531687a Bugfix: #114 Enabled rendering charts with a single data point. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1685 diff changeset	359 if (range == null) {
e8d1e531687a Bugfix: #114 Enabled rendering charts with a single data point. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1685 diff changeset	360 return null;
e8d1e531687a Bugfix: #114 Enabled rendering charts with a single data point. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1685 diff changeset	361 }
e8d1e531687a Bugfix: #114 Enabled rendering charts with a single data point. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1685 diff changeset	362
e8d1e531687a Bugfix: #114 Enabled rendering charts with a single data point. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1685 diff changeset	363 double value = range.getLowerBound();
e8d1e531687a Bugfix: #114 Enabled rendering charts with a single data point. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1685 diff changeset	364 double expand = value / 100 * percent;
e8d1e531687a Bugfix: #114 Enabled rendering charts with a single data point. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1685 diff changeset	365
e8d1e531687a Bugfix: #114 Enabled rendering charts with a single data point. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1685 diff changeset	366 return expand != 0
e8d1e531687a Bugfix: #114 Enabled rendering charts with a single data point. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1685 diff changeset	367 ? new Range(value-expand, value+expand)
e8d1e531687a Bugfix: #114 Enabled rendering charts with a single data point. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1685 diff changeset	368 : new Range(-0.01 * percent, 0.01 * percent);
e8d1e531687a Bugfix: #114 Enabled rendering charts with a single data point. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1685 diff changeset	369 }
e8d1e531687a Bugfix: #114 Enabled rendering charts with a single data point. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1685 diff changeset	370
e8d1e531687a Bugfix: #114 Enabled rendering charts with a single data point. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1685 diff changeset	371
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	372 /**
654 bbc966c81809 #90 Removed margins between data area border and curves. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 653 diff changeset	373 * 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	374 * 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	375 * 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	376 * 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	377 * 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	378 *
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	379 * @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	380 */
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	381 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	382 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	383
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	384 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	385 Range yrange = getValueAxisRange();
654 bbc966c81809 #90 Removed margins between data area border and curves. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 653 diff changeset	386
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	387 zoomX(plot, plot.getDomainAxis(), xRanges.get(0), xrange);
923 7ca4a287cd0e #135 Modified the way to store datasets for different chart axes. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 718 diff changeset	388
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	389 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	390 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	391
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	392 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	393 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	394 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	395 }
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	396
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	397 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	398 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	399 }
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	400 }
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	401
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	402
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	403 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	404 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	405 }
f3fd8c9b7f51 #157 Computed discharge curve charts always have a lower bound set to 0. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 717 diff changeset	406
f3fd8c9b7f51 #157 Computed discharge curve charts always have a lower bound set to 0. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 717 diff changeset	407
f3fd8c9b7f51 #157 Computed discharge curve charts always have a lower bound set to 0. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 717 diff changeset	408 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	409 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	410 }
f3fd8c9b7f51 #157 Computed discharge curve charts always have a lower bound set to 0. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 717 diff changeset	411
f3fd8c9b7f51 #157 Computed discharge curve charts always have a lower bound set to 0. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 717 diff changeset	412
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	413 /**
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	414 * 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	415 *
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	416 * @param plot The XYPlot.
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	417 * @param axis The axis the shoud be modified.
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	418 * @param range The whole range specified by a dataset.
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	419 * @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	420 *
bbc966c81809 #90 Removed margins between data area border and curves. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 653 diff changeset	421 * @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	422 */
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	423 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	424
0155cbaba182 XYChartGenerator: Do not crash if no zoom axis given Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1735 diff changeset	425 if (range == null) {
0155cbaba182 XYChartGenerator: Do not crash if no zoom axis given Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1735 diff changeset	426 return false;
0155cbaba182 XYChartGenerator: Do not crash if no zoom axis given Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1735 diff changeset	427 }
0155cbaba182 XYChartGenerator: Do not crash if no zoom axis given Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1735 diff changeset	428
673 b22f21b173a7 Changed the zoom process - the values in the chart request document are percentual values that apply to every axis. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 667 diff changeset	429 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	430 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	431 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	432 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	433
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	434 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	435 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	436 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	437
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	438 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	439
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	440 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	441
bbc966c81809 #90 Removed margins between data area border and curves. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 653 diff changeset	442 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	443 }
654 bbc966c81809 #90 Removed margins between data area border and curves. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 653 diff changeset	444
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	445 axis.setRangeWithMargins(range);
654 bbc966c81809 #90 Removed margins between data area border and curves. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 653 diff changeset	446 return false;
bbc966c81809 #90 Removed margins between data area border and curves. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 653 diff changeset	447 }
bbc966c81809 #90 Removed margins between data area border and curves. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 653 diff changeset	448
bbc966c81809 #90 Removed margins between data area border and curves. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 653 diff changeset	449
bbc966c81809 #90 Removed margins between data area border and curves. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 653 diff changeset	450 /**
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	451 * 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	452 * 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	453 *
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	454 * @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	455 *
bbc966c81809 #90 Removed margins between data area border and curves. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 653 diff changeset	456 * @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	457 */
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	458 public Range[] getRangesForDataset(int index) {
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	459 return new Range[] {
1698 6e935087f6a1 XYChartGenerator: s/new Integer(small)/Integer.valueOf(small)/ Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1688 diff changeset	460 xRanges.get(Integer.valueOf(0)),
6e935087f6a1 XYChartGenerator: s/new Integer(small)/Integer.valueOf(small)/ Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1688 diff changeset	461 yRanges.get(Integer.valueOf(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	462 };
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	463 }
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	464
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	465
1679 69929c471646 Improved the creation/rendering of annotations (km favorites, mainvalues). Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1645 diff changeset	466 protected void addAnnotations(XYPlot plot) {
69929c471646 Improved the creation/rendering of annotations (km favorites, mainvalues). Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1645 diff changeset	467 plot.clearAnnotations();
69929c471646 Improved the creation/rendering of annotations (km favorites, mainvalues). Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1645 diff changeset	468
69929c471646 Improved the creation/rendering of annotations (km favorites, mainvalues). Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1645 diff changeset	469 if (annotations == null) {
69929c471646 Improved the creation/rendering of annotations (km favorites, mainvalues). Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1645 diff changeset	470 logger.debug("No Annotations given.");
69929c471646 Improved the creation/rendering of annotations (km favorites, mainvalues). Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1645 diff changeset	471 return;
69929c471646 Improved the creation/rendering of annotations (km favorites, mainvalues). Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1645 diff changeset	472 }
69929c471646 Improved the creation/rendering of annotations (km favorites, mainvalues). Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1645 diff changeset	473
69929c471646 Improved the creation/rendering of annotations (km favorites, mainvalues). Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1645 diff changeset	474 LegendItemCollection lic = new LegendItemCollection();
69929c471646 Improved the creation/rendering of annotations (km favorites, mainvalues). Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1645 diff changeset	475
69929c471646 Improved the creation/rendering of annotations (km favorites, mainvalues). Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1645 diff changeset	476 int idx = 0;
69929c471646 Improved the creation/rendering of annotations (km favorites, mainvalues). Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1645 diff changeset	477 if (plot.getRangeAxis(idx) == null && plot.getRangeAxisCount() >= 2) {
69929c471646 Improved the creation/rendering of annotations (km favorites, mainvalues). Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1645 diff changeset	478 idx = 1;
69929c471646 Improved the creation/rendering of annotations (km favorites, mainvalues). Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1645 diff changeset	479 }
69929c471646 Improved the creation/rendering of annotations (km favorites, mainvalues). Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1645 diff changeset	480
69929c471646 Improved the creation/rendering of annotations (km favorites, mainvalues). Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1645 diff changeset	481 XYItemRenderer renderer = plot.getRenderer(idx);
69929c471646 Improved the creation/rendering of annotations (km favorites, mainvalues). Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1645 diff changeset	482
69929c471646 Improved the creation/rendering of annotations (km favorites, mainvalues). Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1645 diff changeset	483 for (FLYSAnnotation fa: annotations) {
69929c471646 Improved the creation/rendering of annotations (km favorites, mainvalues). Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1645 diff changeset	484 Document theme = fa.getTheme();
69929c471646 Improved the creation/rendering of annotations (km favorites, mainvalues). Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1645 diff changeset	485
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	486 ThemeAccess themeAccess = new ThemeAccess(theme);
1679 69929c471646 Improved the creation/rendering of annotations (km favorites, mainvalues). Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1645 diff changeset	487
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	488 Color color = themeAccess.parseLineColorField();
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	489 int lineWidth = themeAccess.parseLineWidth();
1679 69929c471646 Improved the creation/rendering of annotations (km favorites, mainvalues). Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1645 diff changeset	490 lic.add(new LegendItem(fa.getLabel(), color));
69929c471646 Improved the creation/rendering of annotations (km favorites, mainvalues). Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1645 diff changeset	491
69929c471646 Improved the creation/rendering of annotations (km favorites, mainvalues). Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1645 diff changeset	492 for (XYTextAnnotation ta: fa.getAnnotations()) {
1738 6cdc7a77d3d4 Apply theme attributes to axis annotation. Raimund Renkert <raimund.renkert@intevation.de> parents: 1736 diff changeset	493 if(ta instanceof StickyAxisAnnotation) {
6cdc7a77d3d4 Apply theme attributes to axis annotation. Raimund Renkert <raimund.renkert@intevation.de> parents: 1736 diff changeset	494 StickyAxisAnnotation sta = (StickyAxisAnnotation)ta;
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	495 sta.applyTheme(themeAccess);
1738 6cdc7a77d3d4 Apply theme attributes to axis annotation. Raimund Renkert <raimund.renkert@intevation.de> parents: 1736 diff changeset	496 renderer.addAnnotation(sta);
6cdc7a77d3d4 Apply theme attributes to axis annotation. Raimund Renkert <raimund.renkert@intevation.de> parents: 1736 diff changeset	497 }
6cdc7a77d3d4 Apply theme attributes to axis annotation. Raimund Renkert <raimund.renkert@intevation.de> parents: 1736 diff changeset	498 else {
6cdc7a77d3d4 Apply theme attributes to axis annotation. Raimund Renkert <raimund.renkert@intevation.de> parents: 1736 diff changeset	499 ta.setPaint(color);
6cdc7a77d3d4 Apply theme attributes to axis annotation. Raimund Renkert <raimund.renkert@intevation.de> parents: 1736 diff changeset	500 ta.setOutlineStroke(new BasicStroke((float) lineWidth));
6cdc7a77d3d4 Apply theme attributes to axis annotation. Raimund Renkert <raimund.renkert@intevation.de> parents: 1736 diff changeset	501 renderer.addAnnotation(ta);
6cdc7a77d3d4 Apply theme attributes to axis annotation. Raimund Renkert <raimund.renkert@intevation.de> parents: 1736 diff changeset	502 }
1679 69929c471646 Improved the creation/rendering of annotations (km favorites, mainvalues). Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1645 diff changeset	503 }
69929c471646 Improved the creation/rendering of annotations (km favorites, mainvalues). Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1645 diff changeset	504
1932 17e18948fe5e Fix legend and themeing with new multiaxis feature. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1931 diff changeset	505 // TODO Do after loop?
1679 69929c471646 Improved the creation/rendering of annotations (km favorites, mainvalues). Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1645 diff changeset	506 plot.setFixedLegendItems(lic);
69929c471646 Improved the creation/rendering of annotations (km favorites, mainvalues). Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1645 diff changeset	507 }
69929c471646 Improved the creation/rendering of annotations (km favorites, mainvalues). Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1645 diff changeset	508 }
69929c471646 Improved the creation/rendering of annotations (km favorites, mainvalues). Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1645 diff changeset	509
69929c471646 Improved the creation/rendering of annotations (km favorites, mainvalues). Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1645 diff changeset	510
369 2ce7b473620e Implemented the chart creation of a longitudinal section chart - W and Q facets. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: diff changeset	511 /**
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	512 * Adjusts the axes of a plot (the first axis does not include zero).
369 2ce7b473620e Implemented the chart creation of a longitudinal section chart - W and Q facets. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: diff changeset	513 *
2ce7b473620e Implemented the chart creation of a longitudinal section chart - W and Q facets. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: diff changeset	514 * @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	515 */
2ce7b473620e Implemented the chart creation of a longitudinal section chart - W and Q facets. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: diff changeset	516 protected void adjustAxes(XYPlot plot) {
2ce7b473620e Implemented the chart creation of a longitudinal section chart - W and Q facets. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: diff changeset	517 NumberAxis yAxis = (NumberAxis) plot.getRangeAxis();
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	518 if (yAxis == 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	519 logger.warn("No Axis to setAutoRangeIncludeZero.");
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	520 }
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	521 else {
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	522 yAxis.setAutoRangeIncludesZero(false);
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	523 }
369 2ce7b473620e Implemented the chart creation of a longitudinal section chart - W and Q facets. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: diff changeset	524 }
414 0385bcc4229a Added subtitles to the available charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 375 diff changeset	525
0385bcc4229a Added subtitles to the available charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 375 diff changeset	526
419 4de7d9eac10f Display gridlines in charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 414 diff changeset	527 protected void adjustPlot(XYPlot plot) {
4de7d9eac10f Display gridlines in charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 414 diff changeset	528 Stroke gridStroke = new BasicStroke(
4de7d9eac10f Display gridlines in charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 414 diff changeset	529 DEFAULT_GRID_LINE_WIDTH,
4de7d9eac10f Display gridlines in charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 414 diff changeset	530 BasicStroke.CAP_BUTT,
4de7d9eac10f Display gridlines in charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 414 diff changeset	531 BasicStroke.JOIN_MITER,
4de7d9eac10f Display gridlines in charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 414 diff changeset	532 3.0f,
4de7d9eac10f Display gridlines in charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 414 diff changeset	533 new float[] { 3.0f },
4de7d9eac10f Display gridlines in charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 414 diff changeset	534 0.0f);
4de7d9eac10f Display gridlines in charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 414 diff changeset	535
4de7d9eac10f Display gridlines in charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 414 diff changeset	536 plot.setDomainGridlineStroke(gridStroke);
4de7d9eac10f Display gridlines in charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 414 diff changeset	537 plot.setDomainGridlinePaint(DEFAULT_GRID_COLOR);
4de7d9eac10f Display gridlines in charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 414 diff changeset	538 plot.setDomainGridlinesVisible(true);
4de7d9eac10f Display gridlines in charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 414 diff changeset	539
4de7d9eac10f Display gridlines in charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 414 diff changeset	540 plot.setRangeGridlineStroke(gridStroke);
4de7d9eac10f Display gridlines in charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 414 diff changeset	541 plot.setRangeGridlinePaint(DEFAULT_GRID_COLOR);
4de7d9eac10f Display gridlines in charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 414 diff changeset	542 plot.setRangeGridlinesVisible(true);
654 bbc966c81809 #90 Removed margins between data area border and curves. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 653 diff changeset	543
bbc966c81809 #90 Removed margins between data area border and curves. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 653 diff changeset	544 plot.setAxisOffset(new RectangleInsets(0d, 0d, 0d, 0d));
419 4de7d9eac10f Display gridlines in charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 414 diff changeset	545 }
4de7d9eac10f Display gridlines in charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 414 diff changeset	546
4de7d9eac10f Display gridlines in charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 414 diff changeset	547
414 0385bcc4229a Added subtitles to the available charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 375 diff changeset	548 protected void addSubtitles(JFreeChart chart) {
0385bcc4229a Added subtitles to the available charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 375 diff changeset	549 // override this method in subclasses that need subtitles
0385bcc4229a Added subtitles to the available charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 375 diff changeset	550 }
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	551
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	552
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	553 /**
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	554 * 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	555 * 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	556 * 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	557 *
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	558 * @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	559 */
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	560 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	561 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	562 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	563
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	564 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	565 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	566 }
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	567 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	568 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	569 }
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	570 }
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	571
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	572 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	573 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	574
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	575 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	576 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	577 }
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	578 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	579 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	580 }
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	581 }
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	582 }
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	583
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	584
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	585 /**
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	586 * 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	587 * 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	588 *
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	589 * @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	590 */
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	591 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	592 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	593 ((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	594 }
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	595
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	596
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	597 /**
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	598 * 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	599 * 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	600 *
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	601 * @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	602 */
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	603 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	604 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	605 ((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	606 }
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	607
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	608
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	609 protected void applyThemes(XYPlot plot) {
1932 17e18948fe5e Fix legend and themeing with new multiaxis feature. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1931 diff changeset	610 int idx = 0;
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	611
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	612 for (Map.Entry<Integer, List<XYDataset>> entry: datasets.entrySet()) {
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	613 for (XYDataset dataset: entry.getValue()) {
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	614 if (dataset instanceof XYSeriesCollection) {
1932 17e18948fe5e Fix legend and themeing with new multiaxis feature. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1931 diff changeset	615 idx = applyThemes(plot, (XYSeriesCollection)dataset, idx);
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	616 }
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	617 }
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	618 }
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	619 }
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	620
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	621
1932 17e18948fe5e Fix legend and themeing with new multiaxis feature. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1931 diff changeset	622 /**
17e18948fe5e Fix legend and themeing with new multiaxis feature. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1931 diff changeset	623 * @param idx "index" of dataset/series (first dataset to be drawn has
17e18948fe5e Fix legend and themeing with new multiaxis feature. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1931 diff changeset	624 * index 0), correlates with renderer index.
17e18948fe5e Fix legend and themeing with new multiaxis feature. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1931 diff changeset	625 * @return idx increased by number of items addded.
17e18948fe5e Fix legend and themeing with new multiaxis feature. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1931 diff changeset	626 */
17e18948fe5e Fix legend and themeing with new multiaxis feature. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1931 diff changeset	627 protected int applyThemes(XYPlot plot, XYSeriesCollection series, int idx) {
1679 69929c471646 Improved the creation/rendering of annotations (km favorites, mainvalues). Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1645 diff changeset	628 LegendItemCollection lic = new LegendItemCollection();
69929c471646 Improved the creation/rendering of annotations (km favorites, mainvalues). Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1645 diff changeset	629 LegendItemCollection anno = plot.getFixedLegendItems();
69929c471646 Improved the creation/rendering of annotations (km favorites, mainvalues). Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1645 diff changeset	630
1932 17e18948fe5e Fix legend and themeing with new multiaxis feature. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1931 diff changeset	631 XYLineAndShapeRenderer renderer = getRenderer(plot, idx);
17e18948fe5e Fix legend and themeing with new multiaxis feature. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1931 diff changeset	632 int retidx = idx;
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	633
1932 17e18948fe5e Fix legend and themeing with new multiaxis feature. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1931 diff changeset	634 for (int s = 0, num = series.getSeriesCount(); s < num; s++) {
17e18948fe5e Fix legend and themeing with new multiaxis feature. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1931 diff changeset	635 XYSeries serie = series.getSeries(s);
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	636
1932 17e18948fe5e Fix legend and themeing with new multiaxis feature. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1931 diff changeset	637 if (serie instanceof StyledXYSeries) {
17e18948fe5e Fix legend and themeing with new multiaxis feature. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1931 diff changeset	638 ((StyledXYSeries) serie).applyTheme(renderer, s);
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	639 }
1679 69929c471646 Improved the creation/rendering of annotations (km favorites, mainvalues). Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1645 diff changeset	640
1686 e8d1e531687a Bugfix: #114 Enabled rendering charts with a single data point. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1685 diff changeset	641 // special case: if there is just one single item, we need to enable
e8d1e531687a Bugfix: #114 Enabled rendering charts with a single data point. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1685 diff changeset	642 // points for this series, otherwise we would not see anything in
e8d1e531687a Bugfix: #114 Enabled rendering charts with a single data point. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1685 diff changeset	643 // the chart area.
1932 17e18948fe5e Fix legend and themeing with new multiaxis feature. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1931 diff changeset	644 if (serie.getItemCount() == 1) {
17e18948fe5e Fix legend and themeing with new multiaxis feature. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1931 diff changeset	645 renderer.setSeriesShapesVisible(s, true);
1686 e8d1e531687a Bugfix: #114 Enabled rendering charts with a single data point. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1685 diff changeset	646 }
e8d1e531687a Bugfix: #114 Enabled rendering charts with a single data point. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1685 diff changeset	647
1932 17e18948fe5e Fix legend and themeing with new multiaxis feature. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1931 diff changeset	648 LegendItem li = renderer.getLegendItem(idx, s);
17e18948fe5e Fix legend and themeing with new multiaxis feature. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1931 diff changeset	649 if (li != null) {
17e18948fe5e Fix legend and themeing with new multiaxis feature. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1931 diff changeset	650 lic.add(li);
17e18948fe5e Fix legend and themeing with new multiaxis feature. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1931 diff changeset	651 }
17e18948fe5e Fix legend and themeing with new multiaxis feature. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1931 diff changeset	652 else {
17e18948fe5e Fix legend and themeing with new multiaxis feature. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1931 diff changeset	653 logger.warn("Could not get LegentItem for renderer: "
17e18948fe5e Fix legend and themeing with new multiaxis feature. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1931 diff changeset	654 + idx + ", series-idx " + s);
17e18948fe5e Fix legend and themeing with new multiaxis feature. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1931 diff changeset	655 }
17e18948fe5e Fix legend and themeing with new multiaxis feature. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1931 diff changeset	656 retidx++;
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	657 }
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	658
1679 69929c471646 Improved the creation/rendering of annotations (km favorites, mainvalues). Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1645 diff changeset	659 if (anno != null) {
69929c471646 Improved the creation/rendering of annotations (km favorites, mainvalues). Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1645 diff changeset	660 lic.addAll(anno);
69929c471646 Improved the creation/rendering of annotations (km favorites, mainvalues). Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1645 diff changeset	661 }
69929c471646 Improved the creation/rendering of annotations (km favorites, mainvalues). Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1645 diff changeset	662
69929c471646 Improved the creation/rendering of annotations (km favorites, mainvalues). Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1645 diff changeset	663 plot.setFixedLegendItems(lic);
69929c471646 Improved the creation/rendering of annotations (km favorites, mainvalues). Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 1645 diff changeset	664
1932 17e18948fe5e Fix legend and themeing with new multiaxis feature. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1931 diff changeset	665 plot.setRenderer(idx, renderer);
17e18948fe5e Fix legend and themeing with new multiaxis feature. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1931 diff changeset	666
17e18948fe5e Fix legend and themeing with new multiaxis feature. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1931 diff changeset	667 return retidx;
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	668 }
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	669
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	670
1932 17e18948fe5e Fix legend and themeing with new multiaxis feature. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1931 diff changeset	671 /**
17e18948fe5e Fix legend and themeing with new multiaxis feature. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1931 diff changeset	672 * Get renderer, from plot or cloned default renderer otherwise.
17e18948fe5e Fix legend and themeing with new multiaxis feature. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1931 diff changeset	673 */
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	674 protected XYLineAndShapeRenderer getRenderer(XYPlot plot, int idx) {
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	675 XYLineAndShapeRenderer r =
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	676 (XYLineAndShapeRenderer) plot.getRenderer(idx);
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	677
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	678 if (r != null) {
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	679 return r;
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	680 }
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	681
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	682 if (idx == 0) {
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	683 logger.warn("No default renderer set!");
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	684 return new XYLineAndShapeRenderer();
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	685 }
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	686
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	687 r = (XYLineAndShapeRenderer) plot.getRenderer(0);
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	688
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	689 try {
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	690 return (XYLineAndShapeRenderer) r.clone();
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	691 }
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	692 catch (CloneNotSupportedException cnse) {
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	693 logger.warn(cnse, cnse);
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	694 }
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	695
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	696 logger.warn("No applicalable renderer found!");
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	697
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	698 return new XYLineAndShapeRenderer();
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	699 }
1849 5d5dd44d613e Refactored, move doMainValueAnnotations to XYChartGenerator. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1768 diff changeset	700
5d5dd44d613e Refactored, move doMainValueAnnotations to XYChartGenerator. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1768 diff changeset	701
5d5dd44d613e Refactored, move doMainValueAnnotations to XYChartGenerator. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1768 diff changeset	702 /**
1861 11c4b1429117 Cosmetics, resolve code duplicate. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1849 diff changeset	703 * Register annotations like MainValues for later plotting
11c4b1429117 Cosmetics, resolve code duplicate. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1849 diff changeset	704 *
11c4b1429117 Cosmetics, resolve code duplicate. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1849 diff changeset	705 * @param o list of annotations (data of facet).
11c4b1429117 Cosmetics, resolve code duplicate. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1849 diff changeset	706 * @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	707 * FLYSArtifact.getNativeFacet() instead to retrieve a Facet which supports
11c4b1429117 Cosmetics, resolve code duplicate. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1849 diff changeset	708 * data.
11c4b1429117 Cosmetics, resolve code duplicate. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1849 diff changeset	709 * @param theme Theme document for given annotations.
11c4b1429117 Cosmetics, resolve code duplicate. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1849 diff changeset	710 * @param visible The visibility of the annotations.
1849 5d5dd44d613e Refactored, move doMainValueAnnotations to XYChartGenerator. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1768 diff changeset	711 */
5d5dd44d613e Refactored, move doMainValueAnnotations to XYChartGenerator. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1768 diff changeset	712 protected void doAnnotations(
5d5dd44d613e Refactored, move doMainValueAnnotations to XYChartGenerator. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1768 diff changeset	713 FLYSAnnotation annotations,
5d5dd44d613e Refactored, move doMainValueAnnotations to XYChartGenerator. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1768 diff changeset	714 Facet facet,
5d5dd44d613e Refactored, move doMainValueAnnotations to XYChartGenerator. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1768 diff changeset	715 Document theme,
5d5dd44d613e Refactored, move doMainValueAnnotations to XYChartGenerator. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1768 diff changeset	716 boolean visible
5d5dd44d613e Refactored, move doMainValueAnnotations to XYChartGenerator. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1768 diff changeset	717 ){
5d5dd44d613e Refactored, move doMainValueAnnotations to XYChartGenerator. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1768 diff changeset	718 logger.debug("doAnnotations");
5d5dd44d613e Refactored, move doMainValueAnnotations to XYChartGenerator. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1768 diff changeset	719
1861 11c4b1429117 Cosmetics, resolve code duplicate. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1849 diff changeset	720 // Add all annotations to our annotation pool.
1849 5d5dd44d613e Refactored, move doMainValueAnnotations to XYChartGenerator. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1768 diff changeset	721 annotations.setTheme(theme);
5d5dd44d613e Refactored, move doMainValueAnnotations to XYChartGenerator. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1768 diff changeset	722 annotations.setLabel(facet.getDescription());
5d5dd44d613e Refactored, move doMainValueAnnotations to XYChartGenerator. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1768 diff changeset	723 addAnnotations(annotations, visible);
5d5dd44d613e Refactored, move doMainValueAnnotations to XYChartGenerator. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 1768 diff changeset	724 }
369 2ce7b473620e Implemented the chart creation of a longitudinal section chart - W and Q facets. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: diff changeset	725 }
2ce7b473620e Implemented the chart creation of a longitudinal section chart - W and Q facets. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: diff changeset	726 // 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 @ 1934:e4a516ca2e86