Menu
▾
▴
[Jfreechart-commit] jfreechart/source/org/jfree/chart/plot ColorPalette.java, 1.1.2.1, 1.1.2.2 CompassPlot.java, 1.11.2.4, 1.11.2.5 ContourPlot.java, 1.16.2.3, 1.16.2.4 ContourPlotUtilities.java, 1.2.2.1, 1.2.2.2 ContourValuePlot.java, 1.3.2.1, 1.3.2.2 GreyPalette.java, 1.1.2.1, 1.1.2.2 JThermometer.java, 1.8.2.2, 1.8.2.3 PolarPlot.java, 1.13.2.5, 1.13.2.6 RainbowPalette.java, 1.1.2.1, 1.1.2.2 ThermometerPlot.java, 1.13.2.4, 1.13.2.5
|
From: David G. <mu...@us...> - 2007-01-17 11:59:47
|
Update of /cvsroot/jfreechart/jfreechart/source/org/jfree/chart/plot In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv15739/source/org/jfree/chart/plot Modified Files: Tag: STABLE_1-0-0 ColorPalette.java CompassPlot.java ContourPlot.java ContourPlotUtilities.java ContourValuePlot.java GreyPalette.java JThermometer.java PolarPlot.java RainbowPalette.java ThermometerPlot.java Log Message: 2007-01-17 David Gilbert <dav...@ob...> * source/org/jfree/chart/plot/ColorPalette.java: Removed @author tag and reformatted source code, * source/org/jfree/chart/plot/CompassPlot.java: Likewise, * source/org/jfree/chart/plot/ContourPlot.java: Likewise, * source/org/jfree/chart/plot/ContourPlotUtilities.java: Likewise, * source/org/jfree/chart/plot/ContourValuePlot.java: Likewise, * source/org/jfree/chart/plot/GreyPalette.java: Likewise, * source/org/jfree/chart/plot/JThermometer.java: Likewise, * source/org/jfree/chart/plot/PolarPlot.java: Likewise, * source/org/jfree/chart/plot/RainbowPalette.java: Likewise, * source/org/jfree/chart/plot/ThermometerPlot.java: Likewise. Index: ThermometerPlot.java =================================================================== RCS file: /cvsroot/jfreechart/jfreechart/source/org/jfree/chart/plot/ThermometerPlot.java,v retrieving revision 1.13.2.4 retrieving revision 1.13.2.5 diff -C2 -d -r1.13.2.4 -r1.13.2.5 *** ThermometerPlot.java 14 Nov 2006 17:32:50 -0000 1.13.2.4 --- ThermometerPlot.java 17 Jan 2007 11:59:42 -0000 1.13.2.5 *************** *** 3,7 **** * =========================================================== * ! * (C) Copyright 2000-2006, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html --- 3,7 ---- * =========================================================== * ! * (C) Copyright 2000-2007, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html *************** *** 29,33 **** * -------------------- * ! * (C) Copyright 2000-2006, by Bryan Scott and Contributors. * * Original Author: Bryan Scott (based on MeterPlot by Hari). --- 29,33 ---- * -------------------- * ! * (C) Copyright 2000-2007, by Bryan Scott and Contributors. * * Original Author: Bryan Scott (based on MeterPlot by Hari). *************** *** 134,139 **** * <li>settable display location for the value text.</li> * </ol> - * - * @author Bryan Scott */ public class ThermometerPlot extends Plot implements ValueAxisPlot, --- 134,137 ---- *************** *** 326,332 **** super(); ! this.padding = new RectangleInsets( ! UnitType.RELATIVE, 0.05, 0.05, 0.05, 0.05 ! ); this.dataset = dataset; if (dataset != null) { --- 324,329 ---- super(); ! this.padding = new RectangleInsets(UnitType.RELATIVE, 0.05, 0.05, 0.05, ! 0.05); this.dataset = dataset; if (dataset != null) { *************** *** 906,922 **** int stemTop = (int) (interior.getMinY() + BULB_RADIUS); int stemBottom = (int) (interior.getMaxY() - BULB_DIAMETER); ! Rectangle2D dataArea = new Rectangle2D.Double( ! midX - COLUMN_RADIUS, stemTop, COLUMN_RADIUS, stemBottom - stemTop ! ); ! outerBulb.setFrame( ! midX - BULB_RADIUS, stemBottom, BULB_DIAMETER, BULB_DIAMETER ! ); ! outerStem.setRoundRect( ! midX - COLUMN_RADIUS, interior.getMinY(), COLUMN_DIAMETER, ! stemBottom + BULB_DIAMETER - stemTop, ! COLUMN_DIAMETER, COLUMN_DIAMETER ! ); Area outerThermometer = new Area(outerBulb); --- 903,915 ---- int stemTop = (int) (interior.getMinY() + BULB_RADIUS); int stemBottom = (int) (interior.getMaxY() - BULB_DIAMETER); ! Rectangle2D dataArea = new Rectangle2D.Double(midX - COLUMN_RADIUS, ! stemTop, COLUMN_RADIUS, stemBottom - stemTop); ! outerBulb.setFrame(midX - BULB_RADIUS, stemBottom, BULB_DIAMETER, ! BULB_DIAMETER); ! outerStem.setRoundRect(midX - COLUMN_RADIUS, interior.getMinY(), ! COLUMN_DIAMETER, stemBottom + BULB_DIAMETER - stemTop, ! COLUMN_DIAMETER, COLUMN_DIAMETER); Area outerThermometer = new Area(outerBulb); *************** *** 924,938 **** outerThermometer.add(tempArea); ! innerBulb.setFrame( ! midX - BULB_RADIUS + GAP_RADIUS, stemBottom + GAP_RADIUS, ! BULB_DIAMETER - GAP_DIAMETER, BULB_DIAMETER - GAP_DIAMETER ! ); ! innerStem.setRoundRect( ! midX - COLUMN_RADIUS + GAP_RADIUS, interior.getMinY() + GAP_RADIUS, ! COLUMN_DIAMETER - GAP_DIAMETER, ! stemBottom + BULB_DIAMETER - GAP_DIAMETER - stemTop, ! COLUMN_DIAMETER - GAP_DIAMETER, COLUMN_DIAMETER - GAP_DIAMETER ! ); Area innerThermometer = new Area(innerBulb); --- 917,928 ---- outerThermometer.add(tempArea); ! innerBulb.setFrame(midX - BULB_RADIUS + GAP_RADIUS, ! stemBottom + GAP_RADIUS, BULB_DIAMETER - GAP_DIAMETER, ! BULB_DIAMETER - GAP_DIAMETER); ! innerStem.setRoundRect(midX - COLUMN_RADIUS + GAP_RADIUS, ! interior.getMinY() + GAP_RADIUS, COLUMN_DIAMETER - GAP_DIAMETER, ! stemBottom + BULB_DIAMETER - GAP_DIAMETER - stemTop, ! COLUMN_DIAMETER - GAP_DIAMETER, COLUMN_DIAMETER - GAP_DIAMETER); Area innerThermometer = new Area(innerBulb); *************** *** 942,948 **** if ((this.dataset != null) && (this.dataset.getValue() != null)) { double current = this.dataset.getValue().doubleValue(); ! double ds = this.rangeAxis.valueToJava2D( ! current, dataArea, RectangleEdge.LEFT ! ); int i = COLUMN_DIAMETER - GAP_DIAMETER; // already calculated --- 932,937 ---- if ((this.dataset != null) && (this.dataset.getValue() != null)) { double current = this.dataset.getValue().doubleValue(); ! double ds = this.rangeAxis.valueToJava2D(current, dataArea, ! RectangleEdge.LEFT); int i = COLUMN_DIAMETER - GAP_DIAMETER; // already calculated *************** *** 958,964 **** if (k < (stemBottom + BULB_RADIUS)) { ! mercuryStem.setRoundRect( ! midX - j, k, i, (stemBottom + BULB_RADIUS) - k, l, l ! ); tempArea = new Area(mercuryStem); mercury.add(tempArea); --- 947,952 ---- if (k < (stemBottom + BULB_RADIUS)) { ! mercuryStem.setRoundRect(midX - j, k, i, ! (stemBottom + BULB_RADIUS) - k, l, l); tempArea = new Area(mercuryStem); mercury.add(tempArea); *************** *** 977,983 **** if (range.contains(value)) { double x = midX + COLUMN_RADIUS + 2; ! double y = this.rangeAxis.valueToJava2D( ! value, dataArea, RectangleEdge.LEFT ! ); Line2D line = new Line2D.Double(x, y, x + 10, y); g2.setPaint(this.subrangePaint[NORMAL]); --- 965,970 ---- if (range.contains(value)) { double x = midX + COLUMN_RADIUS + 2; ! double y = this.rangeAxis.valueToJava2D(value, dataArea, ! RectangleEdge.LEFT); Line2D line = new Line2D.Double(x, y, x + 10, y); g2.setPaint(this.subrangePaint[NORMAL]); *************** *** 989,995 **** if (range.contains(value)) { double x = midX + COLUMN_RADIUS + 2; ! double y = this.rangeAxis.valueToJava2D( ! value, dataArea, RectangleEdge.LEFT ! ); Line2D line = new Line2D.Double(x, y, x + 10, y); g2.setPaint(this.subrangePaint[WARNING]); --- 976,981 ---- if (range.contains(value)) { double x = midX + COLUMN_RADIUS + 2; ! double y = this.rangeAxis.valueToJava2D(value, dataArea, ! RectangleEdge.LEFT); Line2D line = new Line2D.Double(x, y, x + 10, y); g2.setPaint(this.subrangePaint[WARNING]); *************** *** 1001,1007 **** if (range.contains(value)) { double x = midX + COLUMN_RADIUS + 2; ! double y = this.rangeAxis.valueToJava2D( ! value, dataArea, RectangleEdge.LEFT ! ); Line2D line = new Line2D.Double(x, y, x + 10, y); g2.setPaint(this.subrangePaint[CRITICAL]); --- 987,992 ---- if (range.contains(value)) { double x = midX + COLUMN_RADIUS + 2; ! double y = this.rangeAxis.valueToJava2D(value, dataArea, ! RectangleEdge.LEFT); Line2D line = new Line2D.Double(x, y, x + 10, y); g2.setPaint(this.subrangePaint[CRITICAL]); *************** *** 1022,1035 **** case RIGHT: cursor = midX + COLUMN_RADIUS; ! drawArea = new Rectangle2D.Double( ! cursor, ! stemTop, ! drawWidth, ! (stemBottom - stemTop + 1) ! ); ! this.rangeAxis.draw( ! g2, cursor, area, drawArea, ! RectangleEdge.RIGHT, null ! ); break; --- 1007,1014 ---- case RIGHT: cursor = midX + COLUMN_RADIUS; ! drawArea = new Rectangle2D.Double(cursor, ! stemTop, drawWidth, (stemBottom - stemTop + 1)); ! this.rangeAxis.draw(g2, cursor, area, drawArea, ! RectangleEdge.RIGHT, null); break; *************** *** 1038,1051 **** //cursor = midX - COLUMN_RADIUS - AXIS_GAP; cursor = midX - COLUMN_RADIUS; ! drawArea = new Rectangle2D.Double( ! cursor, ! stemTop, ! drawWidth, ! (stemBottom - stemTop + 1) ! ); ! this.rangeAxis.draw( ! g2, cursor, area, drawArea, ! RectangleEdge.LEFT, null ! ); break; } --- 1017,1024 ---- //cursor = midX - COLUMN_RADIUS - AXIS_GAP; cursor = midX - COLUMN_RADIUS; ! drawArea = new Rectangle2D.Double(cursor, stemTop, ! drawWidth, (stemBottom - stemTop + 1)); ! this.rangeAxis.draw(g2, cursor, area, drawArea, ! RectangleEdge.LEFT, null); break; } *************** *** 1059,1082 **** switch (this.valueLocation) { case RIGHT: ! g2.drawString( ! this.valueFormat.format(current), ! midX + COLUMN_RADIUS + GAP_RADIUS, midY ! ); break; case LEFT: String valueString = this.valueFormat.format(current); int stringWidth = metrics.stringWidth(valueString); ! g2.drawString( ! valueString, ! midX - COLUMN_RADIUS - GAP_RADIUS - stringWidth, midY ! ); break; case BULB: temp = this.valueFormat.format(current); i = metrics.stringWidth(temp) / 2; ! g2.drawString( ! temp, midX - i, ! stemBottom + BULB_RADIUS + GAP_RADIUS ! ); break; default: --- 1032,1049 ---- switch (this.valueLocation) { case RIGHT: ! g2.drawString(this.valueFormat.format(current), ! midX + COLUMN_RADIUS + GAP_RADIUS, midY); break; case LEFT: String valueString = this.valueFormat.format(current); int stringWidth = metrics.stringWidth(valueString); ! g2.drawString(valueString, midX - COLUMN_RADIUS ! - GAP_RADIUS - stringWidth, midY); break; case BULB: temp = this.valueFormat.format(current); i = metrics.stringWidth(temp) / 2; ! g2.drawString(temp, midX - i, ! stemBottom + BULB_RADIUS + GAP_RADIUS); break; default: *************** *** 1093,1099 **** - metrics.stringWidth(UNITS[this.units]); if (tickX1 > area.getMinX()) { ! g2.drawString( ! UNITS[this.units], tickX1, (int) (area.getMinY() + 20) ! ); } --- 1060,1065 ---- - metrics.stringWidth(UNITS[this.units]); if (tickX1 > area.getMinX()) { ! g2.drawString(UNITS[this.units], tickX1, ! (int) (area.getMinY() + 20)); } *************** *** 1191,1197 **** if ((this.subrange >= 0) && (this.followDataInSubranges)) { this.rangeAxis.setRange( ! new Range(this.subrangeInfo[this.subrange][DISPLAY_LOW], ! this.subrangeInfo[this.subrange][DISPLAY_HIGH]) ! ); } else { --- 1157,1162 ---- if ((this.subrange >= 0) && (this.followDataInSubranges)) { this.rangeAxis.setRange( ! new Range(this.subrangeInfo[this.subrange][DISPLAY_LOW], ! this.subrangeInfo[this.subrange][DISPLAY_HIGH])); } else { *************** *** 1300,1311 **** return false; } ! if (!ObjectUtilities.equal( ! this.thermometerStroke, that.thermometerStroke ! )) { return false; } ! if (!PaintUtilities.equal( ! this.thermometerPaint, that.thermometerPaint ! )) { return false; } --- 1265,1274 ---- return false; } ! if (!ObjectUtilities.equal(this.thermometerStroke, ! that.thermometerStroke)) { return false; } ! if (!PaintUtilities.equal(this.thermometerPaint, ! that.thermometerPaint)) { return false; } Index: PolarPlot.java =================================================================== RCS file: /cvsroot/jfreechart/jfreechart/source/org/jfree/chart/plot/PolarPlot.java,v retrieving revision 1.13.2.5 retrieving revision 1.13.2.6 diff -C2 -d -r1.13.2.5 -r1.13.2.6 *** PolarPlot.java 7 Sep 2006 16:05:51 -0000 1.13.2.5 --- PolarPlot.java 17 Jan 2007 11:59:42 -0000 1.13.2.6 *************** *** 3,7 **** * =========================================================== * ! * (C) Copyright 2000-2006, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html --- 3,7 ---- * =========================================================== * ! * (C) Copyright 2000-2007, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html *************** *** 28,32 **** * PolarPlot.java * -------------- ! * (C) Copyright 2004-2006, by Solution Engineering, Inc. and Contributors. * * Original Author: Daniel Bridenbecker, Solution Engineering, Inc.; --- 28,32 ---- * PolarPlot.java * -------------- ! * (C) Copyright 2004-2007, by Solution Engineering, Inc. and Contributors. * * Original Author: Daniel Bridenbecker, Solution Engineering, Inc.; *************** *** 94,99 **** * Plots data that is in (theta, radius) pairs where * theta equal to zero is due north and and increases clockwise. - * - * @author Daniel Bridenbecker, Solution Engineering, Inc. */ public class PolarPlot extends Plot implements ValueAxisPlot, --- 94,97 ---- *************** *** 124,130 **** = ResourceBundle.getBundle("org.jfree.chart.plot.LocalizationBundle"); - // ------------------------ - // --- Member Variables --- - // ------------------------ /** The angles that are marked with gridlines. */ private List angleTicks; --- 122,125 ---- *************** *** 172,178 **** private List cornerTextItems = new ArrayList(); - // -------------------- - // --- Constructors --- - // -------------------- /** * Default constructor. --- 167,170 ---- Index: JThermometer.java =================================================================== RCS file: /cvsroot/jfreechart/jfreechart/source/org/jfree/chart/plot/JThermometer.java,v retrieving revision 1.8.2.2 retrieving revision 1.8.2.3 diff -C2 -d -r1.8.2.2 -r1.8.2.3 *** JThermometer.java 27 Nov 2006 14:10:49 -0000 1.8.2.2 --- JThermometer.java 17 Jan 2007 11:59:42 -0000 1.8.2.3 *************** *** 3,7 **** * =========================================================== * ! * (C) Copyright 2000-2006, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html --- 3,7 ---- * =========================================================== * ! * (C) Copyright 2000-2007, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html *************** *** 30,34 **** * A plot that displays a single value in a thermometer type display. * ! * (C) Copyright 2000-2006, Australian Antarctic Division and Contributors. * * Original Author: Bryan Scott. --- 30,34 ---- * A plot that displays a single value in a thermometer type display. * ! * (C) Copyright 2000-2007, Australian Antarctic Division and Contributors. * * Original Author: Bryan Scott. *************** *** 67,75 **** * An initial quick and dirty. The concept behind this class would be to * generate a gui bean that could be used within JBuilder, Netbeans etc... - * - * Copyright (c) 2002 - * Australian Antarctic Division - * - * @author Bryan Scott */ public class JThermometer extends JPanel implements Serializable { --- 67,70 ---- Index: ContourPlot.java =================================================================== RCS file: /cvsroot/jfreechart/jfreechart/source/org/jfree/chart/plot/ContourPlot.java,v retrieving revision 1.16.2.3 retrieving revision 1.16.2.4 diff -C2 -d -r1.16.2.3 -r1.16.2.4 *** ContourPlot.java 25 Oct 2005 20:52:08 -0000 1.16.2.3 --- ContourPlot.java 17 Jan 2007 11:59:42 -0000 1.16.2.4 *************** *** 3,7 **** * =========================================================== * ! * (C) Copyright 2000-2005, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html --- 3,7 ---- * =========================================================== * ! * (C) Copyright 2000-2007, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html *************** *** 28,32 **** * ContourPlot.java * ---------------- ! * (C) Copyright 2002-2005, by David M. O'Donnell and Contributors. * * Original Author: David M. O'Donnell; --- 28,32 ---- * ContourPlot.java * ---------------- ! * (C) Copyright 2002-2007, by David M. O'Donnell and Contributors. * * Original Author: David M. O'Donnell; *************** *** 111,116 **** /** * A class for creating shaded contours. - * - * @author David M. O'Donnell */ public class ContourPlot extends Plot implements ContourValuePlot, --- 111,114 ---- *************** *** 575,599 **** AxisSpace space = new AxisSpace(); ! space = this.domainAxis.reserveSpace( ! g2, this, area, RectangleEdge.BOTTOM, space ! ); ! space = this.rangeAxis.reserveSpace( ! g2, this, area, RectangleEdge.LEFT, space ! ); Rectangle2D estimatedDataArea = space.shrink(area, null); AxisSpace space2 = new AxisSpace(); ! space2 = this.colorBar.reserveSpace( ! g2, this, area, estimatedDataArea, this.colorBarLocation, ! space2 ! ); Rectangle2D adjustedPlotArea = space2.shrink(area, null); Rectangle2D dataArea = space.shrink(adjustedPlotArea, null); ! Rectangle2D colorBarArea = space2.reserved( ! area, this.colorBarLocation ! ); // additional dataArea modifications --- 573,591 ---- AxisSpace space = new AxisSpace(); ! space = this.domainAxis.reserveSpace(g2, this, area, ! RectangleEdge.BOTTOM, space); ! space = this.rangeAxis.reserveSpace(g2, this, area, ! RectangleEdge.LEFT, space); Rectangle2D estimatedDataArea = space.shrink(area, null); AxisSpace space2 = new AxisSpace(); ! space2 = this.colorBar.reserveSpace(g2, this, area, estimatedDataArea, ! this.colorBarLocation, space2); Rectangle2D adjustedPlotArea = space2.shrink(area, null); Rectangle2D dataArea = space.shrink(adjustedPlotArea, null); ! Rectangle2D colorBarArea = space2.reserved(area, this.colorBarLocation); // additional dataArea modifications *************** *** 628,635 **** } ! dataArea.setRect( ! tmpDataArea.getX() + tmpDataArea.getWidth() / 2 - w / 2, ! tmpDataArea.getY(), w, h ! ); } --- 620,625 ---- } ! dataArea.setRect(tmpDataArea.getX() + tmpDataArea.getWidth() / 2 ! - w / 2, tmpDataArea.getY(), w, h); } *************** *** 646,668 **** double cursor = dataArea.getMaxY(); if (this.domainAxis != null) { ! this.domainAxis.draw( ! g2, cursor, adjustedPlotArea, dataArea, RectangleEdge.BOTTOM, ! info ! ); } if (this.rangeAxis != null) { cursor = dataArea.getMinX(); ! this.rangeAxis.draw( ! g2, cursor, adjustedPlotArea, dataArea, RectangleEdge.LEFT, info ! ); } if (this.colorBar != null) { cursor = 0.0; ! cursor = this.colorBar.draw( ! g2, cursor, adjustedPlotArea, dataArea, colorBarArea, ! this.colorBarLocation ! ); } Shape originalClip = g2.getClip(); --- 636,653 ---- double cursor = dataArea.getMaxY(); if (this.domainAxis != null) { ! this.domainAxis.draw(g2, cursor, adjustedPlotArea, dataArea, ! RectangleEdge.BOTTOM, info); } if (this.rangeAxis != null) { cursor = dataArea.getMinX(); ! this.rangeAxis.draw(g2, cursor, adjustedPlotArea, dataArea, ! RectangleEdge.LEFT, info); } if (this.colorBar != null) { cursor = 0.0; ! cursor = this.colorBar.draw(g2, cursor, adjustedPlotArea, dataArea, ! colorBarArea, this.colorBarLocation); } Shape originalClip = g2.getClip(); *************** *** 670,676 **** g2.clip(dataArea); ! g2.setComposite(AlphaComposite.getInstance( ! AlphaComposite.SRC_OVER, getForegroundAlpha()) ! ); render(g2, dataArea, info, crosshairState); --- 655,660 ---- g2.clip(dataArea); ! g2.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, ! getForegroundAlpha())); render(g2, dataArea, info, crosshairState); *************** *** 737,743 **** if (this.clipPath != null) { ! GeneralPath clipper = getClipPath().draw( ! g2, dataArea, this.domainAxis, this.rangeAxis ! ); if (this.clipPath.isClip()) { g2.clip(clipper); --- 721,726 ---- if (this.clipPath != null) { ! GeneralPath clipper = getClipPath().draw(g2, dataArea, ! this.domainAxis, this.rangeAxis); if (this.clipPath.isClip()) { g2.clip(clipper); *************** *** 746,757 **** if (this.renderAsPoints) { ! pointRenderer(g2, dataArea, info, this, ! this.domainAxis, this.rangeAxis, zAxis, ! data, crosshairState); } else { ! contourRenderer(g2, dataArea, info, this, ! this.domainAxis, this.rangeAxis, zAxis, ! data, crosshairState); } --- 729,738 ---- if (this.renderAsPoints) { ! pointRenderer(g2, dataArea, info, this, this.domainAxis, ! this.rangeAxis, zAxis, data, crosshairState); } else { ! contourRenderer(g2, dataArea, info, this, this.domainAxis, ! this.rangeAxis, zAxis, data, crosshairState); } *************** *** 817,823 **** //turn off anti-aliasing when filling rectangles Object antiAlias = g2.getRenderingHint(RenderingHints.KEY_ANTIALIASING); ! g2.setRenderingHint( ! RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_OFF ! ); // get the data points --- 798,803 ---- //turn off anti-aliasing when filling rectangles Object antiAlias = g2.getRenderingHint(RenderingHints.KEY_ANTIALIASING); ! g2.setRenderingHint(RenderingHints.KEY_ANTIALIASING, ! RenderingHints.VALUE_ANTIALIAS_OFF); // get the data points *************** *** 858,878 **** if (indexX[i] == k) { // this is a new column if (i == 0) { ! transX = horizontalAxis.valueToJava2D( ! x[k], dataArea, RectangleEdge.BOTTOM ! ); transXm1 = transX; transXp1 = horizontalAxis.valueToJava2D( ! x[indexX[i + 1]], dataArea, RectangleEdge.BOTTOM ! ); transDXm1 = Math.abs(0.5 * (transX - transXm1)); transDXp1 = Math.abs(0.5 * (transX - transXp1)); } else if (i == iMax) { ! transX = horizontalAxis.valueToJava2D( ! x[k], dataArea, RectangleEdge.BOTTOM ! ); ! transXm1 = horizontalAxis.valueToJava2D( ! x[indexX[i - 1]], dataArea, RectangleEdge.BOTTOM ! ); transXp1 = transX; transDXm1 = Math.abs(0.5 * (transX - transXm1)); --- 838,854 ---- if (indexX[i] == k) { // this is a new column if (i == 0) { ! transX = horizontalAxis.valueToJava2D(x[k], dataArea, ! RectangleEdge.BOTTOM); transXm1 = transX; transXp1 = horizontalAxis.valueToJava2D( ! x[indexX[i + 1]], dataArea, RectangleEdge.BOTTOM); transDXm1 = Math.abs(0.5 * (transX - transXm1)); transDXp1 = Math.abs(0.5 * (transX - transXp1)); } else if (i == iMax) { ! transX = horizontalAxis.valueToJava2D(x[k], dataArea, ! RectangleEdge.BOTTOM); ! transXm1 = horizontalAxis.valueToJava2D(x[indexX[i - 1]], ! dataArea, RectangleEdge.BOTTOM); transXp1 = transX; transDXm1 = Math.abs(0.5 * (transX - transXm1)); *************** *** 880,889 **** } else { ! transX = horizontalAxis.valueToJava2D( ! x[k], dataArea, RectangleEdge.BOTTOM ! ); ! transXp1 = horizontalAxis.valueToJava2D( ! x[indexX[i + 1]], dataArea, RectangleEdge.BOTTOM ! ); transDXm1 = transDXp1; transDXp1 = Math.abs(0.5 * (transX - transXp1)); --- 856,863 ---- } else { ! transX = horizontalAxis.valueToJava2D(x[k], dataArea, ! RectangleEdge.BOTTOM); ! transXp1 = horizontalAxis.valueToJava2D(x[indexX[i + 1]], ! dataArea, RectangleEdge.BOTTOM); transDXm1 = transDXp1; transDXp1 = Math.abs(0.5 * (transX - transXp1)); *************** *** 899,912 **** transDX = transDXm1 + transDXp1; ! transY = verticalAxis.valueToJava2D( ! y[k], dataArea, RectangleEdge.LEFT ! ); transYm1 = transY; if (k + 1 == y.length) { continue; } ! transYp1 = verticalAxis.valueToJava2D( ! y[k + 1], dataArea, RectangleEdge.LEFT ! ); transDYm1 = Math.abs(0.5 * (transY - transYm1)); transDYp1 = Math.abs(0.5 * (transY - transYp1)); --- 873,884 ---- transDX = transDXm1 + transDXp1; ! transY = verticalAxis.valueToJava2D(y[k], dataArea, ! RectangleEdge.LEFT); transYm1 = transY; if (k + 1 == y.length) { continue; } ! transYp1 = verticalAxis.valueToJava2D(y[k + 1], dataArea, ! RectangleEdge.LEFT); transDYm1 = Math.abs(0.5 * (transY - transYm1)); transDYp1 = Math.abs(0.5 * (transY - transYp1)); *************** *** 915,924 **** && indexX[i + 1] - 1 == k) || k == x.length - 1) { // end of column ! transY = verticalAxis.valueToJava2D( ! y[k], dataArea, RectangleEdge.LEFT ! ); ! transYm1 = verticalAxis.valueToJava2D( ! y[k - 1], dataArea, RectangleEdge.LEFT ! ); transYp1 = transY; transDYm1 = Math.abs(0.5 * (transY - transYm1)); --- 887,894 ---- && indexX[i + 1] - 1 == k) || k == x.length - 1) { // end of column ! transY = verticalAxis.valueToJava2D(y[k], dataArea, ! RectangleEdge.LEFT); ! transYm1 = verticalAxis.valueToJava2D(y[k - 1], dataArea, ! RectangleEdge.LEFT); transYp1 = transY; transDYm1 = Math.abs(0.5 * (transY - transYm1)); *************** *** 926,935 **** } else { ! transY = verticalAxis.valueToJava2D( ! y[k], dataArea, RectangleEdge.LEFT ! ); ! transYp1 = verticalAxis.valueToJava2D( ! y[k + 1], dataArea, RectangleEdge.LEFT ! ); transDYm1 = transDYp1; transDYp1 = Math.abs(0.5 * (transY - transYp1)); --- 896,903 ---- } else { ! transY = verticalAxis.valueToJava2D(y[k], dataArea, ! RectangleEdge.LEFT); ! transYp1 = verticalAxis.valueToJava2D(y[k + 1], dataArea, ! RectangleEdge.LEFT); transDYm1 = transDYp1; transDYp1 = Math.abs(0.5 * (transY - transYp1)); *************** *** 971,976 **** // reused. ContourEntity entity = new ContourEntity( ! (Rectangle2D.Double) entityArea.clone(), tip, url ! ); entity.setIndex(k); entities.add(entity); --- 939,943 ---- // reused. ContourEntity entity = new ContourEntity( ! (Rectangle2D.Double) entityArea.clone(), tip, url); entity.setIndex(k); entities.add(entity); *************** *** 982,988 **** if (plot.isRangeCrosshairLockedOnData()) { // both axes ! crosshairState.updateCrosshairPoint( ! x[k], y[k], transX, transY, PlotOrientation.VERTICAL ! ); } else { --- 949,954 ---- if (plot.isRangeCrosshairLockedOnData()) { // both axes ! crosshairState.updateCrosshairPoint(x[k], y[k], transX, ! transY, PlotOrientation.VERTICAL); } else { *************** *** 1043,1049 **** //turn off anti-aliasing when filling rectangles Object antiAlias = g2.getRenderingHint(RenderingHints.KEY_ANTIALIASING); ! g2.setRenderingHint( ! RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_OFF ! ); // if (tooltips!=null) tooltips.clearToolTips(); // reset collection --- 1009,1014 ---- //turn off anti-aliasing when filling rectangles Object antiAlias = g2.getRenderingHint(RenderingHints.KEY_ANTIALIASING); ! g2.setRenderingHint(RenderingHints.KEY_ANTIALIASING, ! RenderingHints.VALUE_ANTIALIAS_OFF); // if (tooltips!=null) tooltips.clearToolTips(); // reset collection *************** *** 1068,1074 **** for (int k = 0; k < x.length; k++) { ! transX = domainAxis.valueToJava2D( ! x[k], dataArea, RectangleEdge.BOTTOM ! ) - 0.5 * size; transY = rangeAxis.valueToJava2D(y[k], dataArea, RectangleEdge.LEFT) - 0.5 * size; --- 1033,1038 ---- for (int k = 0; k < x.length; k++) { ! transX = domainAxis.valueToJava2D(x[k], dataArea, ! RectangleEdge.BOTTOM) - 0.5 * size; transY = rangeAxis.valueToJava2D(y[k], dataArea, RectangleEdge.LEFT) - 0.5 * size; *************** *** 1103,1108 **** // reused. ContourEntity entity = new ContourEntity( ! (RectangularShape) entityArea.clone(), tip, url ! ); entity.setIndex(k); entities.add(entity); --- 1067,1071 ---- // reused. ContourEntity entity = new ContourEntity( ! (RectangularShape) entityArea.clone(), tip, url); entity.setIndex(k); entities.add(entity); *************** *** 1113,1119 **** if (plot.isRangeCrosshairLockedOnData()) { // both axes ! crosshairState.updateCrosshairPoint( ! x[k], y[k], transX, transY, PlotOrientation.VERTICAL ! ); } else { --- 1076,1081 ---- if (plot.isRangeCrosshairLockedOnData()) { // both axes ! crosshairState.updateCrosshairPoint(x[k], y[k], transX, ! transY, PlotOrientation.VERTICAL); } else { *************** *** 1149,1158 **** double value, Stroke stroke, Paint paint) { ! double xx = getDomainAxis().valueToJava2D( ! value, dataArea, RectangleEdge.BOTTOM ! ); ! Line2D line = new Line2D.Double( ! xx, dataArea.getMinY(), xx, dataArea.getMaxY() ! ); g2.setStroke(stroke); g2.setPaint(paint); --- 1111,1118 ---- double value, Stroke stroke, Paint paint) { ! double xx = getDomainAxis().valueToJava2D(value, dataArea, ! RectangleEdge.BOTTOM); ! Line2D line = new Line2D.Double(xx, dataArea.getMinY(), xx, ! dataArea.getMaxY()); g2.setStroke(stroke); g2.setPaint(paint); *************** *** 1174,1183 **** Paint paint) { ! double yy = getRangeAxis().valueToJava2D( ! value, dataArea, RectangleEdge.LEFT ! ); ! Line2D line = new Line2D.Double( ! dataArea.getMinX(), yy, dataArea.getMaxX(), yy ! ); g2.setStroke(stroke); g2.setPaint(paint); --- 1134,1141 ---- Paint paint) { ! double yy = getRangeAxis().valueToJava2D(value, dataArea, ! RectangleEdge.LEFT); ! Line2D line = new Line2D.Double(dataArea.getMinX(), yy, ! dataArea.getMaxX(), yy); g2.setStroke(stroke); g2.setPaint(paint); *************** *** 1401,1407 **** */ public void setDomainCrosshairValue(double value) { - setDomainCrosshairValue(value, true); - } --- 1359,1363 ---- *************** *** 1417,1426 **** */ public void setDomainCrosshairValue(double value, boolean notify) { - this.domainCrosshairValue = value; if (isDomainCrosshairVisible() && notify) { notifyListeners(new PlotChangeEvent(this)); } - } --- 1373,1380 ---- *************** *** 1480,1489 **** */ public void setRangeCrosshairVisible(boolean flag) { - if (this.rangeCrosshairVisible != flag) { this.rangeCrosshairVisible = flag; notifyListeners(new PlotChangeEvent(this)); } - } --- 1434,1441 ---- *************** *** 1505,1514 **** */ public void setRangeCrosshairLockedOnData(boolean flag) { - if (this.rangeCrosshairLockedOnData != flag) { this.rangeCrosshairLockedOnData = flag; notifyListeners(new PlotChangeEvent(this)); } - } --- 1457,1464 ---- *************** *** 1531,1537 **** */ public void setRangeCrosshairValue(double value) { - setRangeCrosshairValue(value, true); - } --- 1481,1485 ---- *************** *** 1547,1556 **** */ public void setRangeCrosshairValue(double value, boolean notify) { - this.rangeCrosshairValue = value; if (isRangeCrosshairVisible() && notify) { notifyListeners(new PlotChangeEvent(this)); } - } --- 1495,1502 ---- *************** *** 1610,1617 **** */ public void setToolTipGenerator(ContourToolTipGenerator generator) { - //Object oldValue = this.toolTipGenerator; this.toolTipGenerator = generator; - } --- 1556,1561 ---- *************** *** 1631,1638 **** */ public void setURLGenerator(XYURLGenerator urlGenerator) { - //Object oldValue = this.urlGenerator; this.urlGenerator = urlGenerator; - } --- 1575,1580 ---- *************** *** 1660,1669 **** } ! double x = domainAxis.valueToJava2D( ! value, dataArea, RectangleEdge.BOTTOM ! ); ! Line2D line = new Line2D.Double( ! x, dataArea.getMinY(), x, dataArea.getMaxY() ! ); Paint paint = marker.getOutlinePaint(); Stroke stroke = marker.getOutlineStroke(); --- 1602,1609 ---- } ! double x = domainAxis.valueToJava2D(value, dataArea, ! RectangleEdge.BOTTOM); ! Line2D line = new Line2D.Double(x, dataArea.getMinY(), x, ! dataArea.getMaxY()); Paint paint = marker.getOutlinePaint(); Stroke stroke = marker.getOutlineStroke(); *************** *** 1698,1707 **** } ! double y = rangeAxis.valueToJava2D( ! value, dataArea, RectangleEdge.LEFT ! ); ! Line2D line = new Line2D.Double( ! dataArea.getMinX(), y, dataArea.getMaxX(), y ! ); Paint paint = marker.getOutlinePaint(); Stroke stroke = marker.getOutlineStroke(); --- 1638,1645 ---- } ! double y = rangeAxis.valueToJava2D(value, dataArea, ! RectangleEdge.LEFT); ! Line2D line = new Line2D.Double(dataArea.getMinX(), y, ! dataArea.getMaxX(), y); Paint paint = marker.getOutlinePaint(); Stroke stroke = marker.getOutlineStroke(); *************** *** 1904,1912 **** clone.domainMarkers = (List) ObjectUtilities.deepClone( ! this.domainMarkers ! ); clone.rangeMarkers = (List) ObjectUtilities.deepClone( ! this.rangeMarkers ! ); clone.annotations = (List) ObjectUtilities.deepClone(this.annotations); --- 1842,1848 ---- clone.domainMarkers = (List) ObjectUtilities.deepClone( ! this.domainMarkers); clone.rangeMarkers = (List) ObjectUtilities.deepClone( ! this.rangeMarkers); clone.annotations = (List) ObjectUtilities.deepClone(this.annotations); Index: CompassPlot.java =================================================================== RCS file: /cvsroot/jfreechart/jfreechart/source/org/jfree/chart/plot/CompassPlot.java,v retrieving revision 1.11.2.4 retrieving revision 1.11.2.5 diff -C2 -d -r1.11.2.4 -r1.11.2.5 *** CompassPlot.java 16 Jan 2007 11:08:31 -0000 1.11.2.4 --- CompassPlot.java 17 Jan 2007 11:59:42 -0000 1.11.2.5 *************** *** 28,32 **** * CompassPlot.java * ---------------- ! * (C) Copyright 2002-2005, by the Australian Antarctic Division and * Contributors. * --- 28,32 ---- * CompassPlot.java * ---------------- ! * (C) Copyright 2002-2007, by the Australian Antarctic Division and * Contributors. * *************** *** 99,104 **** * A specialised plot that draws a compass to indicate a direction based on the * value from a {@link ValueDataset}. - * - * @author Bryan Scott */ public class CompassPlot extends Plot implements Cloneable, Serializable { --- 99,102 ---- Index: ColorPalette.java =================================================================== RCS file: /cvsroot/jfreechart/jfreechart/source/org/jfree/chart/plot/Attic/ColorPalette.java,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** ColorPalette.java 24 Nov 2005 16:11:49 -0000 1.1.2.1 --- ColorPalette.java 17 Jan 2007 11:59:42 -0000 1.1.2.2 *************** *** 3,7 **** * =========================================================== * ! * (C) Copyright 2000-2005, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html --- 3,7 ---- * =========================================================== * ! * (C) Copyright 2000-2007, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html *************** *** 28,32 **** * ColorPalette.java * ----------------- ! * (C) Copyright 2002-2005, by David M. O'Donnell and Contributors. * * Original Author: David M. O'Donnell; --- 28,32 ---- * ColorPalette.java * ----------------- ! * (C) Copyright 2002-2007, by David M. O'Donnell and Contributors. * * Original Author: David M. O'Donnell; *************** *** 54,59 **** /** * Defines palette used in Contour Plots. - * - * @author David M. O'Donnell. */ public abstract class ColorPalette implements Cloneable, Serializable { --- 54,57 ---- Index: GreyPalette.java =================================================================== RCS file: /cvsroot/jfreechart/jfreechart/source/org/jfree/chart/plot/Attic/GreyPalette.java,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** GreyPalette.java 24 Nov 2005 16:11:49 -0000 1.1.2.1 --- GreyPalette.java 17 Jan 2007 11:59:42 -0000 1.1.2.2 *************** *** 3,7 **** * =========================================================== * ! * (C) Copyright 2000-2005, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html --- 3,7 ---- * =========================================================== * ! * (C) Copyright 2000-2007, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html *************** *** 28,32 **** * GreyPalette.java * ---------------- ! * (C) Copyright 2002-2005, by David M. O'Donnell and Contributors. * * Original Author: David M. O'Donnell; --- 28,32 ---- * GreyPalette.java * ---------------- ! * (C) Copyright 2002-2007, by David M. O'Donnell and Contributors. * * Original Author: David M. O'Donnell; *************** *** 49,54 **** /** * A grey color palette. - * - * @author David M. O'Donnell. */ public class GreyPalette extends ColorPalette implements Serializable { --- 49,52 ---- Index: RainbowPalette.java =================================================================== RCS file: /cvsroot/jfreechart/jfreechart/source/org/jfree/chart/plot/Attic/RainbowPalette.java,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** RainbowPalette.java 24 Nov 2005 16:11:49 -0000 1.1.2.1 --- RainbowPalette.java 17 Jan 2007 11:59:42 -0000 1.1.2.2 *************** *** 3,7 **** * =========================================================== * ! * (C) Copyright 2000-2005, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html --- 3,7 ---- * =========================================================== * ! * (C) Copyright 2000-2007, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html *************** *** 28,32 **** * RainbowPalette.java * ------------------- ! * (C) Copyright 2002-2005, by David M. O'Donnell and Contributors. * * Original Author: David M. O'Donnell; --- 28,32 ---- * RainbowPalette.java * ------------------- ! * (C) Copyright 2002-2007, by David M. O'Donnell and Contributors. * * Original Author: David M. O'Donnell; *************** *** 52,57 **** * Thus indexes 0 and 1 were preserved for rendering white and black * respectively. - * - * @author David M. O'Donnell */ public class RainbowPalette extends ColorPalette implements Serializable { --- 52,55 ---- Index: ContourValuePlot.java =================================================================== RCS file: /cvsroot/jfreechart/jfreechart/source/org/jfree/chart/plot/ContourValuePlot.java,v retrieving revision 1.3.2.1 retrieving revision 1.3.2.2 diff -C2 -d -r1.3.2.1 -r1.3.2.2 *** ContourValuePlot.java 25 Oct 2005 20:52:08 -0000 1.3.2.1 --- ContourValuePlot.java 17 Jan 2007 11:59:42 -0000 1.3.2.2 *************** *** 3,7 **** * =========================================================== * ! * (C) Copyright 2000-2005, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html --- 3,7 ---- * =========================================================== * ! * (C) Copyright 2000-2007, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html *************** *** 28,32 **** * ContourValuePlot.java * --------------------- ! * (C) Copyright 2002-2004, by David M. O'Donnell and Contributors. * * Original Author: David M. O'Donnell; --- 28,32 ---- * ContourValuePlot.java * --------------------- ! * (C) Copyright 2002-2007, by David M. O'Donnell and Contributors. * * Original Author: David M. O'Donnell; *************** *** 47,52 **** /** * An interface defining methods related to contour plots. - * - * @author David M. O'Donnell */ public interface ContourValuePlot { --- 47,50 ---- Index: ContourPlotUtilities.java =================================================================== RCS file: /cvsroot/jfreechart/jfreechart/source/org/jfree/chart/plot/ContourPlotUtilities.java,v retrieving revision 1.2.2.1 retrieving revision 1.2.2.2 diff -C2 -d -r1.2.2.1 -r1.2.2.2 *** ContourPlotUtilities.java 25 Oct 2005 20:52:08 -0000 1.2.2.1 --- ContourPlotUtilities.java 17 Jan 2007 11:59:42 -0000 1.2.2.2 *************** *** 3,7 **** * =========================================================== * ! * (C) Copyright 2000-2005, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html --- 3,7 ---- * =========================================================== * ! * (C) Copyright 2000-2007, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html *************** *** 28,32 **** * ContourPlotUtilities.java * ------------------------- ! * (C) Copyright 2002-2004, by David M. O'Donnell and Contributors. * * Original Author: David M. O'Donnell; --- 28,32 ---- * ContourPlotUtilities.java * ------------------------- ! * (C) Copyright 2002-2007, by David M. O'Donnell and Contributors. * * Original Author: David M. O'Donnell; *************** *** 51,56 **** /** * Some utility methods for the {@link ContourPlot} class. - * - * @author David M. O'Donnell */ public abstract class ContourPlotUtilities { --- 51,54 ---- |