# HG changeset patch # User Felix Wolfsteller # Date 1313586315 0 # Node ID 5411a33014e073ce9e1b5238eda98b3ceef24d55 # Parent cf39205df113ad09bf28377407dbff20a058b02a Moved StickyAxisAnnotation into new package de.intevation.flys.jfree . flys-artifacts/trunk@2501 c6561f87-3c4e-4783-a992-168aeb5c3f6f diff -r cf39205df113 -r 5411a33014e0 flys-artifacts/ChangeLog --- a/flys-artifacts/ChangeLog Wed Aug 17 13:04:53 2011 +0000 +++ b/flys-artifacts/ChangeLog Wed Aug 17 13:05:15 2011 +0000 @@ -1,3 +1,17 @@ +2011-08-17 Felix Wolfsteller + + Moved StickyAxisAnnotation into new package de.intevation.flys.jfree . + + * src/main/java/de/intevation/flys/exports/StickyAxisAnnotation.java: + Deleted/moved to src/main/java/de/intevation/flys/jfree/ . + + * src/main/java/de/intevation/flys/jfree/StickyAxisAnnotation.java: + New/moved from src/main/java/de/intevation/flys/export/ , adjusted + package statement, made class public. + + * src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: + Added import statement for de.intevation.flys.jfree.StickyAxisAnnotation . + 2011-08-17 Felix Wolfsteller Extracted and renamed CustomAnnotation to StickyAxisAnnotation. Also removed diff -r cf39205df113 -r 5411a33014e0 flys-artifacts/src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java --- a/flys-artifacts/src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java Wed Aug 17 13:04:53 2011 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java Wed Aug 17 13:05:15 2011 +0000 @@ -26,6 +26,7 @@ import de.intevation.flys.artifacts.model.WQKms; import de.intevation.flys.model.Annotation; +import de.intevation.flys.jfree.StickyAxisAnnotation; /** diff -r cf39205df113 -r 5411a33014e0 flys-artifacts/src/main/java/de/intevation/flys/exports/StickyAxisAnnotation.java --- a/flys-artifacts/src/main/java/de/intevation/flys/exports/StickyAxisAnnotation.java Wed Aug 17 13:04:53 2011 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,226 +0,0 @@ -package de.intevation.flys.exports; - -import org.apache.log4j.Logger; - -import java.util.Iterator; - -import java.awt.Shape; -import java.awt.geom.Rectangle2D; -import java.awt.geom.Line2D; - -import org.jfree.chart.annotations.XYTextAnnotation; -import org.jfree.chart.axis.ValueAxis; -import org.jfree.chart.util.LineUtilities; -import org.jfree.text.TextUtilities; -import org.jfree.chart.plot.PlotOrientation; -import org.jfree.chart.plot.XYPlot; -import org.jfree.chart.entity.XYAnnotationEntity; -import org.jfree.chart.plot.PlotRenderingInfo; -import org.jfree.chart.ChartRenderingInfo; -import org.jfree.chart.plot.Plot; - -import org.jfree.ui.RectangleEdge; - - -/** - * Custom Annotations class that is drawn only if no collisions with other - * already drawn CustomAnnotations in current plot are found. - * Draws a given text and a line to it from either axis. - */ -class StickyAxisAnnotation extends XYTextAnnotation { - - /** Logger for this class. */ - private static Logger logger = - Logger.getLogger(StickyAxisAnnotation.class); - - /** Simplified view on axes. */ - public static enum SimpleAxis { - X_AXIS, /** Usually "horizontal". */ - Y_AXIS /** Usually "vertical". */ - } - - /** Which axis to stick to. */ - protected SimpleAxis stickyAxis = SimpleAxis.X_AXIS; - - - /** - * Trivial constructor. - * - * @param text Text to display. - * @param x X-position in dataspace (typical horizontal, in km). - * @param y Y-position in dataspace (typical vertical, in m). - */ - public StickyAxisAnnotation(String text, float x, float y) { - super(text, x, y); - } - - - /** - * Sets the "sticky axis" (whether to draw annotations at the - * X- or the Y-Axis. - * - * @param stickyAxis axis to stick to. - */ - public void setStickyAxis(SimpleAxis stickyAxis) { - this.stickyAxis = stickyAxis; - } - - - /** - * Draws a small line at axis where this annotation resides. - * - * @param g2 the graphics device. - * @param dataArea the data area. - * @param domainAxis the domain axis. - * @param rangeAxis the range axis. - * @param domainEdge the domain edge. - * @param rangeEdge the range edge. - * @param orientation the plot orientation. - */ - protected void drawAxisMark( - java.awt.Graphics2D g2, - java.awt.geom.Rectangle2D dataArea, - ValueAxis domainAxis, - ValueAxis rangeAxis, - RectangleEdge domainEdge, - RectangleEdge rangeEdge, - PlotOrientation orientation) { - float j2DX1 = 0.0f; - float j2DX2 = 0.0f; - float j2DY1 = 0.0f; - float j2DY2 = 0.0f; - float x = (float) getX(); - float y = (float) getY(); - /* When dependent on X/Y-Axis and orientation, following - can be used as a base: - if (orientation == PlotOrientation.VERTICAL) { - j2DX1 = (float) domainAxis.valueToJava2D(x, dataArea, - domainEdge); - j2DY1 = (float) rangeAxis.valueToJava2D(y, dataArea, - rangeEdge); - j2DX2 = (float) domainAxis.valueToJava2D(x, dataArea, - domainEdge); - j2DY2 = (float) rangeAxis.valueToJava2D(y, dataArea, - rangeEdge); - } - else if (orientation == PlotOrientation.HORIZONTAL) { - j2DY1 = (float) domainAxis.valueToJava2D(x, dataArea, - domainEdge); - j2DX1 = (float) rangeAxis.valueToJava2D(y, dataArea, - rangeEdge); - j2DY2 = (float) domainAxis.valueToJava2D(x, dataArea, - domainEdge); - j2DX2 = (float) rangeAxis.valueToJava2D(y, dataArea, - rangeEdge); - } - - g2.setPaint(this.paint); - g2.setStroke(this.stroke); - */ - j2DY1 = (float) RectangleEdge.coordinate(dataArea, domainEdge); - j2DY2 = j2DY1 - 0.10f * (float) - (rangeAxis.getRange().getUpperBound() - - rangeAxis.getRange().getLowerBound()); - j2DX1 = (float) domainAxis.valueToJava2D(x, dataArea, domainEdge); - j2DX2 = j2DX1; - - Line2D line = new Line2D.Float(j2DX1, j2DY1, j2DX2, j2DY2); - - // line is clipped to avoid JRE bug 6574155, for more info - // see JFreeChart bug 2221495 - boolean visible = LineUtilities.clipLine(line, dataArea); - if (visible) { - g2.draw(line); - } - } - - - /** - * Draw the Annotiation if it does not collide with other already drawn - * Annotations. - * - * @param g2 the graphics device. - * @param plot the plot. - * @param dataArea the data area. - * @param domainAxis the domain axis. - * @param rangeAxis the range axis. - * @param rendererIndex the render index. - * @param info state information, escpecially collects info about - * already drawn shapes (and thus annotations), used - * for collision detection. - */ - @Override - public void draw( - java.awt.Graphics2D g2, - XYPlot plot, - java.awt.geom.Rectangle2D dataArea, - ValueAxis domainAxis, - ValueAxis rangeAxis, - int rendererIndex, - PlotRenderingInfo info) { - - if (info == null) - return; - - // Calculate the bounding box. - ChartRenderingInfo chartInfo = info.getOwner(); - - PlotOrientation orientation = plot.getOrientation(); - RectangleEdge domainEdge = Plot.resolveDomainAxisLocation( - plot.getDomainAxisLocation(), orientation); - RectangleEdge rangeEdge = Plot.resolveRangeAxisLocation( - plot.getRangeAxisLocation(), orientation); - float anchorX = (float) domainAxis.valueToJava2D( - getX(), dataArea, domainEdge); - float anchorY = (float) rangeAxis.valueToJava2D( - getY(), dataArea, rangeEdge); - if (orientation == PlotOrientation.HORIZONTAL) { - float tempAnchor = anchorX; - anchorX = anchorY; - anchorY = tempAnchor; - } - - // Always draw the small line at axis. - drawAxisMark(g2, dataArea, domainAxis, rangeAxis, domainEdge, - rangeEdge, orientation); - - g2.setFont(getFont()); - Shape hotspot = TextUtilities.calculateRotatedStringBounds( - getText(), g2, anchorX, anchorY, getTextAnchor(), - getRotationAngle(), getRotationAnchor()); - Rectangle2D hotspotBox = hotspot.getBounds2D(); - // Check for collisions with other XYAnnotations. - for (Iterator i = chartInfo.getEntityCollection().iterator(); - i.hasNext(); ) { - Object next = i.next(); - // Collision with other stuff than XYAnnotations are okay. - if (next instanceof XYAnnotationEntity) { - XYAnnotationEntity drawnShape = (XYAnnotationEntity) next; - if (drawnShape.getArea().intersects(hotspotBox)) { - // Found collision, early stop. - return; - } - } - } - - // Actuall drawing. - if (getBackgroundPaint() != null) { - g2.setPaint(getBackgroundPaint()); - g2.fill(hotspot); - } - g2.setPaint(getPaint()); - TextUtilities.drawRotatedString(getText(), g2, anchorX, anchorY, - getTextAnchor(), getRotationAngle(), getRotationAnchor()); - // Draw outline. - if (false) { - g2.setStroke(getOutlineStroke()); - g2.setPaint(getOutlinePaint()); - g2.draw(hotspot); - } - - // Add info that we have drawn this Annotation. - addEntity(info, hotspot, rendererIndex, getToolTipText(), getURL()); - } -} - -