Mercurial > dive4elements > gnv-client
comparison gnv-artifacts/src/main/java/de/intevation/gnv/chart/TimeSeriesChart.java @ 310:45625b5cd6d4
Added timegap definitions to charts. Adapted constructors and constructor calls.
gnv-artifacts/trunk@368 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author | Ingo Weinzierl <ingo.weinzierl@intevation.de> |
---|---|
date | Tue, 24 Nov 2009 19:14:58 +0000 |
parents | 80f7c5dc09c6 |
children | 19fbd03544ea |
comparison
equal
deleted
inserted
replaced
309:333ea3d54423 | 310:45625b5cd6d4 |
---|---|
30 public TimeSeriesChart( | 30 public TimeSeriesChart( |
31 ChartLabels labels, | 31 ChartLabels labels, |
32 ChartTheme theme, | 32 ChartTheme theme, |
33 Collection parameters, | 33 Collection parameters, |
34 Collection measurements, | 34 Collection measurements, |
35 Collection dates, | |
35 Collection result, | 36 Collection result, |
36 Collection dates, | 37 Collection timeGaps, |
37 Locale locale | 38 Locale locale |
38 ) { | 39 ) { |
39 this.labels = labels; | 40 this.labels = labels; |
40 this.theme = theme; | 41 this.theme = theme; |
41 this.parameters = parameters; | 42 this.parameters = parameters; |
42 this.measurements = measurements; | 43 this.measurements = measurements; |
44 this.dates = dates; | |
43 this.resultSet = result; | 45 this.resultSet = result; |
44 this.dates = dates; | 46 this.timeGaps = timeGaps; |
45 this.locale = locale; | 47 this.locale = locale; |
46 this.PLOT_ORIENTATION = PlotOrientation.VERTICAL; | 48 this.PLOT_ORIENTATION = PlotOrientation.VERTICAL; |
47 } | 49 } |
48 | 50 |
49 | 51 |
94 addValue(row, series); | 96 addValue(row, series); |
95 } | 97 } |
96 | 98 |
97 // add the last dataset if existing to plot and prepare its axis | 99 // add the last dataset if existing to plot and prepare its axis |
98 addSeries(series, idx); | 100 addSeries(series, idx); |
99 prepareAxis(((String)series.getKey()), idx++); | 101 |
102 if (series != null) | |
103 prepareAxis(((String)series.getKey()), idx++); | |
100 } | 104 } |
101 | 105 |
102 | 106 |
103 protected void addValue(Result row, Series series) { | 107 protected void addValue(Result row, Series series) { |
104 // TODO look for gaps between two values | 108 // TODO look for gaps between two values |
133 " " + | 137 " " + |
134 findValueTitle(measurements, breakPoint2) + | 138 findValueTitle(measurements, breakPoint2) + |
135 "m"; | 139 "m"; |
136 } | 140 } |
137 } | 141 } |
138 // vim:set ts=4 sw=4 si et sta sts=4 fenc=latin1 : | 142 // vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : |