Mercurial > dive4elements > river
comparison artifacts/src/main/java/org/dive4elements/river/exports/TimeseriesChartGenerator.java @ 8343:42b258294067
Remove duplication of AnnotationHelper-code in ChartGenerator.
author | Tom Gottfried <tom@intevation.de> |
---|---|
date | Tue, 30 Sep 2014 13:03:55 +0200 |
parents | e4606eae8ea5 |
children | 6dfc3a1fc70d |
comparison
equal
deleted
inserted
replaced
8342:d786b6a852c1 | 8343:42b258294067 |
---|---|
12 import org.dive4elements.river.artifacts.resources.Resources; | 12 import org.dive4elements.river.artifacts.resources.Resources; |
13 import org.dive4elements.river.jfree.Bounds; | 13 import org.dive4elements.river.jfree.Bounds; |
14 import org.dive4elements.river.jfree.CollisionFreeXYTextAnnotation; | 14 import org.dive4elements.river.jfree.CollisionFreeXYTextAnnotation; |
15 import org.dive4elements.river.jfree.DoubleBounds; | 15 import org.dive4elements.river.jfree.DoubleBounds; |
16 import org.dive4elements.river.jfree.RiverAnnotation; | 16 import org.dive4elements.river.jfree.RiverAnnotation; |
17 import org.dive4elements.river.jfree.AnnotationHelper; | |
17 import org.dive4elements.river.jfree.StyledTimeSeries; | 18 import org.dive4elements.river.jfree.StyledTimeSeries; |
18 import org.dive4elements.river.jfree.TimeBounds; | 19 import org.dive4elements.river.jfree.TimeBounds; |
19 import org.dive4elements.river.jfree.AxisDataset; | 20 import org.dive4elements.river.jfree.AxisDataset; |
20 import org.dive4elements.river.themes.ThemeDocument; | 21 import org.dive4elements.river.themes.ThemeDocument; |
21 | 22 |
122 | 123 |
123 applySeriesAttributes(plot); | 124 applySeriesAttributes(plot); |
124 | 125 |
125 consumeAxisSettings(plot); | 126 consumeAxisSettings(plot); |
126 | 127 |
127 addAnnotationsToRenderer(plot); | 128 AnnotationHelper.addAnnotationsToRenderer( |
129 annotations, | |
130 plot, | |
131 getChartSettings(), | |
132 datasets); | |
128 addLogo(plot); | 133 addLogo(plot); |
129 aggregateLegendEntries(plot); | 134 aggregateLegendEntries(plot); |
130 return chart; | 135 return chart; |
131 } | 136 } |
132 | 137 |