comparison artifacts/src/main/java/org/dive4elements/river/exports/DiagramGenerator.java @ 8341:130160b8d245

Introduce annotations, which know to which axis they belong.
author Tom Gottfried <tom@intevation.de>
date Tue, 30 Sep 2014 11:50:43 +0200
parents ac7cb15e1946
children 31272d799dad
comparison
equal deleted inserted replaced
8340:8679875f2c09 8341:130160b8d245
16 import java.util.ArrayList; 16 import java.util.ArrayList;
17 import java.util.HashMap; 17 import java.util.HashMap;
18 import java.util.HashSet; 18 import java.util.HashSet;
19 import java.util.LinkedHashSet; 19 import java.util.LinkedHashSet;
20 import java.util.List; 20 import java.util.List;
21 import java.util.ArrayList;
21 import java.util.Map; 22 import java.util.Map;
22 import java.util.Set; 23 import java.util.Set;
23 24
24 import java.util.regex.Pattern; 25 import java.util.regex.Pattern;
25 import java.util.regex.Matcher; 26 import java.util.regex.Matcher;
37 38
38 import org.dive4elements.river.artifacts.D4EArtifact; 39 import org.dive4elements.river.artifacts.D4EArtifact;
39 40
40 import org.dive4elements.river.exports.process.Processor; 41 import org.dive4elements.river.exports.process.Processor;
41 42
43 import org.dive4elements.river.jfree.RiverAnnotation;
42 import org.dive4elements.river.jfree.AnnotationHelper; 44 import org.dive4elements.river.jfree.AnnotationHelper;
43 import org.dive4elements.river.jfree.AxisDataset; 45 import org.dive4elements.river.jfree.AxisDataset;
44 import org.dive4elements.river.jfree.Bounds; 46 import org.dive4elements.river.jfree.Bounds;
45 import org.dive4elements.river.jfree.DoubleBounds; 47 import org.dive4elements.river.jfree.DoubleBounds;
46 import org.dive4elements.river.jfree.StyledAreaSeriesCollection; 48 import org.dive4elements.river.jfree.StyledAreaSeriesCollection;
224 //debugAxis(plot); 226 //debugAxis(plot);
225 227
226 // These have to go after the autozoom. 228 // These have to go after the autozoom.
227 AnnotationHelper.addAnnotationsToRenderer(annotations, plot, 229 AnnotationHelper.addAnnotationsToRenderer(annotations, plot,
228 getChartSettings(), datasets); 230 getChartSettings(), datasets);
231 AnnotationHelper.addYAnnotationsToRenderer(yAnnotations, plot,
232 getChartSettings(), datasets);
229 233
230 // Add a logo (maybe). 234 // Add a logo (maybe).
231 addLogo(plot); 235 addLogo(plot);
232 236
233 aggregateLegendEntries(plot); 237 aggregateLegendEntries(plot);
559 plot.addDomainMarker(marker); 563 plot.addDomainMarker(marker);
560 } 564 }
561 for(Marker marker : valueMarkers) { 565 for(Marker marker : valueMarkers) {
562 plot.addRangeMarker(marker); 566 plot.addRangeMarker(marker);
563 } 567 }
568 }
569
570
571 public void addYAnnotation(
572 RiverAnnotation annotation,
573 String axisName
574 ) {
575 addYAnnotation(annotation, diagramAttributes.getAxisIndex(axisName));
564 } 576 }
565 577
566 578
567 /** 579 /**
568 * Effect: extend range of x axis to include given limits. 580 * Effect: extend range of x axis to include given limits.

http://dive4elements.wald.intevation.org