# HG changeset patch # User Felix Wolfsteller # Date 1329144105 0 # Node ID 7e0be3e5dfaa5fa579504e37f75b30d293db11ac # Parent 388cd6fc451b6f967f3046d8f5c5274ba9e3f117 Fix flys/issue490 (text for manual points). flys-artifacts/trunk@4041 c6561f87-3c4e-4783-a992-168aeb5c3f6f diff -r 388cd6fc451b -r 7e0be3e5dfaa flys-artifacts/ChangeLog --- 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 + + Fix flys/issue490 + + * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: + Pass artifact and facet for doAnnotation. + 2012-02-10 Sascha L. Teichmann * src/main/java/de/intevation/flys/artifacts/model/WWAxisTypes.java: diff -r 388cd6fc451b -r 7e0be3e5dfaa flys-artifacts/src/main/java/de/intevation/flys/exports/XYChartGenerator.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); }