Mercurial > dive4elements > river
diff flys-artifacts/src/main/java/de/intevation/flys/exports/ChartGenerator.java @ 4432:e8a4d2fd25cc
Merged.
author | Felix Wolfsteller <felix.wolfsteller@intevation.de> |
---|---|
date | Wed, 07 Nov 2012 09:47:44 +0100 |
parents | 3c8964855270 |
children | 5b8919ef601d |
line wrap: on
line diff
--- a/flys-artifacts/src/main/java/de/intevation/flys/exports/ChartGenerator.java Wed Nov 07 09:44:24 2012 +0100 +++ b/flys-artifacts/src/main/java/de/intevation/flys/exports/ChartGenerator.java Wed Nov 07 09:47:44 2012 +0100 @@ -200,6 +200,7 @@ int rendererIndex = 0; if (annotation.atX()) { + logger.debug("ChartGenerator: Sticky at X."); textAnnotation = new CollisionFreeXYTextAnnotation( annotation.getText(), annotation.getPos(), area.ofGround(TEXT_OFF)); // OPTIMIZE externalize the calculation involving PI. @@ -214,6 +215,7 @@ // There is one nasty case (duration curves, where annotations // might stick to the second y-axis). // FIXME: Remove dependency to XYChartGenerator here + logger.debug("ChartGenerator: Sticky at no-X."); AxisDataset dataset = getAxisDataset( new Integer(annotation.getAxisSymbol())); if (dataset == null) { @@ -434,6 +436,8 @@ return; } + logger.debug("addAnnotationsToRenderer: " + annotations.size()); + // OPTMIMIZE: Pre-calculate positions ChartArea area = new ChartArea( plot.getDomainAxis(0).getRange(), @@ -441,7 +445,7 @@ // Walk over all Annotation sets. for (FLYSAnnotation fa: annotations) { - + // Access text styling, if any. Document theme = fa.getTheme(); TextStyle textStyle = null; @@ -1506,11 +1510,12 @@ XPathConstants.NODE, ArtifactNamespaceContext.INSTANCE); + // unter -aft liegt eine XML java mit toString + System.err.println(XMLUtils.toString(request)); if (yrange == null) { return null; } - String uri = ArtifactNamespaceContext.NAMESPACE_URI; String lower = yrange.getAttributeNS(uri, "from");