Mercurial > dive4elements > river
annotate artifacts/src/main/java/org/dive4elements/river/exports/fixings/FixDeltaWtGenerator.java @ 9123:1cc7653ca84f
Cleanup of ChartGenerator and ChartGenerator2 code. Put some of the copy/pasted code into a common abstraction.
author | gernotbelger |
---|---|
date | Tue, 05 Jun 2018 19:21:16 +0200 |
parents | 5e38e2924c07 |
children | 094ed9d1f2ad |
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:
5867
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:
5867
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:
4866
diff
changeset
|
9 package org.dive4elements.river.exports.fixings; |
3131
bac0b2721451
FixA: Added delta W(t) chart in fix analysis.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
10 |
5831
bd047b71ab37
Repaired internal references
Sascha L. Teichmann <teichmann@intevation.de>
parents:
4866
diff
changeset
|
11 import org.dive4elements.artifactdatabase.state.ArtifactAndFacet; |
bd047b71ab37
Repaired internal references
Sascha L. Teichmann <teichmann@intevation.de>
parents:
4866
diff
changeset
|
12 import org.dive4elements.artifacts.CallContext; |
5867
59ff03ff48f1
River artifacts: Renamed FLYSArtifact(Collection) to D4EArtifact(Collection).
Sascha L. Teichmann <teichmann@intevation.de>
parents:
5864
diff
changeset
|
13 import org.dive4elements.river.artifacts.D4EArtifact; |
5831
bd047b71ab37
Repaired internal references
Sascha L. Teichmann <teichmann@intevation.de>
parents:
4866
diff
changeset
|
14 import org.dive4elements.river.artifacts.access.FixAnalysisAccess; |
bd047b71ab37
Repaired internal references
Sascha L. Teichmann <teichmann@intevation.de>
parents:
4866
diff
changeset
|
15 import org.dive4elements.river.artifacts.model.DateRange; |
bd047b71ab37
Repaired internal references
Sascha L. Teichmann <teichmann@intevation.de>
parents:
4866
diff
changeset
|
16 import org.dive4elements.river.artifacts.model.FacetTypes; |
bd047b71ab37
Repaired internal references
Sascha L. Teichmann <teichmann@intevation.de>
parents:
4866
diff
changeset
|
17 import org.dive4elements.river.artifacts.model.QWDDateRange; |
bd047b71ab37
Repaired internal references
Sascha L. Teichmann <teichmann@intevation.de>
parents:
4866
diff
changeset
|
18 import org.dive4elements.river.artifacts.model.fixings.QWD; |
bd047b71ab37
Repaired internal references
Sascha L. Teichmann <teichmann@intevation.de>
parents:
4866
diff
changeset
|
19 import org.dive4elements.river.artifacts.resources.Resources; |
bd047b71ab37
Repaired internal references
Sascha L. Teichmann <teichmann@intevation.de>
parents:
4866
diff
changeset
|
20 import org.dive4elements.river.exports.TimeseriesChartGenerator; |
bd047b71ab37
Repaired internal references
Sascha L. Teichmann <teichmann@intevation.de>
parents:
4866
diff
changeset
|
21 import org.dive4elements.river.jfree.CollisionFreeXYTextAnnotation; |
5864
f2e46a668fe6
River artifacts: Renamed FLYSAnnotation to RiverAnnotation.
Sascha L. Teichmann <teichmann@intevation.de>
parents:
5863
diff
changeset
|
22 import org.dive4elements.river.jfree.RiverAnnotation; |
5831
bd047b71ab37
Repaired internal references
Sascha L. Teichmann <teichmann@intevation.de>
parents:
4866
diff
changeset
|
23 import org.dive4elements.river.jfree.StyledDomainMarker; |
bd047b71ab37
Repaired internal references
Sascha L. Teichmann <teichmann@intevation.de>
parents:
4866
diff
changeset
|
24 import org.dive4elements.river.jfree.StyledTimeSeries; |
bd047b71ab37
Repaired internal references
Sascha L. Teichmann <teichmann@intevation.de>
parents:
4866
diff
changeset
|
25 import org.dive4elements.river.jfree.StyledValueMarker; |
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:
6874
diff
changeset
|
26 import org.dive4elements.river.themes.ThemeDocument; |
3988
090fea205d1d
Fixing Delta W/t chart: reference period area can now switched to invisible (#877)
Christian Lins <christian.lins@intevation.de>
parents:
3908
diff
changeset
|
27 |
3746
7bc61f4ab26b
Fix for #837
Christian Lins <christian.lins@intevation.de>
parents:
3727
diff
changeset
|
28 import java.io.OutputStream; |
3908
bd0f5a50e194
Theming and i18n of Delta W/t A1/B facets
Christian Lins <christian.lins@intevation.de>
parents:
3907
diff
changeset
|
29 import java.text.NumberFormat; |
3746
7bc61f4ab26b
Fix for #837
Christian Lins <christian.lins@intevation.de>
parents:
3727
diff
changeset
|
30 import java.util.ArrayList; |
7bc61f4ab26b
Fix for #837
Christian Lins <christian.lins@intevation.de>
parents:
3727
diff
changeset
|
31 import java.util.HashMap; |
7bc61f4ab26b
Fix for #837
Christian Lins <christian.lins@intevation.de>
parents:
3727
diff
changeset
|
32 import java.util.List; |
3908
bd0f5a50e194
Theming and i18n of Delta W/t A1/B facets
Christian Lins <christian.lins@intevation.de>
parents:
3907
diff
changeset
|
33 import java.util.Locale; |
3746
7bc61f4ab26b
Fix for #837
Christian Lins <christian.lins@intevation.de>
parents:
3727
diff
changeset
|
34 import java.util.Map; |
7bc61f4ab26b
Fix for #837
Christian Lins <christian.lins@intevation.de>
parents:
3727
diff
changeset
|
35 |
7bc61f4ab26b
Fix for #837
Christian Lins <christian.lins@intevation.de>
parents:
3727
diff
changeset
|
36 import org.apache.log4j.Logger; |
7bc61f4ab26b
Fix for #837
Christian Lins <christian.lins@intevation.de>
parents:
3727
diff
changeset
|
37 import org.jfree.chart.annotations.XYTextAnnotation; |
7bc61f4ab26b
Fix for #837
Christian Lins <christian.lins@intevation.de>
parents:
3727
diff
changeset
|
38 import org.jfree.data.time.RegularTimePeriod; |
6159
41cc83e5c2a2
Prophylactic fix for DeltaWt's before 1900
Andre Heinecke <aheinecke@intevation.de>
parents:
6101
diff
changeset
|
39 import org.jfree.data.time.FixedMillisecond; |
3746
7bc61f4ab26b
Fix for #837
Christian Lins <christian.lins@intevation.de>
parents:
3727
diff
changeset
|
40 import org.jfree.data.time.TimeSeries; |
7bc61f4ab26b
Fix for #837
Christian Lins <christian.lins@intevation.de>
parents:
3727
diff
changeset
|
41 import org.jfree.data.time.TimeSeriesCollection; |
7bc61f4ab26b
Fix for #837
Christian Lins <christian.lins@intevation.de>
parents:
3727
diff
changeset
|
42 import org.w3c.dom.Document; |
7bc61f4ab26b
Fix for #837
Christian Lins <christian.lins@intevation.de>
parents:
3727
diff
changeset
|
43 |
6874
d9dfa52f69eb
FixA Delta W(t): Add 30 seconds to colliding dates to avoid them vanishing from the diagrams.
Sascha L. Teichmann <teichmann@intevation.de>
parents:
6835
diff
changeset
|
44 import gnu.trove.TLongHashSet; |
d9dfa52f69eb
FixA Delta W(t): Add 30 seconds to colliding dates to avoid them vanishing from the diagrams.
Sascha L. Teichmann <teichmann@intevation.de>
parents:
6835
diff
changeset
|
45 |
8381
592df582e462
Use context constant for current km in fix delta w/t generator.
Raimund Renkert <rrenkert@intevation.de>
parents:
8202
diff
changeset
|
46 import static org.dive4elements.river.exports.injector.InjectorConstants.CURRENT_KM; |
3251
aeeb9192e395
W(t) chart point label rotation working
Christian Lins <christian.lins@intevation.de>
parents:
3242
diff
changeset
|
47 |
3131
bac0b2721451
FixA: Added delta W(t) chart in fix analysis.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
48 /** |
3251
aeeb9192e395
W(t) chart point label rotation working
Christian Lins <christian.lins@intevation.de>
parents:
3242
diff
changeset
|
49 * Generator for Delta W(t) charts. |
3131
bac0b2721451
FixA: Added delta W(t) chart in fix analysis.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
50 * @author <a href="mailto:raimund.renkert@intevation.de">Raimund Renkert</a> |
bac0b2721451
FixA: Added delta W(t) chart in fix analysis.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
51 */ |
bac0b2721451
FixA: Added delta W(t) chart in fix analysis.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
52 public class FixDeltaWtGenerator |
bac0b2721451
FixA: Added delta W(t) chart in fix analysis.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
53 extends TimeseriesChartGenerator |
bac0b2721451
FixA: Added delta W(t) chart in fix analysis.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
54 implements FacetTypes |
bac0b2721451
FixA: Added delta W(t) chart in fix analysis.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
55 { |
8202
e4606eae8ea5
sed src/**/*.java 's/logger/log/g'
Sascha L. Teichmann <teichmann@intevation.de>
parents:
7261
diff
changeset
|
56 /** Private log. */ |
e4606eae8ea5
sed src/**/*.java 's/logger/log/g'
Sascha L. Teichmann <teichmann@intevation.de>
parents:
7261
diff
changeset
|
57 private static Logger log = |
3746
7bc61f4ab26b
Fix for #837
Christian Lins <christian.lins@intevation.de>
parents:
3727
diff
changeset
|
58 Logger.getLogger(FixDeltaWtGenerator.class); |
3131
bac0b2721451
FixA: Added delta W(t) chart in fix analysis.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
59 |
bac0b2721451
FixA: Added delta W(t) chart in fix analysis.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
60 public static final String I18N_CHART_TITLE = |
3746
7bc61f4ab26b
Fix for #837
Christian Lins <christian.lins@intevation.de>
parents:
3727
diff
changeset
|
61 "chart.fix.deltawt.title"; |
3131
bac0b2721451
FixA: Added delta W(t) chart in fix analysis.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
62 |
bac0b2721451
FixA: Added delta W(t) chart in fix analysis.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
63 public static final String I18N_CHART_SUBTITLE = |
3746
7bc61f4ab26b
Fix for #837
Christian Lins <christian.lins@intevation.de>
parents:
3727
diff
changeset
|
64 "chart.fix.deltawt.subtitle"; |
3131
bac0b2721451
FixA: Added delta W(t) chart in fix analysis.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
65 |
bac0b2721451
FixA: Added delta W(t) chart in fix analysis.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
66 public static final String I18N_XAXIS_LABEL = |
3746
7bc61f4ab26b
Fix for #837
Christian Lins <christian.lins@intevation.de>
parents:
3727
diff
changeset
|
67 "chart.fix.deltawt.xaxis.label"; |
3131
bac0b2721451
FixA: Added delta W(t) chart in fix analysis.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
68 |
bac0b2721451
FixA: Added delta W(t) chart in fix analysis.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
69 public static final String I18N_YAXIS_LABEL = |
3746
7bc61f4ab26b
Fix for #837
Christian Lins <christian.lins@intevation.de>
parents:
3727
diff
changeset
|
70 "chart.fix.deltawt.yaxis.label"; |
3131
bac0b2721451
FixA: Added delta W(t) chart in fix analysis.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
71 |
bac0b2721451
FixA: Added delta W(t) chart in fix analysis.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
72 public static final String I18N_YAXIS_SECOND_LABEL = |
3746
7bc61f4ab26b
Fix for #837
Christian Lins <christian.lins@intevation.de>
parents:
3727
diff
changeset
|
73 "chart.fix.deltawt.yaxis.second.label"; |
3131
bac0b2721451
FixA: Added delta W(t) chart in fix analysis.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
74 |
bac0b2721451
FixA: Added delta W(t) chart in fix analysis.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
75 |
bac0b2721451
FixA: Added delta W(t) chart in fix analysis.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
76 public static enum YAXIS { |
bac0b2721451
FixA: Added delta W(t) chart in fix analysis.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
77 dW(0); |
bac0b2721451
FixA: Added delta W(t) chart in fix analysis.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
78 protected int idx; |
bac0b2721451
FixA: Added delta W(t) chart in fix analysis.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
79 private YAXIS(int c) { |
bac0b2721451
FixA: Added delta W(t) chart in fix analysis.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
80 idx = c; |
bac0b2721451
FixA: Added delta W(t) chart in fix analysis.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
81 } |
bac0b2721451
FixA: Added delta W(t) chart in fix analysis.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
82 } |
3280
4a70525c5b0d
Removed trailing whitespace.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents:
3279
diff
changeset
|
83 |
4a70525c5b0d
Removed trailing whitespace.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents:
3279
diff
changeset
|
84 |
6874
d9dfa52f69eb
FixA Delta W(t): Add 30 seconds to colliding dates to avoid them vanishing from the diagrams.
Sascha L. Teichmann <teichmann@intevation.de>
parents:
6835
diff
changeset
|
85 private D4EArtifact artifact; |
d9dfa52f69eb
FixA Delta W(t): Add 30 seconds to colliding dates to avoid them vanishing from the diagrams.
Sascha L. Teichmann <teichmann@intevation.de>
parents:
6835
diff
changeset
|
86 |
d9dfa52f69eb
FixA Delta W(t): Add 30 seconds to colliding dates to avoid them vanishing from the diagrams.
Sascha L. Teichmann <teichmann@intevation.de>
parents:
6835
diff
changeset
|
87 // Used to make the dates collision free. |
d9dfa52f69eb
FixA Delta W(t): Add 30 seconds to colliding dates to avoid them vanishing from the diagrams.
Sascha L. Teichmann <teichmann@intevation.de>
parents:
6835
diff
changeset
|
88 private TLongHashSet uniqueDates = new TLongHashSet(); |
3131
bac0b2721451
FixA: Added delta W(t) chart in fix analysis.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
89 |
bac0b2721451
FixA: Added delta W(t) chart in fix analysis.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
90 |
bac0b2721451
FixA: Added delta W(t) chart in fix analysis.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
91 @Override |
bac0b2721451
FixA: Added delta W(t) chart in fix analysis.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
92 protected YAxisWalker getYAxisWalker() { |
bac0b2721451
FixA: Added delta W(t) chart in fix analysis.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
93 return new YAxisWalker() { |
bac0b2721451
FixA: Added delta W(t) chart in fix analysis.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
94 @Override |
bac0b2721451
FixA: Added delta W(t) chart in fix analysis.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
95 public int length() { |
bac0b2721451
FixA: Added delta W(t) chart in fix analysis.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
96 return YAXIS.values().length; |
bac0b2721451
FixA: Added delta W(t) chart in fix analysis.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
97 } |
bac0b2721451
FixA: Added delta W(t) chart in fix analysis.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
98 |
bac0b2721451
FixA: Added delta W(t) chart in fix analysis.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
99 @Override |
bac0b2721451
FixA: Added delta W(t) chart in fix analysis.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
100 public String getId(int idx) { |
bac0b2721451
FixA: Added delta W(t) chart in fix analysis.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
101 YAXIS[] yaxes = YAXIS.values(); |
bac0b2721451
FixA: Added delta W(t) chart in fix analysis.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
102 return yaxes[idx].toString(); |
bac0b2721451
FixA: Added delta W(t) chart in fix analysis.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
103 } |
bac0b2721451
FixA: Added delta W(t) chart in fix analysis.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
104 }; |
bac0b2721451
FixA: Added delta W(t) chart in fix analysis.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
105 } |
bac0b2721451
FixA: Added delta W(t) chart in fix analysis.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
106 |
bac0b2721451
FixA: Added delta W(t) chart in fix analysis.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
107 |
bac0b2721451
FixA: Added delta W(t) chart in fix analysis.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
108 @Override |
9123
1cc7653ca84f
Cleanup of ChartGenerator and ChartGenerator2 code. Put some of the copy/pasted code into a common abstraction.
gernotbelger
parents:
8856
diff
changeset
|
109 protected String getDefaultChartTitle(final CallContext context) { |
3131
bac0b2721451
FixA: Added delta W(t) chart in fix analysis.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
110 return msg(I18N_CHART_TITLE, I18N_CHART_TITLE); |
bac0b2721451
FixA: Added delta W(t) chart in fix analysis.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
111 } |
bac0b2721451
FixA: Added delta W(t) chart in fix analysis.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
112 |
bac0b2721451
FixA: Added delta W(t) chart in fix analysis.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
113 |
bac0b2721451
FixA: Added delta W(t) chart in fix analysis.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
114 @Override |
9123
1cc7653ca84f
Cleanup of ChartGenerator and ChartGenerator2 code. Put some of the copy/pasted code into a common abstraction.
gernotbelger
parents:
8856
diff
changeset
|
115 protected String getChartTitle(final CallContext context) { |
3406
3732e1bab0aa
Add kilometer to chart titles
Christian Lins <christian.lins@intevation.de>
parents:
3404
diff
changeset
|
116 return Resources.format( |
3732e1bab0aa
Add kilometer to chart titles
Christian Lins <christian.lins@intevation.de>
parents:
3404
diff
changeset
|
117 context.getMeta(), |
3732e1bab0aa
Add kilometer to chart titles
Christian Lins <christian.lins@intevation.de>
parents:
3404
diff
changeset
|
118 I18N_CHART_TITLE, |
3732e1bab0aa
Add kilometer to chart titles
Christian Lins <christian.lins@intevation.de>
parents:
3404
diff
changeset
|
119 "", |
3727
b81f328da582
Removed code duplication.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents:
3611
diff
changeset
|
120 FixChartGenerator |
9123
1cc7653ca84f
Cleanup of ChartGenerator and ChartGenerator2 code. Put some of the copy/pasted code into a common abstraction.
gernotbelger
parents:
8856
diff
changeset
|
121 .getCurrentKmFromRequest(getRequest()).doubleValue()); |
3406
3732e1bab0aa
Add kilometer to chart titles
Christian Lins <christian.lins@intevation.de>
parents:
3404
diff
changeset
|
122 } |
3732e1bab0aa
Add kilometer to chart titles
Christian Lins <christian.lins@intevation.de>
parents:
3404
diff
changeset
|
123 |
3732e1bab0aa
Add kilometer to chart titles
Christian Lins <christian.lins@intevation.de>
parents:
3404
diff
changeset
|
124 |
3732e1bab0aa
Add kilometer to chart titles
Christian Lins <christian.lins@intevation.de>
parents:
3404
diff
changeset
|
125 @Override |
9123
1cc7653ca84f
Cleanup of ChartGenerator and ChartGenerator2 code. Put some of the copy/pasted code into a common abstraction.
gernotbelger
parents:
8856
diff
changeset
|
126 protected String getDefaultChartSubtitle(final CallContext context) { |
6101
a0078e5e3b39
Removed unused context from RangeAccess and subclasses leading to some dead code removal.
Sascha L. Teichmann <teichmann@intevation.de>
parents:
5994
diff
changeset
|
127 FixAnalysisAccess access = new FixAnalysisAccess(artifact); |
3409
97ad960f5579
Add subtitle to Fix W/Q chart and refactor addSubtitle() method(s)
Christian Lins <christian.lins@intevation.de>
parents:
3408
diff
changeset
|
128 DateRange dateRange = access.getDateRange(); |
97ad960f5579
Add subtitle to Fix W/Q chart and refactor addSubtitle() method(s)
Christian Lins <christian.lins@intevation.de>
parents:
3408
diff
changeset
|
129 DateRange refRange = access.getReferencePeriod(); |
3279
5a7b4f890d53
Delta W(t) chart subtitle fixed
Christian Lins <christian.lins@intevation.de>
parents:
3254
diff
changeset
|
130 return Resources.format( |
3280
4a70525c5b0d
Removed trailing whitespace.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents:
3279
diff
changeset
|
131 context.getMeta(), |
4a70525c5b0d
Removed trailing whitespace.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents:
3279
diff
changeset
|
132 I18N_CHART_SUBTITLE, |
4a70525c5b0d
Removed trailing whitespace.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents:
3279
diff
changeset
|
133 "", |
7261
a56fe3bc6700
Refactoring: Let RiverAccess.getRiver return an River.
Felix Wolfsteller <felix.wolfsteller@intevation.de>
parents:
7077
diff
changeset
|
134 access.getRiverName(), |
3409
97ad960f5579
Add subtitle to Fix W/Q chart and refactor addSubtitle() method(s)
Christian Lins <christian.lins@intevation.de>
parents:
3408
diff
changeset
|
135 dateRange.getFrom(), |
97ad960f5579
Add subtitle to Fix W/Q chart and refactor addSubtitle() method(s)
Christian Lins <christian.lins@intevation.de>
parents:
3408
diff
changeset
|
136 dateRange.getTo(), |
97ad960f5579
Add subtitle to Fix W/Q chart and refactor addSubtitle() method(s)
Christian Lins <christian.lins@intevation.de>
parents:
3408
diff
changeset
|
137 refRange.getFrom(), |
97ad960f5579
Add subtitle to Fix W/Q chart and refactor addSubtitle() method(s)
Christian Lins <christian.lins@intevation.de>
parents:
3408
diff
changeset
|
138 refRange.getTo()); |
3131
bac0b2721451
FixA: Added delta W(t) chart in fix analysis.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
139 } |
bac0b2721451
FixA: Added delta W(t) chart in fix analysis.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
140 |
bac0b2721451
FixA: Added delta W(t) chart in fix analysis.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
141 |
bac0b2721451
FixA: Added delta W(t) chart in fix analysis.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
142 @Override |
9123
1cc7653ca84f
Cleanup of ChartGenerator and ChartGenerator2 code. Put some of the copy/pasted code into a common abstraction.
gernotbelger
parents:
8856
diff
changeset
|
143 protected String getDefaultXAxisLabel(final CallContext context) { |
3131
bac0b2721451
FixA: Added delta W(t) chart in fix analysis.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
144 return msg(I18N_XAXIS_LABEL, I18N_XAXIS_LABEL); |
bac0b2721451
FixA: Added delta W(t) chart in fix analysis.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
145 } |
bac0b2721451
FixA: Added delta W(t) chart in fix analysis.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
146 |
bac0b2721451
FixA: Added delta W(t) chart in fix analysis.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
147 @Override |
bac0b2721451
FixA: Added delta W(t) chart in fix analysis.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
148 protected String getDefaultYAxisLabel(int pos) { |
bac0b2721451
FixA: Added delta W(t) chart in fix analysis.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
149 if (pos == 0) { |
bac0b2721451
FixA: Added delta W(t) chart in fix analysis.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
150 return msg(I18N_YAXIS_LABEL, I18N_YAXIS_LABEL); |
bac0b2721451
FixA: Added delta W(t) chart in fix analysis.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
151 } |
bac0b2721451
FixA: Added delta W(t) chart in fix analysis.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
152 else if (pos == 1) { |
bac0b2721451
FixA: Added delta W(t) chart in fix analysis.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
153 return msg(I18N_YAXIS_SECOND_LABEL, I18N_YAXIS_SECOND_LABEL); |
bac0b2721451
FixA: Added delta W(t) chart in fix analysis.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
154 } |
bac0b2721451
FixA: Added delta W(t) chart in fix analysis.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
155 else { |
bac0b2721451
FixA: Added delta W(t) chart in fix analysis.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
156 return "NO TITLE FOR Y AXIS: " + pos; |
bac0b2721451
FixA: Added delta W(t) chart in fix analysis.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
157 } |
bac0b2721451
FixA: Added delta W(t) chart in fix analysis.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
158 } |
bac0b2721451
FixA: Added delta W(t) chart in fix analysis.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
159 |
bac0b2721451
FixA: Added delta W(t) chart in fix analysis.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
160 |
3251
aeeb9192e395
W(t) chart point label rotation working
Christian Lins <christian.lins@intevation.de>
parents:
3242
diff
changeset
|
161 @Override |
3131
bac0b2721451
FixA: Added delta W(t) chart in fix analysis.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
162 public void doOut( |
3746
7bc61f4ab26b
Fix for #837
Christian Lins <christian.lins@intevation.de>
parents:
3727
diff
changeset
|
163 ArtifactAndFacet artifactFacet, |
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:
6874
diff
changeset
|
164 ThemeDocument theme, |
3746
7bc61f4ab26b
Fix for #837
Christian Lins <christian.lins@intevation.de>
parents:
3727
diff
changeset
|
165 boolean visible |
7bc61f4ab26b
Fix for #837
Christian Lins <christian.lins@intevation.de>
parents:
3727
diff
changeset
|
166 ) { |
3131
bac0b2721451
FixA: Added delta W(t) chart in fix analysis.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
167 String name = artifactFacet.getFacetName(); |
8202
e4606eae8ea5
sed src/**/*.java 's/logger/log/g'
Sascha L. Teichmann <teichmann@intevation.de>
parents:
7261
diff
changeset
|
168 log.debug("FixDeltaWtGenerator.doOut: " + name); |
8856 | 169 log.debug("Theme description is: " |
170 + artifactFacet.getFacetDescription()); | |
3280
4a70525c5b0d
Removed trailing whitespace.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents:
3279
diff
changeset
|
171 |
5867
59ff03ff48f1
River artifacts: Renamed FLYSArtifact(Collection) to D4EArtifact(Collection).
Sascha L. Teichmann <teichmann@intevation.de>
parents:
5864
diff
changeset
|
172 this.artifact = (D4EArtifact)artifactFacet.getArtifact(); |
3131
bac0b2721451
FixA: Added delta W(t) chart in fix analysis.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
173 |
9123
1cc7653ca84f
Cleanup of ChartGenerator and ChartGenerator2 code. Put some of the copy/pasted code into a common abstraction.
gernotbelger
parents:
8856
diff
changeset
|
174 final CallContext context = getContext(); |
1cc7653ca84f
Cleanup of ChartGenerator and ChartGenerator2 code. Put some of the copy/pasted code into a common abstraction.
gernotbelger
parents:
8856
diff
changeset
|
175 |
3131
bac0b2721451
FixA: Added delta W(t) chart in fix analysis.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
176 if (name.contains(FIX_SECTOR_AVERAGE_DWT)) { |
bac0b2721451
FixA: Added delta W(t) chart in fix analysis.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
177 doSectorAverageOut( |
5867
59ff03ff48f1
River artifacts: Renamed FLYSArtifact(Collection) to D4EArtifact(Collection).
Sascha L. Teichmann <teichmann@intevation.de>
parents:
5864
diff
changeset
|
178 (D4EArtifact) artifactFacet.getArtifact(), |
3746
7bc61f4ab26b
Fix for #837
Christian Lins <christian.lins@intevation.de>
parents:
3727
diff
changeset
|
179 artifactFacet.getData(context), |
7bc61f4ab26b
Fix for #837
Christian Lins <christian.lins@intevation.de>
parents:
3727
diff
changeset
|
180 artifactFacet.getFacetDescription(), |
7bc61f4ab26b
Fix for #837
Christian Lins <christian.lins@intevation.de>
parents:
3727
diff
changeset
|
181 theme, |
7bc61f4ab26b
Fix for #837
Christian Lins <christian.lins@intevation.de>
parents:
3727
diff
changeset
|
182 visible); |
3131
bac0b2721451
FixA: Added delta W(t) chart in fix analysis.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
183 } |
bac0b2721451
FixA: Added delta W(t) chart in fix analysis.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
184 else if (name.equals(FIX_REFERENCE_EVENTS_DWT)) { |
bac0b2721451
FixA: Added delta W(t) chart in fix analysis.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
185 doReferenceEventsOut( |
5867
59ff03ff48f1
River artifacts: Renamed FLYSArtifact(Collection) to D4EArtifact(Collection).
Sascha L. Teichmann <teichmann@intevation.de>
parents:
5864
diff
changeset
|
186 (D4EArtifact) artifactFacet.getArtifact(), |
3746
7bc61f4ab26b
Fix for #837
Christian Lins <christian.lins@intevation.de>
parents:
3727
diff
changeset
|
187 artifactFacet.getData(context), |
7bc61f4ab26b
Fix for #837
Christian Lins <christian.lins@intevation.de>
parents:
3727
diff
changeset
|
188 artifactFacet.getFacetDescription(), |
7bc61f4ab26b
Fix for #837
Christian Lins <christian.lins@intevation.de>
parents:
3727
diff
changeset
|
189 theme, |
7bc61f4ab26b
Fix for #837
Christian Lins <christian.lins@intevation.de>
parents:
3727
diff
changeset
|
190 visible); |
3131
bac0b2721451
FixA: Added delta W(t) chart in fix analysis.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
191 } |
bac0b2721451
FixA: Added delta W(t) chart in fix analysis.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
192 else if (name.equals(FIX_ANALYSIS_EVENTS_DWT)) { |
bac0b2721451
FixA: Added delta W(t) chart in fix analysis.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
193 doAnalysisEventsOut( |
5867
59ff03ff48f1
River artifacts: Renamed FLYSArtifact(Collection) to D4EArtifact(Collection).
Sascha L. Teichmann <teichmann@intevation.de>
parents:
5864
diff
changeset
|
194 (D4EArtifact) artifactFacet.getArtifact(), |
3746
7bc61f4ab26b
Fix for #837
Christian Lins <christian.lins@intevation.de>
parents:
3727
diff
changeset
|
195 artifactFacet.getData(context), |
7bc61f4ab26b
Fix for #837
Christian Lins <christian.lins@intevation.de>
parents:
3727
diff
changeset
|
196 artifactFacet.getFacetDescription(), |
7bc61f4ab26b
Fix for #837
Christian Lins <christian.lins@intevation.de>
parents:
3727
diff
changeset
|
197 theme, |
7bc61f4ab26b
Fix for #837
Christian Lins <christian.lins@intevation.de>
parents:
3727
diff
changeset
|
198 visible); |
3131
bac0b2721451
FixA: Added delta W(t) chart in fix analysis.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
199 } |
bac0b2721451
FixA: Added delta W(t) chart in fix analysis.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
200 else if (name.equals(FIX_DEVIATION_DWT)) { |
bac0b2721451
FixA: Added delta W(t) chart in fix analysis.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
201 doDeviationOut( |
5867
59ff03ff48f1
River artifacts: Renamed FLYSArtifact(Collection) to D4EArtifact(Collection).
Sascha L. Teichmann <teichmann@intevation.de>
parents:
5864
diff
changeset
|
202 (D4EArtifact) artifactFacet.getArtifact(), |
3746
7bc61f4ab26b
Fix for #837
Christian Lins <christian.lins@intevation.de>
parents:
3727
diff
changeset
|
203 artifactFacet.getData(context), |
7bc61f4ab26b
Fix for #837
Christian Lins <christian.lins@intevation.de>
parents:
3727
diff
changeset
|
204 artifactFacet.getFacetDescription(), |
7bc61f4ab26b
Fix for #837
Christian Lins <christian.lins@intevation.de>
parents:
3727
diff
changeset
|
205 theme, |
7bc61f4ab26b
Fix for #837
Christian Lins <christian.lins@intevation.de>
parents:
3727
diff
changeset
|
206 visible); |
3131
bac0b2721451
FixA: Added delta W(t) chart in fix analysis.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
207 } |
bac0b2721451
FixA: Added delta W(t) chart in fix analysis.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
208 else if (name.equals(FIX_ANALYSIS_PERIODS_DWT)) { |
bac0b2721451
FixA: Added delta W(t) chart in fix analysis.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
209 doAnalysisPeriodsOut( |
5867
59ff03ff48f1
River artifacts: Renamed FLYSArtifact(Collection) to D4EArtifact(Collection).
Sascha L. Teichmann <teichmann@intevation.de>
parents:
5864
diff
changeset
|
210 (D4EArtifact) artifactFacet.getArtifact(), |
3746
7bc61f4ab26b
Fix for #837
Christian Lins <christian.lins@intevation.de>
parents:
3727
diff
changeset
|
211 artifactFacet.getData(context), |
7bc61f4ab26b
Fix for #837
Christian Lins <christian.lins@intevation.de>
parents:
3727
diff
changeset
|
212 artifactFacet.getFacetDescription(), |
7bc61f4ab26b
Fix for #837
Christian Lins <christian.lins@intevation.de>
parents:
3727
diff
changeset
|
213 theme, |
7bc61f4ab26b
Fix for #837
Christian Lins <christian.lins@intevation.de>
parents:
3727
diff
changeset
|
214 visible); |
3131
bac0b2721451
FixA: Added delta W(t) chart in fix analysis.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
215 } |
3907
9a2c38fb5f29
Add reference period facet to delta W/t chart
Christian Lins <christian.lins@intevation.de>
parents:
3770
diff
changeset
|
216 else if (name.equals(FIX_REFERENCE_PERIOD_DWT)) { |
9a2c38fb5f29
Add reference period facet to delta W/t chart
Christian Lins <christian.lins@intevation.de>
parents:
3770
diff
changeset
|
217 doReferencePeriodsOut( |
5867
59ff03ff48f1
River artifacts: Renamed FLYSArtifact(Collection) to D4EArtifact(Collection).
Sascha L. Teichmann <teichmann@intevation.de>
parents:
5864
diff
changeset
|
218 (D4EArtifact) artifactFacet.getArtifact(), |
3907
9a2c38fb5f29
Add reference period facet to delta W/t chart
Christian Lins <christian.lins@intevation.de>
parents:
3770
diff
changeset
|
219 artifactFacet.getData(context), |
9a2c38fb5f29
Add reference period facet to delta W/t chart
Christian Lins <christian.lins@intevation.de>
parents:
3770
diff
changeset
|
220 artifactFacet.getFacetDescription(), |
9a2c38fb5f29
Add reference period facet to delta W/t chart
Christian Lins <christian.lins@intevation.de>
parents:
3770
diff
changeset
|
221 theme, |
9a2c38fb5f29
Add reference period facet to delta W/t chart
Christian Lins <christian.lins@intevation.de>
parents:
3770
diff
changeset
|
222 visible); |
9a2c38fb5f29
Add reference period facet to delta W/t chart
Christian Lins <christian.lins@intevation.de>
parents:
3770
diff
changeset
|
223 } |
3770
6a08f4dc790b
Manual Points for fixing charts (not working yet)
Christian Lins <christian.lins@intevation.de>
parents:
3746
diff
changeset
|
224 else if (FacetTypes.IS.MANUALPOINTS(name)) { |
6a08f4dc790b
Manual Points for fixing charts (not working yet)
Christian Lins <christian.lins@intevation.de>
parents:
3746
diff
changeset
|
225 doPoints (artifactFacet.getData(context), |
6a08f4dc790b
Manual Points for fixing charts (not working yet)
Christian Lins <christian.lins@intevation.de>
parents:
3746
diff
changeset
|
226 artifactFacet, |
6a08f4dc790b
Manual Points for fixing charts (not working yet)
Christian Lins <christian.lins@intevation.de>
parents:
3746
diff
changeset
|
227 theme, visible, YAXIS.dW.idx); |
6a08f4dc790b
Manual Points for fixing charts (not working yet)
Christian Lins <christian.lins@intevation.de>
parents:
3746
diff
changeset
|
228 } |
3131
bac0b2721451
FixA: Added delta W(t) chart in fix analysis.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
229 else { |
8202
e4606eae8ea5
sed src/**/*.java 's/logger/log/g'
Sascha L. Teichmann <teichmann@intevation.de>
parents:
7261
diff
changeset
|
230 log.warn("doOut(): unknown facet name: " + name); |
3746
7bc61f4ab26b
Fix for #837
Christian Lins <christian.lins@intevation.de>
parents:
3727
diff
changeset
|
231 return; |
3131
bac0b2721451
FixA: Added delta W(t) chart in fix analysis.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
232 } |
bac0b2721451
FixA: Added delta W(t) chart in fix analysis.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
233 } |
bac0b2721451
FixA: Added delta W(t) chart in fix analysis.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
234 |
bac0b2721451
FixA: Added delta W(t) chart in fix analysis.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
235 |
3907
9a2c38fb5f29
Add reference period facet to delta W/t chart
Christian Lins <christian.lins@intevation.de>
parents:
3770
diff
changeset
|
236 protected void doReferencePeriodsOut( |
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:
6874
diff
changeset
|
237 D4EArtifact artifact, |
1b35b2ddfc28
Artifacts: Introduce ThemeDocument & make stuff compileable again. THIS BREAKS THE SYSTEM! TODO: Move ThemeUtils into ThemeDocument.
Sascha L. Teichmann <teichmann@intevation.de>
parents:
6874
diff
changeset
|
238 Object data, |
1b35b2ddfc28
Artifacts: Introduce ThemeDocument & make stuff compileable again. THIS BREAKS THE SYSTEM! TODO: Move ThemeUtils into ThemeDocument.
Sascha L. Teichmann <teichmann@intevation.de>
parents:
6874
diff
changeset
|
239 String desc, |
1b35b2ddfc28
Artifacts: Introduce ThemeDocument & make stuff compileable again. THIS BREAKS THE SYSTEM! TODO: Move ThemeUtils into ThemeDocument.
Sascha L. Teichmann <teichmann@intevation.de>
parents:
6874
diff
changeset
|
240 ThemeDocument theme, |
1b35b2ddfc28
Artifacts: Introduce ThemeDocument & make stuff compileable again. THIS BREAKS THE SYSTEM! TODO: Move ThemeUtils into ThemeDocument.
Sascha L. Teichmann <teichmann@intevation.de>
parents:
6874
diff
changeset
|
241 boolean visible) |
3907
9a2c38fb5f29
Add reference period facet to delta W/t chart
Christian Lins <christian.lins@intevation.de>
parents:
3770
diff
changeset
|
242 { |
8202
e4606eae8ea5
sed src/**/*.java 's/logger/log/g'
Sascha L. Teichmann <teichmann@intevation.de>
parents:
7261
diff
changeset
|
243 log.debug("doReferencePeriodsOut()"); |
3907
9a2c38fb5f29
Add reference period facet to delta W/t chart
Christian Lins <christian.lins@intevation.de>
parents:
3770
diff
changeset
|
244 |
3988
090fea205d1d
Fixing Delta W/t chart: reference period area can now switched to invisible (#877)
Christian Lins <christian.lins@intevation.de>
parents:
3908
diff
changeset
|
245 if (visible) { |
6101
a0078e5e3b39
Removed unused context from RangeAccess and subclasses leading to some dead code removal.
Sascha L. Teichmann <teichmann@intevation.de>
parents:
5994
diff
changeset
|
246 FixAnalysisAccess access = new FixAnalysisAccess(artifact); |
3988
090fea205d1d
Fixing Delta W/t chart: reference period area can now switched to invisible (#877)
Christian Lins <christian.lins@intevation.de>
parents:
3908
diff
changeset
|
247 DateRange refRange = access.getReferencePeriod(); |
3907
9a2c38fb5f29
Add reference period facet to delta W/t chart
Christian Lins <christian.lins@intevation.de>
parents:
3770
diff
changeset
|
248 |
6159
41cc83e5c2a2
Prophylactic fix for DeltaWt's before 1900
Andre Heinecke <aheinecke@intevation.de>
parents:
6101
diff
changeset
|
249 RegularTimePeriod start = new FixedMillisecond(refRange.getFrom()); |
41cc83e5c2a2
Prophylactic fix for DeltaWt's before 1900
Andre Heinecke <aheinecke@intevation.de>
parents:
6101
diff
changeset
|
250 RegularTimePeriod end = new FixedMillisecond(refRange.getTo()); |
3988
090fea205d1d
Fixing Delta W/t chart: reference period area can now switched to invisible (#877)
Christian Lins <christian.lins@intevation.de>
parents:
3908
diff
changeset
|
251 StyledDomainMarker marker = new StyledDomainMarker( |
090fea205d1d
Fixing Delta W/t chart: reference period area can now switched to invisible (#877)
Christian Lins <christian.lins@intevation.de>
parents:
3908
diff
changeset
|
252 start.getMiddleMillisecond(), |
090fea205d1d
Fixing Delta W/t chart: reference period area can now switched to invisible (#877)
Christian Lins <christian.lins@intevation.de>
parents:
3908
diff
changeset
|
253 end.getMiddleMillisecond(), |
090fea205d1d
Fixing Delta W/t chart: reference period area can now switched to invisible (#877)
Christian Lins <christian.lins@intevation.de>
parents:
3908
diff
changeset
|
254 theme); |
090fea205d1d
Fixing Delta W/t chart: reference period area can now switched to invisible (#877)
Christian Lins <christian.lins@intevation.de>
parents:
3908
diff
changeset
|
255 domainMarker.add(marker); |
090fea205d1d
Fixing Delta W/t chart: reference period area can now switched to invisible (#877)
Christian Lins <christian.lins@intevation.de>
parents:
3908
diff
changeset
|
256 } |
3907
9a2c38fb5f29
Add reference period facet to delta W/t chart
Christian Lins <christian.lins@intevation.de>
parents:
3770
diff
changeset
|
257 } |
9a2c38fb5f29
Add reference period facet to delta W/t chart
Christian Lins <christian.lins@intevation.de>
parents:
3770
diff
changeset
|
258 |
6874
d9dfa52f69eb
FixA Delta W(t): Add 30 seconds to colliding dates to avoid them vanishing from the diagrams.
Sascha L. Teichmann <teichmann@intevation.de>
parents:
6835
diff
changeset
|
259 private long uniqueDate(long date) { |
d9dfa52f69eb
FixA Delta W(t): Add 30 seconds to colliding dates to avoid them vanishing from the diagrams.
Sascha L. Teichmann <teichmann@intevation.de>
parents:
6835
diff
changeset
|
260 return uniqueDates.add(date) |
d9dfa52f69eb
FixA Delta W(t): Add 30 seconds to colliding dates to avoid them vanishing from the diagrams.
Sascha L. Teichmann <teichmann@intevation.de>
parents:
6835
diff
changeset
|
261 ? date |
d9dfa52f69eb
FixA Delta W(t): Add 30 seconds to colliding dates to avoid them vanishing from the diagrams.
Sascha L. Teichmann <teichmann@intevation.de>
parents:
6835
diff
changeset
|
262 : uniqueDate(date+30L*1000L); // add 30secs. |
d9dfa52f69eb
FixA Delta W(t): Add 30 seconds to colliding dates to avoid them vanishing from the diagrams.
Sascha L. Teichmann <teichmann@intevation.de>
parents:
6835
diff
changeset
|
263 } |
d9dfa52f69eb
FixA Delta W(t): Add 30 seconds to colliding dates to avoid them vanishing from the diagrams.
Sascha L. Teichmann <teichmann@intevation.de>
parents:
6835
diff
changeset
|
264 |
3907
9a2c38fb5f29
Add reference period facet to delta W/t chart
Christian Lins <christian.lins@intevation.de>
parents:
3770
diff
changeset
|
265 |
3131
bac0b2721451
FixA: Added delta W(t) chart in fix analysis.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
266 protected void doSectorAverageOut( |
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:
6874
diff
changeset
|
267 D4EArtifact artifact, |
1b35b2ddfc28
Artifacts: Introduce ThemeDocument & make stuff compileable again. THIS BREAKS THE SYSTEM! TODO: Move ThemeUtils into ThemeDocument.
Sascha L. Teichmann <teichmann@intevation.de>
parents:
6874
diff
changeset
|
268 Object data, |
1b35b2ddfc28
Artifacts: Introduce ThemeDocument & make stuff compileable again. THIS BREAKS THE SYSTEM! TODO: Move ThemeUtils into ThemeDocument.
Sascha L. Teichmann <teichmann@intevation.de>
parents:
6874
diff
changeset
|
269 String desc, |
1b35b2ddfc28
Artifacts: Introduce ThemeDocument & make stuff compileable again. THIS BREAKS THE SYSTEM! TODO: Move ThemeUtils into ThemeDocument.
Sascha L. Teichmann <teichmann@intevation.de>
parents:
6874
diff
changeset
|
270 ThemeDocument theme, |
1b35b2ddfc28
Artifacts: Introduce ThemeDocument & make stuff compileable again. THIS BREAKS THE SYSTEM! TODO: Move ThemeUtils into ThemeDocument.
Sascha L. Teichmann <teichmann@intevation.de>
parents:
6874
diff
changeset
|
271 boolean visible) |
3131
bac0b2721451
FixA: Added delta W(t) chart in fix analysis.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
272 { |
8202
e4606eae8ea5
sed src/**/*.java 's/logger/log/g'
Sascha L. Teichmann <teichmann@intevation.de>
parents:
7261
diff
changeset
|
273 log.debug("doSectorAverageOut(): description = " + desc); |
3131
bac0b2721451
FixA: Added delta W(t) chart in fix analysis.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
274 |
3467
b9c2becbcc9e
Towards issue745 (lines for averages in deltawt).
Felix Wolfsteller <felix.wolfsteller@intevation.de>
parents:
3438
diff
changeset
|
275 QWDDateRange qwd = (QWDDateRange) data; |
3131
bac0b2721451
FixA: Added delta W(t) chart in fix analysis.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
276 TimeSeriesCollection tsc = new TimeSeriesCollection(); |
bac0b2721451
FixA: Added delta W(t) chart in fix analysis.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
277 TimeSeries series = new StyledTimeSeries(desc, theme); |
bac0b2721451
FixA: Added delta W(t) chart in fix analysis.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
278 |
3467
b9c2becbcc9e
Towards issue745 (lines for averages in deltawt).
Felix Wolfsteller <felix.wolfsteller@intevation.de>
parents:
3438
diff
changeset
|
279 if (qwd == null || qwd.qwd == null || qwd.dateRange == null) { |
3131
bac0b2721451
FixA: Added delta W(t) chart in fix analysis.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
280 return; |
bac0b2721451
FixA: Added delta W(t) chart in fix analysis.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
281 } |
6159
41cc83e5c2a2
Prophylactic fix for DeltaWt's before 1900
Andre Heinecke <aheinecke@intevation.de>
parents:
6101
diff
changeset
|
282 RegularTimePeriod rtp = new FixedMillisecond(qwd.qwd.getDate()); |
3467
b9c2becbcc9e
Towards issue745 (lines for averages in deltawt).
Felix Wolfsteller <felix.wolfsteller@intevation.de>
parents:
3438
diff
changeset
|
283 double value = qwd.qwd.getDeltaW(); |
3611
a74bdd032cf7
FixA: Changed sector average form point to line in delta W(t) chart.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
3610
diff
changeset
|
284 |
3467
b9c2becbcc9e
Towards issue745 (lines for averages in deltawt).
Felix Wolfsteller <felix.wolfsteller@intevation.de>
parents:
3438
diff
changeset
|
285 // Draw a line spanning the analysis time. |
3131
bac0b2721451
FixA: Added delta W(t) chart in fix analysis.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
286 series.add(rtp, value); |
6835
9bd2d5c40f17
Part of flys/issue1168: Show discharge sector averages as lines again.
Sascha L. Teichmann <teichmann@intevation.de>
parents:
6159
diff
changeset
|
287 rtp = new FixedMillisecond(qwd.dateRange.getFrom()); |
3611
a74bdd032cf7
FixA: Changed sector average form point to line in delta W(t) chart.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
3610
diff
changeset
|
288 series.addOrUpdate(rtp, value); |
6835
9bd2d5c40f17
Part of flys/issue1168: Show discharge sector averages as lines again.
Sascha L. Teichmann <teichmann@intevation.de>
parents:
6159
diff
changeset
|
289 rtp = new FixedMillisecond(qwd.dateRange.getTo()); |
3611
a74bdd032cf7
FixA: Changed sector average form point to line in delta W(t) chart.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
3610
diff
changeset
|
290 series.addOrUpdate(rtp, value); |
3467
b9c2becbcc9e
Towards issue745 (lines for averages in deltawt).
Felix Wolfsteller <felix.wolfsteller@intevation.de>
parents:
3438
diff
changeset
|
291 |
3131
bac0b2721451
FixA: Added delta W(t) chart in fix analysis.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
292 tsc.addSeries(series); |
bac0b2721451
FixA: Added delta W(t) chart in fix analysis.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
293 |
bac0b2721451
FixA: Added delta W(t) chart in fix analysis.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
294 addAxisDataset(tsc, 0, visible); |
3746
7bc61f4ab26b
Fix for #837
Christian Lins <christian.lins@intevation.de>
parents:
3727
diff
changeset
|
295 |
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:
6874
diff
changeset
|
296 if (visible && theme.parseShowLineLabel()) { |
8856 | 297 List<XYTextAnnotation> textAnnos = |
298 new ArrayList<XYTextAnnotation>(); | |
3746
7bc61f4ab26b
Fix for #837
Christian Lins <christian.lins@intevation.de>
parents:
3727
diff
changeset
|
299 XYTextAnnotation anno = new CollisionFreeXYTextAnnotation( |
8856 | 300 "\u0394 W(t) [cm] " |
301 + (float)Math.round(qwd.qwd.getDeltaW() * 10000) / 10000, | |
3746
7bc61f4ab26b
Fix for #837
Christian Lins <christian.lins@intevation.de>
parents:
3727
diff
changeset
|
302 tsc.getXValue(0, 0), |
7bc61f4ab26b
Fix for #837
Christian Lins <christian.lins@intevation.de>
parents:
3727
diff
changeset
|
303 qwd.qwd.getDeltaW()); |
7bc61f4ab26b
Fix for #837
Christian Lins <christian.lins@intevation.de>
parents:
3727
diff
changeset
|
304 textAnnos.add(anno); |
7bc61f4ab26b
Fix for #837
Christian Lins <christian.lins@intevation.de>
parents:
3727
diff
changeset
|
305 |
8856 | 306 RiverAnnotation flysAnno = |
307 new RiverAnnotation(null, null, null, theme); | |
3746
7bc61f4ab26b
Fix for #837
Christian Lins <christian.lins@intevation.de>
parents:
3727
diff
changeset
|
308 flysAnno.setTextAnnotations(textAnnos); |
7bc61f4ab26b
Fix for #837
Christian Lins <christian.lins@intevation.de>
parents:
3727
diff
changeset
|
309 addAnnotations(flysAnno); |
7bc61f4ab26b
Fix for #837
Christian Lins <christian.lins@intevation.de>
parents:
3727
diff
changeset
|
310 } |
3131
bac0b2721451
FixA: Added delta W(t) chart in fix analysis.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
311 } |
bac0b2721451
FixA: Added delta W(t) chart in fix analysis.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
312 |
bac0b2721451
FixA: Added delta W(t) chart in fix analysis.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
313 |
bac0b2721451
FixA: Added delta W(t) chart in fix analysis.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
314 protected void doAnalysisEventsOut( |
5867
59ff03ff48f1
River artifacts: Renamed FLYSArtifact(Collection) to D4EArtifact(Collection).
Sascha L. Teichmann <teichmann@intevation.de>
parents:
5864
diff
changeset
|
315 D4EArtifact artifact, |
3746
7bc61f4ab26b
Fix for #837
Christian Lins <christian.lins@intevation.de>
parents:
3727
diff
changeset
|
316 Object data, |
7bc61f4ab26b
Fix for #837
Christian Lins <christian.lins@intevation.de>
parents:
3727
diff
changeset
|
317 String desc, |
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:
6874
diff
changeset
|
318 ThemeDocument theme, |
3746
7bc61f4ab26b
Fix for #837
Christian Lins <christian.lins@intevation.de>
parents:
3727
diff
changeset
|
319 boolean visible |
7bc61f4ab26b
Fix for #837
Christian Lins <christian.lins@intevation.de>
parents:
3727
diff
changeset
|
320 ) { |
8202
e4606eae8ea5
sed src/**/*.java 's/logger/log/g'
Sascha L. Teichmann <teichmann@intevation.de>
parents:
7261
diff
changeset
|
321 log.debug("doAnalysisEventsOut: desc = " + desc); |
3131
bac0b2721451
FixA: Added delta W(t) chart in fix analysis.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
322 |
3610
66f539df4e8b
Issue 716.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
3562
diff
changeset
|
323 QWD qwd = (QWD) data; |
66f539df4e8b
Issue 716.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
3562
diff
changeset
|
324 doQWDEventsOut(qwd, desc, theme, visible); |
3438
b9aff8d6ff74
Simplify annotation code
Christian Lins <christian.lins@intevation.de>
parents:
3409
diff
changeset
|
325 } |
b9aff8d6ff74
Simplify annotation code
Christian Lins <christian.lins@intevation.de>
parents:
3409
diff
changeset
|
326 |
b9aff8d6ff74
Simplify annotation code
Christian Lins <christian.lins@intevation.de>
parents:
3409
diff
changeset
|
327 |
8856 | 328 protected void doQWDEventsOut( |
329 QWD qwd, | |
330 String desc, | |
331 ThemeDocument theme, | |
332 boolean visible | |
333 ) { | |
3131
bac0b2721451
FixA: Added delta W(t) chart in fix analysis.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
334 TimeSeriesCollection tsc = new TimeSeriesCollection(); |
3134
5a0aef74c316
Use different stylings for real and interpolated data points.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
3131
diff
changeset
|
335 |
5a0aef74c316
Use different stylings for real and interpolated data points.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
3131
diff
changeset
|
336 TimeSeries series = new StyledTimeSeries(desc, theme); |
5a0aef74c316
Use different stylings for real and interpolated data points.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
3131
diff
changeset
|
337 TimeSeries interpol = new StyledTimeSeries(desc + "interpol", theme); |
3131
bac0b2721451
FixA: Added delta W(t) chart in fix analysis.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
338 |
3610
66f539df4e8b
Issue 716.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
3562
diff
changeset
|
339 if (qwd == null) { |
8202
e4606eae8ea5
sed src/**/*.java 's/logger/log/g'
Sascha L. Teichmann <teichmann@intevation.de>
parents:
7261
diff
changeset
|
340 log.debug("doQWDEventsOut: qwd == null"); |
3212
abc2db630815
Work in generalized annotations for chart generators
Christian Lins <christian.lins@intevation.de>
parents:
3210
diff
changeset
|
341 return; |
abc2db630815
Work in generalized annotations for chart generators
Christian Lins <christian.lins@intevation.de>
parents:
3210
diff
changeset
|
342 } |
abc2db630815
Work in generalized annotations for chart generators
Christian Lins <christian.lins@intevation.de>
parents:
3210
diff
changeset
|
343 |
abc2db630815
Work in generalized annotations for chart generators
Christian Lins <christian.lins@intevation.de>
parents:
3210
diff
changeset
|
344 Map<Integer, int[]> annoIdxMap = new HashMap<Integer, int[]>(); |
abc2db630815
Work in generalized annotations for chart generators
Christian Lins <christian.lins@intevation.de>
parents:
3210
diff
changeset
|
345 |
3237
1cad94fa0817
Fix array-index-oobs in FixDeltaWtGenerator.
Felix Wolfsteller <felix.wolfsteller@intevation.de>
parents:
3234
diff
changeset
|
346 int idxInterpol = 0; |
1cad94fa0817
Fix array-index-oobs in FixDeltaWtGenerator.
Felix Wolfsteller <felix.wolfsteller@intevation.de>
parents:
3234
diff
changeset
|
347 int idxRegular = 0; |
6874
d9dfa52f69eb
FixA Delta W(t): Add 30 seconds to colliding dates to avoid them vanishing from the diagrams.
Sascha L. Teichmann <teichmann@intevation.de>
parents:
6835
diff
changeset
|
348 long time = uniqueDate(qwd.getDate().getTime()); |
d9dfa52f69eb
FixA Delta W(t): Add 30 seconds to colliding dates to avoid them vanishing from the diagrams.
Sascha L. Teichmann <teichmann@intevation.de>
parents:
6835
diff
changeset
|
349 RegularTimePeriod rtp = new FixedMillisecond(time); |
3610
66f539df4e8b
Issue 716.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
3562
diff
changeset
|
350 double value = qwd.getDeltaW(); |
66f539df4e8b
Issue 716.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
3562
diff
changeset
|
351 boolean interpolate = qwd.getInterpolated(); |
66f539df4e8b
Issue 716.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
3562
diff
changeset
|
352 if (interpolate) { |
66f539df4e8b
Issue 716.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
3562
diff
changeset
|
353 if(interpol.addOrUpdate(rtp, value) == null) { |
66f539df4e8b
Issue 716.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
3562
diff
changeset
|
354 annoIdxMap.put( |
66f539df4e8b
Issue 716.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
3562
diff
changeset
|
355 0, |
66f539df4e8b
Issue 716.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
3562
diff
changeset
|
356 new int[]{1, idxInterpol}); |
66f539df4e8b
Issue 716.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
3562
diff
changeset
|
357 idxInterpol++; |
3134
5a0aef74c316
Use different stylings for real and interpolated data points.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
3131
diff
changeset
|
358 } |
3131
bac0b2721451
FixA: Added delta W(t) chart in fix analysis.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
359 } |
3610
66f539df4e8b
Issue 716.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
3562
diff
changeset
|
360 else { |
66f539df4e8b
Issue 716.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
3562
diff
changeset
|
361 if(series.addOrUpdate(rtp, value) == null) { |
66f539df4e8b
Issue 716.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
3562
diff
changeset
|
362 annoIdxMap.put( |
66f539df4e8b
Issue 716.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
3562
diff
changeset
|
363 0, |
66f539df4e8b
Issue 716.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
3562
diff
changeset
|
364 new int[]{0, idxRegular}); |
66f539df4e8b
Issue 716.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
3562
diff
changeset
|
365 idxRegular++; |
66f539df4e8b
Issue 716.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
3562
diff
changeset
|
366 } |
66f539df4e8b
Issue 716.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
3562
diff
changeset
|
367 } |
66f539df4e8b
Issue 716.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
3562
diff
changeset
|
368 |
3131
bac0b2721451
FixA: Added delta W(t) chart in fix analysis.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
369 tsc.addSeries(series); |
3134
5a0aef74c316
Use different stylings for real and interpolated data points.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
3131
diff
changeset
|
370 tsc.addSeries(interpol); |
3131
bac0b2721451
FixA: Added delta W(t) chart in fix analysis.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
371 addAxisDataset(tsc, 0, visible); |
3134
5a0aef74c316
Use different stylings for real and interpolated data points.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
3131
diff
changeset
|
372 addAttribute(desc + "interpol", "interpolate"); |
3168
e10323bf3cbc
Look for the attribut "outline" in TimeseriesChartGenerator to render shape
Raimund Renkert <raimund.renkert@intevation.de>
parents:
3139
diff
changeset
|
373 addAttribute(desc, "outline"); |
3212
abc2db630815
Work in generalized annotations for chart generators
Christian Lins <christian.lins@intevation.de>
parents:
3210
diff
changeset
|
374 |
3610
66f539df4e8b
Issue 716.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
3562
diff
changeset
|
375 doQWDTextAnnotations(annoIdxMap, tsc, qwd, theme, visible); |
3131
bac0b2721451
FixA: Added delta W(t) chart in fix analysis.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
376 } |
bac0b2721451
FixA: Added delta W(t) chart in fix analysis.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
377 |
bac0b2721451
FixA: Added delta W(t) chart in fix analysis.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
378 |
3438
b9aff8d6ff74
Simplify annotation code
Christian Lins <christian.lins@intevation.de>
parents:
3409
diff
changeset
|
379 /** |
8856 | 380 * @param annoIdxMap map of index in qwds to series/data item indices |
381 * in tsc. | |
3438
b9aff8d6ff74
Simplify annotation code
Christian Lins <christian.lins@intevation.de>
parents:
3409
diff
changeset
|
382 */ |
b9aff8d6ff74
Simplify annotation code
Christian Lins <christian.lins@intevation.de>
parents:
3409
diff
changeset
|
383 protected void doQWDTextAnnotations(Map<Integer, int[]> annoIdxMap, |
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:
6874
diff
changeset
|
384 TimeSeriesCollection tsc, QWD qwd, ThemeDocument theme, |
3438
b9aff8d6ff74
Simplify annotation code
Christian Lins <christian.lins@intevation.de>
parents:
3409
diff
changeset
|
385 boolean visible) { |
8202
e4606eae8ea5
sed src/**/*.java 's/logger/log/g'
Sascha L. Teichmann <teichmann@intevation.de>
parents:
7261
diff
changeset
|
386 log.debug("doQWDTextAnnotation()"); |
3438
b9aff8d6ff74
Simplify annotation code
Christian Lins <christian.lins@intevation.de>
parents:
3409
diff
changeset
|
387 |
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:
6874
diff
changeset
|
388 if (!visible || !theme.parseShowPointLabel()) { |
8202
e4606eae8ea5
sed src/**/*.java 's/logger/log/g'
Sascha L. Teichmann <teichmann@intevation.de>
parents:
7261
diff
changeset
|
389 log.debug("doQWDTextAnnotation: annotation not visible"); |
3438
b9aff8d6ff74
Simplify annotation code
Christian Lins <christian.lins@intevation.de>
parents:
3409
diff
changeset
|
390 return; |
b9aff8d6ff74
Simplify annotation code
Christian Lins <christian.lins@intevation.de>
parents:
3409
diff
changeset
|
391 } |
b9aff8d6ff74
Simplify annotation code
Christian Lins <christian.lins@intevation.de>
parents:
3409
diff
changeset
|
392 |
9123
1cc7653ca84f
Cleanup of ChartGenerator and ChartGenerator2 code. Put some of the copy/pasted code into a common abstraction.
gernotbelger
parents:
8856
diff
changeset
|
393 Locale locale = Resources.getLocale(getContext().getMeta()); |
3908
bd0f5a50e194
Theming and i18n of Delta W/t A1/B facets
Christian Lins <christian.lins@intevation.de>
parents:
3907
diff
changeset
|
394 NumberFormat nf = NumberFormat.getInstance(locale); |
bd0f5a50e194
Theming and i18n of Delta W/t A1/B facets
Christian Lins <christian.lins@intevation.de>
parents:
3907
diff
changeset
|
395 |
9123
1cc7653ca84f
Cleanup of ChartGenerator and ChartGenerator2 code. Put some of the copy/pasted code into a common abstraction.
gernotbelger
parents:
8856
diff
changeset
|
396 List<XYTextAnnotation> textAnnos = new ArrayList<>(); |
3438
b9aff8d6ff74
Simplify annotation code
Christian Lins <christian.lins@intevation.de>
parents:
3409
diff
changeset
|
397 |
4050
975f608dd254
Cleaned up iterating over maps. Removed some dead code.
Sascha L. Teichmann <teichmann@intevation.de>
parents:
3988
diff
changeset
|
398 for (int[] idxs: annoIdxMap.values()) { |
975f608dd254
Cleaned up iterating over maps. Removed some dead code.
Sascha L. Teichmann <teichmann@intevation.de>
parents:
3988
diff
changeset
|
399 |
3438
b9aff8d6ff74
Simplify annotation code
Christian Lins <christian.lins@intevation.de>
parents:
3409
diff
changeset
|
400 double x = tsc.getXValue(idxs[0], idxs[1]); |
3908
bd0f5a50e194
Theming and i18n of Delta W/t A1/B facets
Christian Lins <christian.lins@intevation.de>
parents:
3907
diff
changeset
|
401 |
3438
b9aff8d6ff74
Simplify annotation code
Christian Lins <christian.lins@intevation.de>
parents:
3409
diff
changeset
|
402 XYTextAnnotation anno = new CollisionFreeXYTextAnnotation( |
3908
bd0f5a50e194
Theming and i18n of Delta W/t A1/B facets
Christian Lins <christian.lins@intevation.de>
parents:
3907
diff
changeset
|
403 nf.format(qwd.getQ()) + " m\u00B3/s", |
3746
7bc61f4ab26b
Fix for #837
Christian Lins <christian.lins@intevation.de>
parents:
3727
diff
changeset
|
404 x, |
7bc61f4ab26b
Fix for #837
Christian Lins <christian.lins@intevation.de>
parents:
3727
diff
changeset
|
405 qwd.getDeltaW()); |
3438
b9aff8d6ff74
Simplify annotation code
Christian Lins <christian.lins@intevation.de>
parents:
3409
diff
changeset
|
406 textAnnos.add(anno); |
b9aff8d6ff74
Simplify annotation code
Christian Lins <christian.lins@intevation.de>
parents:
3409
diff
changeset
|
407 } |
b9aff8d6ff74
Simplify annotation code
Christian Lins <christian.lins@intevation.de>
parents:
3409
diff
changeset
|
408 |
5864
f2e46a668fe6
River artifacts: Renamed FLYSAnnotation to RiverAnnotation.
Sascha L. Teichmann <teichmann@intevation.de>
parents:
5863
diff
changeset
|
409 RiverAnnotation flysAnno = new RiverAnnotation(null, null, null, theme); |
3438
b9aff8d6ff74
Simplify annotation code
Christian Lins <christian.lins@intevation.de>
parents:
3409
diff
changeset
|
410 flysAnno.setTextAnnotations(textAnnos); |
b9aff8d6ff74
Simplify annotation code
Christian Lins <christian.lins@intevation.de>
parents:
3409
diff
changeset
|
411 addAnnotations(flysAnno); |
b9aff8d6ff74
Simplify annotation code
Christian Lins <christian.lins@intevation.de>
parents:
3409
diff
changeset
|
412 } |
b9aff8d6ff74
Simplify annotation code
Christian Lins <christian.lins@intevation.de>
parents:
3409
diff
changeset
|
413 |
b9aff8d6ff74
Simplify annotation code
Christian Lins <christian.lins@intevation.de>
parents:
3409
diff
changeset
|
414 |
b9aff8d6ff74
Simplify annotation code
Christian Lins <christian.lins@intevation.de>
parents:
3409
diff
changeset
|
415 protected void doReferenceEventsOut( |
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:
6874
diff
changeset
|
416 D4EArtifact artifact, |
1b35b2ddfc28
Artifacts: Introduce ThemeDocument & make stuff compileable again. THIS BREAKS THE SYSTEM! TODO: Move ThemeUtils into ThemeDocument.
Sascha L. Teichmann <teichmann@intevation.de>
parents:
6874
diff
changeset
|
417 Object data, |
1b35b2ddfc28
Artifacts: Introduce ThemeDocument & make stuff compileable again. THIS BREAKS THE SYSTEM! TODO: Move ThemeUtils into ThemeDocument.
Sascha L. Teichmann <teichmann@intevation.de>
parents:
6874
diff
changeset
|
418 String desc, |
1b35b2ddfc28
Artifacts: Introduce ThemeDocument & make stuff compileable again. THIS BREAKS THE SYSTEM! TODO: Move ThemeUtils into ThemeDocument.
Sascha L. Teichmann <teichmann@intevation.de>
parents:
6874
diff
changeset
|
419 ThemeDocument theme, |
1b35b2ddfc28
Artifacts: Introduce ThemeDocument & make stuff compileable again. THIS BREAKS THE SYSTEM! TODO: Move ThemeUtils into ThemeDocument.
Sascha L. Teichmann <teichmann@intevation.de>
parents:
6874
diff
changeset
|
420 boolean visible |
3746
7bc61f4ab26b
Fix for #837
Christian Lins <christian.lins@intevation.de>
parents:
3727
diff
changeset
|
421 ) { |
8202
e4606eae8ea5
sed src/**/*.java 's/logger/log/g'
Sascha L. Teichmann <teichmann@intevation.de>
parents:
7261
diff
changeset
|
422 log.debug("doReferenceEventsOut: desc = " + desc); |
3438
b9aff8d6ff74
Simplify annotation code
Christian Lins <christian.lins@intevation.de>
parents:
3409
diff
changeset
|
423 |
3610
66f539df4e8b
Issue 716.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
3562
diff
changeset
|
424 QWD qwd = (QWD) data; |
66f539df4e8b
Issue 716.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
3562
diff
changeset
|
425 doQWDEventsOut(qwd, desc, theme, visible); |
3438
b9aff8d6ff74
Simplify annotation code
Christian Lins <christian.lins@intevation.de>
parents:
3409
diff
changeset
|
426 } |
b9aff8d6ff74
Simplify annotation code
Christian Lins <christian.lins@intevation.de>
parents:
3409
diff
changeset
|
427 |
b9aff8d6ff74
Simplify annotation code
Christian Lins <christian.lins@intevation.de>
parents:
3409
diff
changeset
|
428 |
3131
bac0b2721451
FixA: Added delta W(t) chart in fix analysis.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
429 protected void doDeviationOut( |
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:
6874
diff
changeset
|
430 D4EArtifact artifact, |
1b35b2ddfc28
Artifacts: Introduce ThemeDocument & make stuff compileable again. THIS BREAKS THE SYSTEM! TODO: Move ThemeUtils into ThemeDocument.
Sascha L. Teichmann <teichmann@intevation.de>
parents:
6874
diff
changeset
|
431 Object data, |
1b35b2ddfc28
Artifacts: Introduce ThemeDocument & make stuff compileable again. THIS BREAKS THE SYSTEM! TODO: Move ThemeUtils into ThemeDocument.
Sascha L. Teichmann <teichmann@intevation.de>
parents:
6874
diff
changeset
|
432 String desc, |
1b35b2ddfc28
Artifacts: Introduce ThemeDocument & make stuff compileable again. THIS BREAKS THE SYSTEM! TODO: Move ThemeUtils into ThemeDocument.
Sascha L. Teichmann <teichmann@intevation.de>
parents:
6874
diff
changeset
|
433 ThemeDocument theme, |
1b35b2ddfc28
Artifacts: Introduce ThemeDocument & make stuff compileable again. THIS BREAKS THE SYSTEM! TODO: Move ThemeUtils into ThemeDocument.
Sascha L. Teichmann <teichmann@intevation.de>
parents:
6874
diff
changeset
|
434 boolean visible |
3746
7bc61f4ab26b
Fix for #837
Christian Lins <christian.lins@intevation.de>
parents:
3727
diff
changeset
|
435 ) { |
8202
e4606eae8ea5
sed src/**/*.java 's/logger/log/g'
Sascha L. Teichmann <teichmann@intevation.de>
parents:
7261
diff
changeset
|
436 log.debug("doDeviationOut: desc = " + desc); |
3131
bac0b2721451
FixA: Added delta W(t) chart in fix analysis.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
437 |
bac0b2721451
FixA: Added delta W(t) chart in fix analysis.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
438 if (data == null || !visible) { |
8202
e4606eae8ea5
sed src/**/*.java 's/logger/log/g'
Sascha L. Teichmann <teichmann@intevation.de>
parents:
7261
diff
changeset
|
439 log.debug("no standard deviation"); |
3131
bac0b2721451
FixA: Added delta W(t) chart in fix analysis.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
440 return; |
bac0b2721451
FixA: Added delta W(t) chart in fix analysis.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
441 } |
bac0b2721451
FixA: Added delta W(t) chart in fix analysis.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
442 double[] value = (double[]) data; |
8856 | 443 StyledDomainMarker lower = |
444 new StyledDomainMarker((value[0] * -1), 0, theme); | |
445 StyledDomainMarker upper = | |
446 new StyledDomainMarker(0, value[0], theme); | |
3131
bac0b2721451
FixA: Added delta W(t) chart in fix analysis.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
447 |
bac0b2721451
FixA: Added delta W(t) chart in fix analysis.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
448 valueMarker.add(lower); |
bac0b2721451
FixA: Added delta W(t) chart in fix analysis.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
449 valueMarker.add(upper); |
bac0b2721451
FixA: Added delta W(t) chart in fix analysis.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
450 } |
bac0b2721451
FixA: Added delta W(t) chart in fix analysis.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
451 |
bac0b2721451
FixA: Added delta W(t) chart in fix analysis.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
452 |
bac0b2721451
FixA: Added delta W(t) chart in fix analysis.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
453 protected void doAnalysisPeriodsOut( |
5867
59ff03ff48f1
River artifacts: Renamed FLYSArtifact(Collection) to D4EArtifact(Collection).
Sascha L. Teichmann <teichmann@intevation.de>
parents:
5864
diff
changeset
|
454 D4EArtifact artifact, |
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:
6874
diff
changeset
|
455 Object data, |
1b35b2ddfc28
Artifacts: Introduce ThemeDocument & make stuff compileable again. THIS BREAKS THE SYSTEM! TODO: Move ThemeUtils into ThemeDocument.
Sascha L. Teichmann <teichmann@intevation.de>
parents:
6874
diff
changeset
|
456 String desc, |
1b35b2ddfc28
Artifacts: Introduce ThemeDocument & make stuff compileable again. THIS BREAKS THE SYSTEM! TODO: Move ThemeUtils into ThemeDocument.
Sascha L. Teichmann <teichmann@intevation.de>
parents:
6874
diff
changeset
|
457 ThemeDocument theme, |
1b35b2ddfc28
Artifacts: Introduce ThemeDocument & make stuff compileable again. THIS BREAKS THE SYSTEM! TODO: Move ThemeUtils into ThemeDocument.
Sascha L. Teichmann <teichmann@intevation.de>
parents:
6874
diff
changeset
|
458 boolean visible) |
3907
9a2c38fb5f29
Add reference period facet to delta W/t chart
Christian Lins <christian.lins@intevation.de>
parents:
3770
diff
changeset
|
459 { |
3131
bac0b2721451
FixA: Added delta W(t) chart in fix analysis.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
460 DateRange[] ranges = (DateRange[]) data; |
bac0b2721451
FixA: Added delta W(t) chart in fix analysis.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
461 if (ranges == null || !visible) { |
bac0b2721451
FixA: Added delta W(t) chart in fix analysis.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
462 return; |
bac0b2721451
FixA: Added delta W(t) chart in fix analysis.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
463 } |
bac0b2721451
FixA: Added delta W(t) chart in fix analysis.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
464 for (int i = 0; i < ranges.length; i++) { |
8202
e4606eae8ea5
sed src/**/*.java 's/logger/log/g'
Sascha L. Teichmann <teichmann@intevation.de>
parents:
7261
diff
changeset
|
465 log.debug("creating domain marker"); |
6159
41cc83e5c2a2
Prophylactic fix for DeltaWt's before 1900
Andre Heinecke <aheinecke@intevation.de>
parents:
6101
diff
changeset
|
466 RegularTimePeriod start = new FixedMillisecond(ranges[i].getFrom()); |
41cc83e5c2a2
Prophylactic fix for DeltaWt's before 1900
Andre Heinecke <aheinecke@intevation.de>
parents:
6101
diff
changeset
|
467 RegularTimePeriod end = new FixedMillisecond(ranges[i].getTo()); |
3254
9a4707ec7800
Add styles for W(t) chart domain markers
Christian Lins <christian.lins@intevation.de>
parents:
3251
diff
changeset
|
468 StyledDomainMarker marker = |
3746
7bc61f4ab26b
Fix for #837
Christian Lins <christian.lins@intevation.de>
parents:
3727
diff
changeset
|
469 new StyledDomainMarker(start.getMiddleMillisecond(), |
7bc61f4ab26b
Fix for #837
Christian Lins <christian.lins@intevation.de>
parents:
3727
diff
changeset
|
470 end.getMiddleMillisecond(), theme); |
3254
9a4707ec7800
Add styles for W(t) chart domain markers
Christian Lins <christian.lins@intevation.de>
parents:
3251
diff
changeset
|
471 marker.useSecondColor(i % 2 == 0); |
3131
bac0b2721451
FixA: Added delta W(t) chart in fix analysis.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
472 domainMarker.add(marker); |
bac0b2721451
FixA: Added delta W(t) chart in fix analysis.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
473 } |
8202
e4606eae8ea5
sed src/**/*.java 's/logger/log/g'
Sascha L. Teichmann <teichmann@intevation.de>
parents:
7261
diff
changeset
|
474 log.debug("domainmarkers: " + domainMarker.size()); |
3131
bac0b2721451
FixA: Added delta W(t) chart in fix analysis.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
475 } |
bac0b2721451
FixA: Added delta W(t) chart in fix analysis.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
476 |
bac0b2721451
FixA: Added delta W(t) chart in fix analysis.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
477 |
bac0b2721451
FixA: Added delta W(t) chart in fix analysis.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
478 @Override |
8856 | 479 public void init( |
480 String outName, | |
481 Document request, | |
482 OutputStream out, | |
483 CallContext context | |
484 ) { | |
7077
0a337f0005c2
Extended init() of OutGenerator to take name of the out to serve.
Sascha L. Teichmann <teichmann@intevation.de>
parents:
6905
diff
changeset
|
485 super.init(outName, request, out, context); |
3131
bac0b2721451
FixA: Added delta W(t) chart in fix analysis.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
486 |
3727
b81f328da582
Removed code duplication.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents:
3611
diff
changeset
|
487 Double currentKm = FixChartGenerator.getCurrentKmFromRequest(request); |
3404
d7b065b88f10
Simplified code.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents:
3286
diff
changeset
|
488 |
8202
e4606eae8ea5
sed src/**/*.java 's/logger/log/g'
Sascha L. Teichmann <teichmann@intevation.de>
parents:
7261
diff
changeset
|
489 if (log.isDebugEnabled()) { |
e4606eae8ea5
sed src/**/*.java 's/logger/log/g'
Sascha L. Teichmann <teichmann@intevation.de>
parents:
7261
diff
changeset
|
490 log.debug("currentKm = " + currentKm); |
3404
d7b065b88f10
Simplified code.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents:
3286
diff
changeset
|
491 } |
d7b065b88f10
Simplified code.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents:
3286
diff
changeset
|
492 |
8381
592df582e462
Use context constant for current km in fix delta w/t generator.
Raimund Renkert <rrenkert@intevation.de>
parents:
8202
diff
changeset
|
493 context.putContextValue(CURRENT_KM, currentKm); |
3131
bac0b2721451
FixA: Added delta W(t) chart in fix analysis.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
494 |
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:
6874
diff
changeset
|
495 // XXX: This looks hackish! |
1b35b2ddfc28
Artifacts: Introduce ThemeDocument & make stuff compileable again. THIS BREAKS THE SYSTEM! TODO: Move ThemeUtils into ThemeDocument.
Sascha L. Teichmann <teichmann@intevation.de>
parents:
6874
diff
changeset
|
496 StyledValueMarker marker = |
1b35b2ddfc28
Artifacts: Introduce ThemeDocument & make stuff compileable again. THIS BREAKS THE SYSTEM! TODO: Move ThemeUtils into ThemeDocument.
Sascha L. Teichmann <teichmann@intevation.de>
parents:
6874
diff
changeset
|
497 new StyledValueMarker(0, new ThemeDocument(request)); |
3131
bac0b2721451
FixA: Added delta W(t) chart in fix analysis.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
498 valueMarker.add(marker); |
bac0b2721451
FixA: Added delta W(t) chart in fix analysis.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
499 } |
bac0b2721451
FixA: Added delta W(t) chart in fix analysis.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
500 } |
bac0b2721451
FixA: Added delta W(t) chart in fix analysis.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
501 // vim:set ts=4 sw=4 si et sta sts=4 fenc=utf-8 : |