Mercurial > dive4elements > river
diff artifacts/src/main/java/org/dive4elements/river/exports/XYChartGenerator.java @ 9123:1cc7653ca84f
Cleanup of ChartGenerator and ChartGenerator2 code. Put some of the copy/pasted code into a common abstraction.
| author | gernotbelger |
|---|---|
| date | Tue, 05 Jun 2018 19:21:16 +0200 |
| parents | 07d51fd4864c |
| children | 7c7f73e5e01e |
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/exports/XYChartGenerator.java Tue Jun 05 19:10:38 2018 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/exports/XYChartGenerator.java Tue Jun 05 19:21:16 2018 +0200 @@ -40,6 +40,7 @@ import org.json.JSONException; import org.dive4elements.artifactdatabase.state.ArtifactAndFacet; +import org.dive4elements.artifacts.CallContext; import org.dive4elements.river.jfree.Bounds; import org.dive4elements.river.jfree.CollisionFreeXYTextAnnotation; import org.dive4elements.river.jfree.DoubleBounds; @@ -47,7 +48,6 @@ import org.dive4elements.river.jfree.StyledAreaSeriesCollection; import org.dive4elements.river.jfree.StyledXYSeries; import org.dive4elements.river.jfree.AxisDataset; -import org.dive4elements.river.jfree.AnnotationHelper; import org.dive4elements.river.themes.ThemeDocument; @@ -102,11 +102,11 @@ * Generate the chart anew (including localized axis and all). */ @Override - public JFreeChart generateChart() { + protected JFreeChart generateChart(CallContext context) { log.debug("XYChartGenerator.generateChart"); JFreeChart chart = ChartFactory.createXYLineChart( - getChartTitle(), + getChartTitle(context), getXAxisLabel(), getYAxisLabel(0), null, @@ -121,8 +121,8 @@ chart.setBackgroundPaint(Color.WHITE); plot.setBackgroundPaint(Color.WHITE); - addSubtitles(chart); - addMetadataSubtitle(chart); + addSubtitles(context, chart); + addMetadataSubtitle(context, chart); adjustPlot(plot); //debugAxis(plot); @@ -994,10 +994,5 @@ public void setInverted(boolean inverted) { this.inverted = inverted; } - - protected void addAnnotationsToRenderer(XYPlot plot) { - AnnotationHelper.addAnnotationsToRenderer(annotations, plot, - getChartSettings(), datasets); - } } // vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 :