Menu
▾
▴
[Jfreechart-commit] jfreechart/source/org/jfree/chart/renderer/category AbstractCategoryItemRenderer.java,1.19,1.20 AreaRenderer.java,1.8,1.9 BarRenderer.java,1.16,1.17 BoxAndWhiskerRenderer.java,1.10,1.11 LineAndShapeRenderer.java,1.21,1.22
Update of /cvsroot/jfreechart/jfreechart/source/org/jfree/chart/renderer/category In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20728/source/org/jfree/chart/renderer/category Modified Files: AbstractCategoryItemRenderer.java AreaRenderer.java BarRenderer.java BoxAndWhiskerRenderer.java LineAndShapeRenderer.java Log Message: 2005-12-12 David Gilbert <dav...@ob...> * source/org/jfree/chart/LegendItem.java: (LegendItem(String, AttributedString, String, String, String, Shape, Paint)): Removed AttributedString argument, (LegendItem(String, AttributedString, String, String, String, Shape, Paint, Stroke, Paint)): Likewise, (LegendItem(String, AttributedString, String, String, String, Shape, Stroke, Paint)): Likewise, (LegendItem(String, AttributedString, String, String, String, boolean, Shape, boolean, Paint, boolean, Paint, Stroke, boolean, Shape, Stroke, Paint)): Likewise, (LegendItem(AttributedString, String, String, String, Shape, Paint)): New constructor, (LegendItem(AttributedString, String, String, String, Shape, Paint, Stroke, Paint)): Likewise, (LegendItem(AttributedString, String, String, String, Shape, Stroke, Paint)): Likewise, (LegendItem(AttributedString, String, String, String, boolean, Shape, boolean, Paint, boolean, Paint, Stroke, boolean, Shape, Stroke, Paint)): Likewise, (characterIteratorToString): New method, * source/org/jfree/chart/junit/LegendItemCollectionTests.java (testEquals): Updated for change to LegendItem constructor, (testSerialization): Likewise, (testCloning): Likewise, * source/org/jfree/chart/junit/LegendItemTests.java (testEquals): Updated for change to LegendItem constructor, (testSerialization): Likewise, (testCloning): Likewise, * source/org/jfree/chart/plot/MeterPlot.java (getLegendItems): Update for change to LegendItem constructor, * source/org/jfree/chart/plot/MultiplePiePlot.java (getLegendItems): Likewise, * source/org/jfree/chart/plot/PiePlot.java (drawItem): Use sectionOutlinesVisible flag, fix potential NullPointerException for entities, (getLegendItems): Update for change to LegendItem constructor, * source/org/jfree/chart/plot/SpiderWebPlot.java (getLegendItems): Likewise, * source/org/jfree/chart/renderer/DefaultPolarItemRenderer.java (getLegendItem): Likewise, * source/org/jfree/chart/renderer/WaferMapRenderer.java (getLegendCollection): Likewise, * source/org/jfree/chart/renderer/category/AbstractCategoryItemRenderer.java (getLegendItem): Likewise, * source/org/jfree/chart/renderer/category/AreaRenderer.java (getLegendItem): Likewise, * source/org/jfree/chart/renderer/category/BarRenderer.java (getLegendItem): Likewise, plus reformatting, * source/org/jfree/chart/renderer/category/BoxAndWhiskerRenderer.java (getLegendItem): Likewise, * source/org/jfree/chart/renderer/category/LineAndShapeRenderer.java (getLegendItem): Likewise, * source/org/jfree/chart/renderer/xy/AbstractXYItemRenderer.java (getLegendItem): Likewise, * source/org/jfree/chart/renderer/xy/StandardXYItemRenderer.java (getLegendItem): Likewise, * source/org/jfree/chart/renderer/xy/XYAreaRenderer.java (getLegendItem): Likewise, * source/org/jfree/chart/renderer/xy/XYAreaRenderer2.java (getLegendItem): Likewise, * source/org/jfree/chart/renderer/xy/XYBarRenderer.java (getLegendItem): Likewise, * source/org/jfree/chart/renderer/xy/XYBubbleRenderer.java (getLegendItem): Likewise, * source/org/jfree/chart/renderer/xy/XYDifferenceRenderer.java (getLegendItem): Likewise, * source/org/jfree/chart/renderer/xy/XYLineAndShapeRenderer.java (getLegendItem): Likewise. ---------------------------------------------------------------------- Index: BarRenderer.java =================================================================== RCS file: /cvsroot/jfreechart/jfreechart/source/org/jfree/chart/renderer/category/BarRenderer.java,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** BarRenderer.java 30 Sep 2005 10:23:21 -0000 1.16 --- BarRenderer.java 12 Dec 2005 14:11:32 -0000 1.17 *************** *** 17,23 **** * License for more details. * ! * You should have received a copy of the GNU Lesser General Public License ! * along with this library; if not, write to the Free Software Foundation, ! * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. * * [Java is a trademark or registered trademark of Sun Microsystems, Inc. --- 17,24 ---- * License for more details. * ! * You should have received a copy of the GNU Lesser General Public ! * License along with this library; if not, write to the Free Software ! * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, ! * USA. * * [Java is a trademark or registered trademark of Sun Microsystems, Inc. *************** *** 75,78 **** --- 76,81 ---- package org.jfree.chart.renderer.category; + import java.awt.BasicStroke; + import java.awt.Color; import java.awt.Font; import java.awt.GradientPaint; *************** *** 81,84 **** --- 84,88 ---- import java.awt.Shape; import java.awt.Stroke; + import java.awt.geom.Line2D; import java.awt.geom.Point2D; import java.awt.geom.Rectangle2D; *************** *** 394,400 **** PlotRenderingInfo info) { ! CategoryItemRendererState state = super.initialise( ! g2, dataArea, plot, rendererIndex, info ! ); // get the clipping values... --- 398,403 ---- PlotRenderingInfo info) { ! CategoryItemRendererState state = super.initialise(g2, dataArea, plot, ! rendererIndex, info); // get the clipping values... *************** *** 487,493 **** space = dataArea.getWidth(); } ! double barW0 = domainAxis.getCategoryStart( ! column, getColumnCount(), dataArea, plot.getDomainAxisEdge() ! ); int seriesCount = getRowCount(); int categoryCount = getColumnCount(); --- 490,495 ---- space = dataArea.getWidth(); } ! double barW0 = domainAxis.getCategoryStart(column, getColumnCount(), ! dataArea, plot.getDomainAxisEdge()); int seriesCount = getRowCount(); int categoryCount = getColumnCount(); *************** *** 495,508 **** double seriesGap = space * getItemMargin() / (categoryCount * (seriesCount - 1)); ! double seriesW = calculateSeriesWidth( ! space, domainAxis, categoryCount, seriesCount ! ); barW0 = barW0 + row * (seriesW + seriesGap) + (seriesW / 2.0) - (state.getBarWidth() / 2.0); } else { ! barW0 = domainAxis.getCategoryMiddle( ! column, getColumnCount(), dataArea, plot.getDomainAxisEdge() ! ) - state.getBarWidth() / 2.0; } return barW0; --- 497,509 ---- double seriesGap = space * getItemMargin() / (categoryCount * (seriesCount - 1)); ! double seriesW = calculateSeriesWidth(space, domainAxis, ! categoryCount, seriesCount); barW0 = barW0 + row * (seriesW + seriesGap) + (seriesW / 2.0) - (state.getBarWidth() / 2.0); } else { ! barW0 = domainAxis.getCategoryMiddle(column, getColumnCount(), ! dataArea, plot.getDomainAxisEdge()) - state.getBarWidth() ! / 2.0; } return barW0; *************** *** 570,588 **** CategoryDataset dataset; dataset = cp.getDataset(datasetIndex); ! String label = getLegendItemLabelGenerator().generateLabel( ! dataset, series ! ); String description = label; String toolTipText = null; if (getLegendItemToolTipGenerator() != null) { toolTipText = getLegendItemToolTipGenerator().generateLabel( ! dataset, series ! ); } String urlText = null; if (getLegendItemURLGenerator() != null) { ! urlText = getLegendItemURLGenerator().generateLabel( ! dataset, series ! ); } Shape shape = new Rectangle2D.Double(-4.0, -4.0, 8.0, 8.0); --- 571,586 ---- CategoryDataset dataset; dataset = cp.getDataset(datasetIndex); ! String label = getLegendItemLabelGenerator().generateLabel(dataset, ! series); String description = label; String toolTipText = null; if (getLegendItemToolTipGenerator() != null) { toolTipText = getLegendItemToolTipGenerator().generateLabel( ! dataset, series); } String urlText = null; if (getLegendItemURLGenerator() != null) { ! urlText = getLegendItemURLGenerator().generateLabel(dataset, ! series); } Shape shape = new Rectangle2D.Double(-4.0, -4.0, 8.0, 8.0); *************** *** 591,597 **** Stroke outlineStroke = getSeriesOutlineStroke(series); ! return new LegendItem(label, null, description, toolTipText, urlText, ! shape, paint, outlineStroke, outlinePaint); ! } --- 589,597 ---- Stroke outlineStroke = getSeriesOutlineStroke(series); ! return new LegendItem(label, description, toolTipText, urlText, ! true, shape, true, paint, ! isDrawBarOutline(), outlinePaint, outlineStroke, ! false, new Line2D.Float(), new BasicStroke(1.0f), ! Color.black); } *************** *** 630,636 **** PlotOrientation orientation = plot.getOrientation(); ! double barW0 = calculateBarW0( ! plot, orientation, dataArea, domainAxis, state, row, column ! ); double[] barL0L1 = calculateBarL0L1(value); if (barL0L1 == null) { --- 630,635 ---- PlotOrientation orientation = plot.getOrientation(); ! double barW0 = calculateBarW0(plot, orientation, dataArea, domainAxis, ! state, row, column); double[] barL0L1 = calculateBarL0L1(value); if (barL0L1 == null) { *************** *** 642,660 **** double transL1 = rangeAxis.valueToJava2D(barL0L1[1], dataArea, edge); double barL0 = Math.min(transL0, transL1); ! double barLength = Math.max( ! Math.abs(transL1 - transL0), getMinimumBarLength() ! ); // draw the bar... Rectangle2D bar = null; if (orientation == PlotOrientation.HORIZONTAL) { ! bar = new Rectangle2D.Double( ! barL0, barW0, barLength, state.getBarWidth() ! ); } else { ! bar = new Rectangle2D.Double( ! barW0, barL0, state.getBarWidth(), barLength ! ); } Paint itemPaint = getItemPaint(row, column); --- 641,656 ---- double transL1 = rangeAxis.valueToJava2D(barL0L1[1], dataArea, edge); double barL0 = Math.min(transL0, transL1); ! double barLength = Math.max(Math.abs(transL1 - transL0), ! getMinimumBarLength()); // draw the bar... Rectangle2D bar = null; if (orientation == PlotOrientation.HORIZONTAL) { ! bar = new Rectangle2D.Double(barL0, barW0, barLength, ! state.getBarWidth()); } else { ! bar = new Rectangle2D.Double(barW0, barL0, state.getBarWidth(), ! barLength); } Paint itemPaint = getItemPaint(row, column); *************** *** 681,687 **** = getItemLabelGenerator(row, column); if (generator != null && isItemLabelVisible(row, column)) { ! drawItemLabel( ! g2, dataset, row, column, plot, generator, bar, (value < 0.0) ! ); } --- 677,682 ---- = getItemLabelGenerator(row, column); if (generator != null && isItemLabelVisible(row, column)) { ! drawItemLabel(g2, dataset, row, column, plot, generator, bar, ! (value < 0.0)); } *************** *** 757,772 **** // work out the label anchor point... Point2D anchorPoint = calculateLabelAnchorPoint( ! position.getItemLabelAnchor(), bar, plot.getOrientation() ! ); if (isInternalAnchor(position.getItemLabelAnchor())) { ! Shape bounds = TextUtilities.calculateRotatedStringBounds( ! label, g2, ! (float) anchorPoint.getX(), ! (float) anchorPoint.getY(), ! position.getTextAnchor(), ! position.getAngle(), ! position.getRotationAnchor() ! ); if (bounds != null) { --- 752,762 ---- // work out the label anchor point... Point2D anchorPoint = calculateLabelAnchorPoint( ! position.getItemLabelAnchor(), bar, plot.getOrientation()); if (isInternalAnchor(position.getItemLabelAnchor())) { ! Shape bounds = TextUtilities.calculateRotatedStringBounds(label, ! g2, (float) anchorPoint.getX(), (float) anchorPoint.getY(), ! position.getTextAnchor(), position.getAngle(), ! position.getRotationAnchor()); if (bounds != null) { *************** *** 780,786 **** if (position != null) { anchorPoint = calculateLabelAnchorPoint( ! position.getItemLabelAnchor(), bar, ! plot.getOrientation() ! ); } } --- 770,775 ---- if (position != null) { anchorPoint = calculateLabelAnchorPoint( ! position.getItemLabelAnchor(), bar, ! plot.getOrientation()); } } *************** *** 790,799 **** if (position != null) { ! TextUtilities.drawRotatedString( ! label, g2, (float) anchorPoint.getX(), ! (float) anchorPoint.getY(), ! position.getTextAnchor(), position.getAngle(), ! position.getRotationAnchor() ! ); } } --- 779,786 ---- if (position != null) { ! TextUtilities.drawRotatedString(label, g2, ! (float) anchorPoint.getX(), (float) anchorPoint.getY(), ! position.getTextAnchor(), position.getAngle(), ! position.getRotationAnchor()); } } *************** *** 971,987 **** return false; } ! if (!ObjectUtilities.equal( ! this.positiveItemLabelPositionFallback, ! that.positiveItemLabelPositionFallback ! )) { return false; } ! if (!ObjectUtilities.equal( ! this.negativeItemLabelPositionFallback, ! that.negativeItemLabelPositionFallback ! )) { return false; } - return true; --- 958,969 ---- return false; } ! if (!ObjectUtilities.equal(this.positiveItemLabelPositionFallback, ! that.positiveItemLabelPositionFallback)) { return false; } ! if (!ObjectUtilities.equal(this.negativeItemLabelPositionFallback, ! that.negativeItemLabelPositionFallback)) { return false; } return true; Index: AbstractCategoryItemRenderer.java =================================================================== RCS file: /cvsroot/jfreechart/jfreechart/source/org/jfree/chart/renderer/category/AbstractCategoryItemRenderer.java,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** AbstractCategoryItemRenderer.java 1 Jul 2005 14:57:38 -0000 1.19 --- AbstractCategoryItemRenderer.java 12 Dec 2005 14:11:32 -0000 1.20 *************** *** 17,23 **** * License for more details. * ! * You should have received a copy of the GNU Lesser General Public License ! * along with this library; if not, write to the Free Software Foundation, ! * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. * * [Java is a trademark or registered trademark of Sun Microsystems, Inc. --- 17,24 ---- * License for more details. * ! * You should have received a copy of the GNU Lesser General Public ! * License along with this library; if not, write to the Free Software ! * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, ! * USA. * * [Java is a trademark or registered trademark of Sun Microsystems, Inc. *************** *** 1036,1040 **** // TODO: generate attributed label ! return new LegendItem(label, null, description, toolTipText, urlText, shape, paint, outlineStroke, outlinePaint); --- 1037,1041 ---- // TODO: generate attributed label ! return new LegendItem(label, description, toolTipText, urlText, shape, paint, outlineStroke, outlinePaint); Index: BoxAndWhiskerRenderer.java =================================================================== RCS file: /cvsroot/jfreechart/jfreechart/source/org/jfree/chart/renderer/category/BoxAndWhiskerRenderer.java,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** BoxAndWhiskerRenderer.java 1 Jul 2005 14:57:39 -0000 1.10 --- BoxAndWhiskerRenderer.java 12 Dec 2005 14:11:32 -0000 1.11 *************** *** 17,23 **** * License for more details. * ! * You should have received a copy of the GNU Lesser General Public License ! * along with this library; if not, write to the Free Software Foundation, ! * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. * * [Java is a trademark or registered trademark of Sun Microsystems, Inc. --- 17,24 ---- * License for more details. * ! * You should have received a copy of the GNU Lesser General Public ! * License along with this library; if not, write to the Free Software ! * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, ! * USA. * * [Java is a trademark or registered trademark of Sun Microsystems, Inc. *************** *** 223,227 **** Stroke outlineStroke = getSeriesOutlineStroke(series); ! return new LegendItem(label, null, description, toolTipText, urlText, shape, paint, outlineStroke, outlinePaint); --- 224,228 ---- Stroke outlineStroke = getSeriesOutlineStroke(series); ! return new LegendItem(label, description, toolTipText, urlText, shape, paint, outlineStroke, outlinePaint); Index: LineAndShapeRenderer.java =================================================================== RCS file: /cvsroot/jfreechart/jfreechart/source/org/jfree/chart/renderer/category/LineAndShapeRenderer.java,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** LineAndShapeRenderer.java 30 Sep 2005 16:00:45 -0000 1.21 --- LineAndShapeRenderer.java 12 Dec 2005 14:11:32 -0000 1.22 *************** *** 17,23 **** * License for more details. * ! * You should have received a copy of the GNU Lesser General Public License ! * along with this library; if not, write to the Free Software Foundation, ! * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. * * [Java is a trademark or registered trademark of Sun Microsystems, Inc. --- 17,24 ---- * License for more details. * ! * You should have received a copy of the GNU Lesser General Public ! * License along with this library; if not, write to the Free Software ! * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, ! * USA. * * [Java is a trademark or registered trademark of Sun Microsystems, Inc. *************** *** 650,654 **** boolean shapeVisible = getItemShapeVisible(series, 0); // TODO: generalise the hardcoded line in the following... ! return new LegendItem(label, null, description, toolTipText, urlText, shapeVisible, shape, getItemShapeFilled(series, 0), fillPaint, shapeOutlineVisible, outlinePaint, outlineStroke, --- 651,655 ---- boolean shapeVisible = getItemShapeVisible(series, 0); // TODO: generalise the hardcoded line in the following... ! return new LegendItem(label, description, toolTipText, urlText, shapeVisible, shape, getItemShapeFilled(series, 0), fillPaint, shapeOutlineVisible, outlinePaint, outlineStroke, Index: AreaRenderer.java =================================================================== RCS file: /cvsroot/jfreechart/jfreechart/source/org/jfree/chart/renderer/category/AreaRenderer.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** AreaRenderer.java 1 Jul 2005 14:57:39 -0000 1.8 --- AreaRenderer.java 12 Dec 2005 14:11:32 -0000 1.9 *************** *** 17,23 **** * License for more details. * ! * You should have received a copy of the GNU Lesser General Public License ! * along with this library; if not, write to the Free Software Foundation, ! * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. * * [Java is a trademark or registered trademark of Sun Microsystems, Inc. --- 17,24 ---- * License for more details. * ! * You should have received a copy of the GNU Lesser General Public ! * License along with this library; if not, write to the Free Software ! * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, ! * USA. * * [Java is a trademark or registered trademark of Sun Microsystems, Inc. *************** *** 168,172 **** Stroke outlineStroke = getSeriesOutlineStroke(series); ! return new LegendItem(label, null, description, toolTipText, urlText, shape, paint, outlineStroke, outlinePaint); --- 169,173 ---- Stroke outlineStroke = getSeriesOutlineStroke(series); ! return new LegendItem(label, description, toolTipText, urlText, shape, paint, outlineStroke, outlinePaint); |