Mercurial > dive4elements > river

comparison flys-artifacts/src/main/java/de/intevation/flys/exports/WDifferencesCurveGenerator.java @ 1640:fb296bdf815f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Improved w-differences diagram generation with included 'absolute' values. flys-artifacts/trunk@2825 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author Felix Wolfsteller <felix.wolfsteller@intevation.de>
date Mon, 26 Sep 2011 13:37:30 +0000
parents d1b20d0e9eb4
children 614ffddb860e
comparison
equal deleted inserted replaced
1639:12235a2ace21 1640:fb296bdf815f
16 import de.intevation.flys.artifacts.FLYSArtifact; 16 import de.intevation.flys.artifacts.FLYSArtifact;
17 import de.intevation.flys.artifacts.model.FacetTypes; 17 import de.intevation.flys.artifacts.model.FacetTypes;
18 import de.intevation.flys.artifacts.model.WKms; 18 import de.intevation.flys.artifacts.model.WKms;
19 19
20 import de.intevation.flys.utils.DataUtil; 20 import de.intevation.flys.utils.DataUtil;
21 import de.intevation.flys.model.DischargeTable;
22 import de.intevation.flys.model.Gauge; 21 import de.intevation.flys.model.Gauge;
23 import de.intevation.flys.model.River; 22 import de.intevation.flys.model.River;
24 import de.intevation.flys.model.TimeInterval;
25 23
26 import de.intevation.flys.artifacts.WINFOArtifact; 24 import de.intevation.flys.artifacts.WINFOArtifact;
27 25
28 import de.intevation.flys.artifacts.model.WQKms; 26 import de.intevation.flys.artifacts.model.WQKms;
29 import de.intevation.flys.utils.FLYSUtils; 27 import de.intevation.flys.utils.FLYSUtils;
51 "chart.w_differences.yaxis.second.label"; 49 "chart.w_differences.yaxis.second.label";
52 50
53 // TODO proper i18n. 51 // TODO proper i18n.
54 public static final String I18N_CHART_TITLE_DEFAULT = "W-Differenzen"; 52 public static final String I18N_CHART_TITLE_DEFAULT = "W-Differenzen";
55 public static final String I18N_XAXIS_LABEL_DEFAULT = "km"; 53 public static final String I18N_XAXIS_LABEL_DEFAULT = "km";
56 public static final String I18N_YAXIS_LABEL_DEFAULT = "W [NN + m]"; 54 public static final String I18N_YAXIS_LABEL_DEFAULT = "W [m]";
57 55
58 56
59 /** 57 /**
60 * Add a subtitle to Chart. 58 * Add a subtitle to Chart.
61 * @param chart Chart to add subtitle to. 59 * @param chart Chart to add subtitle to.
102 return; 100 return;
103 } 101 }
104 } 102 }
105 103
106 104
105 /**
106 * Add the waterlevel-curves (the "absolutes" from which
107 * differences were calculated).
108 * @param wqkms The wqkms to add to the diagram.
109 */
107 public void doWaterlevelOut(WQKms wqkms, 110 public void doWaterlevelOut(WQKms wqkms,
108 String description, 111 String description,
109 Document theme, 112 Document theme,
110 WINFOArtifact flysArtifact) { 113 WINFOArtifact flysArtifact) {
111 String gaugeName = wqkms.getName(); 114 String wqkmsName = wqkms.getName();
112 115
113 River river = FLYSUtils.getRiver(flysArtifact); 116 River river = FLYSUtils.getRiver(flysArtifact);
114 117
115 if (river == null) { 118 if (river == null) {
116 logger.debug("no river found"); 119 logger.warn("no river found");
117 return; 120 return;
118 } 121 }
119 122
120 Gauge gauge = river.determineGaugeByName(gaugeName); 123 logger.debug("WDifferencesCurveGenerator.doWaterlevelOut, gauge: " +
124 wqkmsName);
125 /*
126 Gauge gauge = river.determineGaugeByName(wqkmsName);
121 127
122 if (gauge == null) { 128 if (gauge == null) {
123 logger.debug("no gauge found"); 129 logger.warn("no gauge found");
124 return; 130 return;
125 } 131 }
126 132 */
127 String seriesName = "(tbd)Source for Diff."; 133
134
135 double [][] values = new double [][] {
136 wqkms.getKms(), wqkms.getWs() };
137
138 int size = values != null ? values[0].length : 0;
139
140 String seriesName = wqkmsName;
128 //getSeriesName(gauge); 141 //getSeriesName(gauge);
129
130 double [][] values = new double [][] {
131 wqkms.getQs(), wqkms.getWs() };
132
133 int size = values != null ? values[0].length : 0;
134 142
135 XYSeries series = new StyledXYSeries(seriesName, theme); 143 XYSeries series = new StyledXYSeries(seriesName, theme);
136 144
137 for (int i = 0; i < size; i++) { 145 for (int i = 0; i < size; i++) {
138 series.add(values[0][i], values[1][i]); 146 series.add(values[0][i], values[1][i]);
http://dive4elements.wald.intevation.org