Mercurial > dive4elements > river
changeset 2411:7e0be3e5dfaa
Fix flys/issue490 (text for manual points).
flys-artifacts/trunk@4041 c6561f87-3c4e-4783-a992-168aeb5c3f6f
| author | Felix Wolfsteller <felix.wolfsteller@intevation.de> |
|---|---|
| date | Mon, 13 Feb 2012 14:41:45 +0000 |
| parents | 388cd6fc451b |
| children | 451b25878105 |
| files | flys-artifacts/ChangeLog flys-artifacts/src/main/java/de/intevation/flys/exports/XYChartGenerator.java |
| diffstat | 2 files changed, 11 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/flys-artifacts/ChangeLog Fri Feb 10 17:28:28 2012 +0000 +++ b/flys-artifacts/ChangeLog Mon Feb 13 14:41:45 2012 +0000 @@ -1,3 +1,10 @@ +2012-02-13 Felix Wolfsteller <felix.wolfsteller@intevation.de> + + Fix flys/issue490 + + * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: + Pass artifact and facet for doAnnotation. + 2012-02-10 Sascha L. Teichmann <sascha.teichmann@intevation.de> * src/main/java/de/intevation/flys/artifacts/model/WWAxisTypes.java:
--- a/flys-artifacts/src/main/java/de/intevation/flys/exports/XYChartGenerator.java Fri Feb 10 17:28:28 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/exports/XYChartGenerator.java Mon Feb 13 14:41:45 2012 +0000 @@ -396,7 +396,7 @@ private void recoverEmptyPlot(XYPlot plot) { if (plot.getRangeAxis() == null) { logger.debug("debug: No range axis"); - plot.setRangeAxis(createYAxis(0)); + plot.setRangeAxis(createYAxis(0, null)); } } @@ -828,7 +828,7 @@ addStickyAnnotation(sta, plot, area, lineStyle, textStyle); } - // Other Text Annotations. + // Other Text Annotations (e.g. labels of manual points). for (XYTextAnnotation ta: fa.getTextAnnotations()) { // Style the text. if (textStyle != null) { @@ -986,6 +986,7 @@ Document theme, boolean visible ){ + // Running into trouble here. logger.debug("doAnnotations"); if (aandf == null) { logger.warn( @@ -1043,7 +1044,7 @@ FLYSAnnotation annotations = new FLYSAnnotation(null, null, null, theme); annotations.setTextAnnotations(xy); - doAnnotations(annotations, null, theme, visible); + doAnnotations(annotations, aandf, theme, visible); addAxisSeries(series, axisIndex, visible); }