Mercurial > dive4elements > river

comparison flys-client/src/main/java/de/intevation/flys/client/client/ui/chart/ChartThemePanel.java @ 1462:a346db45c830

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Feed new parameter to area artifact, fix reversed assignment of under/over curves. flys-client/trunk@3501 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author Felix Wolfsteller <felix.wolfsteller@intevation.de>
date Tue, 20 Dec 2011 15:18:07 +0000
parents dfe884cc24a4
children 31d0557f31a2
comparison
equal deleted inserted replaced
1461:83ed39d1083d 1462:a346db45c830
137 } 137 }
138 138
139 139
140 /** 140 /**
141 * Tell an area artifact where to get the upper and lower curve from. 141 * Tell an area artifact where to get the upper and lower curve from.
142 * @param over if null, something 142 * @param artifact UUID of area-artifact.
143 */ 143 */
144 public void feedTellArea(final String artifact, Theme under, Theme over) { 144 public void feedTellArea(
145 final String artifact,
146 Theme under,
147 Theme over,
148 boolean between
149 ) {
145 150
146 Data[] feedData; 151 Data[] feedData;
147 152
148 if (over != null && under != null) { 153 if (over != null && under != null) {
149 feedData = new Data[] { 154 feedData = new Data[] {
152 DefaultData.createSimpleStringData("area.curve_over", 157 DefaultData.createSimpleStringData("area.curve_over",
153 over.getArtifact() + over.getIndex()), 158 over.getArtifact() + over.getIndex()),
154 DefaultData.createSimpleStringData("area.name", 159 DefaultData.createSimpleStringData("area.name",
155 over.getDescription() + " / " + under.getDescription()), 160 over.getDescription() + " / " + under.getDescription()),
156 DefaultData.createSimpleStringData("area.facet", 161 DefaultData.createSimpleStringData("area.facet",
157 getAreaFacetName()) 162 getAreaFacetName()),
163 DefaultData.createSimpleStringData("area.between",
164 (between)? "true" : "false")
158 }; 165 };
159 GWT.log("Have over and under"); 166 GWT.log("Have over and under");
160 } 167 }
161 else if (over == null && under != null) { 168 else if (over == null && under != null) {
162 feedData = new Data[] { 169 feedData = new Data[] {
163 DefaultData.createSimpleStringData("area.curve_under", 170 DefaultData.createSimpleStringData("area.curve_under",
164 under.getArtifact() + under.getIndex()), 171 under.getArtifact() + under.getIndex()),
165 DefaultData.createSimpleStringData("area.name", 172 DefaultData.createSimpleStringData("area.name",
166 under.getDescription() + " / " + MSG.getString("x_axis")), 173 under.getDescription() + " / " + MSG.getString("x_axis")),
167 DefaultData.createSimpleStringData("area.facet", 174 DefaultData.createSimpleStringData("area.facet",
168 getAreaFacetName()) 175 getAreaFacetName()),
176 DefaultData.createSimpleStringData("area.between",
177 (between)? "true" : "false")
169 }; 178 };
170 GWT.log("Have under only"); 179 GWT.log("Have under only");
171 } 180 }
172 else if (over != null && under == null) { 181 else if (over != null && under == null) {
173 feedData = new Data[] { 182 feedData = new Data[] {
174 DefaultData.createSimpleStringData("area.curve_over", 183 DefaultData.createSimpleStringData("area.curve_over",
175 over.getArtifact() + over.getIndex()), 184 over.getArtifact() + over.getIndex()),
176 DefaultData.createSimpleStringData("area.name", 185 DefaultData.createSimpleStringData("area.name",
177 MSG.getString("x_axis") + " / " + over.getDescription()), 186 MSG.getString("x_axis") + " / " + over.getDescription()),
178 DefaultData.createSimpleStringData("area.facet", 187 DefaultData.createSimpleStringData("area.facet",
179 getAreaFacetName()) 188 getAreaFacetName()),
189 DefaultData.createSimpleStringData("area.between",
190 (between)? "true" : "false")
180 }; 191 };
181 GWT.log("Have over only"); 192 GWT.log("Have over only");
182 } 193 }
183 else { 194 else {
184 GWT.log("Missing Data for area painting."); 195 GWT.log("Missing Data for area painting.");
209 220
210 221
211 /** 222 /**
212 * Create and parameterize a new area artifact. 223 * Create and parameterize a new area artifact.
213 * @param under 224 * @param under
214 * @param over if null, something. 225 * @param over if null, against axis.
226 * @param between if true, ignore under/over order.
215 */ 227 */
216 public void createAreaArtifact( 228 public void createAreaArtifact(
217 final Theme under, 229 final Theme over,
218 final Theme over, 230 final Theme under,
219 boolean between 231 final boolean between
220 ) { 232 ) {
221 Config config = Config.getInstance(); 233 Config config = Config.getInstance();
222 String locale = config.getLocale(); 234 String locale = config.getLocale();
223 235
224 Recommendation area = new Recommendation( 236 Recommendation area = new Recommendation(
241 } 253 }
242 public void onSuccess(Artifact[] artifacts) { 254 public void onSuccess(Artifact[] artifacts) {
243 GWT.log("Success, created area artifact: " 255 GWT.log("Success, created area artifact: "
244 + artifacts[0].getUuid()); 256 + artifacts[0].getUuid());
245 // Now, feed the artifact with the relevant data. 257 // Now, feed the artifact with the relevant data.
246 feedTellArea(artifacts[0].getUuid(), under, over); 258 feedTellArea(artifacts[0].getUuid(), under, over, between);
247 } 259 }
248 } 260 }
249 ); 261 );
250 } 262 }
251 263
http://dive4elements.wald.intevation.org