dive4elements/river: artifacts/src/main/java/org/dive4elements/river/exports/TimeseriesChartGenerator.java annotate

annotate artifacts/src/main/java/org/dive4elements/river/exports/TimeseriesChartGenerator.java @ 8856:5e38e2924c07 3.2.x

Fix code style.

author	Tom Gottfried <tom@intevation.de>
date	Thu, 18 Jan 2018 20:12:01 +0100
parents	be5ce2882708
children	0071702ba03f

rev	line source
5863 4897a58c8746 River artifacts: Added new copyright headers. Sascha L. Teichmann <teichmann@intevation.de> parents: 5838 diff changeset	1 /* Copyright (C) 2011, 2012, 2013 by Bundesanstalt für Gewässerkunde
4897a58c8746 River artifacts: Added new copyright headers. Sascha L. Teichmann <teichmann@intevation.de> parents: 5838 diff changeset	2 * Software engineering by Intevation GmbH
4897a58c8746 River artifacts: Added new copyright headers. Sascha L. Teichmann <teichmann@intevation.de> parents: 5838 diff changeset	3 *
5994 af13ceeba52a Removed trailing whitespace. Sascha L. Teichmann <teichmann@intevation.de> parents: 5864 diff changeset	4 * This file is Free Software under the GNU AGPL (>=v3)
5863 4897a58c8746 River artifacts: Added new copyright headers. Sascha L. Teichmann <teichmann@intevation.de> parents: 5838 diff changeset	5 * and comes with ABSOLUTELY NO WARRANTY! Check out the
5994 af13ceeba52a Removed trailing whitespace. Sascha L. Teichmann <teichmann@intevation.de> parents: 5864 diff changeset	6 * documentation coming with Dive4Elements River for details.
5863 4897a58c8746 River artifacts: Added new copyright headers. Sascha L. Teichmann <teichmann@intevation.de> parents: 5838 diff changeset	7 */
4897a58c8746 River artifacts: Added new copyright headers. Sascha L. Teichmann <teichmann@intevation.de> parents: 5838 diff changeset	8
5831 bd047b71ab37 Repaired internal references Sascha L. Teichmann <teichmann@intevation.de> parents: 4044 diff changeset	9 package org.dive4elements.river.exports;
2233 958a10e2e246 Added a new ChartGenerator for timeseries charts and refactored some code in XYChartGenerator. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: diff changeset	10
5831 bd047b71ab37 Repaired internal references Sascha L. Teichmann <teichmann@intevation.de> parents: 4044 diff changeset	11 import org.dive4elements.artifactdatabase.state.ArtifactAndFacet;
bd047b71ab37 Repaired internal references Sascha L. Teichmann <teichmann@intevation.de> parents: 4044 diff changeset	12 import org.dive4elements.river.artifacts.resources.Resources;
bd047b71ab37 Repaired internal references Sascha L. Teichmann <teichmann@intevation.de> parents: 4044 diff changeset	13 import org.dive4elements.river.jfree.Bounds;
bd047b71ab37 Repaired internal references Sascha L. Teichmann <teichmann@intevation.de> parents: 4044 diff changeset	14 import org.dive4elements.river.jfree.CollisionFreeXYTextAnnotation;
bd047b71ab37 Repaired internal references Sascha L. Teichmann <teichmann@intevation.de> parents: 4044 diff changeset	15 import org.dive4elements.river.jfree.DoubleBounds;
5864 f2e46a668fe6 River artifacts: Renamed FLYSAnnotation to RiverAnnotation. Sascha L. Teichmann <teichmann@intevation.de> parents: 5863 diff changeset	16 import org.dive4elements.river.jfree.RiverAnnotation;
8343 42b258294067 Remove duplication of AnnotationHelper-code in ChartGenerator. Tom Gottfried <tom@intevation.de> parents: 8202 diff changeset	17 import org.dive4elements.river.jfree.AnnotationHelper;
5831 bd047b71ab37 Repaired internal references Sascha L. Teichmann <teichmann@intevation.de> parents: 4044 diff changeset	18 import org.dive4elements.river.jfree.StyledTimeSeries;
bd047b71ab37 Repaired internal references Sascha L. Teichmann <teichmann@intevation.de> parents: 4044 diff changeset	19 import org.dive4elements.river.jfree.TimeBounds;
7034 557cb3a3d772 Combine AxisDataset implementations and remove / simplify handling code. Andre Heinecke <aheinecke@intevation.de> parents: 6905 diff changeset	20 import org.dive4elements.river.jfree.AxisDataset;
6905 1b35b2ddfc28 Artifacts: Introduce ThemeDocument & make stuff compileable again. THIS BREAKS THE SYSTEM! TODO: Move ThemeUtils into ThemeDocument. Sascha L. Teichmann <teichmann@intevation.de> parents: 6795 diff changeset	21 import org.dive4elements.river.themes.ThemeDocument;
3278 c27c4e06dd87 Re-add HYK rendering code to CrossSectionGenerator Christian Lins <christian.lins@intevation.de> parents: 3242 diff changeset	22
2238 23c7c51df772 Some more refactoring in XYChartGenerator and ChartGenerator; implemented necessary stuff in TimeseriesChartGenerator and return new empty instances of timeseries charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2236 diff changeset	23 import java.awt.Color;
3139 5888c4685701 Removed superfluous import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3134 diff changeset	24 import java.awt.Font;
3984 89d7e97e9c9a Manual points working in fixing Delta W/t char (#462). Christian Lins <clins@intevation.de> parents: 3969 diff changeset	25 import java.text.DateFormat;
89d7e97e9c9a Manual points working in fixing Delta W/t char (#462). Christian Lins <clins@intevation.de> parents: 3969 diff changeset	26 import java.text.ParseException;
2238 23c7c51df772 Some more refactoring in XYChartGenerator and ChartGenerator; implemented necessary stuff in TimeseriesChartGenerator and return new empty instances of timeseries charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2236 diff changeset	27 import java.util.ArrayList;
3139 5888c4685701 Removed superfluous import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3134 diff changeset	28 import java.util.Date;
2238 23c7c51df772 Some more refactoring in XYChartGenerator and ChartGenerator; implemented necessary stuff in TimeseriesChartGenerator and return new empty instances of timeseries charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2236 diff changeset	29 import java.util.HashMap;
4044 7eebd9e58641 Add chart legend entries for interpolated series (#838). Christian Lins <christian.lins@intevation.de> parents: 4021 diff changeset	30 import java.util.Iterator;
2238 23c7c51df772 Some more refactoring in XYChartGenerator and ChartGenerator; implemented necessary stuff in TimeseriesChartGenerator and return new empty instances of timeseries charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2236 diff changeset	31 import java.util.List;
23c7c51df772 Some more refactoring in XYChartGenerator and ChartGenerator; implemented necessary stuff in TimeseriesChartGenerator and return new empty instances of timeseries charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2236 diff changeset	32 import java.util.Map;
2233 958a10e2e246 Added a new ChartGenerator for timeseries charts and refactored some code in XYChartGenerator. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: diff changeset	33
3622 5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	34 import javax.swing.ImageIcon;
5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	35
2233 958a10e2e246 Added a new ChartGenerator for timeseries charts and refactored some code in XYChartGenerator. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: diff changeset	36 import org.apache.log4j.Logger;
2238 23c7c51df772 Some more refactoring in XYChartGenerator and ChartGenerator; implemented necessary stuff in TimeseriesChartGenerator and return new empty instances of timeseries charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2236 diff changeset	37 import org.jfree.chart.ChartFactory;
2233 958a10e2e246 Added a new ChartGenerator for timeseries charts and refactored some code in XYChartGenerator. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: diff changeset	38 import org.jfree.chart.JFreeChart;
4044 7eebd9e58641 Add chart legend entries for interpolated series (#838). Christian Lins <christian.lins@intevation.de> parents: 4021 diff changeset	39 import org.jfree.chart.LegendItem;
7eebd9e58641 Add chart legend entries for interpolated series (#838). Christian Lins <christian.lins@intevation.de> parents: 4021 diff changeset	40 import org.jfree.chart.LegendItemCollection;
3622 5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	41 import org.jfree.chart.annotations.XYAnnotation;
5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	42 import org.jfree.chart.annotations.XYImageAnnotation;
3139 5888c4685701 Removed superfluous import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3134 diff changeset	43 import org.jfree.chart.annotations.XYTextAnnotation;
2330 594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	44 import org.jfree.chart.axis.ValueAxis;
3139 5888c4685701 Removed superfluous import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3134 diff changeset	45 import org.jfree.chart.plot.Marker;
2238 23c7c51df772 Some more refactoring in XYChartGenerator and ChartGenerator; implemented necessary stuff in TimeseriesChartGenerator and return new empty instances of timeseries charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2236 diff changeset	46 import org.jfree.chart.plot.XYPlot;
3139 5888c4685701 Removed superfluous import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3134 diff changeset	47 import org.jfree.chart.renderer.xy.XYLineAndShapeRenderer;
2238 23c7c51df772 Some more refactoring in XYChartGenerator and ChartGenerator; implemented necessary stuff in TimeseriesChartGenerator and return new empty instances of timeseries charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2236 diff changeset	48 import org.jfree.data.Range;
2242 7e8e1d5384c0 Further refactoring of XYChartGenerator / ChartGenerator with the result, that timerange charts are now able to display lines. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2238 diff changeset	49 import org.jfree.data.general.Series;
7904 8b8407c71ee2 Potential fix for exception reported in flys/issue1717. Sascha L. Teichmann <teichmann@intevation.de> parents: 7595 diff changeset	50 import org.jfree.data.time.FixedMillisecond;
3139 5888c4685701 Removed superfluous import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3134 diff changeset	51 import org.jfree.data.time.TimeSeries;
5888c4685701 Removed superfluous import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3134 diff changeset	52 import org.jfree.data.time.TimeSeriesCollection;
2238 23c7c51df772 Some more refactoring in XYChartGenerator and ChartGenerator; implemented necessary stuff in TimeseriesChartGenerator and return new empty instances of timeseries charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2236 diff changeset	53 import org.jfree.data.xy.XYDataset;
3139 5888c4685701 Removed superfluous import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3134 diff changeset	54 import org.jfree.ui.Layer;
5888c4685701 Removed superfluous import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3134 diff changeset	55 import org.json.JSONArray;
5888c4685701 Removed superfluous import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3134 diff changeset	56 import org.json.JSONException;
2233 958a10e2e246 Added a new ChartGenerator for timeseries charts and refactored some code in XYChartGenerator. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: diff changeset	57
958a10e2e246 Added a new ChartGenerator for timeseries charts and refactored some code in XYChartGenerator. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: diff changeset	58 /**
6795 0747ca95ad6e Cosmetics. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 5994 diff changeset	59 * Generator for diagrams with time on x axis.
2233 958a10e2e246 Added a new ChartGenerator for timeseries charts and refactored some code in XYChartGenerator. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: diff changeset	60 * @author <a href="mailto:ingo.weinzierl@intevation.de">Ingo Weinzierl</a>
958a10e2e246 Added a new ChartGenerator for timeseries charts and refactored some code in XYChartGenerator. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: diff changeset	61 */
6795 0747ca95ad6e Cosmetics. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 5994 diff changeset	62 public abstract class TimeseriesChartGenerator
0747ca95ad6e Cosmetics. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 5994 diff changeset	63 extends ChartGenerator {
2238 23c7c51df772 Some more refactoring in XYChartGenerator and ChartGenerator; implemented necessary stuff in TimeseriesChartGenerator and return new empty instances of timeseries charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2236 diff changeset	64
3130 0dd569e9b9f1 Added new methods to add domain and value axis markers to time series plots. Raimund Renkert <raimund.renkert@intevation.de> parents: 3087 diff changeset	65 protected List<Marker> domainMarker;
2238 23c7c51df772 Some more refactoring in XYChartGenerator and ChartGenerator; implemented necessary stuff in TimeseriesChartGenerator and return new empty instances of timeseries charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2236 diff changeset	66
3130 0dd569e9b9f1 Added new methods to add domain and value axis markers to time series plots. Raimund Renkert <raimund.renkert@intevation.de> parents: 3087 diff changeset	67 protected List<Marker> valueMarker;
0dd569e9b9f1 Added new methods to add domain and value axis markers to time series plots. Raimund Renkert <raimund.renkert@intevation.de> parents: 3087 diff changeset	68
3134 5a0aef74c316 Use different stylings for real and interpolated data points. Raimund Renkert <raimund.renkert@intevation.de> parents: 3130 diff changeset	69 protected Map<String, String> attributes;
5a0aef74c316 Use different stylings for real and interpolated data points. Raimund Renkert <raimund.renkert@intevation.de> parents: 3130 diff changeset	70
3130 0dd569e9b9f1 Added new methods to add domain and value axis markers to time series plots. Raimund Renkert <raimund.renkert@intevation.de> parents: 3087 diff changeset	71 protected boolean domainZeroLineVisible;
2238 23c7c51df772 Some more refactoring in XYChartGenerator and ChartGenerator; implemented necessary stuff in TimeseriesChartGenerator and return new empty instances of timeseries charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2236 diff changeset	72
8202 e4606eae8ea5 sed src/*/.java 's/logger/log/g' Sascha L. Teichmann <teichmann@intevation.de> parents: 7904 diff changeset	73 private static final Logger log =
2233 958a10e2e246 Added a new ChartGenerator for timeseries charts and refactored some code in XYChartGenerator. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: diff changeset	74 Logger.getLogger(TimeseriesChartGenerator.class);
958a10e2e246 Added a new ChartGenerator for timeseries charts and refactored some code in XYChartGenerator. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: diff changeset	75
2330 594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	76 public static final int AXIS_SPACE = 5;
2238 23c7c51df772 Some more refactoring in XYChartGenerator and ChartGenerator; implemented necessary stuff in TimeseriesChartGenerator and return new empty instances of timeseries charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2236 diff changeset	77
2587 bece6f604899 Removed references to Range and replaced those with references to Bounds in ChartGenerators. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2586 diff changeset	78 protected Map<Integer, Bounds> xBounds;
2330 594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	79
2587 bece6f604899 Removed references to Range and replaced those with references to Bounds in ChartGenerators. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2586 diff changeset	80 protected Map<Integer, Bounds> yBounds;
2238 23c7c51df772 Some more refactoring in XYChartGenerator and ChartGenerator; implemented necessary stuff in TimeseriesChartGenerator and return new empty instances of timeseries charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2236 diff changeset	81
23c7c51df772 Some more refactoring in XYChartGenerator and ChartGenerator; implemented necessary stuff in TimeseriesChartGenerator and return new empty instances of timeseries charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2236 diff changeset	82
23c7c51df772 Some more refactoring in XYChartGenerator and ChartGenerator; implemented necessary stuff in TimeseriesChartGenerator and return new empty instances of timeseries charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2236 diff changeset	83 /**
23c7c51df772 Some more refactoring in XYChartGenerator and ChartGenerator; implemented necessary stuff in TimeseriesChartGenerator and return new empty instances of timeseries charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2236 diff changeset	84 * The default constructor that initializes internal datastructures.
23c7c51df772 Some more refactoring in XYChartGenerator and ChartGenerator; implemented necessary stuff in TimeseriesChartGenerator and return new empty instances of timeseries charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2236 diff changeset	85 */
23c7c51df772 Some more refactoring in XYChartGenerator and ChartGenerator; implemented necessary stuff in TimeseriesChartGenerator and return new empty instances of timeseries charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2236 diff changeset	86 public TimeseriesChartGenerator() {
23c7c51df772 Some more refactoring in XYChartGenerator and ChartGenerator; implemented necessary stuff in TimeseriesChartGenerator and return new empty instances of timeseries charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2236 diff changeset	87 super();
23c7c51df772 Some more refactoring in XYChartGenerator and ChartGenerator; implemented necessary stuff in TimeseriesChartGenerator and return new empty instances of timeseries charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2236 diff changeset	88
2587 bece6f604899 Removed references to Range and replaced those with references to Bounds in ChartGenerators. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2586 diff changeset	89 xBounds = new HashMap<Integer, Bounds>();
bece6f604899 Removed references to Range and replaced those with references to Bounds in ChartGenerators. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2586 diff changeset	90 yBounds = new HashMap<Integer, Bounds>();
3130 0dd569e9b9f1 Added new methods to add domain and value axis markers to time series plots. Raimund Renkert <raimund.renkert@intevation.de> parents: 3087 diff changeset	91 domainMarker = new ArrayList<Marker>();
0dd569e9b9f1 Added new methods to add domain and value axis markers to time series plots. Raimund Renkert <raimund.renkert@intevation.de> parents: 3087 diff changeset	92 valueMarker = new ArrayList<Marker>();
3134 5a0aef74c316 Use different stylings for real and interpolated data points. Raimund Renkert <raimund.renkert@intevation.de> parents: 3130 diff changeset	93 attributes = new HashMap<String, String>();
2238 23c7c51df772 Some more refactoring in XYChartGenerator and ChartGenerator; implemented necessary stuff in TimeseriesChartGenerator and return new empty instances of timeseries charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2236 diff changeset	94 }
23c7c51df772 Some more refactoring in XYChartGenerator and ChartGenerator; implemented necessary stuff in TimeseriesChartGenerator and return new empty instances of timeseries charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2236 diff changeset	95
2233 958a10e2e246 Added a new ChartGenerator for timeseries charts and refactored some code in XYChartGenerator. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: diff changeset	96
958a10e2e246 Added a new ChartGenerator for timeseries charts and refactored some code in XYChartGenerator. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: diff changeset	97
958a10e2e246 Added a new ChartGenerator for timeseries charts and refactored some code in XYChartGenerator. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: diff changeset	98 @Override
2234 46ec09c7f578 Refactoring: moved more base code from XYChartGenerator into its parent class ChartGenerator. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2233 diff changeset	99 public JFreeChart generateChart() {
8202 e4606eae8ea5 sed src/*/.java 's/logger/log/g' Sascha L. Teichmann <teichmann@intevation.de> parents: 7904 diff changeset	100 log.info("Generate Timeseries Chart.");
2233 958a10e2e246 Added a new ChartGenerator for timeseries charts and refactored some code in XYChartGenerator. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: diff changeset	101
2238 23c7c51df772 Some more refactoring in XYChartGenerator and ChartGenerator; implemented necessary stuff in TimeseriesChartGenerator and return new empty instances of timeseries charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2236 diff changeset	102 JFreeChart chart = ChartFactory.createTimeSeriesChart(
23c7c51df772 Some more refactoring in XYChartGenerator and ChartGenerator; implemented necessary stuff in TimeseriesChartGenerator and return new empty instances of timeseries charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2236 diff changeset	103 getChartTitle(),
23c7c51df772 Some more refactoring in XYChartGenerator and ChartGenerator; implemented necessary stuff in TimeseriesChartGenerator and return new empty instances of timeseries charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2236 diff changeset	104 getXAxisLabel(),
23c7c51df772 Some more refactoring in XYChartGenerator and ChartGenerator; implemented necessary stuff in TimeseriesChartGenerator and return new empty instances of timeseries charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2236 diff changeset	105 getYAxisLabel(0),
23c7c51df772 Some more refactoring in XYChartGenerator and ChartGenerator; implemented necessary stuff in TimeseriesChartGenerator and return new empty instances of timeseries charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2236 diff changeset	106 null,
2422 44dc117aa2b7 Picked rev 4058,4063,4065,4068,4069 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2330 diff changeset	107 isLegendVisible(),
2238 23c7c51df772 Some more refactoring in XYChartGenerator and ChartGenerator; implemented necessary stuff in TimeseriesChartGenerator and return new empty instances of timeseries charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2236 diff changeset	108 false,
23c7c51df772 Some more refactoring in XYChartGenerator and ChartGenerator; implemented necessary stuff in TimeseriesChartGenerator and return new empty instances of timeseries charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2236 diff changeset	109 false);
23c7c51df772 Some more refactoring in XYChartGenerator and ChartGenerator; implemented necessary stuff in TimeseriesChartGenerator and return new empty instances of timeseries charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2236 diff changeset	110
23c7c51df772 Some more refactoring in XYChartGenerator and ChartGenerator; implemented necessary stuff in TimeseriesChartGenerator and return new empty instances of timeseries charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2236 diff changeset	111 XYPlot plot = (XYPlot) chart.getPlot();
23c7c51df772 Some more refactoring in XYChartGenerator and ChartGenerator; implemented necessary stuff in TimeseriesChartGenerator and return new empty instances of timeseries charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2236 diff changeset	112
23c7c51df772 Some more refactoring in XYChartGenerator and ChartGenerator; implemented necessary stuff in TimeseriesChartGenerator and return new empty instances of timeseries charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2236 diff changeset	113 chart.setBackgroundPaint(Color.WHITE);
23c7c51df772 Some more refactoring in XYChartGenerator and ChartGenerator; implemented necessary stuff in TimeseriesChartGenerator and return new empty instances of timeseries charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2236 diff changeset	114 plot.setBackgroundPaint(Color.WHITE);
23c7c51df772 Some more refactoring in XYChartGenerator and ChartGenerator; implemented necessary stuff in TimeseriesChartGenerator and return new empty instances of timeseries charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2236 diff changeset	115
23c7c51df772 Some more refactoring in XYChartGenerator and ChartGenerator; implemented necessary stuff in TimeseriesChartGenerator and return new empty instances of timeseries charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2236 diff changeset	116 addSubtitles(chart);
2422 44dc117aa2b7 Picked rev 4058,4063,4065,4068,4069 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2330 diff changeset	117 adjustPlot(plot);
2238 23c7c51df772 Some more refactoring in XYChartGenerator and ChartGenerator; implemented necessary stuff in TimeseriesChartGenerator and return new empty instances of timeseries charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2236 diff changeset	118 addDatasets(plot);
2586 8cd6358eb7f8 Enabeld axes label font sizes for timeseries charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2554 diff changeset	119 adjustAxes(plot);
3130 0dd569e9b9f1 Added new methods to add domain and value axis markers to time series plots. Raimund Renkert <raimund.renkert@intevation.de> parents: 3087 diff changeset	120 addDomainAxisMarker(plot);
0dd569e9b9f1 Added new methods to add domain and value axis markers to time series plots. Raimund Renkert <raimund.renkert@intevation.de> parents: 3087 diff changeset	121 addValueAxisMarker(plot);
2330 594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	122 adaptZoom(plot);
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	123
3134 5a0aef74c316 Use different stylings for real and interpolated data points. Raimund Renkert <raimund.renkert@intevation.de> parents: 3130 diff changeset	124 applySeriesAttributes(plot);
4021 7cc05da7e35c Add message for 'state.chart.km' Christian Lins <christian.lins@intevation.de> parents: 3984 diff changeset	125
7595 ce1b8a59934e issue1558: Allow fixed axis for timeseries-diagrams. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 7034 diff changeset	126 consumeAxisSettings(plot);
ce1b8a59934e issue1558: Allow fixed axis for timeseries-diagrams. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 7034 diff changeset	127
8343 42b258294067 Remove duplication of AnnotationHelper-code in ChartGenerator. Tom Gottfried <tom@intevation.de> parents: 8202 diff changeset	128 AnnotationHelper.addAnnotationsToRenderer(
42b258294067 Remove duplication of AnnotationHelper-code in ChartGenerator. Tom Gottfried <tom@intevation.de> parents: 8202 diff changeset	129 annotations,
42b258294067 Remove duplication of AnnotationHelper-code in ChartGenerator. Tom Gottfried <tom@intevation.de> parents: 8202 diff changeset	130 plot,
42b258294067 Remove duplication of AnnotationHelper-code in ChartGenerator. Tom Gottfried <tom@intevation.de> parents: 8202 diff changeset	131 getChartSettings(),
42b258294067 Remove duplication of AnnotationHelper-code in ChartGenerator. Tom Gottfried <tom@intevation.de> parents: 8202 diff changeset	132 datasets);
3622 5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	133 addLogo(plot);
3185 f1e4b37dcb60 Enable legend item aggreation in time series charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3168 diff changeset	134 aggregateLegendEntries(plot);
2238 23c7c51df772 Some more refactoring in XYChartGenerator and ChartGenerator; implemented necessary stuff in TimeseriesChartGenerator and return new empty instances of timeseries charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2236 diff changeset	135 return chart;
23c7c51df772 Some more refactoring in XYChartGenerator and ChartGenerator; implemented necessary stuff in TimeseriesChartGenerator and return new empty instances of timeseries charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2236 diff changeset	136 }
23c7c51df772 Some more refactoring in XYChartGenerator and ChartGenerator; implemented necessary stuff in TimeseriesChartGenerator and return new empty instances of timeseries charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2236 diff changeset	137
23c7c51df772 Some more refactoring in XYChartGenerator and ChartGenerator; implemented necessary stuff in TimeseriesChartGenerator and return new empty instances of timeseries charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2236 diff changeset	138
3622 5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	139 /**
5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	140 * Return left most data points x value (on first axis).
5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	141 * Shortcut, especially to be overridden in (LS) charts where
5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	142 * axis could be inverted.
5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	143 */
8455 6dfc3a1fc70d (issue1764) Set upper-time and lower-time for time series axes Andre Heinecke <andre.heinecke@intevation.de> parents: 8343 diff changeset	144 protected long getLeftX() {
3622 5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	145 return (Long)getXBounds(0).getLower();
5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	146 }
5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	147
5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	148
5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	149 /**
5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	150 * Return right most data points x value (on first axis).
5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	151 * Shortcut, especially to be overridden in (LS) charts where
5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	152 * axis could be inverted.
5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	153 */
8455 6dfc3a1fc70d (issue1764) Set upper-time and lower-time for time series axes Andre Heinecke <andre.heinecke@intevation.de> parents: 8343 diff changeset	154 protected long getRightX() {
3622 5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	155 return (Long)getXBounds(0).getUpper();
5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	156 }
5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	157
5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	158
5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	159 /**
5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	160 * Add a logo as background annotation to plot.
5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	161 * Copy from XYChartGenerator.
5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	162 */
5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	163 protected void addLogo(XYPlot plot) {
5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	164 String logo = showLogo();
5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	165 if (logo == null) {
8202 e4606eae8ea5 sed src/*/.java 's/logger/log/g' Sascha L. Teichmann <teichmann@intevation.de> parents: 7904 diff changeset	166 log.debug("No logo to show chosen");
3622 5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	167 return;
5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	168 }
5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	169
3633 ebfce31c7eec Removed trailing whitespace. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3632 diff changeset	170 ImageIcon imageIcon = null;
3622 5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	171 if (logo.equals("none")) {
5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	172 return;
5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	173 }
3623 119b8ba2b77f Include logos in resources. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3622 diff changeset	174 /*
119b8ba2b77f Include logos in resources. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3622 diff changeset	175 If you want to add images, remember to change code in these places:
119b8ba2b77f Include logos in resources. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3622 diff changeset	176 flys-artifacts:
119b8ba2b77f Include logos in resources. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3622 diff changeset	177 XYChartGenerator.java
119b8ba2b77f Include logos in resources. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3622 diff changeset	178 Timeseries*Generator.java and
119b8ba2b77f Include logos in resources. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3622 diff changeset	179 in the flys-client projects ChartPropertEditor.java.
3638 6bfcbe391393 Better comment for logo-adders. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3637 diff changeset	180 Also, these images have to be put in
6bfcbe391393 Better comment for logo-adders. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3637 diff changeset	181 flys-artifacts/src/main/resources/images/
6bfcbe391393 Better comment for logo-adders. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3637 diff changeset	182 flys-client/src/main/webapp/images/
3623 119b8ba2b77f Include logos in resources. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3622 diff changeset	183 */
3637 d5a0602375fb Fixed logo integration in timeseries charts. Raimund Renkert <raimund.renkert@intevation.de> parents: 3633 diff changeset	184 java.net.URL imageURL;
3622 5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	185 if (logo.equals("Intevation")) {
8856 5e38e2924c07 Fix code style. Tom Gottfried <tom@intevation.de> parents: 8489 diff changeset	186 imageURL = XYChartGenerator.class.getResource(
5e38e2924c07 Fix code style. Tom Gottfried <tom@intevation.de> parents: 8489 diff changeset	187 "/images/intevation.png");
3622 5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	188 }
5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	189 else { // TODO else if ...
8856 5e38e2924c07 Fix code style. Tom Gottfried <tom@intevation.de> parents: 8489 diff changeset	190 imageURL = XYChartGenerator.class.getResource(
5e38e2924c07 Fix code style. Tom Gottfried <tom@intevation.de> parents: 8489 diff changeset	191 "/images/bfg_logo.gif");
3622 5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	192 }
3637 d5a0602375fb Fixed logo integration in timeseries charts. Raimund Renkert <raimund.renkert@intevation.de> parents: 3633 diff changeset	193 imageIcon = new ImageIcon(imageURL);
3622 5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	194 double xPos = 0d, yPos = 0d;
5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	195
5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	196 String placeh = logoHPlace();
5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	197 String placev = logoVPlace();
5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	198
5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	199 if (placev == null \|\| placev.equals("none")) {
5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	200 placev = "top";
5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	201 }
5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	202 if (placev.equals("top")) {
5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	203 yPos = (Double)getYBounds(0).getUpper();
5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	204 }
5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	205 else if (placev.equals("bottom")) {
5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	206 yPos = (Double)getYBounds(0).getLower();
5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	207 }
5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	208 else if (placev.equals("center")) {
8856 5e38e2924c07 Fix code style. Tom Gottfried <tom@intevation.de> parents: 8489 diff changeset	209 yPos = ((Double)getYBounds(0).getUpper()
5e38e2924c07 Fix code style. Tom Gottfried <tom@intevation.de> parents: 8489 diff changeset	210 + (Double)getYBounds(0).getLower())/2d;
3622 5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	211 }
5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	212 else {
8202 e4606eae8ea5 sed src/*/.java 's/logger/log/g' Sascha L. Teichmann <teichmann@intevation.de> parents: 7904 diff changeset	213 log.debug("Unknown place-v value: " + placev);
3622 5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	214 }
5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	215
5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	216 if (placeh == null \|\| placeh.equals("none")) {
5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	217 placeh = "center";
5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	218 }
5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	219 if (placeh.equals("left")) {
5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	220 xPos = getLeftX();
5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	221 }
5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	222 else if (placeh.equals("right")) {
5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	223 xPos = getRightX();
5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	224 }
5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	225 else if (placeh.equals("center")) {
8856 5e38e2924c07 Fix code style. Tom Gottfried <tom@intevation.de> parents: 8489 diff changeset	226 xPos = ((Long)getXBounds(0).getUpper()
5e38e2924c07 Fix code style. Tom Gottfried <tom@intevation.de> parents: 8489 diff changeset	227 + (Long)getXBounds(0).getLower())/2d;
3622 5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	228 }
5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	229 else {
8202 e4606eae8ea5 sed src/*/.java 's/logger/log/g' Sascha L. Teichmann <teichmann@intevation.de> parents: 7904 diff changeset	230 log.debug("Unknown place-h value: " + placeh);
3622 5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	231 }
5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	232
8202 e4606eae8ea5 sed src/*/.java 's/logger/log/g' Sascha L. Teichmann <teichmann@intevation.de> parents: 7904 diff changeset	233 log.debug("logo position: " + xPos + "/" + yPos);
3622 5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	234
5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	235 org.jfree.ui.RectangleAnchor anchor
5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	236 = org.jfree.ui.RectangleAnchor.TOP;
5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	237 if (placev.equals("top")) {
5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	238 if (placeh.equals("left")) {
5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	239 anchor = org.jfree.ui.RectangleAnchor.TOP_LEFT;
5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	240 }
5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	241 else if (placeh.equals("right")) {
5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	242 anchor = org.jfree.ui.RectangleAnchor.TOP_RIGHT;
5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	243 }
5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	244 else if (placeh.equals("center")) {
5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	245 anchor = org.jfree.ui.RectangleAnchor.TOP;
5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	246 }
5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	247 }
5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	248 else if (placev.equals("bottom")) {
5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	249 if (placeh.equals("left")) {
5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	250 anchor = org.jfree.ui.RectangleAnchor.BOTTOM_LEFT;
5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	251 }
5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	252 else if (placeh.equals("right")) {
5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	253 anchor = org.jfree.ui.RectangleAnchor.BOTTOM_RIGHT;
5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	254 }
5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	255 else if (placeh.equals("center")) {
5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	256 anchor = org.jfree.ui.RectangleAnchor.BOTTOM;
5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	257 }
5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	258 }
5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	259 else if (placev.equals("center")) {
5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	260 if (placeh.equals("left")) {
5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	261 anchor = org.jfree.ui.RectangleAnchor.LEFT;
5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	262 }
5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	263 else if (placeh.equals("right")) {
5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	264 anchor = org.jfree.ui.RectangleAnchor.RIGHT;
5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	265 }
5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	266 else if (placeh.equals("center")) {
5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	267 anchor = org.jfree.ui.RectangleAnchor.CENTER;
5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	268 }
5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	269 }
5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	270
5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	271 XYAnnotation xyannotation =
3633 ebfce31c7eec Removed trailing whitespace. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3632 diff changeset	272 new XYImageAnnotation(xPos, yPos, imageIcon.getImage(), anchor);
8856 5e38e2924c07 Fix code style. Tom Gottfried <tom@intevation.de> parents: 8489 diff changeset	273 plot.getRenderer().addAnnotation(
5e38e2924c07 Fix code style. Tom Gottfried <tom@intevation.de> parents: 8489 diff changeset	274 xyannotation, org.jfree.ui.Layer.BACKGROUND);
3622 5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	275 }
5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	276
7595 ce1b8a59934e issue1558: Allow fixed axis for timeseries-diagrams. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 7034 diff changeset	277 /**
ce1b8a59934e issue1558: Allow fixed axis for timeseries-diagrams. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 7034 diff changeset	278 * This method zooms the plot to the specified ranges in the attribute
ce1b8a59934e issue1558: Allow fixed axis for timeseries-diagrams. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 7034 diff changeset	279 * document or to the ranges specified by the min/max values in the
ce1b8a59934e issue1558: Allow fixed axis for timeseries-diagrams. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 7034 diff changeset	280 * datasets. <b>Note:</b> We determine the range manually if no zoom ranges
ce1b8a59934e issue1558: Allow fixed axis for timeseries-diagrams. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 7034 diff changeset	281 * are given, because JFreeCharts auto-zoom adds a margin to the left and
ce1b8a59934e issue1558: Allow fixed axis for timeseries-diagrams. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 7034 diff changeset	282 * right of the data area.
ce1b8a59934e issue1558: Allow fixed axis for timeseries-diagrams. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 7034 diff changeset	283 *
ce1b8a59934e issue1558: Allow fixed axis for timeseries-diagrams. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 7034 diff changeset	284 * Copy of implementation in XYChartGenerator.
ce1b8a59934e issue1558: Allow fixed axis for timeseries-diagrams. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 7034 diff changeset	285 *
ce1b8a59934e issue1558: Allow fixed axis for timeseries-diagrams. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 7034 diff changeset	286 * @param plot The XYPlot.
ce1b8a59934e issue1558: Allow fixed axis for timeseries-diagrams. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 7034 diff changeset	287 */
ce1b8a59934e issue1558: Allow fixed axis for timeseries-diagrams. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 7034 diff changeset	288 protected void consumeAxisSettings(XYPlot plot) {
8202 e4606eae8ea5 sed src/*/.java 's/logger/log/g' Sascha L. Teichmann <teichmann@intevation.de> parents: 7904 diff changeset	289 log.debug("Zoom to specified ranges.");
7595 ce1b8a59934e issue1558: Allow fixed axis for timeseries-diagrams. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 7034 diff changeset	290
ce1b8a59934e issue1558: Allow fixed axis for timeseries-diagrams. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 7034 diff changeset	291 Bounds xrange = getDomainAxisRange();
ce1b8a59934e issue1558: Allow fixed axis for timeseries-diagrams. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 7034 diff changeset	292 Bounds yrange = getValueAxisRange();
ce1b8a59934e issue1558: Allow fixed axis for timeseries-diagrams. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 7034 diff changeset	293
ce1b8a59934e issue1558: Allow fixed axis for timeseries-diagrams. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 7034 diff changeset	294 ValueAxis xAxis = plot.getDomainAxis();
ce1b8a59934e issue1558: Allow fixed axis for timeseries-diagrams. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 7034 diff changeset	295
ce1b8a59934e issue1558: Allow fixed axis for timeseries-diagrams. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 7034 diff changeset	296 Range fixedXRange = getRangeForAxisFromSettings("X");
ce1b8a59934e issue1558: Allow fixed axis for timeseries-diagrams. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 7034 diff changeset	297 if (fixedXRange != null) {
ce1b8a59934e issue1558: Allow fixed axis for timeseries-diagrams. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 7034 diff changeset	298 xAxis.setRange(fixedXRange);
ce1b8a59934e issue1558: Allow fixed axis for timeseries-diagrams. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 7034 diff changeset	299 }
ce1b8a59934e issue1558: Allow fixed axis for timeseries-diagrams. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 7034 diff changeset	300 else {
ce1b8a59934e issue1558: Allow fixed axis for timeseries-diagrams. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 7034 diff changeset	301 zoomX(plot, xAxis, getXBounds(0), xrange);
ce1b8a59934e issue1558: Allow fixed axis for timeseries-diagrams. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 7034 diff changeset	302 }
ce1b8a59934e issue1558: Allow fixed axis for timeseries-diagrams. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 7034 diff changeset	303
ce1b8a59934e issue1558: Allow fixed axis for timeseries-diagrams. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 7034 diff changeset	304 for (int i = 0, num = plot.getRangeAxisCount(); i < num; i++) {
ce1b8a59934e issue1558: Allow fixed axis for timeseries-diagrams. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 7034 diff changeset	305 ValueAxis yaxis = plot.getRangeAxis(i);
ce1b8a59934e issue1558: Allow fixed axis for timeseries-diagrams. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 7034 diff changeset	306
ce1b8a59934e issue1558: Allow fixed axis for timeseries-diagrams. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 7034 diff changeset	307 if (yaxis instanceof IdentifiableNumberAxis) {
ce1b8a59934e issue1558: Allow fixed axis for timeseries-diagrams. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 7034 diff changeset	308 IdentifiableNumberAxis idAxis = (IdentifiableNumberAxis) yaxis;
ce1b8a59934e issue1558: Allow fixed axis for timeseries-diagrams. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 7034 diff changeset	309
ce1b8a59934e issue1558: Allow fixed axis for timeseries-diagrams. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 7034 diff changeset	310 Range fixedRange = getRangeForAxisFromSettings(idAxis.getId());
ce1b8a59934e issue1558: Allow fixed axis for timeseries-diagrams. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 7034 diff changeset	311 if (fixedRange != null) {
ce1b8a59934e issue1558: Allow fixed axis for timeseries-diagrams. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 7034 diff changeset	312 yaxis.setRange(fixedRange);
ce1b8a59934e issue1558: Allow fixed axis for timeseries-diagrams. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 7034 diff changeset	313 continue;
ce1b8a59934e issue1558: Allow fixed axis for timeseries-diagrams. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 7034 diff changeset	314 }
ce1b8a59934e issue1558: Allow fixed axis for timeseries-diagrams. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 7034 diff changeset	315 }
ce1b8a59934e issue1558: Allow fixed axis for timeseries-diagrams. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 7034 diff changeset	316
ce1b8a59934e issue1558: Allow fixed axis for timeseries-diagrams. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 7034 diff changeset	317 if (yaxis == null) {
8202 e4606eae8ea5 sed src/*/.java 's/logger/log/g' Sascha L. Teichmann <teichmann@intevation.de> parents: 7904 diff changeset	318 log.debug("Zoom problem: no Y Axis for index: " + i);
7595 ce1b8a59934e issue1558: Allow fixed axis for timeseries-diagrams. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 7034 diff changeset	319 continue;
ce1b8a59934e issue1558: Allow fixed axis for timeseries-diagrams. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 7034 diff changeset	320 }
ce1b8a59934e issue1558: Allow fixed axis for timeseries-diagrams. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 7034 diff changeset	321
8202 e4606eae8ea5 sed src/*/.java 's/logger/log/g' Sascha L. Teichmann <teichmann@intevation.de> parents: 7904 diff changeset	322 log.debug("Prepare zoom settings for y axis at index: " + i);
7595 ce1b8a59934e issue1558: Allow fixed axis for timeseries-diagrams. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 7034 diff changeset	323 zoomY(plot, yaxis, getYBounds(Integer.valueOf(i)), yrange);
ce1b8a59934e issue1558: Allow fixed axis for timeseries-diagrams. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 7034 diff changeset	324 }
ce1b8a59934e issue1558: Allow fixed axis for timeseries-diagrams. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 7034 diff changeset	325 }
ce1b8a59934e issue1558: Allow fixed axis for timeseries-diagrams. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 7034 diff changeset	326
3622 5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	327
2242 7e8e1d5384c0 Further refactoring of XYChartGenerator / ChartGenerator with the result, that timerange charts are now able to display lines. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2238 diff changeset	328 @Override
7e8e1d5384c0 Further refactoring of XYChartGenerator / ChartGenerator with the result, that timerange charts are now able to display lines. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2238 diff changeset	329 protected Series getSeriesOf(XYDataset dataset, int idx) {
7e8e1d5384c0 Further refactoring of XYChartGenerator / ChartGenerator with the result, that timerange charts are now able to display lines. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2238 diff changeset	330 return ((TimeSeriesCollection) dataset).getSeries(idx);
7e8e1d5384c0 Further refactoring of XYChartGenerator / ChartGenerator with the result, that timerange charts are now able to display lines. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2238 diff changeset	331 }
7e8e1d5384c0 Further refactoring of XYChartGenerator / ChartGenerator with the result, that timerange charts are now able to display lines. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2238 diff changeset	332
7e8e1d5384c0 Further refactoring of XYChartGenerator / ChartGenerator with the result, that timerange charts are now able to display lines. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2238 diff changeset	333
2238 23c7c51df772 Some more refactoring in XYChartGenerator and ChartGenerator; implemented necessary stuff in TimeseriesChartGenerator and return new empty instances of timeseries charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2236 diff changeset	334 /**
7034 557cb3a3d772 Combine AxisDataset implementations and remove / simplify handling code. Andre Heinecke <aheinecke@intevation.de> parents: 6905 diff changeset	335 * This method creates new instances of AxisDataset.
2238 23c7c51df772 Some more refactoring in XYChartGenerator and ChartGenerator; implemented necessary stuff in TimeseriesChartGenerator and return new empty instances of timeseries charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2236 diff changeset	336 *
7034 557cb3a3d772 Combine AxisDataset implementations and remove / simplify handling code. Andre Heinecke <aheinecke@intevation.de> parents: 6905 diff changeset	337 * @param idx The symbol for the new AxisDataset.
2238 23c7c51df772 Some more refactoring in XYChartGenerator and ChartGenerator; implemented necessary stuff in TimeseriesChartGenerator and return new empty instances of timeseries charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2236 diff changeset	338 */
23c7c51df772 Some more refactoring in XYChartGenerator and ChartGenerator; implemented necessary stuff in TimeseriesChartGenerator and return new empty instances of timeseries charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2236 diff changeset	339 @Override
23c7c51df772 Some more refactoring in XYChartGenerator and ChartGenerator; implemented necessary stuff in TimeseriesChartGenerator and return new empty instances of timeseries charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2236 diff changeset	340 protected AxisDataset createAxisDataset(int idx) {
8202 e4606eae8ea5 sed src/*/.java 's/logger/log/g' Sascha L. Teichmann <teichmann@intevation.de> parents: 7904 diff changeset	341 log.debug("Create a new AxisDataset for index: " + idx);
7034 557cb3a3d772 Combine AxisDataset implementations and remove / simplify handling code. Andre Heinecke <aheinecke@intevation.de> parents: 6905 diff changeset	342 return new AxisDataset(idx);
2238 23c7c51df772 Some more refactoring in XYChartGenerator and ChartGenerator; implemented necessary stuff in TimeseriesChartGenerator and return new empty instances of timeseries charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2236 diff changeset	343 }
23c7c51df772 Some more refactoring in XYChartGenerator and ChartGenerator; implemented necessary stuff in TimeseriesChartGenerator and return new empty instances of timeseries charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2236 diff changeset	344
23c7c51df772 Some more refactoring in XYChartGenerator and ChartGenerator; implemented necessary stuff in TimeseriesChartGenerator and return new empty instances of timeseries charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2236 diff changeset	345
2330 594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	346 @Override
2587 bece6f604899 Removed references to Range and replaced those with references to Bounds in ChartGenerators. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2586 diff changeset	347 protected void combineXBounds(Bounds bounds, int index) {
2330 594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	348 if (bounds != null) {
2587 bece6f604899 Removed references to Range and replaced those with references to Bounds in ChartGenerators. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2586 diff changeset	349 Bounds old = getXBounds(index);
2238 23c7c51df772 Some more refactoring in XYChartGenerator and ChartGenerator; implemented necessary stuff in TimeseriesChartGenerator and return new empty instances of timeseries charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2236 diff changeset	350
23c7c51df772 Some more refactoring in XYChartGenerator and ChartGenerator; implemented necessary stuff in TimeseriesChartGenerator and return new empty instances of timeseries charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2236 diff changeset	351 if (old != null) {
2330 594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	352 bounds = bounds.combine(old);
2238 23c7c51df772 Some more refactoring in XYChartGenerator and ChartGenerator; implemented necessary stuff in TimeseriesChartGenerator and return new empty instances of timeseries charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2236 diff changeset	353 }
23c7c51df772 Some more refactoring in XYChartGenerator and ChartGenerator; implemented necessary stuff in TimeseriesChartGenerator and return new empty instances of timeseries charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2236 diff changeset	354
2330 594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	355 setXBounds(index, bounds);
2238 23c7c51df772 Some more refactoring in XYChartGenerator and ChartGenerator; implemented necessary stuff in TimeseriesChartGenerator and return new empty instances of timeseries charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2236 diff changeset	356 }
23c7c51df772 Some more refactoring in XYChartGenerator and ChartGenerator; implemented necessary stuff in TimeseriesChartGenerator and return new empty instances of timeseries charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2236 diff changeset	357 }
2261 6aeb71517136 Registered an Info generator for historical discharge curves; made some adaptions in XYChartGenerator, ChartGenerator and TimeseriesChartGenerator. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2242 diff changeset	358
6aeb71517136 Registered an Info generator for historical discharge curves; made some adaptions in XYChartGenerator, ChartGenerator and TimeseriesChartGenerator. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2242 diff changeset	359
2587 bece6f604899 Removed references to Range and replaced those with references to Bounds in ChartGenerators. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2586 diff changeset	360 @Override
bece6f604899 Removed references to Range and replaced those with references to Bounds in ChartGenerators. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2586 diff changeset	361 protected void combineYBounds(Bounds bounds, int index) {
2330 594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	362 if (bounds != null) {
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	363 Bounds old = getYBounds(index);
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	364
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	365 if (old != null) {
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	366 bounds = bounds.combine(old);
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	367 }
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	368
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	369 setYBounds(index, bounds);
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	370 }
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	371 }
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	372
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	373
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	374 // TODO REPLACE THIS METHOD WITH getBoundsForAxis(index)
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	375 @Override
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	376 public Range[] getRangesForAxis(int index) {
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	377 // TODO
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	378 Bounds[] bounds = getBoundsForAxis(index);
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	379
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	380 return new Range[] {
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	381 new Range(
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	382 bounds[0].getLower().doubleValue(),
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	383 bounds[0].getUpper().doubleValue()),
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	384 new Range(
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	385 bounds[1].getLower().doubleValue(),
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	386 bounds[1].getUpper().doubleValue())
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	387 };
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	388 }
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	389
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	390
2261 6aeb71517136 Registered an Info generator for historical discharge curves; made some adaptions in XYChartGenerator, ChartGenerator and TimeseriesChartGenerator. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2242 diff changeset	391 @Override
2330 594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	392 public Bounds getXBounds(int axis) {
2587 bece6f604899 Removed references to Range and replaced those with references to Bounds in ChartGenerators. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2586 diff changeset	393 return xBounds.get(axis);
2330 594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	394 }
2261 6aeb71517136 Registered an Info generator for historical discharge curves; made some adaptions in XYChartGenerator, ChartGenerator and TimeseriesChartGenerator. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2242 diff changeset	395
2330 594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	396
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	397 @Override
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	398 protected void setXBounds(int axis, Bounds bounds) {
2587 bece6f604899 Removed references to Range and replaced those with references to Bounds in ChartGenerators. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2586 diff changeset	399 xBounds.put(axis, bounds);
2330 594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	400 }
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	401
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	402
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	403 @Override
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	404 public Bounds getYBounds(int axis) {
2587 bece6f604899 Removed references to Range and replaced those with references to Bounds in ChartGenerators. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2586 diff changeset	405 return yBounds.get(axis);
2330 594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	406 }
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	407
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	408
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	409 @Override
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	410 protected void setYBounds(int axis, Bounds bounds) {
2587 bece6f604899 Removed references to Range and replaced those with references to Bounds in ChartGenerators. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2586 diff changeset	411 if (bounds != null) {
bece6f604899 Removed references to Range and replaced those with references to Bounds in ChartGenerators. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2586 diff changeset	412 yBounds.put(axis, bounds);
bece6f604899 Removed references to Range and replaced those with references to Bounds in ChartGenerators. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2586 diff changeset	413 }
2330 594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	414 }
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	415
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	416
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	417 public Bounds[] getBoundsForAxis(int index) {
8202 e4606eae8ea5 sed src/*/.java 's/logger/log/g' Sascha L. Teichmann <teichmann@intevation.de> parents: 7904 diff changeset	418 log.debug("Return x and y bounds for axis at: " + index);
2330 594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	419
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	420 Bounds rx = getXBounds(Integer.valueOf(index));
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	421 Bounds ry = getYBounds(Integer.valueOf(index));
2261 6aeb71517136 Registered an Info generator for historical discharge curves; made some adaptions in XYChartGenerator, ChartGenerator and TimeseriesChartGenerator. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2242 diff changeset	422
6aeb71517136 Registered an Info generator for historical discharge curves; made some adaptions in XYChartGenerator, ChartGenerator and TimeseriesChartGenerator. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2242 diff changeset	423 if (rx == null) {
8202 e4606eae8ea5 sed src/*/.java 's/logger/log/g' Sascha L. Teichmann <teichmann@intevation.de> parents: 7904 diff changeset	424 log.warn("Range for x axis not set." +
2261 6aeb71517136 Registered an Info generator for historical discharge curves; made some adaptions in XYChartGenerator, ChartGenerator and TimeseriesChartGenerator. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2242 diff changeset	425 " Using default values: 0 - 1.");
2330 594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	426 rx = new TimeBounds(0l, 1l);
2261 6aeb71517136 Registered an Info generator for historical discharge curves; made some adaptions in XYChartGenerator, ChartGenerator and TimeseriesChartGenerator. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2242 diff changeset	427 }
6aeb71517136 Registered an Info generator for historical discharge curves; made some adaptions in XYChartGenerator, ChartGenerator and TimeseriesChartGenerator. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2242 diff changeset	428
2330 594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	429 if (ry == null) {
8202 e4606eae8ea5 sed src/*/.java 's/logger/log/g' Sascha L. Teichmann <teichmann@intevation.de> parents: 7904 diff changeset	430 log.warn("Range for y axis not set." +
2330 594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	431 " Using default values: 0 - 1.");
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	432 ry = new DoubleBounds(0l, 1l);
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	433 }
2261 6aeb71517136 Registered an Info generator for historical discharge curves; made some adaptions in XYChartGenerator, ChartGenerator and TimeseriesChartGenerator. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2242 diff changeset	434
8202 e4606eae8ea5 sed src/*/.java 's/logger/log/g' Sascha L. Teichmann <teichmann@intevation.de> parents: 7904 diff changeset	435 log.debug("X Bounds at index " + index + " is: " + rx);
e4606eae8ea5 sed src/*/.java 's/logger/log/g' Sascha L. Teichmann <teichmann@intevation.de> parents: 7904 diff changeset	436 log.debug("Y Bounds at index " + index + " is: " + ry);
2330 594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	437
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	438 return new Bounds[] {rx, ry};
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	439 }
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	440
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	441
3650 cbe2febe30cc Merged revisions 5391-5392 via svnmerge from Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 3638 diff changeset	442 /** Get (zoom)values from request. */
2330 594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	443 public Bounds getDomainAxisRange() {
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	444 String[] ranges = getDomainAxisRangeFromRequest();
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	445
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	446 if (ranges == null \|\| ranges.length < 2) {
8202 e4606eae8ea5 sed src/*/.java 's/logger/log/g' Sascha L. Teichmann <teichmann@intevation.de> parents: 7904 diff changeset	447 log.debug("No zoom range for domain axis specified.");
2330 594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	448 return null;
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	449 }
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	450
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	451 if (ranges[0] == null \|\| ranges[1] == null) {
8202 e4606eae8ea5 sed src/*/.java 's/logger/log/g' Sascha L. Teichmann <teichmann@intevation.de> parents: 7904 diff changeset	452 log.warn("Invalid ranges for domain axis specified!");
2330 594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	453 return null;
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	454 }
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	455
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	456 try {
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	457 double lower = Double.parseDouble(ranges[0]);
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	458 double upper = Double.parseDouble(ranges[1]);
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	459
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	460 return new DoubleBounds(lower, upper);
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	461 }
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	462 catch (NumberFormatException nfe) {
8202 e4606eae8ea5 sed src/*/.java 's/logger/log/g' Sascha L. Teichmann <teichmann@intevation.de> parents: 7904 diff changeset	463 log.warn("Invalid ranges for domain axis specified: " + nfe);
2330 594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	464 }
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	465
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	466 return null;
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	467 }
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	468
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	469
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	470 public Bounds getValueAxisRange() {
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	471 String[] ranges = getValueAxisRangeFromRequest();
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	472
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	473 if (ranges == null \|\| ranges.length < 2) {
8202 e4606eae8ea5 sed src/*/.java 's/logger/log/g' Sascha L. Teichmann <teichmann@intevation.de> parents: 7904 diff changeset	474 log.debug("No zoom range for domain axis specified.");
2330 594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	475 return null;
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	476 }
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	477
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	478 if (ranges[0] == null \|\| ranges[1] == null) {
8202 e4606eae8ea5 sed src/*/.java 's/logger/log/g' Sascha L. Teichmann <teichmann@intevation.de> parents: 7904 diff changeset	479 log.warn("Invalid ranges for domain axis specified!");
2330 594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	480 return null;
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	481 }
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	482
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	483 try {
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	484 double lower = Double.parseDouble(ranges[0]);
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	485 double upper = Double.parseDouble(ranges[1]);
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	486
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	487 return new DoubleBounds(lower, upper);
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	488 }
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	489 catch (NumberFormatException nfe) {
8202 e4606eae8ea5 sed src/*/.java 's/logger/log/g' Sascha L. Teichmann <teichmann@intevation.de> parents: 7904 diff changeset	490 log.warn("Invalid ranges for domain axis specified: " + nfe);
2330 594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	491 }
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	492
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	493 return null;
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	494 }
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	495
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	496
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	497 protected void adaptZoom(XYPlot plot) {
8202 e4606eae8ea5 sed src/*/.java 's/logger/log/g' Sascha L. Teichmann <teichmann@intevation.de> parents: 7904 diff changeset	498 log.debug("Adapt zoom of Timeseries chart.");
2330 594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	499
2587 bece6f604899 Removed references to Range and replaced those with references to Bounds in ChartGenerators. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2586 diff changeset	500 zoomX(plot, plot.getDomainAxis(), getXBounds(0), getDomainAxisRange());
2330 594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	501
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	502 Bounds valueAxisBounds = getValueAxisRange();
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	503
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	504 for (int j = 0, n = plot.getRangeAxisCount(); j < n; j++) {
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	505 zoomY(
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	506 plot,
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	507 plot.getRangeAxis(j),
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	508 getYBounds(j),
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	509 valueAxisBounds);
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	510 }
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	511 }
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	512
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	513
3650 cbe2febe30cc Merged revisions 5391-5392 via svnmerge from Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 3638 diff changeset	514 /**
cbe2febe30cc Merged revisions 5391-5392 via svnmerge from Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 3638 diff changeset	515 * @param plot the plot.
cbe2febe30cc Merged revisions 5391-5392 via svnmerge from Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 3638 diff changeset	516 * @param axis the value (x, time) axis of which to set bounds.
cbe2febe30cc Merged revisions 5391-5392 via svnmerge from Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 3638 diff changeset	517 * @param total the current bounds (?).
cbe2febe30cc Merged revisions 5391-5392 via svnmerge from Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 3638 diff changeset	518 */
2330 594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	519 protected void zoomX(
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	520 XYPlot plot,
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	521 ValueAxis axis,
3650 cbe2febe30cc Merged revisions 5391-5392 via svnmerge from Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 3638 diff changeset	522 Bounds total,//we could equally nicely getXBounds(0)
2330 594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	523 Bounds user
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	524 ) {
8202 e4606eae8ea5 sed src/*/.java 's/logger/log/g' Sascha L. Teichmann <teichmann@intevation.de> parents: 7904 diff changeset	525 if (log.isDebugEnabled()) {
e4606eae8ea5 sed src/*/.java 's/logger/log/g' Sascha L. Teichmann <teichmann@intevation.de> parents: 7904 diff changeset	526 log.debug("== Zoom X axis ==");
e4606eae8ea5 sed src/*/.java 's/logger/log/g' Sascha L. Teichmann <teichmann@intevation.de> parents: 7904 diff changeset	527 log.debug(" Total axis range : " + total);
e4606eae8ea5 sed src/*/.java 's/logger/log/g' Sascha L. Teichmann <teichmann@intevation.de> parents: 7904 diff changeset	528 log.debug(" User defined range: " + user);
2330 594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	529 }
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	530
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	531 if (user != null) {
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	532 long min = total.getLower().longValue();
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	533 long max = total.getUpper().longValue();
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	534 long diff = max > min ? max - min : min - max;
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	535
8856 5e38e2924c07 Fix code style. Tom Gottfried <tom@intevation.de> parents: 8489 diff changeset	536 long newMin = Math.round(
5e38e2924c07 Fix code style. Tom Gottfried <tom@intevation.de> parents: 8489 diff changeset	537 min + user.getLower().doubleValue() * diff);
5e38e2924c07 Fix code style. Tom Gottfried <tom@intevation.de> parents: 8489 diff changeset	538 long newMax = Math.round(
5e38e2924c07 Fix code style. Tom Gottfried <tom@intevation.de> parents: 8489 diff changeset	539 min + user.getUpper().doubleValue() * diff);
2330 594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	540
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	541 TimeBounds newBounds = new TimeBounds(newMin, newMax);
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	542
8202 e4606eae8ea5 sed src/*/.java 's/logger/log/g' Sascha L. Teichmann <teichmann@intevation.de> parents: 7904 diff changeset	543 log.debug(" Zoom axis to: " + newBounds);
2330 594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	544
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	545 newBounds.applyBounds(axis, AXIS_SPACE);
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	546 }
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	547 else {
8202 e4606eae8ea5 sed src/*/.java 's/logger/log/g' Sascha L. Teichmann <teichmann@intevation.de> parents: 7904 diff changeset	548 log.debug("No user specified zoom values found!");
3140 3d456d8bca6e TimeseriesChartGenerator: Prevent some NPEs Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3139 diff changeset	549 if (total != null && axis != null) {
3d456d8bca6e TimeseriesChartGenerator: Prevent some NPEs Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3139 diff changeset	550 total.applyBounds(axis, AXIS_SPACE);
3d456d8bca6e TimeseriesChartGenerator: Prevent some NPEs Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3139 diff changeset	551 }
2330 594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	552 }
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	553 }
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	554
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	555
3650 cbe2febe30cc Merged revisions 5391-5392 via svnmerge from Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 3638 diff changeset	556 /**
cbe2febe30cc Merged revisions 5391-5392 via svnmerge from Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 3638 diff changeset	557 * @param user zoom values in percent.
cbe2febe30cc Merged revisions 5391-5392 via svnmerge from Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 3638 diff changeset	558 */
2330 594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	559 protected void zoomY(
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	560 XYPlot plot,
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	561 ValueAxis axis,
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	562 Bounds total,
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	563 Bounds user
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	564 ) {
8202 e4606eae8ea5 sed src/*/.java 's/logger/log/g' Sascha L. Teichmann <teichmann@intevation.de> parents: 7904 diff changeset	565 if (log.isDebugEnabled()) {
e4606eae8ea5 sed src/*/.java 's/logger/log/g' Sascha L. Teichmann <teichmann@intevation.de> parents: 7904 diff changeset	566 log.debug("== Zoom Y axis ==");
e4606eae8ea5 sed src/*/.java 's/logger/log/g' Sascha L. Teichmann <teichmann@intevation.de> parents: 7904 diff changeset	567 log.debug(" Total axis range : " + total);
e4606eae8ea5 sed src/*/.java 's/logger/log/g' Sascha L. Teichmann <teichmann@intevation.de> parents: 7904 diff changeset	568 log.debug(" User defined range: " + user);
2330 594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	569 }
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	570
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	571 if (user != null) {
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	572 double min = total.getLower().doubleValue();
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	573 double max = total.getUpper().doubleValue();
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	574 double diff = max > min ? max - min : min - max;
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	575
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	576 double newMin = min + user.getLower().doubleValue() * diff;
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	577 double newMax = min + user.getUpper().doubleValue() * diff;
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	578
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	579 DoubleBounds newBounds = new DoubleBounds(newMin, newMax);
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	580
8202 e4606eae8ea5 sed src/*/.java 's/logger/log/g' Sascha L. Teichmann <teichmann@intevation.de> parents: 7904 diff changeset	581 log.debug(" Zoom axis to: " + newBounds);
2330 594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	582
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	583 newBounds.applyBounds(axis, AXIS_SPACE);
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	584 }
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	585 else {
8202 e4606eae8ea5 sed src/*/.java 's/logger/log/g' Sascha L. Teichmann <teichmann@intevation.de> parents: 7904 diff changeset	586 log.debug("No user specified zoom values found!");
3140 3d456d8bca6e TimeseriesChartGenerator: Prevent some NPEs Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3139 diff changeset	587 if (total != null && axis != null) {
3d456d8bca6e TimeseriesChartGenerator: Prevent some NPEs Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3139 diff changeset	588 total.applyBounds(axis, AXIS_SPACE);
3d456d8bca6e TimeseriesChartGenerator: Prevent some NPEs Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3139 diff changeset	589 }
2330 594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	590 }
2261 6aeb71517136 Registered an Info generator for historical discharge curves; made some adaptions in XYChartGenerator, ChartGenerator and TimeseriesChartGenerator. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2242 diff changeset	591 }
2586 8cd6358eb7f8 Enabeld axes label font sizes for timeseries charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2554 diff changeset	592
8cd6358eb7f8 Enabeld axes label font sizes for timeseries charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2554 diff changeset	593
8cd6358eb7f8 Enabeld axes label font sizes for timeseries charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2554 diff changeset	594 /**
8856 5e38e2924c07 Fix code style. Tom Gottfried <tom@intevation.de> parents: 8489 diff changeset	595 * Adjusts the (look of) axes of a plot.
5e38e2924c07 Fix code style. Tom Gottfried <tom@intevation.de> parents: 8489 diff changeset	596 * This method sets the <i>labelFont</i> of the
2586 8cd6358eb7f8 Enabeld axes label font sizes for timeseries charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2554 diff changeset	597 * X axis.
3726 b679f6048acc Removed trailing whitespace. Back from future. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3650 diff changeset	598 *
3650 cbe2febe30cc Merged revisions 5391-5392 via svnmerge from Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 3638 diff changeset	599 * (Duplicate in XYChartGenerator).
2586 8cd6358eb7f8 Enabeld axes label font sizes for timeseries charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2554 diff changeset	600 *
8cd6358eb7f8 Enabeld axes label font sizes for timeseries charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2554 diff changeset	601 * @param plot The XYPlot of the chart.
8cd6358eb7f8 Enabeld axes label font sizes for timeseries charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2554 diff changeset	602 */
8cd6358eb7f8 Enabeld axes label font sizes for timeseries charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2554 diff changeset	603 protected void adjustAxes(XYPlot plot) {
8cd6358eb7f8 Enabeld axes label font sizes for timeseries charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2554 diff changeset	604 ValueAxis xaxis = plot.getDomainAxis();
8cd6358eb7f8 Enabeld axes label font sizes for timeseries charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2554 diff changeset	605
8cd6358eb7f8 Enabeld axes label font sizes for timeseries charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2554 diff changeset	606 ChartSettings chartSettings = getChartSettings();
8cd6358eb7f8 Enabeld axes label font sizes for timeseries charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2554 diff changeset	607 if (chartSettings == null) {
8cd6358eb7f8 Enabeld axes label font sizes for timeseries charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2554 diff changeset	608 return;
8cd6358eb7f8 Enabeld axes label font sizes for timeseries charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2554 diff changeset	609 }
8cd6358eb7f8 Enabeld axes label font sizes for timeseries charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2554 diff changeset	610
8cd6358eb7f8 Enabeld axes label font sizes for timeseries charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2554 diff changeset	611 Font labelFont = new Font(
8cd6358eb7f8 Enabeld axes label font sizes for timeseries charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2554 diff changeset	612 DEFAULT_FONT_NAME,
8cd6358eb7f8 Enabeld axes label font sizes for timeseries charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2554 diff changeset	613 Font.BOLD,
8cd6358eb7f8 Enabeld axes label font sizes for timeseries charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2554 diff changeset	614 getXAxisLabelFontSize());
8cd6358eb7f8 Enabeld axes label font sizes for timeseries charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2554 diff changeset	615
8cd6358eb7f8 Enabeld axes label font sizes for timeseries charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2554 diff changeset	616 xaxis.setLabelFont(labelFont);
2590 d75b427da50a #522 Modified axes creation: label and tick label fonts will now always be the same. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2587 diff changeset	617 xaxis.setTickLabelFont(labelFont);
2586 8cd6358eb7f8 Enabeld axes label font sizes for timeseries charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2554 diff changeset	618 }
2633 894186b4c1d0 Issue 494. Raimund Renkert <raimund.renkert@intevation.de> parents: 2590 diff changeset	619
894186b4c1d0 Issue 494. Raimund Renkert <raimund.renkert@intevation.de> parents: 2590 diff changeset	620
8856 5e38e2924c07 Fix code style. Tom Gottfried <tom@intevation.de> parents: 8489 diff changeset	621 protected Date decodeXAxisValue(JSONArray array)
5e38e2924c07 Fix code style. Tom Gottfried <tom@intevation.de> parents: 8489 diff changeset	622 throws JSONException, ParseException {
3984 89d7e97e9c9a Manual points working in fixing Delta W/t char (#462). Christian Lins <clins@intevation.de> parents: 3969 diff changeset	623 try {
89d7e97e9c9a Manual points working in fixing Delta W/t char (#462). Christian Lins <clins@intevation.de> parents: 3969 diff changeset	624 double x = array.getDouble(0);
89d7e97e9c9a Manual points working in fixing Delta W/t char (#462). Christian Lins <clins@intevation.de> parents: 3969 diff changeset	625 long l = (new Double(x)).longValue();
89d7e97e9c9a Manual points working in fixing Delta W/t char (#462). Christian Lins <clins@intevation.de> parents: 3969 diff changeset	626 return new Date(l);
89d7e97e9c9a Manual points working in fixing Delta W/t char (#462). Christian Lins <clins@intevation.de> parents: 3969 diff changeset	627 }
89d7e97e9c9a Manual points working in fixing Delta W/t char (#462). Christian Lins <clins@intevation.de> parents: 3969 diff changeset	628 catch(JSONException ex) {
89d7e97e9c9a Manual points working in fixing Delta W/t char (#462). Christian Lins <clins@intevation.de> parents: 3969 diff changeset	629 String str = array.getString(0);
89d7e97e9c9a Manual points working in fixing Delta W/t char (#462). Christian Lins <clins@intevation.de> parents: 3969 diff changeset	630 DateFormat df = DateFormat.getDateInstance(
89d7e97e9c9a Manual points working in fixing Delta W/t char (#462). Christian Lins <clins@intevation.de> parents: 3969 diff changeset	631 DateFormat.MEDIUM, Resources.getLocale(context.getMeta()));
89d7e97e9c9a Manual points working in fixing Delta W/t char (#462). Christian Lins <clins@intevation.de> parents: 3969 diff changeset	632 return df.parse(str);
89d7e97e9c9a Manual points working in fixing Delta W/t char (#462). Christian Lins <clins@intevation.de> parents: 3969 diff changeset	633 }
89d7e97e9c9a Manual points working in fixing Delta W/t char (#462). Christian Lins <clins@intevation.de> parents: 3969 diff changeset	634 }
89d7e97e9c9a Manual points working in fixing Delta W/t char (#462). Christian Lins <clins@intevation.de> parents: 3969 diff changeset	635
2633 894186b4c1d0 Issue 494. Raimund Renkert <raimund.renkert@intevation.de> parents: 2590 diff changeset	636 /**
894186b4c1d0 Issue 494. Raimund Renkert <raimund.renkert@intevation.de> parents: 2590 diff changeset	637 * Do Points out.
894186b4c1d0 Issue 494. Raimund Renkert <raimund.renkert@intevation.de> parents: 2590 diff changeset	638 */
894186b4c1d0 Issue 494. Raimund Renkert <raimund.renkert@intevation.de> parents: 2590 diff changeset	639 protected void doPoints(
894186b4c1d0 Issue 494. Raimund Renkert <raimund.renkert@intevation.de> parents: 2590 diff changeset	640 Object o,
894186b4c1d0 Issue 494. Raimund Renkert <raimund.renkert@intevation.de> parents: 2590 diff changeset	641 ArtifactAndFacet aandf,
6905 1b35b2ddfc28 Artifacts: Introduce ThemeDocument & make stuff compileable again. THIS BREAKS THE SYSTEM! TODO: Move ThemeUtils into ThemeDocument. Sascha L. Teichmann <teichmann@intevation.de> parents: 6795 diff changeset	642 ThemeDocument theme,
2633 894186b4c1d0 Issue 494. Raimund Renkert <raimund.renkert@intevation.de> parents: 2590 diff changeset	643 boolean visible,
894186b4c1d0 Issue 494. Raimund Renkert <raimund.renkert@intevation.de> parents: 2590 diff changeset	644 int axisIndex
894186b4c1d0 Issue 494. Raimund Renkert <raimund.renkert@intevation.de> parents: 2590 diff changeset	645 ) {
894186b4c1d0 Issue 494. Raimund Renkert <raimund.renkert@intevation.de> parents: 2590 diff changeset	646 String seriesName = aandf.getFacetDescription();
894186b4c1d0 Issue 494. Raimund Renkert <raimund.renkert@intevation.de> parents: 2590 diff changeset	647 TimeSeries series = new StyledTimeSeries(seriesName, theme);
894186b4c1d0 Issue 494. Raimund Renkert <raimund.renkert@intevation.de> parents: 2590 diff changeset	648
894186b4c1d0 Issue 494. Raimund Renkert <raimund.renkert@intevation.de> parents: 2590 diff changeset	649 // Add text annotations for single points.
894186b4c1d0 Issue 494. Raimund Renkert <raimund.renkert@intevation.de> parents: 2590 diff changeset	650 List<XYTextAnnotation> xy = new ArrayList<XYTextAnnotation>();
8856 5e38e2924c07 Fix code style. Tom Gottfried <tom@intevation.de> parents: 8489 diff changeset	651 HashMap<FixedMillisecond, String> names =
5e38e2924c07 Fix code style. Tom Gottfried <tom@intevation.de> parents: 8489 diff changeset	652 new HashMap<FixedMillisecond, String>();
2633 894186b4c1d0 Issue 494. Raimund Renkert <raimund.renkert@intevation.de> parents: 2590 diff changeset	653
894186b4c1d0 Issue 494. Raimund Renkert <raimund.renkert@intevation.de> parents: 2590 diff changeset	654 try {
894186b4c1d0 Issue 494. Raimund Renkert <raimund.renkert@intevation.de> parents: 2590 diff changeset	655 JSONArray points = new JSONArray((String) o);
3087 4a76da133144 Removed repeated x.size() calls from for loops. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2636 diff changeset	656 for (int i = 0, P = points.length(); i < P; i++) {
2633 894186b4c1d0 Issue 494. Raimund Renkert <raimund.renkert@intevation.de> parents: 2590 diff changeset	657 JSONArray array = points.getJSONArray(i);
3984 89d7e97e9c9a Manual points working in fixing Delta W/t char (#462). Christian Lins <clins@intevation.de> parents: 3969 diff changeset	658
2633 894186b4c1d0 Issue 494. Raimund Renkert <raimund.renkert@intevation.de> parents: 2590 diff changeset	659 double y = array.getDouble(1);
894186b4c1d0 Issue 494. Raimund Renkert <raimund.renkert@intevation.de> parents: 2590 diff changeset	660 String name = array.getString(2);
894186b4c1d0 Issue 494. Raimund Renkert <raimund.renkert@intevation.de> parents: 2590 diff changeset	661 boolean act = array.getBoolean(3);
894186b4c1d0 Issue 494. Raimund Renkert <raimund.renkert@intevation.de> parents: 2590 diff changeset	662 if (!act) {
894186b4c1d0 Issue 494. Raimund Renkert <raimund.renkert@intevation.de> parents: 2590 diff changeset	663 continue;
894186b4c1d0 Issue 494. Raimund Renkert <raimund.renkert@intevation.de> parents: 2590 diff changeset	664 }
3984 89d7e97e9c9a Manual points working in fixing Delta W/t char (#462). Christian Lins <clins@intevation.de> parents: 3969 diff changeset	665
89d7e97e9c9a Manual points working in fixing Delta W/t char (#462). Christian Lins <clins@intevation.de> parents: 3969 diff changeset	666 Date date = decodeXAxisValue(array);
7904 8b8407c71ee2 Potential fix for exception reported in flys/issue1717. Sascha L. Teichmann <teichmann@intevation.de> parents: 7595 diff changeset	667 long ms = date.getTime();
3984 89d7e97e9c9a Manual points working in fixing Delta W/t char (#462). Christian Lins <clins@intevation.de> parents: 3969 diff changeset	668
7904 8b8407c71ee2 Potential fix for exception reported in flys/issue1717. Sascha L. Teichmann <teichmann@intevation.de> parents: 7595 diff changeset	669 FixedMillisecond day = new FixedMillisecond(ms);
8b8407c71ee2 Potential fix for exception reported in flys/issue1717. Sascha L. Teichmann <teichmann@intevation.de> parents: 7595 diff changeset	670 while (names.containsKey(day)) {
8b8407c71ee2 Potential fix for exception reported in flys/issue1717. Sascha L. Teichmann <teichmann@intevation.de> parents: 7595 diff changeset	671 day = new FixedMillisecond(++ms);
8b8407c71ee2 Potential fix for exception reported in flys/issue1717. Sascha L. Teichmann <teichmann@intevation.de> parents: 7595 diff changeset	672 }
2633 894186b4c1d0 Issue 494. Raimund Renkert <raimund.renkert@intevation.de> parents: 2590 diff changeset	673 series.add(day, y, false);
894186b4c1d0 Issue 494. Raimund Renkert <raimund.renkert@intevation.de> parents: 2590 diff changeset	674 names.put(day, name);
894186b4c1d0 Issue 494. Raimund Renkert <raimund.renkert@intevation.de> parents: 2590 diff changeset	675 }
894186b4c1d0 Issue 494. Raimund Renkert <raimund.renkert@intevation.de> parents: 2590 diff changeset	676 }
3984 89d7e97e9c9a Manual points working in fixing Delta W/t char (#462). Christian Lins <clins@intevation.de> parents: 3969 diff changeset	677 catch(JSONException ex) {
8202 e4606eae8ea5 sed src/*/.java 's/logger/log/g' Sascha L. Teichmann <teichmann@intevation.de> parents: 7904 diff changeset	678 log.error("Could not decode json");
3984 89d7e97e9c9a Manual points working in fixing Delta W/t char (#462). Christian Lins <clins@intevation.de> parents: 3969 diff changeset	679 }
89d7e97e9c9a Manual points working in fixing Delta W/t char (#462). Christian Lins <clins@intevation.de> parents: 3969 diff changeset	680 catch(ParseException ex) {
8202 e4606eae8ea5 sed src/*/.java 's/logger/log/g' Sascha L. Teichmann <teichmann@intevation.de> parents: 7904 diff changeset	681 log.error("Could not parse date string");
2633 894186b4c1d0 Issue 494. Raimund Renkert <raimund.renkert@intevation.de> parents: 2590 diff changeset	682 }
894186b4c1d0 Issue 494. Raimund Renkert <raimund.renkert@intevation.de> parents: 2590 diff changeset	683
894186b4c1d0 Issue 494. Raimund Renkert <raimund.renkert@intevation.de> parents: 2590 diff changeset	684 TimeSeriesCollection tsc = new TimeSeriesCollection();
894186b4c1d0 Issue 494. Raimund Renkert <raimund.renkert@intevation.de> parents: 2590 diff changeset	685 tsc.addSeries(series);
894186b4c1d0 Issue 494. Raimund Renkert <raimund.renkert@intevation.de> parents: 2590 diff changeset	686 // Add Annotations.
3087 4a76da133144 Removed repeated x.size() calls from for loops. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2636 diff changeset	687 for (int i = 0, S = series.getItemCount(); i < S; i++) {
2633 894186b4c1d0 Issue 494. Raimund Renkert <raimund.renkert@intevation.de> parents: 2590 diff changeset	688 double x = tsc.getXValue(0, i);
894186b4c1d0 Issue 494. Raimund Renkert <raimund.renkert@intevation.de> parents: 2590 diff changeset	689 double y = tsc.getYValue(0, i);
894186b4c1d0 Issue 494. Raimund Renkert <raimund.renkert@intevation.de> parents: 2590 diff changeset	690 xy.add(new CollisionFreeXYTextAnnotation(
894186b4c1d0 Issue 494. Raimund Renkert <raimund.renkert@intevation.de> parents: 2590 diff changeset	691 names.get(series.getTimePeriod(i)), x, y));
8202 e4606eae8ea5 sed src/*/.java 's/logger/log/g' Sascha L. Teichmann <teichmann@intevation.de> parents: 7904 diff changeset	692 log.debug("doPoints(): x=" + x + " y=" + y);
2633 894186b4c1d0 Issue 494. Raimund Renkert <raimund.renkert@intevation.de> parents: 2590 diff changeset	693 }
5864 f2e46a668fe6 River artifacts: Renamed FLYSAnnotation to RiverAnnotation. Sascha L. Teichmann <teichmann@intevation.de> parents: 5863 diff changeset	694 RiverAnnotation annotations =
f2e46a668fe6 River artifacts: Renamed FLYSAnnotation to RiverAnnotation. Sascha L. Teichmann <teichmann@intevation.de> parents: 5863 diff changeset	695 new RiverAnnotation(null, null, null, theme);
2633 894186b4c1d0 Issue 494. Raimund Renkert <raimund.renkert@intevation.de> parents: 2590 diff changeset	696 annotations.setTextAnnotations(xy);
894186b4c1d0 Issue 494. Raimund Renkert <raimund.renkert@intevation.de> parents: 2590 diff changeset	697
8856 5e38e2924c07 Fix code style. Tom Gottfried <tom@intevation.de> parents: 8489 diff changeset	698 // Do not generate second legend entry.
5e38e2924c07 Fix code style. Tom Gottfried <tom@intevation.de> parents: 8489 diff changeset	699 // (null was passed for the aand before).
2634 fa015cf5c0af Fixed duplicated legend entry for manual points. Raimund Renkert <raimund.renkert@intevation.de> parents: 2633 diff changeset	700 doAnnotations(annotations, null, theme, visible);
2633 894186b4c1d0 Issue 494. Raimund Renkert <raimund.renkert@intevation.de> parents: 2590 diff changeset	701
894186b4c1d0 Issue 494. Raimund Renkert <raimund.renkert@intevation.de> parents: 2590 diff changeset	702 addAxisDataset(tsc, axisIndex, visible);
894186b4c1d0 Issue 494. Raimund Renkert <raimund.renkert@intevation.de> parents: 2590 diff changeset	703 }
894186b4c1d0 Issue 494. Raimund Renkert <raimund.renkert@intevation.de> parents: 2590 diff changeset	704
3130 0dd569e9b9f1 Added new methods to add domain and value axis markers to time series plots. Raimund Renkert <raimund.renkert@intevation.de> parents: 3087 diff changeset	705 public void addDomainAxisMarker(XYPlot plot) {
8202 e4606eae8ea5 sed src/*/.java 's/logger/log/g' Sascha L. Teichmann <teichmann@intevation.de> parents: 7904 diff changeset	706 log.debug("domainmarkers: " + domainMarker.size());
3130 0dd569e9b9f1 Added new methods to add domain and value axis markers to time series plots. Raimund Renkert <raimund.renkert@intevation.de> parents: 3087 diff changeset	707 for (Marker marker: domainMarker) {
8202 e4606eae8ea5 sed src/*/.java 's/logger/log/g' Sascha L. Teichmann <teichmann@intevation.de> parents: 7904 diff changeset	708 log.debug("adding domain marker");
3130 0dd569e9b9f1 Added new methods to add domain and value axis markers to time series plots. Raimund Renkert <raimund.renkert@intevation.de> parents: 3087 diff changeset	709 plot.addDomainMarker(marker, Layer.BACKGROUND);
0dd569e9b9f1 Added new methods to add domain and value axis markers to time series plots. Raimund Renkert <raimund.renkert@intevation.de> parents: 3087 diff changeset	710 }
0dd569e9b9f1 Added new methods to add domain and value axis markers to time series plots. Raimund Renkert <raimund.renkert@intevation.de> parents: 3087 diff changeset	711 domainMarker.clear();
0dd569e9b9f1 Added new methods to add domain and value axis markers to time series plots. Raimund Renkert <raimund.renkert@intevation.de> parents: 3087 diff changeset	712 }
0dd569e9b9f1 Added new methods to add domain and value axis markers to time series plots. Raimund Renkert <raimund.renkert@intevation.de> parents: 3087 diff changeset	713
0dd569e9b9f1 Added new methods to add domain and value axis markers to time series plots. Raimund Renkert <raimund.renkert@intevation.de> parents: 3087 diff changeset	714 public void addValueAxisMarker(XYPlot plot) {
0dd569e9b9f1 Added new methods to add domain and value axis markers to time series plots. Raimund Renkert <raimund.renkert@intevation.de> parents: 3087 diff changeset	715 for (Marker marker: valueMarker) {
8202 e4606eae8ea5 sed src/*/.java 's/logger/log/g' Sascha L. Teichmann <teichmann@intevation.de> parents: 7904 diff changeset	716 log.debug("adding value marker..");
3130 0dd569e9b9f1 Added new methods to add domain and value axis markers to time series plots. Raimund Renkert <raimund.renkert@intevation.de> parents: 3087 diff changeset	717 plot.addRangeMarker(marker, Layer.BACKGROUND);
0dd569e9b9f1 Added new methods to add domain and value axis markers to time series plots. Raimund Renkert <raimund.renkert@intevation.de> parents: 3087 diff changeset	718 }
0dd569e9b9f1 Added new methods to add domain and value axis markers to time series plots. Raimund Renkert <raimund.renkert@intevation.de> parents: 3087 diff changeset	719 valueMarker.clear();
0dd569e9b9f1 Added new methods to add domain and value axis markers to time series plots. Raimund Renkert <raimund.renkert@intevation.de> parents: 3087 diff changeset	720 }
2633 894186b4c1d0 Issue 494. Raimund Renkert <raimund.renkert@intevation.de> parents: 2590 diff changeset	721
3134 5a0aef74c316 Use different stylings for real and interpolated data points. Raimund Renkert <raimund.renkert@intevation.de> parents: 3130 diff changeset	722 public void addAttribute(String seriesKey, String name) {
5a0aef74c316 Use different stylings for real and interpolated data points. Raimund Renkert <raimund.renkert@intevation.de> parents: 3130 diff changeset	723 attributes.put(seriesKey, name);
5a0aef74c316 Use different stylings for real and interpolated data points. Raimund Renkert <raimund.renkert@intevation.de> parents: 3130 diff changeset	724 }
5a0aef74c316 Use different stylings for real and interpolated data points. Raimund Renkert <raimund.renkert@intevation.de> parents: 3130 diff changeset	725
4044 7eebd9e58641 Add chart legend entries for interpolated series (#838). Christian Lins <christian.lins@intevation.de> parents: 4021 diff changeset	726 private LegendItem getLegendItemFor(XYPlot plot, String interSeriesKey) {
7eebd9e58641 Add chart legend entries for interpolated series (#838). Christian Lins <christian.lins@intevation.de> parents: 4021 diff changeset	727 LegendItemCollection litems = plot.getLegendItems();
7eebd9e58641 Add chart legend entries for interpolated series (#838). Christian Lins <christian.lins@intevation.de> parents: 4021 diff changeset	728 Iterator<LegendItem> iter = litems.iterator();
7eebd9e58641 Add chart legend entries for interpolated series (#838). Christian Lins <christian.lins@intevation.de> parents: 4021 diff changeset	729 while(iter.hasNext()) {
7eebd9e58641 Add chart legend entries for interpolated series (#838). Christian Lins <christian.lins@intevation.de> parents: 4021 diff changeset	730 LegendItem item = iter.next();
7eebd9e58641 Add chart legend entries for interpolated series (#838). Christian Lins <christian.lins@intevation.de> parents: 4021 diff changeset	731 if(interSeriesKey.startsWith(item.getSeriesKey().toString())) {
7eebd9e58641 Add chart legend entries for interpolated series (#838). Christian Lins <christian.lins@intevation.de> parents: 4021 diff changeset	732 return item;
7eebd9e58641 Add chart legend entries for interpolated series (#838). Christian Lins <christian.lins@intevation.de> parents: 4021 diff changeset	733 }
7eebd9e58641 Add chart legend entries for interpolated series (#838). Christian Lins <christian.lins@intevation.de> parents: 4021 diff changeset	734 }
7eebd9e58641 Add chart legend entries for interpolated series (#838). Christian Lins <christian.lins@intevation.de> parents: 4021 diff changeset	735 return null;
7eebd9e58641 Add chart legend entries for interpolated series (#838). Christian Lins <christian.lins@intevation.de> parents: 4021 diff changeset	736 }
7eebd9e58641 Add chart legend entries for interpolated series (#838). Christian Lins <christian.lins@intevation.de> parents: 4021 diff changeset	737
3134 5a0aef74c316 Use different stylings for real and interpolated data points. Raimund Renkert <raimund.renkert@intevation.de> parents: 3130 diff changeset	738 protected void applySeriesAttributes(XYPlot plot) {
5a0aef74c316 Use different stylings for real and interpolated data points. Raimund Renkert <raimund.renkert@intevation.de> parents: 3130 diff changeset	739 int count = plot.getDatasetCount();
5a0aef74c316 Use different stylings for real and interpolated data points. Raimund Renkert <raimund.renkert@intevation.de> parents: 3130 diff changeset	740 for (int i = 0; i < count; i++) {
5a0aef74c316 Use different stylings for real and interpolated data points. Raimund Renkert <raimund.renkert@intevation.de> parents: 3130 diff changeset	741 XYDataset data = plot.getDataset(i);
3140 3d456d8bca6e TimeseriesChartGenerator: Prevent some NPEs Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3139 diff changeset	742 if (data == null) {
3d456d8bca6e TimeseriesChartGenerator: Prevent some NPEs Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3139 diff changeset	743 continue;
3d456d8bca6e TimeseriesChartGenerator: Prevent some NPEs Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3139 diff changeset	744 }
4044 7eebd9e58641 Add chart legend entries for interpolated series (#838). Christian Lins <christian.lins@intevation.de> parents: 4021 diff changeset	745
3134 5a0aef74c316 Use different stylings for real and interpolated data points. Raimund Renkert <raimund.renkert@intevation.de> parents: 3130 diff changeset	746 int seriesCount = data.getSeriesCount();
5a0aef74c316 Use different stylings for real and interpolated data points. Raimund Renkert <raimund.renkert@intevation.de> parents: 3130 diff changeset	747 for (int j = 0; j < seriesCount; j++) {
5a0aef74c316 Use different stylings for real and interpolated data points. Raimund Renkert <raimund.renkert@intevation.de> parents: 3130 diff changeset	748 StyledTimeSeries series =
5a0aef74c316 Use different stylings for real and interpolated data points. Raimund Renkert <raimund.renkert@intevation.de> parents: 3130 diff changeset	749 (StyledTimeSeries)getSeriesOf(data, j);
5a0aef74c316 Use different stylings for real and interpolated data points. Raimund Renkert <raimund.renkert@intevation.de> parents: 3130 diff changeset	750 String key = series.getKey().toString();
4044 7eebd9e58641 Add chart legend entries for interpolated series (#838). Christian Lins <christian.lins@intevation.de> parents: 4021 diff changeset	751
3134 5a0aef74c316 Use different stylings for real and interpolated data points. Raimund Renkert <raimund.renkert@intevation.de> parents: 3130 diff changeset	752 if (attributes.containsKey(key)) {
4021 7cc05da7e35c Add message for 'state.chart.km' Christian Lins <christian.lins@intevation.de> parents: 3984 diff changeset	753 // Interpolated points are drawn unfilled
3134 5a0aef74c316 Use different stylings for real and interpolated data points. Raimund Renkert <raimund.renkert@intevation.de> parents: 3130 diff changeset	754 if (attributes.get(key).equals("interpolate")) {
5a0aef74c316 Use different stylings for real and interpolated data points. Raimund Renkert <raimund.renkert@intevation.de> parents: 3130 diff changeset	755 XYLineAndShapeRenderer renderer =
4044 7eebd9e58641 Add chart legend entries for interpolated series (#838). Christian Lins <christian.lins@intevation.de> parents: 4021 diff changeset	756 series.getStyle().getRenderer();
3134 5a0aef74c316 Use different stylings for real and interpolated data points. Raimund Renkert <raimund.renkert@intevation.de> parents: 3130 diff changeset	757 renderer.setSeriesPaint(
5a0aef74c316 Use different stylings for real and interpolated data points. Raimund Renkert <raimund.renkert@intevation.de> parents: 3130 diff changeset	758 j,
5a0aef74c316 Use different stylings for real and interpolated data points. Raimund Renkert <raimund.renkert@intevation.de> parents: 3130 diff changeset	759 renderer.getSeriesFillPaint(j));
5a0aef74c316 Use different stylings for real and interpolated data points. Raimund Renkert <raimund.renkert@intevation.de> parents: 3130 diff changeset	760 renderer.setSeriesShapesFilled(j, false);
4044 7eebd9e58641 Add chart legend entries for interpolated series (#838). Christian Lins <christian.lins@intevation.de> parents: 4021 diff changeset	761
7eebd9e58641 Add chart legend entries for interpolated series (#838). Christian Lins <christian.lins@intevation.de> parents: 4021 diff changeset	762 LegendItem legendItem = getLegendItemFor(plot, key);
7eebd9e58641 Add chart legend entries for interpolated series (#838). Christian Lins <christian.lins@intevation.de> parents: 4021 diff changeset	763 if(legendItem != null) {
7eebd9e58641 Add chart legend entries for interpolated series (#838). Christian Lins <christian.lins@intevation.de> parents: 4021 diff changeset	764 LegendItem interLegend = new LegendItem(
7eebd9e58641 Add chart legend entries for interpolated series (#838). Christian Lins <christian.lins@intevation.de> parents: 4021 diff changeset	765 legendItem.getLabel(),
7eebd9e58641 Add chart legend entries for interpolated series (#838). Christian Lins <christian.lins@intevation.de> parents: 4021 diff changeset	766 legendItem.getDescription(),
7eebd9e58641 Add chart legend entries for interpolated series (#838). Christian Lins <christian.lins@intevation.de> parents: 4021 diff changeset	767 legendItem.getToolTipText(),
7eebd9e58641 Add chart legend entries for interpolated series (#838). Christian Lins <christian.lins@intevation.de> parents: 4021 diff changeset	768 legendItem.getURLText(),
7eebd9e58641 Add chart legend entries for interpolated series (#838). Christian Lins <christian.lins@intevation.de> parents: 4021 diff changeset	769 legendItem.isShapeVisible(),
7eebd9e58641 Add chart legend entries for interpolated series (#838). Christian Lins <christian.lins@intevation.de> parents: 4021 diff changeset	770 legendItem.getShape(),
7eebd9e58641 Add chart legend entries for interpolated series (#838). Christian Lins <christian.lins@intevation.de> parents: 4021 diff changeset	771 false, // shapeFilled?
7eebd9e58641 Add chart legend entries for interpolated series (#838). Christian Lins <christian.lins@intevation.de> parents: 4021 diff changeset	772 legendItem.getFillPaint(),
7eebd9e58641 Add chart legend entries for interpolated series (#838). Christian Lins <christian.lins@intevation.de> parents: 4021 diff changeset	773 true, // shapeOutlineVisible?
7eebd9e58641 Add chart legend entries for interpolated series (#838). Christian Lins <christian.lins@intevation.de> parents: 4021 diff changeset	774 renderer.getSeriesFillPaint(j),
7eebd9e58641 Add chart legend entries for interpolated series (#838). Christian Lins <christian.lins@intevation.de> parents: 4021 diff changeset	775 legendItem.getOutlineStroke(),
7eebd9e58641 Add chart legend entries for interpolated series (#838). Christian Lins <christian.lins@intevation.de> parents: 4021 diff changeset	776 legendItem.isLineVisible(),
7eebd9e58641 Add chart legend entries for interpolated series (#838). Christian Lins <christian.lins@intevation.de> parents: 4021 diff changeset	777 legendItem.getLine(),
7eebd9e58641 Add chart legend entries for interpolated series (#838). Christian Lins <christian.lins@intevation.de> parents: 4021 diff changeset	778 legendItem.getLineStroke(),
7eebd9e58641 Add chart legend entries for interpolated series (#838). Christian Lins <christian.lins@intevation.de> parents: 4021 diff changeset	779 legendItem.getLinePaint()
7eebd9e58641 Add chart legend entries for interpolated series (#838). Christian Lins <christian.lins@intevation.de> parents: 4021 diff changeset	780 );
7eebd9e58641 Add chart legend entries for interpolated series (#838). Christian Lins <christian.lins@intevation.de> parents: 4021 diff changeset	781 interLegend.setSeriesKey(series.getKey());
8856 5e38e2924c07 Fix code style. Tom Gottfried <tom@intevation.de> parents: 8489 diff changeset	782 log.debug("applySeriesAttributes: "
5e38e2924c07 Fix code style. Tom Gottfried <tom@intevation.de> parents: 8489 diff changeset	783 + "draw unfilled legend item");
4044 7eebd9e58641 Add chart legend entries for interpolated series (#838). Christian Lins <christian.lins@intevation.de> parents: 4021 diff changeset	784 plot.getLegendItems().add(interLegend);
7eebd9e58641 Add chart legend entries for interpolated series (#838). Christian Lins <christian.lins@intevation.de> parents: 4021 diff changeset	785 }
3168 e10323bf3cbc Look for the attribut "outline" in TimeseriesChartGenerator to render shape Raimund Renkert <raimund.renkert@intevation.de> parents: 3140 diff changeset	786 }
e10323bf3cbc Look for the attribut "outline" in TimeseriesChartGenerator to render shape Raimund Renkert <raimund.renkert@intevation.de> parents: 3140 diff changeset	787 }
4044 7eebd9e58641 Add chart legend entries for interpolated series (#838). Christian Lins <christian.lins@intevation.de> parents: 4021 diff changeset	788
3168 e10323bf3cbc Look for the attribut "outline" in TimeseriesChartGenerator to render shape Raimund Renkert <raimund.renkert@intevation.de> parents: 3140 diff changeset	789 if (attributes.containsKey(key)) {
e10323bf3cbc Look for the attribut "outline" in TimeseriesChartGenerator to render shape Raimund Renkert <raimund.renkert@intevation.de> parents: 3140 diff changeset	790 if(attributes.get(key).equals("outline")) {
e10323bf3cbc Look for the attribut "outline" in TimeseriesChartGenerator to render shape Raimund Renkert <raimund.renkert@intevation.de> parents: 3140 diff changeset	791 XYLineAndShapeRenderer renderer =
e10323bf3cbc Look for the attribut "outline" in TimeseriesChartGenerator to render shape Raimund Renkert <raimund.renkert@intevation.de> parents: 3140 diff changeset	792 series.getStyle().getRenderer();
e10323bf3cbc Look for the attribut "outline" in TimeseriesChartGenerator to render shape Raimund Renkert <raimund.renkert@intevation.de> parents: 3140 diff changeset	793 renderer.setSeriesPaint(
e10323bf3cbc Look for the attribut "outline" in TimeseriesChartGenerator to render shape Raimund Renkert <raimund.renkert@intevation.de> parents: 3140 diff changeset	794 j,
e10323bf3cbc Look for the attribut "outline" in TimeseriesChartGenerator to render shape Raimund Renkert <raimund.renkert@intevation.de> parents: 3140 diff changeset	795 renderer.getSeriesFillPaint(j));
3134 5a0aef74c316 Use different stylings for real and interpolated data points. Raimund Renkert <raimund.renkert@intevation.de> parents: 3130 diff changeset	796 renderer.setDrawOutlines(true);
5a0aef74c316 Use different stylings for real and interpolated data points. Raimund Renkert <raimund.renkert@intevation.de> parents: 3130 diff changeset	797 }
5a0aef74c316 Use different stylings for real and interpolated data points. Raimund Renkert <raimund.renkert@intevation.de> parents: 3130 diff changeset	798 }
5a0aef74c316 Use different stylings for real and interpolated data points. Raimund Renkert <raimund.renkert@intevation.de> parents: 3130 diff changeset	799 }
5a0aef74c316 Use different stylings for real and interpolated data points. Raimund Renkert <raimund.renkert@intevation.de> parents: 3130 diff changeset	800 }
5a0aef74c316 Use different stylings for real and interpolated data points. Raimund Renkert <raimund.renkert@intevation.de> parents: 3130 diff changeset	801 }
5a0aef74c316 Use different stylings for real and interpolated data points. Raimund Renkert <raimund.renkert@intevation.de> parents: 3130 diff changeset	802
2633 894186b4c1d0 Issue 494. Raimund Renkert <raimund.renkert@intevation.de> parents: 2590 diff changeset	803 /** Two Ranges that span a rectangular area. */
894186b4c1d0 Issue 494. Raimund Renkert <raimund.renkert@intevation.de> parents: 2590 diff changeset	804 public static class Area {
894186b4c1d0 Issue 494. Raimund Renkert <raimund.renkert@intevation.de> parents: 2590 diff changeset	805 protected Range xRange;
894186b4c1d0 Issue 494. Raimund Renkert <raimund.renkert@intevation.de> parents: 2590 diff changeset	806 protected Range yRange;
894186b4c1d0 Issue 494. Raimund Renkert <raimund.renkert@intevation.de> parents: 2590 diff changeset	807
894186b4c1d0 Issue 494. Raimund Renkert <raimund.renkert@intevation.de> parents: 2590 diff changeset	808 public Area(Range rangeX, Range rangeY) {
894186b4c1d0 Issue 494. Raimund Renkert <raimund.renkert@intevation.de> parents: 2590 diff changeset	809 this.xRange = rangeX;
894186b4c1d0 Issue 494. Raimund Renkert <raimund.renkert@intevation.de> parents: 2590 diff changeset	810 this.yRange = rangeY;
894186b4c1d0 Issue 494. Raimund Renkert <raimund.renkert@intevation.de> parents: 2590 diff changeset	811 }
894186b4c1d0 Issue 494. Raimund Renkert <raimund.renkert@intevation.de> parents: 2590 diff changeset	812
894186b4c1d0 Issue 494. Raimund Renkert <raimund.renkert@intevation.de> parents: 2590 diff changeset	813 public Area(ValueAxis axisX, ValueAxis axisY) {
894186b4c1d0 Issue 494. Raimund Renkert <raimund.renkert@intevation.de> parents: 2590 diff changeset	814 this.xRange = axisX.getRange();
894186b4c1d0 Issue 494. Raimund Renkert <raimund.renkert@intevation.de> parents: 2590 diff changeset	815 this.yRange = axisY.getRange();
894186b4c1d0 Issue 494. Raimund Renkert <raimund.renkert@intevation.de> parents: 2590 diff changeset	816 }
894186b4c1d0 Issue 494. Raimund Renkert <raimund.renkert@intevation.de> parents: 2590 diff changeset	817
894186b4c1d0 Issue 494. Raimund Renkert <raimund.renkert@intevation.de> parents: 2590 diff changeset	818 public double ofLeft(double percent) {
894186b4c1d0 Issue 494. Raimund Renkert <raimund.renkert@intevation.de> parents: 2590 diff changeset	819 return xRange.getLowerBound()
894186b4c1d0 Issue 494. Raimund Renkert <raimund.renkert@intevation.de> parents: 2590 diff changeset	820 + xRange.getLength() * percent;
894186b4c1d0 Issue 494. Raimund Renkert <raimund.renkert@intevation.de> parents: 2590 diff changeset	821 }
894186b4c1d0 Issue 494. Raimund Renkert <raimund.renkert@intevation.de> parents: 2590 diff changeset	822
894186b4c1d0 Issue 494. Raimund Renkert <raimund.renkert@intevation.de> parents: 2590 diff changeset	823 public double ofRight(double percent) {
894186b4c1d0 Issue 494. Raimund Renkert <raimund.renkert@intevation.de> parents: 2590 diff changeset	824 return xRange.getUpperBound()
894186b4c1d0 Issue 494. Raimund Renkert <raimund.renkert@intevation.de> parents: 2590 diff changeset	825 - xRange.getLength() * percent;
894186b4c1d0 Issue 494. Raimund Renkert <raimund.renkert@intevation.de> parents: 2590 diff changeset	826 }
894186b4c1d0 Issue 494. Raimund Renkert <raimund.renkert@intevation.de> parents: 2590 diff changeset	827
894186b4c1d0 Issue 494. Raimund Renkert <raimund.renkert@intevation.de> parents: 2590 diff changeset	828 public double ofGround(double percent) {
894186b4c1d0 Issue 494. Raimund Renkert <raimund.renkert@intevation.de> parents: 2590 diff changeset	829 return yRange.getLowerBound()
894186b4c1d0 Issue 494. Raimund Renkert <raimund.renkert@intevation.de> parents: 2590 diff changeset	830 + yRange.getLength() * percent;
894186b4c1d0 Issue 494. Raimund Renkert <raimund.renkert@intevation.de> parents: 2590 diff changeset	831 }
894186b4c1d0 Issue 494. Raimund Renkert <raimund.renkert@intevation.de> parents: 2590 diff changeset	832
894186b4c1d0 Issue 494. Raimund Renkert <raimund.renkert@intevation.de> parents: 2590 diff changeset	833 public double atTop() {
894186b4c1d0 Issue 494. Raimund Renkert <raimund.renkert@intevation.de> parents: 2590 diff changeset	834 return yRange.getUpperBound();
894186b4c1d0 Issue 494. Raimund Renkert <raimund.renkert@intevation.de> parents: 2590 diff changeset	835 }
894186b4c1d0 Issue 494. Raimund Renkert <raimund.renkert@intevation.de> parents: 2590 diff changeset	836
894186b4c1d0 Issue 494. Raimund Renkert <raimund.renkert@intevation.de> parents: 2590 diff changeset	837 public double atGround() {
894186b4c1d0 Issue 494. Raimund Renkert <raimund.renkert@intevation.de> parents: 2590 diff changeset	838 return yRange.getLowerBound();
894186b4c1d0 Issue 494. Raimund Renkert <raimund.renkert@intevation.de> parents: 2590 diff changeset	839 }
894186b4c1d0 Issue 494. Raimund Renkert <raimund.renkert@intevation.de> parents: 2590 diff changeset	840
894186b4c1d0 Issue 494. Raimund Renkert <raimund.renkert@intevation.de> parents: 2590 diff changeset	841 public double atRight() {
894186b4c1d0 Issue 494. Raimund Renkert <raimund.renkert@intevation.de> parents: 2590 diff changeset	842 return xRange.getUpperBound();
894186b4c1d0 Issue 494. Raimund Renkert <raimund.renkert@intevation.de> parents: 2590 diff changeset	843 }
894186b4c1d0 Issue 494. Raimund Renkert <raimund.renkert@intevation.de> parents: 2590 diff changeset	844
894186b4c1d0 Issue 494. Raimund Renkert <raimund.renkert@intevation.de> parents: 2590 diff changeset	845 public double atLeft() {
894186b4c1d0 Issue 494. Raimund Renkert <raimund.renkert@intevation.de> parents: 2590 diff changeset	846 return xRange.getLowerBound();
894186b4c1d0 Issue 494. Raimund Renkert <raimund.renkert@intevation.de> parents: 2590 diff changeset	847 }
894186b4c1d0 Issue 494. Raimund Renkert <raimund.renkert@intevation.de> parents: 2590 diff changeset	848
894186b4c1d0 Issue 494. Raimund Renkert <raimund.renkert@intevation.de> parents: 2590 diff changeset	849 public double above(double percent, double base) {
894186b4c1d0 Issue 494. Raimund Renkert <raimund.renkert@intevation.de> parents: 2590 diff changeset	850 return base + yRange.getLength() * percent;
894186b4c1d0 Issue 494. Raimund Renkert <raimund.renkert@intevation.de> parents: 2590 diff changeset	851 }
894186b4c1d0 Issue 494. Raimund Renkert <raimund.renkert@intevation.de> parents: 2590 diff changeset	852 }
894186b4c1d0 Issue 494. Raimund Renkert <raimund.renkert@intevation.de> parents: 2590 diff changeset	853
8455 6dfc3a1fc70d (issue1764) Set upper-time and lower-time for time series axes Andre Heinecke <andre.heinecke@intevation.de> parents: 8343 diff changeset	854 /* Create an axis section with setUpperTimeRange and
6dfc3a1fc70d (issue1764) Set upper-time and lower-time for time series axes Andre Heinecke <andre.heinecke@intevation.de> parents: 8343 diff changeset	855 * setLowerTimeRange */
6dfc3a1fc70d (issue1764) Set upper-time and lower-time for time series axes Andre Heinecke <andre.heinecke@intevation.de> parents: 8343 diff changeset	856 @Override
6dfc3a1fc70d (issue1764) Set upper-time and lower-time for time series axes Andre Heinecke <andre.heinecke@intevation.de> parents: 8343 diff changeset	857 protected List<AxisSection> buildXAxisSections() {
6dfc3a1fc70d (issue1764) Set upper-time and lower-time for time series axes Andre Heinecke <andre.heinecke@intevation.de> parents: 8343 diff changeset	858 List<AxisSection> axisSections = new ArrayList<AxisSection>();
6dfc3a1fc70d (issue1764) Set upper-time and lower-time for time series axes Andre Heinecke <andre.heinecke@intevation.de> parents: 8343 diff changeset	859
6dfc3a1fc70d (issue1764) Set upper-time and lower-time for time series axes Andre Heinecke <andre.heinecke@intevation.de> parents: 8343 diff changeset	860 String identifier = "X";
6dfc3a1fc70d (issue1764) Set upper-time and lower-time for time series axes Andre Heinecke <andre.heinecke@intevation.de> parents: 8343 diff changeset	861
6dfc3a1fc70d (issue1764) Set upper-time and lower-time for time series axes Andre Heinecke <andre.heinecke@intevation.de> parents: 8343 diff changeset	862 AxisSection axisSection = new AxisSection();
6dfc3a1fc70d (issue1764) Set upper-time and lower-time for time series axes Andre Heinecke <andre.heinecke@intevation.de> parents: 8343 diff changeset	863 axisSection.setIdentifier(identifier);
6dfc3a1fc70d (issue1764) Set upper-time and lower-time for time series axes Andre Heinecke <andre.heinecke@intevation.de> parents: 8343 diff changeset	864 axisSection.setLabel(getXAxisLabel());
6dfc3a1fc70d (issue1764) Set upper-time and lower-time for time series axes Andre Heinecke <andre.heinecke@intevation.de> parents: 8343 diff changeset	865 axisSection.setFontSize(14);
6dfc3a1fc70d (issue1764) Set upper-time and lower-time for time series axes Andre Heinecke <andre.heinecke@intevation.de> parents: 8343 diff changeset	866 axisSection.setFixed(false);
6dfc3a1fc70d (issue1764) Set upper-time and lower-time for time series axes Andre Heinecke <andre.heinecke@intevation.de> parents: 8343 diff changeset	867
8489 be5ce2882708 Time series chart: bounds cannot allways be assumed to be given. Tom Gottfried <tom@intevation.de> parents: 8455 diff changeset	868 long rightX = xBounds.isEmpty() ? 0 : getRightX();
be5ce2882708 Time series chart: bounds cannot allways be assumed to be given. Tom Gottfried <tom@intevation.de> parents: 8455 diff changeset	869 long leftX = xBounds.isEmpty() ? 0 : getLeftX();
be5ce2882708 Time series chart: bounds cannot allways be assumed to be given. Tom Gottfried <tom@intevation.de> parents: 8455 diff changeset	870 axisSection.setUpperTimeRange(rightX);
be5ce2882708 Time series chart: bounds cannot allways be assumed to be given. Tom Gottfried <tom@intevation.de> parents: 8455 diff changeset	871 axisSection.setLowerTimeRange(leftX);
8455 6dfc3a1fc70d (issue1764) Set upper-time and lower-time for time series axes Andre Heinecke <andre.heinecke@intevation.de> parents: 8343 diff changeset	872
6dfc3a1fc70d (issue1764) Set upper-time and lower-time for time series axes Andre Heinecke <andre.heinecke@intevation.de> parents: 8343 diff changeset	873 axisSections.add(axisSection);
6dfc3a1fc70d (issue1764) Set upper-time and lower-time for time series axes Andre Heinecke <andre.heinecke@intevation.de> parents: 8343 diff changeset	874
6dfc3a1fc70d (issue1764) Set upper-time and lower-time for time series axes Andre Heinecke <andre.heinecke@intevation.de> parents: 8343 diff changeset	875 return axisSections;
6dfc3a1fc70d (issue1764) Set upper-time and lower-time for time series axes Andre Heinecke <andre.heinecke@intevation.de> parents: 8343 diff changeset	876 }
6dfc3a1fc70d (issue1764) Set upper-time and lower-time for time series axes Andre Heinecke <andre.heinecke@intevation.de> parents: 8343 diff changeset	877
6dfc3a1fc70d (issue1764) Set upper-time and lower-time for time series axes Andre Heinecke <andre.heinecke@intevation.de> parents: 8343 diff changeset	878
2233 958a10e2e246 Added a new ChartGenerator for timeseries charts and refactored some code in XYChartGenerator. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: diff changeset	879 }
958a10e2e246 Added a new ChartGenerator for timeseries charts and refactored some code in XYChartGenerator. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: diff changeset	880 // vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 :

Mercurial > dive4elements > river

annotate artifacts/src/main/java/org/dive4elements/river/exports/TimeseriesChartGenerator.java @ 8856:5e38e2924c07 3.2.x