Mercurial > dive4elements > river

comparison artifacts/src/main/java/org/dive4elements/river/exports/fixings/FixWQCurveGenerator.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
44 import org.dive4elements.river.artifacts.model.fixings.QWI; 44 import org.dive4elements.river.artifacts.model.fixings.QWI;
45 import org.dive4elements.river.artifacts.resources.Resources; 45 import org.dive4elements.river.artifacts.resources.Resources;
46 import org.dive4elements.river.exports.ChartGenerator; 46 import org.dive4elements.river.exports.ChartGenerator;
47 import org.dive4elements.river.exports.StyledSeriesBuilder; 47 import org.dive4elements.river.exports.StyledSeriesBuilder;
48 import org.dive4elements.river.jfree.CollisionFreeXYTextAnnotation; 48 import org.dive4elements.river.jfree.CollisionFreeXYTextAnnotation;
49 import org.dive4elements.river.jfree.FLYSAnnotation; 49 import org.dive4elements.river.jfree.RiverAnnotation;
50 import org.dive4elements.river.jfree.JFreeUtil; 50 import org.dive4elements.river.jfree.JFreeUtil;
51 import org.dive4elements.river.jfree.StickyAxisAnnotation; 51 import org.dive4elements.river.jfree.StickyAxisAnnotation;
52 import org.dive4elements.river.jfree.StyledXYSeries; 52 import org.dive4elements.river.jfree.StyledXYSeries;
53 import org.dive4elements.river.model.Gauge; 53 import org.dive4elements.river.model.Gauge;
54 import org.dive4elements.river.model.River; 54 import org.dive4elements.river.model.River;
212 qwd.getW()); 212 qwd.getW());
213 textAnnos.add(anno); 213 textAnnos.add(anno);
214 214
215 addAxisSeries(series, 0, visible); 215 addAxisSeries(series, 0, visible);
216 if(visible && ThemeUtil.parseShowPointLabel(doc)) { 216 if(visible && ThemeUtil.parseShowPointLabel(doc)) {
217 FLYSAnnotation flysAnno = new FLYSAnnotation(null, null, null, doc); 217 RiverAnnotation flysAnno = new RiverAnnotation(null, null, null, doc);
218 flysAnno.setTextAnnotations(textAnnos); 218 flysAnno.setTextAnnotations(textAnnos);
219 addAnnotations(flysAnno); 219 addAnnotations(flysAnno);
220 } 220 }
221 } 221 }
222 else { 222 else {
245 qwd.getW()); 245 qwd.getW());
246 textAnnos.add(anno); 246 textAnnos.add(anno);
247 247
248 addAxisSeries(series, 0, visible); 248 addAxisSeries(series, 0, visible);
249 if(visible && ThemeUtil.parseShowPointLabel(doc)) { 249 if(visible && ThemeUtil.parseShowPointLabel(doc)) {
250 FLYSAnnotation flysAnno = new FLYSAnnotation(null, null, null, doc); 250 RiverAnnotation flysAnno = new RiverAnnotation(null, null, null, doc);
251 flysAnno.setTextAnnotations(textAnnos); 251 flysAnno.setTextAnnotations(textAnnos);
252 addAnnotations(flysAnno); 252 addAnnotations(flysAnno);
253 } 253 }
254 } 254 }
255 else { 255 else {
407 for (int i = 0; i< data[0].length; i++) { 407 for (int i = 0; i< data[0].length; i++) {
408 xy.add(new StickyAxisAnnotation(aandf.getFacetDescription(), 408 xy.add(new StickyAxisAnnotation(aandf.getFacetDescription(),
409 (float) data[1][i], StickyAxisAnnotation.SimpleAxis.Y_AXIS)); 409 (float) data[1][i], StickyAxisAnnotation.SimpleAxis.Y_AXIS));
410 } 410 }
411 411
412 doAnnotations(new FLYSAnnotation(facet.getDescription(), xy), 412 doAnnotations(new RiverAnnotation(facet.getDescription(), xy),
413 aandf, theme, visible); 413 aandf, theme, visible);
414 } 414 }
415 else { 415 else {
416 // Assume its WKms. 416 // Assume its WKms.
417 logger.debug("Got WKms"); 417 logger.debug("Got WKms");
423 : getRange()[0]; 423 : getRange()[0];
424 double w = StaticWKmsArtifact.getWAtKmLin(data, location); 424 double w = StaticWKmsArtifact.getWAtKmLin(data, location);
425 xy.add(new StickyAxisAnnotation(aandf.getFacetDescription(), 425 xy.add(new StickyAxisAnnotation(aandf.getFacetDescription(),
426 (float) w, StickyAxisAnnotation.SimpleAxis.Y_AXIS)); 426 (float) w, StickyAxisAnnotation.SimpleAxis.Y_AXIS));
427 427
428 doAnnotations(new FLYSAnnotation(facet.getDescription(), xy), 428 doAnnotations(new RiverAnnotation(facet.getDescription(), xy),
429 aandf, theme, visible); 429 aandf, theme, visible);
430 } 430 }
431 } 431 }
432 432
433 433
522 textAnnos.add(anno); 522 textAnnos.add(anno);
523 } 523 }
524 524
525 addAxisSeries(series, 0, visible); 525 addAxisSeries(series, 0, visible);
526 if (visible && ThemeUtil.parseShowPointLabel(theme)) { 526 if (visible && ThemeUtil.parseShowPointLabel(theme)) {
527 FLYSAnnotation flysAnno = 527 RiverAnnotation flysAnno =
528 new FLYSAnnotation(null, null, null, theme); 528 new RiverAnnotation(null, null, null, theme);
529 flysAnno.setTextAnnotations(textAnnos); 529 flysAnno.setTextAnnotations(textAnnos);
530 addAnnotations(flysAnno); 530 addAnnotations(flysAnno);
531 } 531 }
532 } 532 }
533 533
http://dive4elements.wald.intevation.org