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

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

(issue1579) Fix axes syncronisation at Gauges The SyncNumberAxis was completely broken. It only synced in one direction and even that did not work correctly when data was added to the axis (and the syncAxis rescaled but forgot the old axis) then there were lots of ways to bypass that scaling. And i also think the trans calculation was wrong. It has been replaced by a "mostly" simple method to just keep the W in M and W in CM+Datum axes in sync. I say "Mostly" because it had to deal with the Bounds interface.

author	Andre Heinecke <aheinecke@intevation.de>
date	Fri, 13 Dec 2013 19:03:00 +0100
parents	ce1b8a59934e
children	8b8407c71ee2

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;
5831 bd047b71ab37 Repaired internal references Sascha L. Teichmann <teichmann@intevation.de> parents: 4044 diff changeset	17 import org.dive4elements.river.jfree.StyledTimeSeries;
bd047b71ab37 Repaired internal references Sascha L. Teichmann <teichmann@intevation.de> parents: 4044 diff changeset	18 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	19 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	20 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	21
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	22 import java.awt.Color;
3139 5888c4685701 Removed superfluous import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3134 diff changeset	23 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	24 import java.text.DateFormat;
89d7e97e9c9a Manual points working in fixing Delta W/t char (#462). Christian Lins <clins@intevation.de> parents: 3969 diff changeset	25 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	26 import java.util.ArrayList;
3139 5888c4685701 Removed superfluous import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3134 diff changeset	27 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	28 import java.util.HashMap;
4044 7eebd9e58641 Add chart legend entries for interpolated series (#838). Christian Lins <christian.lins@intevation.de> parents: 4021 diff changeset	29 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	30 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	31 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	32
3622 5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	33 import javax.swing.ImageIcon;
5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	34
2233 958a10e2e246 Added a new ChartGenerator for timeseries charts and refactored some code in XYChartGenerator. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: diff changeset	35 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	36 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	37 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	38 import org.jfree.chart.LegendItem;
7eebd9e58641 Add chart legend entries for interpolated series (#838). Christian Lins <christian.lins@intevation.de> parents: 4021 diff changeset	39 import org.jfree.chart.LegendItemCollection;
3622 5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	40 import org.jfree.chart.annotations.XYAnnotation;
5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	41 import org.jfree.chart.annotations.XYImageAnnotation;
3139 5888c4685701 Removed superfluous import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3134 diff changeset	42 import org.jfree.chart.annotations.XYTextAnnotation;
2330 594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	43 import org.jfree.chart.axis.ValueAxis;
3139 5888c4685701 Removed superfluous import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3134 diff changeset	44 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	45 import org.jfree.chart.plot.XYPlot;
3139 5888c4685701 Removed superfluous import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3134 diff changeset	46 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	47 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	48 import org.jfree.data.general.Series;
3139 5888c4685701 Removed superfluous import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3134 diff changeset	49 import org.jfree.data.time.Day;
5888c4685701 Removed superfluous import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3134 diff changeset	50 import org.jfree.data.time.TimeSeries;
5888c4685701 Removed superfluous import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3134 diff changeset	51 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	52 import org.jfree.data.xy.XYDataset;
3139 5888c4685701 Removed superfluous import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3134 diff changeset	53 import org.jfree.ui.Layer;
5888c4685701 Removed superfluous import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3134 diff changeset	54 import org.json.JSONArray;
5888c4685701 Removed superfluous import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3134 diff changeset	55 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	56
958a10e2e246 Added a new ChartGenerator for timeseries charts and refactored some code in XYChartGenerator. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: diff changeset	57 /**
6795 0747ca95ad6e Cosmetics. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 5994 diff changeset	58 * 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	59 * @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	60 */
6795 0747ca95ad6e Cosmetics. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 5994 diff changeset	61 public abstract class TimeseriesChartGenerator
0747ca95ad6e Cosmetics. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 5994 diff changeset	62 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	63
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	64 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	65
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	66 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	67
3134 5a0aef74c316 Use different stylings for real and interpolated data points. Raimund Renkert <raimund.renkert@intevation.de> parents: 3130 diff changeset	68 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	69
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	70 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	71
2233 958a10e2e246 Added a new ChartGenerator for timeseries charts and refactored some code in XYChartGenerator. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: diff changeset	72 private static final Logger logger =
958a10e2e246 Added a new ChartGenerator for timeseries charts and refactored some code in XYChartGenerator. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: diff changeset	73 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	74
2330 594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	75 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	76
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	77 protected Map<Integer, Bounds> xBounds;
2330 594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	78
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	79 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	80
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 * 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	84 */
23c7c51df772 Some more refactoring in XYChartGenerator and ChartGenerator; implemented necessary stuff in TimeseriesChartGenerator and return new empty instances of timeseries charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2236 diff changeset	85 public 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	86 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	87
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	88 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	89 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	90 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	91 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	92 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	93 }
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
2233 958a10e2e246 Added a new ChartGenerator for timeseries charts and refactored some code in XYChartGenerator. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: diff changeset	95
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 @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	98 public JFreeChart generateChart() {
2233 958a10e2e246 Added a new ChartGenerator for timeseries charts and refactored some code in XYChartGenerator. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: diff changeset	99 logger.info("Generate Timeseries Chart.");
958a10e2e246 Added a new ChartGenerator for timeseries charts and refactored some code in XYChartGenerator. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: diff changeset	100
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	101 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	102 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	103 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	104 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	105 null,
2422 44dc117aa2b7 Picked rev 4058,4063,4065,4068,4069 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2330 diff changeset	106 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	107 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	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
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 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	111
23c7c51df772 Some more refactoring in XYChartGenerator and ChartGenerator; implemented necessary stuff in TimeseriesChartGenerator and return new empty instances of timeseries charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2236 diff changeset	112 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	113 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	114
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 addSubtitles(chart);
2422 44dc117aa2b7 Picked rev 4058,4063,4065,4068,4069 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2330 diff changeset	116 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	117 addDatasets(plot);
2586 8cd6358eb7f8 Enabeld axes label font sizes for timeseries charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2554 diff changeset	118 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	119 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	120 addValueAxisMarker(plot);
2330 594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	121 adaptZoom(plot);
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	122
3134 5a0aef74c316 Use different stylings for real and interpolated data points. Raimund Renkert <raimund.renkert@intevation.de> parents: 3130 diff changeset	123 applySeriesAttributes(plot);
4021 7cc05da7e35c Add message for 'state.chart.km' Christian Lins <christian.lins@intevation.de> parents: 3984 diff changeset	124
7595 ce1b8a59934e issue1558: Allow fixed axis for timeseries-diagrams. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 7034 diff changeset	125 consumeAxisSettings(plot);
ce1b8a59934e issue1558: Allow fixed axis for timeseries-diagrams. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 7034 diff changeset	126
2633 894186b4c1d0 Issue 494. Raimund Renkert <raimund.renkert@intevation.de> parents: 2590 diff changeset	127 addAnnotationsToRenderer(plot);
3622 5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	128 addLogo(plot);
3185 f1e4b37dcb60 Enable legend item aggreation in time series charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3168 diff changeset	129 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	130 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	131 }
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	132
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	133
3622 5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	134 /**
5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	135 * 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	136 * 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	137 * axis could be inverted.
5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	138 */
5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	139 protected double getLeftX() {
5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	140 return (Long)getXBounds(0).getLower();
5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	141 }
5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	142
5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	143
5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	144 /**
5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	145 * 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	146 * 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	147 * axis could be inverted.
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 protected double getRightX() {
5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	150 return (Long)getXBounds(0).getUpper();
5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	151 }
5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	152
5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	153
5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	154 /**
5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	155 * 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	156 * Copy from XYChartGenerator.
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 protected void addLogo(XYPlot plot) {
5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	159 String logo = showLogo();
5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	160 if (logo == null) {
5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	161 logger.debug("No logo to show chosen");
5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	162 return;
5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	163 }
5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	164
3633 ebfce31c7eec Removed trailing whitespace. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3632 diff changeset	165 ImageIcon imageIcon = null;
3622 5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	166 if (logo.equals("none")) {
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 }
3623 119b8ba2b77f Include logos in resources. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3622 diff changeset	169 /*
119b8ba2b77f Include logos in resources. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3622 diff changeset	170 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	171 flys-artifacts:
119b8ba2b77f Include logos in resources. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3622 diff changeset	172 XYChartGenerator.java
119b8ba2b77f Include logos in resources. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3622 diff changeset	173 Timeseries*Generator.java and
119b8ba2b77f Include logos in resources. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3622 diff changeset	174 in the flys-client projects ChartPropertEditor.java.
3638 6bfcbe391393 Better comment for logo-adders. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3637 diff changeset	175 Also, these images have to be put in
6bfcbe391393 Better comment for logo-adders. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3637 diff changeset	176 flys-artifacts/src/main/resources/images/
6bfcbe391393 Better comment for logo-adders. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3637 diff changeset	177 flys-client/src/main/webapp/images/
3623 119b8ba2b77f Include logos in resources. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3622 diff changeset	178 */
3637 d5a0602375fb Fixed logo integration in timeseries charts. Raimund Renkert <raimund.renkert@intevation.de> parents: 3633 diff changeset	179 java.net.URL imageURL;
3622 5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	180 if (logo.equals("Intevation")) {
3637 d5a0602375fb Fixed logo integration in timeseries charts. Raimund Renkert <raimund.renkert@intevation.de> parents: 3633 diff changeset	181 imageURL = XYChartGenerator.class.getResource("/images/intevation.png");
3622 5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	182 }
5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	183 else { // TODO else if ...
3637 d5a0602375fb Fixed logo integration in timeseries charts. Raimund Renkert <raimund.renkert@intevation.de> parents: 3633 diff changeset	184 imageURL = XYChartGenerator.class.getResource("/images/bfg_logo.gif");
3622 5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	185 }
3637 d5a0602375fb Fixed logo integration in timeseries charts. Raimund Renkert <raimund.renkert@intevation.de> parents: 3633 diff changeset	186 imageIcon = new ImageIcon(imageURL);
3622 5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	187 double xPos = 0d, yPos = 0d;
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 String placeh = logoHPlace();
5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	190 String placev = logoVPlace();
5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	191
5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	192 if (placev == null \|\| placev.equals("none")) {
5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	193 placev = "top";
5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	194 }
5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	195 if (placev.equals("top")) {
5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	196 yPos = (Double)getYBounds(0).getUpper();
5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	197 }
5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	198 else if (placev.equals("bottom")) {
5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	199 yPos = (Double)getYBounds(0).getLower();
5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	200 }
5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	201 else if (placev.equals("center")) {
5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	202 yPos = ((Double)getYBounds(0).getUpper() + (Double)getYBounds(0).getLower())/2d;
5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	203 }
5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	204 else {
5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	205 logger.debug("Unknown place-v value: " + placev);
5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	206 }
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 if (placeh == null \|\| placeh.equals("none")) {
5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	209 placeh = "center";
5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	210 }
5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	211 if (placeh.equals("left")) {
5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	212 xPos = getLeftX();
5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	213 }
5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	214 else if (placeh.equals("right")) {
5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	215 xPos = getRightX();
5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	216 }
5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	217 else if (placeh.equals("center")) {
3632 347096b8cdf6 Fix invalid cast. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3623 diff changeset	218 xPos = ((Long)getXBounds(0).getUpper() + (Long)getXBounds(0).getLower())/2d;
3622 5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	219 }
5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	220 else {
5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	221 logger.debug("Unknown place-h value: " + placeh);
5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	222 }
5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	223
5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	224 logger.debug("logo position: " + xPos + "/" + yPos);
5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	225
5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	226 org.jfree.ui.RectangleAnchor anchor
5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	227 = org.jfree.ui.RectangleAnchor.TOP;
5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	228 if (placev.equals("top")) {
5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	229 if (placeh.equals("left")) {
5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	230 anchor = org.jfree.ui.RectangleAnchor.TOP_LEFT;
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 else if (placeh.equals("right")) {
5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	233 anchor = org.jfree.ui.RectangleAnchor.TOP_RIGHT;
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 else if (placeh.equals("center")) {
5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	236 anchor = org.jfree.ui.RectangleAnchor.TOP;
5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	237 }
5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	238 }
5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	239 else if (placev.equals("bottom")) {
5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	240 if (placeh.equals("left")) {
5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	241 anchor = org.jfree.ui.RectangleAnchor.BOTTOM_LEFT;
5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	242 }
5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	243 else if (placeh.equals("right")) {
5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	244 anchor = org.jfree.ui.RectangleAnchor.BOTTOM_RIGHT;
5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	245 }
5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	246 else if (placeh.equals("center")) {
5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	247 anchor = org.jfree.ui.RectangleAnchor.BOTTOM;
5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	248 }
5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	249 }
5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	250 else if (placev.equals("center")) {
5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	251 if (placeh.equals("left")) {
5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	252 anchor = org.jfree.ui.RectangleAnchor.LEFT;
5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	253 }
5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	254 else if (placeh.equals("right")) {
5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	255 anchor = org.jfree.ui.RectangleAnchor.RIGHT;
5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	256 }
5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	257 else if (placeh.equals("center")) {
5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	258 anchor = org.jfree.ui.RectangleAnchor.CENTER;
5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	259 }
5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	260 }
5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	261
5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	262 XYAnnotation xyannotation =
3633 ebfce31c7eec Removed trailing whitespace. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3632 diff changeset	263 new XYImageAnnotation(xPos, yPos, imageIcon.getImage(), anchor);
ebfce31c7eec Removed trailing whitespace. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3632 diff changeset	264 plot.getRenderer().addAnnotation(xyannotation, org.jfree.ui.Layer.BACKGROUND);
3622 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
7595 ce1b8a59934e issue1558: Allow fixed axis for timeseries-diagrams. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 7034 diff changeset	267 /**
ce1b8a59934e issue1558: Allow fixed axis for timeseries-diagrams. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 7034 diff changeset	268 * 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	269 * 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	270 * 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	271 * 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	272 * right of the data area.
ce1b8a59934e issue1558: Allow fixed axis for timeseries-diagrams. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 7034 diff changeset	273 *
ce1b8a59934e issue1558: Allow fixed axis for timeseries-diagrams. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 7034 diff changeset	274 * Copy of implementation in XYChartGenerator.
ce1b8a59934e issue1558: Allow fixed axis for timeseries-diagrams. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 7034 diff changeset	275 *
ce1b8a59934e issue1558: Allow fixed axis for timeseries-diagrams. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 7034 diff changeset	276 * @param plot The XYPlot.
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 protected void consumeAxisSettings(XYPlot plot) {
ce1b8a59934e issue1558: Allow fixed axis for timeseries-diagrams. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 7034 diff changeset	279 logger.debug("Zoom to specified ranges.");
ce1b8a59934e issue1558: Allow fixed axis for timeseries-diagrams. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 7034 diff changeset	280
ce1b8a59934e issue1558: Allow fixed axis for timeseries-diagrams. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 7034 diff changeset	281 Bounds xrange = getDomainAxisRange();
ce1b8a59934e issue1558: Allow fixed axis for timeseries-diagrams. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 7034 diff changeset	282 Bounds yrange = getValueAxisRange();
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 ValueAxis xAxis = plot.getDomainAxis();
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 Range fixedXRange = getRangeForAxisFromSettings("X");
ce1b8a59934e issue1558: Allow fixed axis for timeseries-diagrams. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 7034 diff changeset	287 if (fixedXRange != null) {
ce1b8a59934e issue1558: Allow fixed axis for timeseries-diagrams. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 7034 diff changeset	288 xAxis.setRange(fixedXRange);
ce1b8a59934e issue1558: Allow fixed axis for timeseries-diagrams. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 7034 diff changeset	289 }
ce1b8a59934e issue1558: Allow fixed axis for timeseries-diagrams. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 7034 diff changeset	290 else {
ce1b8a59934e issue1558: Allow fixed axis for timeseries-diagrams. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 7034 diff changeset	291 zoomX(plot, xAxis, getXBounds(0), xrange);
ce1b8a59934e issue1558: Allow fixed axis for timeseries-diagrams. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 7034 diff changeset	292 }
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 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	295 ValueAxis yaxis = plot.getRangeAxis(i);
ce1b8a59934e issue1558: Allow fixed axis for timeseries-diagrams. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 7034 diff changeset	296
ce1b8a59934e issue1558: Allow fixed axis for timeseries-diagrams. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 7034 diff changeset	297 if (yaxis instanceof IdentifiableNumberAxis) {
ce1b8a59934e issue1558: Allow fixed axis for timeseries-diagrams. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 7034 diff changeset	298 IdentifiableNumberAxis idAxis = (IdentifiableNumberAxis) yaxis;
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 Range fixedRange = getRangeForAxisFromSettings(idAxis.getId());
ce1b8a59934e issue1558: Allow fixed axis for timeseries-diagrams. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 7034 diff changeset	301 if (fixedRange != null) {
ce1b8a59934e issue1558: Allow fixed axis for timeseries-diagrams. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 7034 diff changeset	302 yaxis.setRange(fixedRange);
ce1b8a59934e issue1558: Allow fixed axis for timeseries-diagrams. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 7034 diff changeset	303 continue;
ce1b8a59934e issue1558: Allow fixed axis for timeseries-diagrams. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 7034 diff changeset	304 }
ce1b8a59934e issue1558: Allow fixed axis for timeseries-diagrams. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 7034 diff changeset	305 }
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 == null) {
ce1b8a59934e issue1558: Allow fixed axis for timeseries-diagrams. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 7034 diff changeset	308 logger.debug("Zoom problem: no Y Axis for index: " + i);
ce1b8a59934e issue1558: Allow fixed axis for timeseries-diagrams. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 7034 diff changeset	309 continue;
ce1b8a59934e issue1558: Allow fixed axis for timeseries-diagrams. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 7034 diff changeset	310 }
ce1b8a59934e issue1558: Allow fixed axis for timeseries-diagrams. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 7034 diff changeset	311
ce1b8a59934e issue1558: Allow fixed axis for timeseries-diagrams. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 7034 diff changeset	312 logger.debug("Prepare zoom settings for y axis at index: " + i);
ce1b8a59934e issue1558: Allow fixed axis for timeseries-diagrams. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 7034 diff changeset	313 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	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
3622 5e505060a9bf Enable logo rendering in timeseries charts. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 3610 diff changeset	317
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	318 @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	319 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	320 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	321 }
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	322
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	323
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	324 /**
7034 557cb3a3d772 Combine AxisDataset implementations and remove / simplify handling code. Andre Heinecke <aheinecke@intevation.de> parents: 6905 diff changeset	325 * 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	326 *
7034 557cb3a3d772 Combine AxisDataset implementations and remove / simplify handling code. Andre Heinecke <aheinecke@intevation.de> parents: 6905 diff changeset	327 * @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	328 */
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	329 @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	330 protected AxisDataset createAxisDataset(int idx) {
23c7c51df772 Some more refactoring in XYChartGenerator and ChartGenerator; implemented necessary stuff in TimeseriesChartGenerator and return new empty instances of timeseries charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2236 diff changeset	331 logger.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	332 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	333 }
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
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	335
2330 594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	336 @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	337 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	338 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	339 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	340
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	341 if (old != null) {
2330 594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	342 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	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
2330 594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	345 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	346 }
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	347 }
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	348
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	349
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	350 @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	351 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	352 if (bounds != null) {
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	353 Bounds old = getYBounds(index);
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	354
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	355 if (old != null) {
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	356 bounds = bounds.combine(old);
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	357 }
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	358
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	359 setYBounds(index, bounds);
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	360 }
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	361 }
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	362
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	363
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	364 // TODO REPLACE THIS METHOD WITH getBoundsForAxis(index)
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	365 @Override
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	366 public Range[] getRangesForAxis(int index) {
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	367 // TODO
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	368 Bounds[] bounds = getBoundsForAxis(index);
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	369
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	370 return new Range[] {
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	371 new Range(
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	372 bounds[0].getLower().doubleValue(),
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	373 bounds[0].getUpper().doubleValue()),
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	374 new Range(
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	375 bounds[1].getLower().doubleValue(),
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	376 bounds[1].getUpper().doubleValue())
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	377 };
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	378 }
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
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	381 @Override
2330 594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	382 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	383 return xBounds.get(axis);
2330 594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	384 }
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	385
2330 594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	386
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	387 @Override
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	388 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	389 xBounds.put(axis, bounds);
2330 594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	390 }
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	391
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	392
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	393 @Override
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	394 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	395 return yBounds.get(axis);
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
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	398
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	399 @Override
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	400 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	401 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	402 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	403 }
2330 594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	404 }
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	405
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 public Bounds[] getBoundsForAxis(int index) {
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	408 logger.debug("Return x and y bounds for axis at: " + index);
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	409
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	410 Bounds rx = getXBounds(Integer.valueOf(index));
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	411 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	412
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	413 if (rx == null) {
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	414 logger.warn("Range for x axis not set." +
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	415 " Using default values: 0 - 1.");
2330 594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	416 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	417 }
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	418
2330 594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	419 if (ry == null) {
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	420 logger.warn("Range for y axis not set." +
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	421 " Using default values: 0 - 1.");
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	422 ry = new DoubleBounds(0l, 1l);
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	423 }
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	424
2330 594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	425 logger.debug("X Bounds at index " + index + " is: " + rx);
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	426 logger.debug("Y Bounds at index " + index + " is: " + ry);
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	427
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	428 return new Bounds[] {rx, ry};
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	429 }
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	430
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	431
3650 cbe2febe30cc Merged revisions 5391-5392 via svnmerge from Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 3638 diff changeset	432 /** Get (zoom)values from request. */
2330 594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	433 public Bounds getDomainAxisRange() {
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	434 String[] ranges = getDomainAxisRangeFromRequest();
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	435
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	436 if (ranges == null \|\| ranges.length < 2) {
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	437 logger.debug("No zoom range for domain axis specified.");
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	438 return null;
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 if (ranges[0] == null \|\| ranges[1] == null) {
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	442 logger.warn("Invalid ranges for domain axis specified!");
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	443 return null;
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	444 }
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 try {
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	447 double lower = Double.parseDouble(ranges[0]);
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	448 double upper = Double.parseDouble(ranges[1]);
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 return new DoubleBounds(lower, upper);
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	451 }
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	452 catch (NumberFormatException nfe) {
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	453 logger.warn("Invalid ranges for domain axis specified: " + nfe);
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 return null;
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	457 }
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	458
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 public Bounds getValueAxisRange() {
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	461 String[] ranges = getValueAxisRangeFromRequest();
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	462
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	463 if (ranges == null \|\| ranges.length < 2) {
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	464 logger.debug("No zoom range for domain axis specified.");
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	465 return null;
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	466 }
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 if (ranges[0] == null \|\| ranges[1] == null) {
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	469 logger.warn("Invalid ranges for domain axis specified!");
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	470 return null;
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	471 }
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 try {
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	474 double lower = Double.parseDouble(ranges[0]);
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	475 double upper = Double.parseDouble(ranges[1]);
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 return new DoubleBounds(lower, upper);
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	478 }
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	479 catch (NumberFormatException nfe) {
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	480 logger.warn("Invalid ranges for domain axis specified: " + nfe);
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 return null;
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	484 }
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	485
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 protected void adaptZoom(XYPlot plot) {
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	488 logger.debug("Adapt zoom of Timeseries chart.");
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	489
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	490 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	491
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	492 Bounds valueAxisBounds = getValueAxisRange();
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	493
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	494 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	495 zoomY(
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	496 plot,
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	497 plot.getRangeAxis(j),
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	498 getYBounds(j),
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	499 valueAxisBounds);
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	500 }
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
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	503
3650 cbe2febe30cc Merged revisions 5391-5392 via svnmerge from Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 3638 diff changeset	504 /**
cbe2febe30cc Merged revisions 5391-5392 via svnmerge from Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 3638 diff changeset	505 * @param plot the plot.
cbe2febe30cc Merged revisions 5391-5392 via svnmerge from Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 3638 diff changeset	506 * @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	507 * @param total the current bounds (?).
cbe2febe30cc Merged revisions 5391-5392 via svnmerge from Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 3638 diff changeset	508 */
2330 594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	509 protected void zoomX(
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	510 XYPlot plot,
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	511 ValueAxis axis,
3650 cbe2febe30cc Merged revisions 5391-5392 via svnmerge from Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 3638 diff changeset	512 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	513 Bounds user
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	514 ) {
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	515 if (logger.isDebugEnabled()) {
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	516 logger.debug("== Zoom X axis ==");
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	517 logger.debug(" Total axis range : " + total);
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	518 logger.debug(" User defined range: " + user);
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	519 }
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	520
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	521 if (user != null) {
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	522 long min = total.getLower().longValue();
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	523 long max = total.getUpper().longValue();
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	524 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	525
3278 c27c4e06dd87 Re-add HYK rendering code to CrossSectionGenerator Christian Lins <christian.lins@intevation.de> parents: 3242 diff changeset	526 long newMin = Math.round(min + user.getLower().doubleValue() * diff);
c27c4e06dd87 Re-add HYK rendering code to CrossSectionGenerator Christian Lins <christian.lins@intevation.de> parents: 3242 diff changeset	527 long newMax = Math.round(min + user.getUpper().doubleValue() * diff);
2330 594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	528
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	529 TimeBounds newBounds = new TimeBounds(newMin, newMax);
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 logger.debug(" Zoom axis to: " + newBounds);
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	532
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	533 newBounds.applyBounds(axis, AXIS_SPACE);
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	534 }
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	535 else {
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	536 logger.debug("No user specified zoom values found!");
3140 3d456d8bca6e TimeseriesChartGenerator: Prevent some NPEs Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3139 diff changeset	537 if (total != null && axis != null) {
3d456d8bca6e TimeseriesChartGenerator: Prevent some NPEs Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3139 diff changeset	538 total.applyBounds(axis, AXIS_SPACE);
3d456d8bca6e TimeseriesChartGenerator: Prevent some NPEs Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3139 diff changeset	539 }
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 }
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	542
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	543
3650 cbe2febe30cc Merged revisions 5391-5392 via svnmerge from Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 3638 diff changeset	544 /**
cbe2febe30cc Merged revisions 5391-5392 via svnmerge from Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 3638 diff changeset	545 * @param user zoom values in percent.
cbe2febe30cc Merged revisions 5391-5392 via svnmerge from Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 3638 diff changeset	546 */
2330 594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	547 protected void zoomY(
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	548 XYPlot plot,
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	549 ValueAxis axis,
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	550 Bounds total,
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	551 Bounds user
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 if (logger.isDebugEnabled()) {
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	554 logger.debug("== Zoom Y axis ==");
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	555 logger.debug(" Total axis range : " + total);
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	556 logger.debug(" User defined range: " + user);
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	557 }
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	558
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	559 if (user != null) {
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	560 double min = total.getLower().doubleValue();
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	561 double max = total.getUpper().doubleValue();
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	562 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	563
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	564 double newMin = min + user.getLower().doubleValue() * diff;
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	565 double newMax = min + user.getUpper().doubleValue() * diff;
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	566
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	567 DoubleBounds newBounds = new DoubleBounds(newMin, newMax);
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	568
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	569 logger.debug(" Zoom axis to: " + newBounds);
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 newBounds.applyBounds(axis, AXIS_SPACE);
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	572 }
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	573 else {
594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	574 logger.debug("No user specified zoom values found!");
3140 3d456d8bca6e TimeseriesChartGenerator: Prevent some NPEs Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3139 diff changeset	575 if (total != null && axis != null) {
3d456d8bca6e TimeseriesChartGenerator: Prevent some NPEs Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3139 diff changeset	576 total.applyBounds(axis, AXIS_SPACE);
3d456d8bca6e TimeseriesChartGenerator: Prevent some NPEs Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3139 diff changeset	577 }
2330 594885703687 Picked changes r4015:4026 from trunk. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2261 diff changeset	578 }
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	579 }
2586 8cd6358eb7f8 Enabeld axes label font sizes for timeseries charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2554 diff changeset	580
8cd6358eb7f8 Enabeld axes label font sizes for timeseries charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2554 diff changeset	581
8cd6358eb7f8 Enabeld axes label font sizes for timeseries charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2554 diff changeset	582 /**
7595 ce1b8a59934e issue1558: Allow fixed axis for timeseries-diagrams. Felix Wolfsteller <felix.wolfsteller@intevation.de> parents: 7034 diff changeset	583 * Adjusts the (look of) axes of a plot. 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	584 * X axis.
3726 b679f6048acc Removed trailing whitespace. Back from future. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3650 diff changeset	585 *
3650 cbe2febe30cc Merged revisions 5391-5392 via svnmerge from Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 3638 diff changeset	586 * (Duplicate in XYChartGenerator).
2586 8cd6358eb7f8 Enabeld axes label font sizes for timeseries charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2554 diff changeset	587 *
8cd6358eb7f8 Enabeld axes label font sizes for timeseries charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2554 diff changeset	588 * @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	589 */
8cd6358eb7f8 Enabeld axes label font sizes for timeseries charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2554 diff changeset	590 protected void adjustAxes(XYPlot plot) {
8cd6358eb7f8 Enabeld axes label font sizes for timeseries charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2554 diff changeset	591 ValueAxis xaxis = plot.getDomainAxis();
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 ChartSettings chartSettings = getChartSettings();
8cd6358eb7f8 Enabeld axes label font sizes for timeseries charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2554 diff changeset	594 if (chartSettings == null) {
8cd6358eb7f8 Enabeld axes label font sizes for timeseries charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2554 diff changeset	595 return;
8cd6358eb7f8 Enabeld axes label font sizes for timeseries charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2554 diff changeset	596 }
8cd6358eb7f8 Enabeld axes label font sizes for timeseries charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2554 diff changeset	597
8cd6358eb7f8 Enabeld axes label font sizes for timeseries charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2554 diff changeset	598 Font labelFont = new Font(
8cd6358eb7f8 Enabeld axes label font sizes for timeseries charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2554 diff changeset	599 DEFAULT_FONT_NAME,
8cd6358eb7f8 Enabeld axes label font sizes for timeseries charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2554 diff changeset	600 Font.BOLD,
8cd6358eb7f8 Enabeld axes label font sizes for timeseries charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2554 diff changeset	601 getXAxisLabelFontSize());
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 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	604 xaxis.setTickLabelFont(labelFont);
2586 8cd6358eb7f8 Enabeld axes label font sizes for timeseries charts. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: 2554 diff changeset	605 }
2633 894186b4c1d0 Issue 494. Raimund Renkert <raimund.renkert@intevation.de> parents: 2590 diff changeset	606
894186b4c1d0 Issue 494. Raimund Renkert <raimund.renkert@intevation.de> parents: 2590 diff changeset	607
3984 89d7e97e9c9a Manual points working in fixing Delta W/t char (#462). Christian Lins <clins@intevation.de> parents: 3969 diff changeset	608 protected Date decodeXAxisValue(JSONArray array) throws JSONException, ParseException {
89d7e97e9c9a Manual points working in fixing Delta W/t char (#462). Christian Lins <clins@intevation.de> parents: 3969 diff changeset	609 try {
89d7e97e9c9a Manual points working in fixing Delta W/t char (#462). Christian Lins <clins@intevation.de> parents: 3969 diff changeset	610 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	611 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	612 return new Date(l);
89d7e97e9c9a Manual points working in fixing Delta W/t char (#462). Christian Lins <clins@intevation.de> parents: 3969 diff changeset	613 }
89d7e97e9c9a Manual points working in fixing Delta W/t char (#462). Christian Lins <clins@intevation.de> parents: 3969 diff changeset	614 catch(JSONException ex) {
89d7e97e9c9a Manual points working in fixing Delta W/t char (#462). Christian Lins <clins@intevation.de> parents: 3969 diff changeset	615 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	616 DateFormat df = DateFormat.getDateInstance(
89d7e97e9c9a Manual points working in fixing Delta W/t char (#462). Christian Lins <clins@intevation.de> parents: 3969 diff changeset	617 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	618 return df.parse(str);
89d7e97e9c9a Manual points working in fixing Delta W/t char (#462). Christian Lins <clins@intevation.de> parents: 3969 diff changeset	619 }
89d7e97e9c9a Manual points working in fixing Delta W/t char (#462). Christian Lins <clins@intevation.de> parents: 3969 diff changeset	620 }
89d7e97e9c9a Manual points working in fixing Delta W/t char (#462). Christian Lins <clins@intevation.de> parents: 3969 diff changeset	621
2633 894186b4c1d0 Issue 494. Raimund Renkert <raimund.renkert@intevation.de> parents: 2590 diff changeset	622 /**
894186b4c1d0 Issue 494. Raimund Renkert <raimund.renkert@intevation.de> parents: 2590 diff changeset	623 * Do Points out.
894186b4c1d0 Issue 494. Raimund Renkert <raimund.renkert@intevation.de> parents: 2590 diff changeset	624 */
894186b4c1d0 Issue 494. Raimund Renkert <raimund.renkert@intevation.de> parents: 2590 diff changeset	625 protected void doPoints(
894186b4c1d0 Issue 494. Raimund Renkert <raimund.renkert@intevation.de> parents: 2590 diff changeset	626 Object o,
894186b4c1d0 Issue 494. Raimund Renkert <raimund.renkert@intevation.de> parents: 2590 diff changeset	627 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	628 ThemeDocument theme,
2633 894186b4c1d0 Issue 494. Raimund Renkert <raimund.renkert@intevation.de> parents: 2590 diff changeset	629 boolean visible,
894186b4c1d0 Issue 494. Raimund Renkert <raimund.renkert@intevation.de> parents: 2590 diff changeset	630 int axisIndex
894186b4c1d0 Issue 494. Raimund Renkert <raimund.renkert@intevation.de> parents: 2590 diff changeset	631 ) {
894186b4c1d0 Issue 494. Raimund Renkert <raimund.renkert@intevation.de> parents: 2590 diff changeset	632 String seriesName = aandf.getFacetDescription();
894186b4c1d0 Issue 494. Raimund Renkert <raimund.renkert@intevation.de> parents: 2590 diff changeset	633 TimeSeries series = new StyledTimeSeries(seriesName, theme);
894186b4c1d0 Issue 494. Raimund Renkert <raimund.renkert@intevation.de> parents: 2590 diff changeset	634
894186b4c1d0 Issue 494. Raimund Renkert <raimund.renkert@intevation.de> parents: 2590 diff changeset	635 // Add text annotations for single points.
894186b4c1d0 Issue 494. Raimund Renkert <raimund.renkert@intevation.de> parents: 2590 diff changeset	636 List<XYTextAnnotation> xy = new ArrayList<XYTextAnnotation>();
894186b4c1d0 Issue 494. Raimund Renkert <raimund.renkert@intevation.de> parents: 2590 diff changeset	637 HashMap<Day, String> names = new HashMap<Day, String>();
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 try {
894186b4c1d0 Issue 494. Raimund Renkert <raimund.renkert@intevation.de> parents: 2590 diff changeset	640 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	641 for (int i = 0, P = points.length(); i < P; i++) {
2633 894186b4c1d0 Issue 494. Raimund Renkert <raimund.renkert@intevation.de> parents: 2590 diff changeset	642 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	643
2633 894186b4c1d0 Issue 494. Raimund Renkert <raimund.renkert@intevation.de> parents: 2590 diff changeset	644 double y = array.getDouble(1);
894186b4c1d0 Issue 494. Raimund Renkert <raimund.renkert@intevation.de> parents: 2590 diff changeset	645 String name = array.getString(2);
894186b4c1d0 Issue 494. Raimund Renkert <raimund.renkert@intevation.de> parents: 2590 diff changeset	646 boolean act = array.getBoolean(3);
894186b4c1d0 Issue 494. Raimund Renkert <raimund.renkert@intevation.de> parents: 2590 diff changeset	647 if (!act) {
894186b4c1d0 Issue 494. Raimund Renkert <raimund.renkert@intevation.de> parents: 2590 diff changeset	648 continue;
894186b4c1d0 Issue 494. Raimund Renkert <raimund.renkert@intevation.de> parents: 2590 diff changeset	649 }
3984 89d7e97e9c9a Manual points working in fixing Delta W/t char (#462). Christian Lins <clins@intevation.de> parents: 3969 diff changeset	650
89d7e97e9c9a Manual points working in fixing Delta W/t char (#462). Christian Lins <clins@intevation.de> parents: 3969 diff changeset	651 Date date = decodeXAxisValue(array);
89d7e97e9c9a Manual points working in fixing Delta W/t char (#462). Christian Lins <clins@intevation.de> parents: 3969 diff changeset	652
2633 894186b4c1d0 Issue 494. Raimund Renkert <raimund.renkert@intevation.de> parents: 2590 diff changeset	653 Day day = new Day(date);
894186b4c1d0 Issue 494. Raimund Renkert <raimund.renkert@intevation.de> parents: 2590 diff changeset	654 series.add(day, y, false);
894186b4c1d0 Issue 494. Raimund Renkert <raimund.renkert@intevation.de> parents: 2590 diff changeset	655 names.put(day, name);
894186b4c1d0 Issue 494. Raimund Renkert <raimund.renkert@intevation.de> parents: 2590 diff changeset	656 }
894186b4c1d0 Issue 494. Raimund Renkert <raimund.renkert@intevation.de> parents: 2590 diff changeset	657 }
3984 89d7e97e9c9a Manual points working in fixing Delta W/t char (#462). Christian Lins <clins@intevation.de> parents: 3969 diff changeset	658 catch(JSONException ex) {
89d7e97e9c9a Manual points working in fixing Delta W/t char (#462). Christian Lins <clins@intevation.de> parents: 3969 diff changeset	659 logger.error("Could not decode json");
89d7e97e9c9a Manual points working in fixing Delta W/t char (#462). Christian Lins <clins@intevation.de> parents: 3969 diff changeset	660 }
89d7e97e9c9a Manual points working in fixing Delta W/t char (#462). Christian Lins <clins@intevation.de> parents: 3969 diff changeset	661 catch(ParseException ex) {
89d7e97e9c9a Manual points working in fixing Delta W/t char (#462). Christian Lins <clins@intevation.de> parents: 3969 diff changeset	662 logger.error("Could not parse date string");
2633 894186b4c1d0 Issue 494. Raimund Renkert <raimund.renkert@intevation.de> parents: 2590 diff changeset	663 }
894186b4c1d0 Issue 494. Raimund Renkert <raimund.renkert@intevation.de> parents: 2590 diff changeset	664
894186b4c1d0 Issue 494. Raimund Renkert <raimund.renkert@intevation.de> parents: 2590 diff changeset	665 TimeSeriesCollection tsc = new TimeSeriesCollection();
894186b4c1d0 Issue 494. Raimund Renkert <raimund.renkert@intevation.de> parents: 2590 diff changeset	666 tsc.addSeries(series);
894186b4c1d0 Issue 494. Raimund Renkert <raimund.renkert@intevation.de> parents: 2590 diff changeset	667 // Add Annotations.
3087 4a76da133144 Removed repeated x.size() calls from for loops. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2636 diff changeset	668 for (int i = 0, S = series.getItemCount(); i < S; i++) {
2633 894186b4c1d0 Issue 494. Raimund Renkert <raimund.renkert@intevation.de> parents: 2590 diff changeset	669 double x = tsc.getXValue(0, i);
894186b4c1d0 Issue 494. Raimund Renkert <raimund.renkert@intevation.de> parents: 2590 diff changeset	670 double y = tsc.getYValue(0, i);
894186b4c1d0 Issue 494. Raimund Renkert <raimund.renkert@intevation.de> parents: 2590 diff changeset	671 xy.add(new CollisionFreeXYTextAnnotation(
894186b4c1d0 Issue 494. Raimund Renkert <raimund.renkert@intevation.de> parents: 2590 diff changeset	672 names.get(series.getTimePeriod(i)), x, y));
3984 89d7e97e9c9a Manual points working in fixing Delta W/t char (#462). Christian Lins <clins@intevation.de> parents: 3969 diff changeset	673 logger.debug("doPoints(): x=" + x + " y=" + y);
2633 894186b4c1d0 Issue 494. Raimund Renkert <raimund.renkert@intevation.de> parents: 2590 diff changeset	674 }
5864 f2e46a668fe6 River artifacts: Renamed FLYSAnnotation to RiverAnnotation. Sascha L. Teichmann <teichmann@intevation.de> parents: 5863 diff changeset	675 RiverAnnotation annotations =
f2e46a668fe6 River artifacts: Renamed FLYSAnnotation to RiverAnnotation. Sascha L. Teichmann <teichmann@intevation.de> parents: 5863 diff changeset	676 new RiverAnnotation(null, null, null, theme);
2633 894186b4c1d0 Issue 494. Raimund Renkert <raimund.renkert@intevation.de> parents: 2590 diff changeset	677 annotations.setTextAnnotations(xy);
894186b4c1d0 Issue 494. Raimund Renkert <raimund.renkert@intevation.de> parents: 2590 diff changeset	678
894186b4c1d0 Issue 494. Raimund Renkert <raimund.renkert@intevation.de> parents: 2590 diff changeset	679 // Do not generate second legend entry. (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	680 doAnnotations(annotations, null, theme, visible);
2633 894186b4c1d0 Issue 494. Raimund Renkert <raimund.renkert@intevation.de> parents: 2590 diff changeset	681
894186b4c1d0 Issue 494. Raimund Renkert <raimund.renkert@intevation.de> parents: 2590 diff changeset	682 addAxisDataset(tsc, axisIndex, visible);
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
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	685 public void addDomainAxisMarker(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	686 logger.debug("domainmarkers: " + domainMarker.size());
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	687 for (Marker marker: domainMarker) {
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	688 logger.debug("adding domain 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	689 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	690 }
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	691 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	692 }
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	693
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	694 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	695 for (Marker 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	696 logger.debug("adding value 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	697 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	698 }
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	699 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	700 }
2633 894186b4c1d0 Issue 494. Raimund Renkert <raimund.renkert@intevation.de> parents: 2590 diff changeset	701
3134 5a0aef74c316 Use different stylings for real and interpolated data points. Raimund Renkert <raimund.renkert@intevation.de> parents: 3130 diff changeset	702 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	703 attributes.put(seriesKey, name);
5a0aef74c316 Use different stylings for real and interpolated data points. Raimund Renkert <raimund.renkert@intevation.de> parents: 3130 diff changeset	704 }
5a0aef74c316 Use different stylings for real and interpolated data points. Raimund Renkert <raimund.renkert@intevation.de> parents: 3130 diff changeset	705
4044 7eebd9e58641 Add chart legend entries for interpolated series (#838). Christian Lins <christian.lins@intevation.de> parents: 4021 diff changeset	706 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	707 LegendItemCollection litems = plot.getLegendItems();
7eebd9e58641 Add chart legend entries for interpolated series (#838). Christian Lins <christian.lins@intevation.de> parents: 4021 diff changeset	708 Iterator<LegendItem> iter = litems.iterator();
7eebd9e58641 Add chart legend entries for interpolated series (#838). Christian Lins <christian.lins@intevation.de> parents: 4021 diff changeset	709 while(iter.hasNext()) {
7eebd9e58641 Add chart legend entries for interpolated series (#838). Christian Lins <christian.lins@intevation.de> parents: 4021 diff changeset	710 LegendItem item = iter.next();
7eebd9e58641 Add chart legend entries for interpolated series (#838). Christian Lins <christian.lins@intevation.de> parents: 4021 diff changeset	711 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	712 return item;
7eebd9e58641 Add chart legend entries for interpolated series (#838). Christian Lins <christian.lins@intevation.de> parents: 4021 diff changeset	713 }
7eebd9e58641 Add chart legend entries for interpolated series (#838). Christian Lins <christian.lins@intevation.de> parents: 4021 diff changeset	714 }
7eebd9e58641 Add chart legend entries for interpolated series (#838). Christian Lins <christian.lins@intevation.de> parents: 4021 diff changeset	715 return null;
7eebd9e58641 Add chart legend entries for interpolated series (#838). Christian Lins <christian.lins@intevation.de> parents: 4021 diff changeset	716 }
7eebd9e58641 Add chart legend entries for interpolated series (#838). Christian Lins <christian.lins@intevation.de> parents: 4021 diff changeset	717
3134 5a0aef74c316 Use different stylings for real and interpolated data points. Raimund Renkert <raimund.renkert@intevation.de> parents: 3130 diff changeset	718 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	719 int count = plot.getDatasetCount();
5a0aef74c316 Use different stylings for real and interpolated data points. Raimund Renkert <raimund.renkert@intevation.de> parents: 3130 diff changeset	720 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	721 XYDataset data = plot.getDataset(i);
3140 3d456d8bca6e TimeseriesChartGenerator: Prevent some NPEs Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3139 diff changeset	722 if (data == null) {
3d456d8bca6e TimeseriesChartGenerator: Prevent some NPEs Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3139 diff changeset	723 continue;
3d456d8bca6e TimeseriesChartGenerator: Prevent some NPEs Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3139 diff changeset	724 }
4044 7eebd9e58641 Add chart legend entries for interpolated series (#838). Christian Lins <christian.lins@intevation.de> parents: 4021 diff changeset	725
3134 5a0aef74c316 Use different stylings for real and interpolated data points. Raimund Renkert <raimund.renkert@intevation.de> parents: 3130 diff changeset	726 int seriesCount = data.getSeriesCount();
5a0aef74c316 Use different stylings for real and interpolated data points. Raimund Renkert <raimund.renkert@intevation.de> parents: 3130 diff changeset	727 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	728 StyledTimeSeries series =
5a0aef74c316 Use different stylings for real and interpolated data points. Raimund Renkert <raimund.renkert@intevation.de> parents: 3130 diff changeset	729 (StyledTimeSeries)getSeriesOf(data, j);
5a0aef74c316 Use different stylings for real and interpolated data points. Raimund Renkert <raimund.renkert@intevation.de> parents: 3130 diff changeset	730 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	731
3134 5a0aef74c316 Use different stylings for real and interpolated data points. Raimund Renkert <raimund.renkert@intevation.de> parents: 3130 diff changeset	732 if (attributes.containsKey(key)) {
4021 7cc05da7e35c Add message for 'state.chart.km' Christian Lins <christian.lins@intevation.de> parents: 3984 diff changeset	733 // 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	734 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	735 XYLineAndShapeRenderer renderer =
4044 7eebd9e58641 Add chart legend entries for interpolated series (#838). Christian Lins <christian.lins@intevation.de> parents: 4021 diff changeset	736 series.getStyle().getRenderer();
3134 5a0aef74c316 Use different stylings for real and interpolated data points. Raimund Renkert <raimund.renkert@intevation.de> parents: 3130 diff changeset	737 renderer.setSeriesPaint(
5a0aef74c316 Use different stylings for real and interpolated data points. Raimund Renkert <raimund.renkert@intevation.de> parents: 3130 diff changeset	738 j,
5a0aef74c316 Use different stylings for real and interpolated data points. Raimund Renkert <raimund.renkert@intevation.de> parents: 3130 diff changeset	739 renderer.getSeriesFillPaint(j));
5a0aef74c316 Use different stylings for real and interpolated data points. Raimund Renkert <raimund.renkert@intevation.de> parents: 3130 diff changeset	740 renderer.setSeriesShapesFilled(j, false);
4044 7eebd9e58641 Add chart legend entries for interpolated series (#838). Christian Lins <christian.lins@intevation.de> parents: 4021 diff changeset	741
7eebd9e58641 Add chart legend entries for interpolated series (#838). Christian Lins <christian.lins@intevation.de> parents: 4021 diff changeset	742 LegendItem legendItem = getLegendItemFor(plot, key);
7eebd9e58641 Add chart legend entries for interpolated series (#838). Christian Lins <christian.lins@intevation.de> parents: 4021 diff changeset	743 if(legendItem != null) {
7eebd9e58641 Add chart legend entries for interpolated series (#838). Christian Lins <christian.lins@intevation.de> parents: 4021 diff changeset	744 LegendItem interLegend = new LegendItem(
7eebd9e58641 Add chart legend entries for interpolated series (#838). Christian Lins <christian.lins@intevation.de> parents: 4021 diff changeset	745 legendItem.getLabel(),
7eebd9e58641 Add chart legend entries for interpolated series (#838). Christian Lins <christian.lins@intevation.de> parents: 4021 diff changeset	746 legendItem.getDescription(),
7eebd9e58641 Add chart legend entries for interpolated series (#838). Christian Lins <christian.lins@intevation.de> parents: 4021 diff changeset	747 legendItem.getToolTipText(),
7eebd9e58641 Add chart legend entries for interpolated series (#838). Christian Lins <christian.lins@intevation.de> parents: 4021 diff changeset	748 legendItem.getURLText(),
7eebd9e58641 Add chart legend entries for interpolated series (#838). Christian Lins <christian.lins@intevation.de> parents: 4021 diff changeset	749 legendItem.isShapeVisible(),
7eebd9e58641 Add chart legend entries for interpolated series (#838). Christian Lins <christian.lins@intevation.de> parents: 4021 diff changeset	750 legendItem.getShape(),
7eebd9e58641 Add chart legend entries for interpolated series (#838). Christian Lins <christian.lins@intevation.de> parents: 4021 diff changeset	751 false, // shapeFilled?
7eebd9e58641 Add chart legend entries for interpolated series (#838). Christian Lins <christian.lins@intevation.de> parents: 4021 diff changeset	752 legendItem.getFillPaint(),
7eebd9e58641 Add chart legend entries for interpolated series (#838). Christian Lins <christian.lins@intevation.de> parents: 4021 diff changeset	753 true, // shapeOutlineVisible?
7eebd9e58641 Add chart legend entries for interpolated series (#838). Christian Lins <christian.lins@intevation.de> parents: 4021 diff changeset	754 renderer.getSeriesFillPaint(j),
7eebd9e58641 Add chart legend entries for interpolated series (#838). Christian Lins <christian.lins@intevation.de> parents: 4021 diff changeset	755 legendItem.getOutlineStroke(),
7eebd9e58641 Add chart legend entries for interpolated series (#838). Christian Lins <christian.lins@intevation.de> parents: 4021 diff changeset	756 legendItem.isLineVisible(),
7eebd9e58641 Add chart legend entries for interpolated series (#838). Christian Lins <christian.lins@intevation.de> parents: 4021 diff changeset	757 legendItem.getLine(),
7eebd9e58641 Add chart legend entries for interpolated series (#838). Christian Lins <christian.lins@intevation.de> parents: 4021 diff changeset	758 legendItem.getLineStroke(),
7eebd9e58641 Add chart legend entries for interpolated series (#838). Christian Lins <christian.lins@intevation.de> parents: 4021 diff changeset	759 legendItem.getLinePaint()
7eebd9e58641 Add chart legend entries for interpolated series (#838). Christian Lins <christian.lins@intevation.de> parents: 4021 diff changeset	760 );
7eebd9e58641 Add chart legend entries for interpolated series (#838). Christian Lins <christian.lins@intevation.de> parents: 4021 diff changeset	761 interLegend.setSeriesKey(series.getKey());
7eebd9e58641 Add chart legend entries for interpolated series (#838). Christian Lins <christian.lins@intevation.de> parents: 4021 diff changeset	762 logger.debug("applySeriesAttributes: draw unfilled legend item");
7eebd9e58641 Add chart legend entries for interpolated series (#838). Christian Lins <christian.lins@intevation.de> parents: 4021 diff changeset	763 plot.getLegendItems().add(interLegend);
7eebd9e58641 Add chart legend entries for interpolated series (#838). Christian Lins <christian.lins@intevation.de> parents: 4021 diff changeset	764 }
3168 e10323bf3cbc Look for the attribut "outline" in TimeseriesChartGenerator to render shape Raimund Renkert <raimund.renkert@intevation.de> parents: 3140 diff changeset	765 }
e10323bf3cbc Look for the attribut "outline" in TimeseriesChartGenerator to render shape Raimund Renkert <raimund.renkert@intevation.de> parents: 3140 diff changeset	766 }
4044 7eebd9e58641 Add chart legend entries for interpolated series (#838). Christian Lins <christian.lins@intevation.de> parents: 4021 diff changeset	767
3168 e10323bf3cbc Look for the attribut "outline" in TimeseriesChartGenerator to render shape Raimund Renkert <raimund.renkert@intevation.de> parents: 3140 diff changeset	768 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	769 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	770 XYLineAndShapeRenderer renderer =
e10323bf3cbc Look for the attribut "outline" in TimeseriesChartGenerator to render shape Raimund Renkert <raimund.renkert@intevation.de> parents: 3140 diff changeset	771 series.getStyle().getRenderer();
e10323bf3cbc Look for the attribut "outline" in TimeseriesChartGenerator to render shape Raimund Renkert <raimund.renkert@intevation.de> parents: 3140 diff changeset	772 renderer.setSeriesPaint(
e10323bf3cbc Look for the attribut "outline" in TimeseriesChartGenerator to render shape Raimund Renkert <raimund.renkert@intevation.de> parents: 3140 diff changeset	773 j,
e10323bf3cbc Look for the attribut "outline" in TimeseriesChartGenerator to render shape Raimund Renkert <raimund.renkert@intevation.de> parents: 3140 diff changeset	774 renderer.getSeriesFillPaint(j));
3134 5a0aef74c316 Use different stylings for real and interpolated data points. Raimund Renkert <raimund.renkert@intevation.de> parents: 3130 diff changeset	775 renderer.setDrawOutlines(true);
5a0aef74c316 Use different stylings for real and interpolated data points. Raimund Renkert <raimund.renkert@intevation.de> parents: 3130 diff changeset	776 }
5a0aef74c316 Use different stylings for real and interpolated data points. Raimund Renkert <raimund.renkert@intevation.de> parents: 3130 diff changeset	777 }
5a0aef74c316 Use different stylings for real and interpolated data points. Raimund Renkert <raimund.renkert@intevation.de> parents: 3130 diff changeset	778 }
5a0aef74c316 Use different stylings for real and interpolated data points. Raimund Renkert <raimund.renkert@intevation.de> parents: 3130 diff changeset	779 }
5a0aef74c316 Use different stylings for real and interpolated data points. Raimund Renkert <raimund.renkert@intevation.de> parents: 3130 diff changeset	780 }
5a0aef74c316 Use different stylings for real and interpolated data points. Raimund Renkert <raimund.renkert@intevation.de> parents: 3130 diff changeset	781
2633 894186b4c1d0 Issue 494. Raimund Renkert <raimund.renkert@intevation.de> parents: 2590 diff changeset	782 /** Two Ranges that span a rectangular area. */
894186b4c1d0 Issue 494. Raimund Renkert <raimund.renkert@intevation.de> parents: 2590 diff changeset	783 public static class Area {
894186b4c1d0 Issue 494. Raimund Renkert <raimund.renkert@intevation.de> parents: 2590 diff changeset	784 protected Range xRange;
894186b4c1d0 Issue 494. Raimund Renkert <raimund.renkert@intevation.de> parents: 2590 diff changeset	785 protected Range yRange;
894186b4c1d0 Issue 494. Raimund Renkert <raimund.renkert@intevation.de> parents: 2590 diff changeset	786
894186b4c1d0 Issue 494. Raimund Renkert <raimund.renkert@intevation.de> parents: 2590 diff changeset	787 public Area(Range rangeX, Range rangeY) {
894186b4c1d0 Issue 494. Raimund Renkert <raimund.renkert@intevation.de> parents: 2590 diff changeset	788 this.xRange = rangeX;
894186b4c1d0 Issue 494. Raimund Renkert <raimund.renkert@intevation.de> parents: 2590 diff changeset	789 this.yRange = rangeY;
894186b4c1d0 Issue 494. Raimund Renkert <raimund.renkert@intevation.de> parents: 2590 diff changeset	790 }
894186b4c1d0 Issue 494. Raimund Renkert <raimund.renkert@intevation.de> parents: 2590 diff changeset	791
894186b4c1d0 Issue 494. Raimund Renkert <raimund.renkert@intevation.de> parents: 2590 diff changeset	792 public Area(ValueAxis axisX, ValueAxis axisY) {
894186b4c1d0 Issue 494. Raimund Renkert <raimund.renkert@intevation.de> parents: 2590 diff changeset	793 this.xRange = axisX.getRange();
894186b4c1d0 Issue 494. Raimund Renkert <raimund.renkert@intevation.de> parents: 2590 diff changeset	794 this.yRange = axisY.getRange();
894186b4c1d0 Issue 494. Raimund Renkert <raimund.renkert@intevation.de> parents: 2590 diff changeset	795 }
894186b4c1d0 Issue 494. Raimund Renkert <raimund.renkert@intevation.de> parents: 2590 diff changeset	796
894186b4c1d0 Issue 494. Raimund Renkert <raimund.renkert@intevation.de> parents: 2590 diff changeset	797 public double ofLeft(double percent) {
894186b4c1d0 Issue 494. Raimund Renkert <raimund.renkert@intevation.de> parents: 2590 diff changeset	798 return xRange.getLowerBound()
894186b4c1d0 Issue 494. Raimund Renkert <raimund.renkert@intevation.de> parents: 2590 diff changeset	799 + xRange.getLength() * percent;
894186b4c1d0 Issue 494. Raimund Renkert <raimund.renkert@intevation.de> parents: 2590 diff changeset	800 }
894186b4c1d0 Issue 494. Raimund Renkert <raimund.renkert@intevation.de> parents: 2590 diff changeset	801
894186b4c1d0 Issue 494. Raimund Renkert <raimund.renkert@intevation.de> parents: 2590 diff changeset	802 public double ofRight(double percent) {
894186b4c1d0 Issue 494. Raimund Renkert <raimund.renkert@intevation.de> parents: 2590 diff changeset	803 return xRange.getUpperBound()
894186b4c1d0 Issue 494. Raimund Renkert <raimund.renkert@intevation.de> parents: 2590 diff changeset	804 - xRange.getLength() * percent;
894186b4c1d0 Issue 494. Raimund Renkert <raimund.renkert@intevation.de> parents: 2590 diff changeset	805 }
894186b4c1d0 Issue 494. Raimund Renkert <raimund.renkert@intevation.de> parents: 2590 diff changeset	806
894186b4c1d0 Issue 494. Raimund Renkert <raimund.renkert@intevation.de> parents: 2590 diff changeset	807 public double ofGround(double percent) {
894186b4c1d0 Issue 494. Raimund Renkert <raimund.renkert@intevation.de> parents: 2590 diff changeset	808 return yRange.getLowerBound()
894186b4c1d0 Issue 494. Raimund Renkert <raimund.renkert@intevation.de> parents: 2590 diff changeset	809 + yRange.getLength() * percent;
894186b4c1d0 Issue 494. Raimund Renkert <raimund.renkert@intevation.de> parents: 2590 diff changeset	810 }
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 public double atTop() {
894186b4c1d0 Issue 494. Raimund Renkert <raimund.renkert@intevation.de> parents: 2590 diff changeset	813 return yRange.getUpperBound();
894186b4c1d0 Issue 494. Raimund Renkert <raimund.renkert@intevation.de> parents: 2590 diff changeset	814 }
894186b4c1d0 Issue 494. Raimund Renkert <raimund.renkert@intevation.de> parents: 2590 diff changeset	815
894186b4c1d0 Issue 494. Raimund Renkert <raimund.renkert@intevation.de> parents: 2590 diff changeset	816 public double atGround() {
894186b4c1d0 Issue 494. Raimund Renkert <raimund.renkert@intevation.de> parents: 2590 diff changeset	817 return yRange.getLowerBound();
894186b4c1d0 Issue 494. Raimund Renkert <raimund.renkert@intevation.de> parents: 2590 diff changeset	818 }
894186b4c1d0 Issue 494. Raimund Renkert <raimund.renkert@intevation.de> parents: 2590 diff changeset	819
894186b4c1d0 Issue 494. Raimund Renkert <raimund.renkert@intevation.de> parents: 2590 diff changeset	820 public double atRight() {
894186b4c1d0 Issue 494. Raimund Renkert <raimund.renkert@intevation.de> parents: 2590 diff changeset	821 return xRange.getUpperBound();
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
894186b4c1d0 Issue 494. Raimund Renkert <raimund.renkert@intevation.de> parents: 2590 diff changeset	824 public double atLeft() {
894186b4c1d0 Issue 494. Raimund Renkert <raimund.renkert@intevation.de> parents: 2590 diff changeset	825 return xRange.getLowerBound();
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 above(double percent, double base) {
894186b4c1d0 Issue 494. Raimund Renkert <raimund.renkert@intevation.de> parents: 2590 diff changeset	829 return base + yRange.getLength() * percent;
894186b4c1d0 Issue 494. Raimund Renkert <raimund.renkert@intevation.de> parents: 2590 diff changeset	830 }
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
2233 958a10e2e246 Added a new ChartGenerator for timeseries charts and refactored some code in XYChartGenerator. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: diff changeset	833 }
958a10e2e246 Added a new ChartGenerator for timeseries charts and refactored some code in XYChartGenerator. Ingo Weinzierl <ingo.weinzierl@intevation.de> parents: diff changeset	834 // 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 @ 7691:fa4fbd66e752