Mercurial > dive4elements > river
comparison flys-artifacts/src/main/java/de/intevation/flys/exports/XYChartGenerator.java @ 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 | 4e82bcd07550 |
| children | b5f5af53a526 |
comparison
equal
deleted
inserted
replaced
| 2410:388cd6fc451b | 2411:7e0be3e5dfaa |
|---|---|
| 394 * If no data is visible, draw at least empty axis. | 394 * If no data is visible, draw at least empty axis. |
| 395 */ | 395 */ |
| 396 private void recoverEmptyPlot(XYPlot plot) { | 396 private void recoverEmptyPlot(XYPlot plot) { |
| 397 if (plot.getRangeAxis() == null) { | 397 if (plot.getRangeAxis() == null) { |
| 398 logger.debug("debug: No range axis"); | 398 logger.debug("debug: No range axis"); |
| 399 plot.setRangeAxis(createYAxis(0)); | 399 plot.setRangeAxis(createYAxis(0, null)); |
| 400 } | 400 } |
| 401 } | 401 } |
| 402 | 402 |
| 403 | 403 |
| 404 /** | 404 /** |
| 826 // The 'Sticky' Annotations (at axis, with line and text). | 826 // The 'Sticky' Annotations (at axis, with line and text). |
| 827 for (StickyAxisAnnotation sta: fa.getAxisTextAnnotations()) { | 827 for (StickyAxisAnnotation sta: fa.getAxisTextAnnotations()) { |
| 828 addStickyAnnotation(sta, plot, area, lineStyle, textStyle); | 828 addStickyAnnotation(sta, plot, area, lineStyle, textStyle); |
| 829 } | 829 } |
| 830 | 830 |
| 831 // Other Text Annotations. | 831 // Other Text Annotations (e.g. labels of manual points). |
| 832 for (XYTextAnnotation ta: fa.getTextAnnotations()) { | 832 for (XYTextAnnotation ta: fa.getTextAnnotations()) { |
| 833 // Style the text. | 833 // Style the text. |
| 834 if (textStyle != null) { | 834 if (textStyle != null) { |
| 835 textStyle.apply(ta); | 835 textStyle.apply(ta); |
| 836 } | 836 } |
| 984 FLYSAnnotation annotations, | 984 FLYSAnnotation annotations, |
| 985 ArtifactAndFacet aandf, | 985 ArtifactAndFacet aandf, |
| 986 Document theme, | 986 Document theme, |
| 987 boolean visible | 987 boolean visible |
| 988 ){ | 988 ){ |
| 989 // Running into trouble here. | |
| 989 logger.debug("doAnnotations"); | 990 logger.debug("doAnnotations"); |
| 990 if (aandf == null) { | 991 if (aandf == null) { |
| 991 logger.warn( | 992 logger.warn( |
| 992 "Facet for Annotations is null. " + | 993 "Facet for Annotations is null. " + |
| 993 "This should never happen!"); | 994 "This should never happen!"); |
| 1041 } | 1042 } |
| 1042 | 1043 |
| 1043 FLYSAnnotation annotations = new FLYSAnnotation(null, null, null, theme); | 1044 FLYSAnnotation annotations = new FLYSAnnotation(null, null, null, theme); |
| 1044 annotations.setTextAnnotations(xy); | 1045 annotations.setTextAnnotations(xy); |
| 1045 | 1046 |
| 1046 doAnnotations(annotations, null, theme, visible); | 1047 doAnnotations(annotations, aandf, theme, visible); |
| 1047 addAxisSeries(series, axisIndex, visible); | 1048 addAxisSeries(series, axisIndex, visible); |
| 1048 } | 1049 } |
| 1049 | 1050 |
| 1050 | 1051 |
| 1051 /** Two Ranges that span a rectangular area. */ | 1052 /** Two Ranges that span a rectangular area. */ |