From: David G. <mu...@us...> - 2005-09-30 14:32:01
|
Update of /cvsroot/jfreechart/jfreechart/source/org/jfree/chart/renderer/xy In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29875/source/org/jfree/chart/renderer/xy Modified Files: StandardXYItemRenderer.java XYLineAndShapeRenderer.java Log Message: 30-Sep-2005 David Gilbert <dav...@ob...> * source/org/jfree/chart/renderer/xy/StandardXYItemRenderer.java (plotShapes): renamed baseShapesVisible, (defaultShapesFilled): renamed baseShapesFilled, (StandardXYItemRenderer(int, XYToolTipGenerator, XYURLGenerator)): update for renamed fields, (getDefaultShapesVisible): renamed getBaseShapesVisible(), (setDefaultShapesVisible): renamed setBaseShapesVisible(), (getPlotShapes): removed, (setPlotShapes): removed, (getSeriesShapesFilled): updated for renamed field, (getDefaultShapesFilled): renamed getBaseShapesFilled(), (setDefaultShapesFilled): renamed getDefaultShapesFilled(), (getLegendItem): updated for renamed fields, (drawItem): likewise, (equals): likewise, * source/org/jfree/chart/renderer/xy/XYLineAndShapeRenderer.java (defaultLinesVisible): renamed baseLinesVisible, (defaultShapesVisible): renamed baseShapesVisible, (defaultShapesFilled): renamed baseShapesFilled, (XYLineAndShapeRenderer(boolean, boolean)): updated for renamed fields, (getItemLineVisible): updated for renamed fields, (getDefaultLinesVisible): renamed getBaseLinesVisible(), (setDefaultLinesVisible): renamed setBaseLinesVisible(), (getItemShapeVisible): updated for renamed field, (getDefaultShapesVisible): renamed getBaseShapesVisible(), (setDefaultShapesVisible): renamed setBaseShapesVisible(), (getItemShapeFilled): updated for renamed field, (getDefaultShapesFilled): renamed getBaseShapesFilled(), (setDefaultShapesFilled): renamed setBaseShapesFilled(), (drawSecondaryPass): added label drawing code, (equals): updated for renamed fields, * source/org/jfree/chart/renderer/xy/junit/StandardXYItemRendererTests.java updated for renamed methods in StandardXYItemRenderer, * source/org/jfree/chart/renderer/xy/junit/XYLineAndShapeRendererTests.java likewise. Index: XYLineAndShapeRenderer.java =================================================================== RCS file: /cvsroot/jfreechart/jfreechart/source/org/jfree/chart/renderer/xy/XYLineAndShapeRenderer.java,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** XYLineAndShapeRenderer.java 1 Jul 2005 14:56:52 -0000 1.21 --- XYLineAndShapeRenderer.java 30 Sep 2005 14:31:49 -0000 1.22 *************** *** 50,53 **** --- 50,54 ---- * 09-Mar-2005 : Added fillPaint settings (DG); * 20-Apr-2005 : Use generators for legend tooltips and URLs (DG); + * 29-Jul-2005 : Added code to draw item labels (DG); * */ *************** *** 108,112 **** /** The default value returned by the getLinesVisible() method. */ ! private boolean defaultLinesVisible; /** The shape that is used to represent a line in the legend. */ --- 109,113 ---- /** The default value returned by the getLinesVisible() method. */ ! private boolean baseLinesVisible; /** The shape that is used to represent a line in the legend. */ *************** *** 125,129 **** /** The default value returned by the getShapeVisible() method. */ ! private boolean defaultShapesVisible; /** A flag that controls whether or not shapes are filled for ALL series. */ --- 126,130 ---- /** The default value returned by the getShapeVisible() method. */ ! private boolean baseShapesVisible; /** A flag that controls whether or not shapes are filled for ALL series. */ *************** *** 137,141 **** /** The default value returned by the getShapeFilled() method. */ ! private boolean defaultShapesFilled; /** A flag that controls whether outlines are drawn for shapes. */ --- 138,142 ---- /** The default value returned by the getShapeFilled() method. */ ! private boolean baseShapesFilled; /** A flag that controls whether outlines are drawn for shapes. */ *************** *** 176,190 **** this.linesVisible = null; this.seriesLinesVisible = new BooleanList(); ! this.defaultLinesVisible = lines; this.legendLine = new Line2D.Double(-7.0, 0.0, 7.0, 0.0); this.shapesVisible = null; this.seriesShapesVisible = new BooleanList(); ! this.defaultShapesVisible = shapes; this.shapesFilled = null; this.useFillPaint = false; // use item paint for fills by default this.seriesShapesFilled = new BooleanList(); ! this.defaultShapesFilled = true; this.drawOutlines = true; --- 177,191 ---- this.linesVisible = null; this.seriesLinesVisible = new BooleanList(); ! this.baseLinesVisible = lines; this.legendLine = new Line2D.Double(-7.0, 0.0, 7.0, 0.0); this.shapesVisible = null; this.seriesShapesVisible = new BooleanList(); ! this.baseShapesVisible = shapes; this.shapesFilled = null; this.useFillPaint = false; // use item paint for fills by default this.seriesShapesFilled = new BooleanList(); ! this.baseShapesFilled = true; this.drawOutlines = true; *************** *** 246,250 **** } else { ! return this.defaultLinesVisible; } } --- 247,251 ---- } else { ! return this.baseLinesVisible; } } *************** *** 319,328 **** /** ! * Returns the default 'lines visible' attribute. * ! * @return The default flag. */ ! public boolean getDefaultLinesVisible() { ! return this.defaultLinesVisible; } --- 320,339 ---- /** ! * Returns the base 'lines visible' attribute. * ! * @return The base flag. */ ! public boolean getBaseLinesVisible() { ! return this.baseLinesVisible; ! } ! ! /** ! * Sets the base 'lines visible' flag. ! * ! * @param flag the flag. ! */ ! public void setBaseLinesVisible(boolean flag) { ! this.baseLinesVisible = flag; ! notifyListeners(new RendererChangeEvent(this)); } *************** *** 350,363 **** } - /** - * Sets the default 'lines visible' flag. - * - * @param flag the flag. - */ - public void setDefaultLinesVisible(boolean flag) { - this.defaultLinesVisible = flag; - notifyListeners(new RendererChangeEvent(this)); - } - // SHAPES VISIBLE --- 361,364 ---- *************** *** 384,388 **** } else { ! return this.defaultShapesVisible; } } --- 385,389 ---- } else { ! return this.baseShapesVisible; } } *************** *** 455,473 **** /** ! * Returns the default 'shape visible' attribute. * ! * @return The default flag. */ ! public boolean getDefaultShapesVisible() { ! return this.defaultShapesVisible; } /** ! * Sets the default 'shapes visible' flag. * * @param flag the flag. */ ! public void setDefaultShapesVisible(boolean flag) { ! this.defaultShapesVisible = flag; notifyListeners(new RendererChangeEvent(this)); } --- 456,474 ---- /** ! * Returns the base 'shape visible' attribute. * ! * @return The base flag. */ ! public boolean getBaseShapesVisible() { ! return this.baseShapesVisible; } /** ! * Sets the base 'shapes visible' flag. * * @param flag the flag. */ ! public void setBaseShapesVisible(boolean flag) { ! this.baseShapesVisible = flag; notifyListeners(new RendererChangeEvent(this)); } *************** *** 497,501 **** } else { ! return this.defaultShapesFilled; } } --- 498,502 ---- } else { ! return this.baseShapesFilled; } } *************** *** 556,574 **** /** ! * Returns the default 'shape filled' attribute. * ! * @return The default flag. */ ! public boolean getDefaultShapesFilled() { ! return this.defaultShapesFilled; } /** ! * Sets the default 'shapes filled' flag. * * @param flag the flag. */ ! public void setDefaultShapesFilled(boolean flag) { ! this.defaultShapesFilled = flag; notifyListeners(new RendererChangeEvent(this)); } --- 557,575 ---- /** ! * Returns the base 'shape filled' attribute. * ! * @return The base flag. */ ! public boolean getBaseShapesFilled() { ! return this.baseShapesFilled; } /** ! * Sets the base 'shapes filled' flag. * * @param flag the flag. */ ! public void setBaseShapesFilled(boolean flag) { ! this.baseShapesFilled = flag; notifyListeners(new RendererChangeEvent(this)); } *************** *** 1013,1016 **** --- 1014,1018 ---- } + PlotOrientation orientation = plot.getOrientation(); RectangleEdge xAxisLocation = plot.getDomainAxisEdge(); RectangleEdge yAxisLocation = plot.getRangeAxisEdge(); *************** *** 1020,1024 **** if (getItemShapeVisible(series, item)) { Shape shape = getItemShape(series, item); - PlotOrientation orientation = plot.getOrientation(); if (orientation == PlotOrientation.HORIZONTAL) { shape = ShapeUtilities.createTranslatedShape( --- 1022,1025 ---- *************** *** 1055,1058 **** --- 1056,1071 ---- } + // draw the item label if there is one... + if (isItemLabelVisible(series, item)) { + double xx = transX1; + double yy = transY1; + if (orientation == PlotOrientation.HORIZONTAL) { + xx = transY1; + yy = transX1; + } + drawItemLabel(g2, orientation, dataset, series, item, xx, yy, + (y1 < 0.0)); + } + updateCrosshairValues( crosshairState, x1, y1, transX1, transY1, plot.getOrientation() *************** *** 1167,1171 **** return false; } ! if (this.defaultLinesVisible != that.defaultLinesVisible) { return false; } --- 1180,1184 ---- return false; } ! if (this.baseLinesVisible != that.baseLinesVisible) { return false; } *************** *** 1181,1185 **** return false; } ! if (this.defaultShapesVisible != that.defaultShapesVisible) { return false; } --- 1194,1198 ---- return false; } ! if (this.baseShapesVisible != that.baseShapesVisible) { return false; } *************** *** 1192,1196 **** return false; } ! if (this.defaultShapesFilled != that.defaultShapesFilled) { return false; } --- 1205,1209 ---- return false; } ! if (this.baseShapesFilled != that.baseShapesFilled) { return false; } Index: StandardXYItemRenderer.java =================================================================== RCS file: /cvsroot/jfreechart/jfreechart/source/org/jfree/chart/renderer/xy/StandardXYItemRenderer.java,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** StandardXYItemRenderer.java 1 Jul 2005 14:56:52 -0000 1.19 --- StandardXYItemRenderer.java 30 Sep 2005 14:31:49 -0000 1.20 *************** *** 167,171 **** /** A flag indicating whether or not shapes are drawn at each XY point. */ ! private boolean plotShapes; /** A flag indicating whether or not lines are drawn between XY points. */ --- 167,171 ---- /** A flag indicating whether or not shapes are drawn at each XY point. */ ! private boolean baseShapesVisible; /** A flag indicating whether or not lines are drawn between XY points. */ *************** *** 194,198 **** /** The default value returned by the getShapeFilled() method. */ ! private Boolean defaultShapesFilled; /** --- 194,198 ---- /** The default value returned by the getShapeFilled() method. */ ! private boolean baseShapesFilled; /** *************** *** 261,265 **** setURLGenerator(urlGenerator); if ((type & SHAPES) != 0) { ! this.plotShapes = true; } if ((type & LINES) != 0) { --- 261,265 ---- setURLGenerator(urlGenerator); if ((type & SHAPES) != 0) { ! this.baseShapesVisible = true; } if ((type & LINES) != 0) { *************** *** 275,279 **** this.shapesFilled = null; this.seriesShapesFilled = new BooleanList(); ! this.defaultShapesFilled = Boolean.TRUE; this.legendLine = new Line2D.Double(-7.0, 0.0, 7.0, 0.0); this.drawSeriesLineAsPath = false; --- 275,279 ---- this.shapesFilled = null; this.seriesShapesFilled = new BooleanList(); ! this.baseShapesFilled = true; this.legendLine = new Line2D.Double(-7.0, 0.0, 7.0, 0.0); this.drawSeriesLineAsPath = false; *************** *** 285,312 **** * @return <code>true</code> if shapes are being plotted by the renderer. */ ! public boolean getDefaultShapesVisible() { ! return this.plotShapes; ! } ! ! /** ! * Sets the flag that controls whether or not a shape is plotted at each ! * data point. ! * ! * @param flag the flag. ! */ ! public void setDefaultShapesVisible(boolean flag) { ! if (this.plotShapes != flag) { ! this.plotShapes = flag; ! notifyListeners(new RendererChangeEvent(this)); ! } ! } ! ! /** ! * Returns true if shapes are being plotted by the renderer. ! * ! * @return <code>true</code> if shapes are being plotted by the renderer. ! */ ! public boolean getPlotShapes() { ! return this.plotShapes; } --- 285,290 ---- * @return <code>true</code> if shapes are being plotted by the renderer. */ ! public boolean getBaseShapesVisible() { ! return this.baseShapesVisible; } *************** *** 317,323 **** * @param flag the flag. */ ! public void setPlotShapes(boolean flag) { ! if (this.plotShapes != flag) { ! this.plotShapes = flag; notifyListeners(new RendererChangeEvent(this)); } --- 295,301 ---- * @param flag the flag. */ ! public void setBaseShapesVisible(boolean flag) { ! if (this.baseShapesVisible != flag) { ! this.baseShapesVisible = flag; notifyListeners(new RendererChangeEvent(this)); } *************** *** 364,368 **** } else { ! return this.defaultShapesFilled.booleanValue(); } --- 342,346 ---- } else { ! return this.baseShapesFilled; } *************** *** 399,417 **** /** ! * Returns the default 'shape filled' attribute. * ! * @return The default flag. */ ! public Boolean getDefaultShapesFilled() { ! return this.defaultShapesFilled; } /** ! * Sets the default 'shapes filled' flag. * * @param flag the flag. */ ! public void setDefaultShapesFilled(Boolean flag) { ! this.defaultShapesFilled = flag; } --- 377,395 ---- /** ! * Returns the base 'shape filled' attribute. * ! * @return The base flag. */ ! public boolean getBaseShapesFilled() { ! return this.baseShapesFilled; } /** ! * Sets the base 'shapes filled' flag. * * @param flag the flag. */ ! public void setBaseShapesFilled(boolean flag) { ! this.baseShapesFilled = flag; } *************** *** 596,600 **** result = new LegendItem( label, attributedLabel, description, toolTipText, urlText, ! this.plotShapes, shape, shapeFilled, paint, !shapeFilled, paint, lineStroke, this.plotLines, this.legendLine, lineStroke, linePaint --- 574,578 ---- result = new LegendItem( label, attributedLabel, description, toolTipText, urlText, ! this.baseShapesVisible, shape, shapeFilled, paint, !shapeFilled, paint, lineStroke, this.plotLines, this.legendLine, lineStroke, linePaint *************** *** 830,834 **** } ! if (getPlotShapes()) { Shape shape = getItemShape(series, item); --- 808,812 ---- } ! if (getBaseShapesVisible()) { Shape shape = getItemShape(series, item); *************** *** 918,922 **** } StandardXYItemRenderer that = (StandardXYItemRenderer) obj; ! if (this.plotShapes != that.plotShapes) { return false; } --- 896,900 ---- } StandardXYItemRenderer that = (StandardXYItemRenderer) obj; ! if (this.baseShapesVisible != that.baseShapesVisible) { return false; } |