Mercurial > dive4elements > river

comparison artifacts/src/main/java/org/dive4elements/river/exports/ComputedDischargeCurveGenerator.java @ 5864:f2e46a668fe6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
River artifacts: Renamed FLYSAnnotation to RiverAnnotation.
author Sascha L. Teichmann <teichmann@intevation.de>
date Sun, 28 Apr 2013 15:04:44 +0200
parents 4897a58c8746
children 73da40528cf2
comparison
equal deleted inserted replaced
5863:4897a58c8746 5864:f2e46a668fe6
14 import org.dive4elements.river.artifacts.StaticWKmsArtifact; 14 import org.dive4elements.river.artifacts.StaticWKmsArtifact;
15 import org.dive4elements.river.artifacts.WINFOArtifact; 15 import org.dive4elements.river.artifacts.WINFOArtifact;
16 import org.dive4elements.river.artifacts.model.FacetTypes; 16 import org.dive4elements.river.artifacts.model.FacetTypes;
17 import org.dive4elements.river.artifacts.model.WKms; 17 import org.dive4elements.river.artifacts.model.WKms;
18 import org.dive4elements.river.artifacts.model.WQKms; 18 import org.dive4elements.river.artifacts.model.WQKms;
19 import org.dive4elements.river.jfree.FLYSAnnotation; 19 import org.dive4elements.river.jfree.RiverAnnotation;
20 import org.dive4elements.river.jfree.StickyAxisAnnotation; 20 import org.dive4elements.river.jfree.StickyAxisAnnotation;
21 import org.dive4elements.river.jfree.StyledXYSeries; 21 import org.dive4elements.river.jfree.StyledXYSeries;
22 22
23 import org.dive4elements.river.utils.FLYSUtils; 23 import org.dive4elements.river.utils.FLYSUtils;
24 24
129 else if (name.equals(COMPUTED_DISCHARGE_MAINVALUES_Q) 129 else if (name.equals(COMPUTED_DISCHARGE_MAINVALUES_Q)
130 || name.equals(MAINVALUES_Q) 130 || name.equals(MAINVALUES_Q)
131 || name.equals(COMPUTED_DISCHARGE_MAINVALUES_W) 131 || name.equals(COMPUTED_DISCHARGE_MAINVALUES_W)
132 || name.equals(MAINVALUES_W) 132 || name.equals(MAINVALUES_W)
133 ) { 133 ) {
134 doAnnotations((FLYSAnnotation) 134 doAnnotations((RiverAnnotation)
135 artifactFacet.getData(context), artifactFacet, attr, visible); 135 artifactFacet.getData(context), artifactFacet, attr, visible);
136 } 136 }
137 else if (name.equals(STATIC_WKMS_INTERPOL) || name.equals(HEIGHTMARKS_POINTS)) { 137 else if (name.equals(STATIC_WKMS_INTERPOL) || name.equals(HEIGHTMARKS_POINTS)) {
138 doWAnnotations( 138 doWAnnotations(
139 artifactFacet.getData(context), 139 artifactFacet.getData(context),
226 (float) data[0][i], StickyAxisAnnotation.SimpleAxis.X_AXIS)); 226 (float) data[0][i], StickyAxisAnnotation.SimpleAxis.X_AXIS));
227 xy.add(new StickyAxisAnnotation(aandf.getFacetDescription(), 227 xy.add(new StickyAxisAnnotation(aandf.getFacetDescription(),
228 (float) data[1][i], StickyAxisAnnotation.SimpleAxis.Y_AXIS)); 228 (float) data[1][i], StickyAxisAnnotation.SimpleAxis.Y_AXIS));
229 } 229 }
230 230
231 doAnnotations(new FLYSAnnotation(aandf.getFacetDescription(), xy), 231 doAnnotations(new RiverAnnotation(aandf.getFacetDescription(), xy),
232 aandf, theme, visible); 232 aandf, theme, visible);
233 } 233 }
234 234
235 235
236 /** 236 /**
255 for (int i = 0; i< data[0].length; i++) { 255 for (int i = 0; i< data[0].length; i++) {
256 xy.add(new StickyAxisAnnotation(aandf.getFacetDescription(), 256 xy.add(new StickyAxisAnnotation(aandf.getFacetDescription(),
257 (float) data[1][i], StickyAxisAnnotation.SimpleAxis.Y_AXIS)); 257 (float) data[1][i], StickyAxisAnnotation.SimpleAxis.Y_AXIS));
258 } 258 }
259 259
260 doAnnotations(new FLYSAnnotation(facet.getDescription(), xy), 260 doAnnotations(new RiverAnnotation(facet.getDescription(), xy),
261 aandf, theme, visible); 261 aandf, theme, visible);
262 } 262 }
263 else { 263 else {
264 logger.debug("its wkms time, baby"); 264 logger.debug("its wkms time, baby");
265 WKms data = (WKms) wqkms; 265 WKms data = (WKms) wqkms;
267 // XXX DEAD CODE // double location = getRange()[0]; 267 // XXX DEAD CODE // double location = getRange()[0];
268 double w = StaticWKmsArtifact.getWAtKmLin(data, getRange()[0]); 268 double w = StaticWKmsArtifact.getWAtKmLin(data, getRange()[0]);
269 xy.add(new StickyAxisAnnotation(aandf.getFacetDescription(), 269 xy.add(new StickyAxisAnnotation(aandf.getFacetDescription(),
270 (float) w, StickyAxisAnnotation.SimpleAxis.Y_AXIS)); 270 (float) w, StickyAxisAnnotation.SimpleAxis.Y_AXIS));
271 271
272 doAnnotations(new FLYSAnnotation(facet.getDescription(), xy), 272 doAnnotations(new RiverAnnotation(facet.getDescription(), xy),
273 aandf, theme, visible); 273 aandf, theme, visible);
274 } 274 }
275 } 275 }
276 } 276 }
277 // vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : 277 // vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 :
http://dive4elements.wald.intevation.org