From: David G. <mu...@us...> - 2006-12-19 10:40:18
|
Update of /cvsroot/jfreechart/jfreechart/source/org/jfree/chart In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv22123/source/org/jfree/chart Modified Files: Tag: STABLE_1-0-0 ChartUtilities.java Log Message: 2006-12-19 David Gilbert <dav...@ob...> * source/org/jfree/chart/ChartUtilities.java: API doc updates and source reformatting. Index: ChartUtilities.java =================================================================== RCS file: /cvsroot/jfreechart/jfreechart/source/org/jfree/chart/ChartUtilities.java,v retrieving revision 1.4.2.1 retrieving revision 1.4.2.2 diff -C2 -d -r1.4.2.1 -r1.4.2.2 *** ChartUtilities.java 25 Oct 2005 16:50:20 -0000 1.4.2.1 --- ChartUtilities.java 19 Dec 2006 10:40:09 -0000 1.4.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-2006, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html *************** *** 28,32 **** * ChartUtilities.java * ------------------- ! * (C) Copyright 2001-2005, by Object Refinery Limited and Contributors. * * Original Author: David Gilbert (for Object Refinery Limited); --- 28,32 ---- * ChartUtilities.java * ------------------- ! * (C) Copyright 2001-2006, by Object Refinery Limited and Contributors. * * Original Author: David Gilbert (for Object Refinery Limited); *************** *** 99,102 **** --- 99,104 ---- * converting charts to image formats (PNG and JPEG) plus creating simple HTML * image maps. + * + * @see ImageMapUtilities */ public abstract class ChartUtilities { *************** *** 112,119 **** * @throws IOException if there are any I/O errors. */ ! public static void writeChartAsPNG(OutputStream out, ! JFreeChart chart, ! int width, ! int height) throws IOException { // defer argument checking... --- 114,119 ---- * @throws IOException if there are any I/O errors. */ ! public static void writeChartAsPNG(OutputStream out, JFreeChart chart, ! int width, int height) throws IOException { // defer argument checking... *************** *** 134,148 **** * @throws IOException if there are any I/O errors. */ ! public static void writeChartAsPNG(OutputStream out, ! JFreeChart chart, ! int width, ! int height, ! boolean encodeAlpha, ! int compression) throws IOException { // defer argument checking... ! ChartUtilities.writeChartAsPNG( ! out, chart, width, height, null, encodeAlpha, compression ! ); } --- 134,144 ---- * @throws IOException if there are any I/O errors. */ ! public static void writeChartAsPNG(OutputStream out, JFreeChart chart, ! int width, int height, boolean encodeAlpha, int compression) ! throws IOException { // defer argument checking... ! ChartUtilities.writeChartAsPNG(out, chart, width, height, null, ! encodeAlpha, compression); } *************** *** 162,171 **** * @throws IOException if there are any I/O errors. */ ! public static void writeChartAsPNG(OutputStream out, ! JFreeChart chart, ! int width, ! int height, ! ChartRenderingInfo info) ! throws IOException { if (chart == null) { --- 158,164 ---- * @throws IOException if there are any I/O errors. */ ! public static void writeChartAsPNG(OutputStream out, JFreeChart chart, ! int width, int height, ChartRenderingInfo info) ! throws IOException { if (chart == null) { *************** *** 173,177 **** } BufferedImage bufferedImage ! = chart.createBufferedImage(width, height, info); EncoderUtil.writeBufferedImage(bufferedImage, ImageFormat.PNG, out); } --- 166,170 ---- } BufferedImage bufferedImage ! = chart.createBufferedImage(width, height, info); EncoderUtil.writeBufferedImage(bufferedImage, ImageFormat.PNG, out); } *************** *** 194,203 **** * @throws IOException if there are any I/O errors. */ ! public static void writeChartAsPNG(OutputStream out, ! JFreeChart chart, ! int width, int height, ! ChartRenderingInfo info, ! boolean encodeAlpha, ! int compression) throws IOException { if (out == null) { --- 187,193 ---- * @throws IOException if there are any I/O errors. */ ! public static void writeChartAsPNG(OutputStream out, JFreeChart chart, ! int width, int height, ChartRenderingInfo info, ! boolean encodeAlpha, int compression) throws IOException { if (out == null) { *************** *** 207,216 **** throw new IllegalArgumentException("Null 'chart' argument."); } ! BufferedImage chartImage = chart.createBufferedImage( ! width, height, BufferedImage.TYPE_INT_ARGB, info ! ); ! ChartUtilities.writeBufferedImageAsPNG( ! out, chartImage, encodeAlpha, compression ! ); } --- 197,204 ---- throw new IllegalArgumentException("Null 'chart' argument."); } ! BufferedImage chartImage = chart.createBufferedImage(width, height, ! BufferedImage.TYPE_INT_ARGB, info); ! ChartUtilities.writeBufferedImageAsPNG(out, chartImage, encodeAlpha, ! compression); } *************** *** 229,238 **** */ public static void writeScaledChartAsPNG(OutputStream out, ! JFreeChart chart, ! int width, ! int height, ! int widthScaleFactor, ! int heightScaleFactor) ! throws IOException { if (out == null) { --- 217,222 ---- */ public static void writeScaledChartAsPNG(OutputStream out, ! JFreeChart chart, int width, int height, int widthScaleFactor, ! int heightScaleFactor) throws IOException { if (out == null) { *************** *** 257,263 **** double scaleY = desiredHeight / defaultHeight; ! BufferedImage image = new BufferedImage( ! (int) desiredWidth, (int) desiredHeight, BufferedImage.TYPE_INT_ARGB ! ); Graphics2D g2 = image.createGraphics(); --- 241,246 ---- double scaleY = desiredHeight / defaultHeight; ! BufferedImage image = new BufferedImage((int) desiredWidth, ! (int) desiredHeight, BufferedImage.TYPE_INT_ARGB); Graphics2D g2 = image.createGraphics(); *************** *** 265,280 **** AffineTransform saved = g2.getTransform(); g2.transform(AffineTransform.getScaleInstance(scaleX, scaleY)); ! chart.draw( ! g2, new Rectangle2D.Double(0, 0, defaultWidth, defaultHeight), ! null, null ! ); g2.setTransform(saved); g2.dispose(); } else { ! chart.draw( ! g2, new Rectangle2D.Double(0, 0, defaultWidth, defaultHeight), ! null, null ! ); } out.write(encodeAsPNG(image)); --- 248,259 ---- AffineTransform saved = g2.getTransform(); g2.transform(AffineTransform.getScaleInstance(scaleX, scaleY)); ! chart.draw(g2, new Rectangle2D.Double(0, 0, defaultWidth, ! defaultHeight), null, null); g2.setTransform(saved); g2.dispose(); } else { ! chart.draw(g2, new Rectangle2D.Double(0, 0, defaultWidth, ! defaultHeight), null, null); } out.write(encodeAsPNG(image)); *************** *** 292,299 **** * @throws IOException if there are any I/O errors. */ ! public static void saveChartAsPNG(File file, ! JFreeChart chart, ! int width, ! int height) throws IOException { // defer argument checking... --- 271,276 ---- * @throws IOException if there are any I/O errors. */ ! public static void saveChartAsPNG(File file, JFreeChart chart, ! int width, int height) throws IOException { // defer argument checking... *************** *** 316,324 **** * @throws IOException if there are any I/O errors. */ ! public static void saveChartAsPNG(File file, ! JFreeChart chart, ! int width, ! int height, ! ChartRenderingInfo info) throws IOException { --- 293,298 ---- * @throws IOException if there are any I/O errors. */ ! public static void saveChartAsPNG(File file, JFreeChart chart, ! int width, int height, ChartRenderingInfo info) throws IOException { *************** *** 347,357 **** * @throws IOException if there are any I/O errors. */ ! public static void saveChartAsPNG(File file, ! JFreeChart chart, ! int width, ! int height, ! ChartRenderingInfo info, ! boolean encodeAlpha, ! int compression) throws IOException { if (file == null) { --- 321,327 ---- * @throws IOException if there are any I/O errors. */ ! public static void saveChartAsPNG(File file, JFreeChart chart, ! int width, int height, ChartRenderingInfo info, boolean encodeAlpha, ! int compression) throws IOException { if (file == null) { *************** *** 363,369 **** OutputStream out = new BufferedOutputStream(new FileOutputStream(file)); ! writeChartAsPNG( ! out, chart, width, height, info, encodeAlpha, compression ! ); out.close(); --- 333,338 ---- OutputStream out = new BufferedOutputStream(new FileOutputStream(file)); ! writeChartAsPNG(out, chart, width, height, info, encodeAlpha, ! compression); out.close(); *************** *** 382,388 **** */ public static void writeChartAsJPEG(OutputStream out, ! JFreeChart chart, ! int width, ! int height) throws IOException { // defer argument checking... --- 351,355 ---- */ public static void writeChartAsJPEG(OutputStream out, ! JFreeChart chart, int width, int height) throws IOException { // defer argument checking... *************** *** 403,416 **** * @throws IOException if there are any I/O errors. */ ! public static void writeChartAsJPEG(OutputStream out, ! float quality, ! JFreeChart chart, ! int width, ! int height) throws IOException { // defer argument checking... ! ChartUtilities.writeChartAsJPEG( ! out, quality, chart, width, height, null ! ); } --- 370,379 ---- * @throws IOException if there are any I/O errors. */ ! public static void writeChartAsJPEG(OutputStream out, float quality, ! JFreeChart chart, int width, int height) throws IOException { // defer argument checking... ! ChartUtilities.writeChartAsJPEG(out, quality, chart, width, height, ! null); } *************** *** 430,439 **** * @throws IOException if there are any I/O errors. */ ! public static void writeChartAsJPEG(OutputStream out, ! JFreeChart chart, ! int width, ! int height, ! ChartRenderingInfo info) ! throws IOException { if (chart == null) { --- 393,399 ---- * @throws IOException if there are any I/O errors. */ ! public static void writeChartAsJPEG(OutputStream out, JFreeChart chart, ! int width, int height, ChartRenderingInfo info) ! throws IOException { if (chart == null) { *************** *** 460,470 **** * @throws IOException if there are any I/O errors. */ ! public static void writeChartAsJPEG(OutputStream out, ! float quality, ! JFreeChart chart, ! int width, ! int height, ! ChartRenderingInfo info) ! throws IOException { if (chart == null) { --- 420,426 ---- * @throws IOException if there are any I/O errors. */ ! public static void writeChartAsJPEG(OutputStream out, float quality, ! JFreeChart chart, int width, int height, ChartRenderingInfo info) ! throws IOException { if (chart == null) { *************** *** 486,493 **** * @throws IOException if there are any I/O errors. */ ! public static void saveChartAsJPEG(File file, ! JFreeChart chart, ! int width, ! int height) throws IOException { // defer argument checking... --- 442,447 ---- * @throws IOException if there are any I/O errors. */ ! public static void saveChartAsJPEG(File file, JFreeChart chart, ! int width, int height) throws IOException { // defer argument checking... *************** *** 507,515 **** * @throws IOException if there are any I/O errors. */ ! public static void saveChartAsJPEG(File file, ! float quality, ! JFreeChart chart, ! int width, ! int height) throws IOException { // defer argument checking... --- 461,466 ---- * @throws IOException if there are any I/O errors. */ ! public static void saveChartAsJPEG(File file, float quality, ! JFreeChart chart, int width, int height) throws IOException { // defer argument checking... *************** *** 532,541 **** * @throws IOException if there are any I/O errors. */ ! public static void saveChartAsJPEG(File file, ! JFreeChart chart, ! int width, ! int height, ! ChartRenderingInfo info) ! throws IOException { if (file == null) { --- 483,488 ---- * @throws IOException if there are any I/O errors. */ ! public static void saveChartAsJPEG(File file, JFreeChart chart, ! int width, int height, ChartRenderingInfo info) throws IOException { if (file == null) { *************** *** 566,576 **** * @throws IOException if there are any I/O errors. */ ! public static void saveChartAsJPEG(File file, ! float quality, ! JFreeChart chart, ! int width, ! int height, ! ChartRenderingInfo info) ! throws IOException { if (file == null) { --- 513,519 ---- * @throws IOException if there are any I/O errors. */ ! public static void saveChartAsJPEG(File file, float quality, ! JFreeChart chart, int width, int height, ! ChartRenderingInfo info) throws IOException { if (file == null) { *************** *** 595,600 **** */ public static void writeBufferedImageAsJPEG(OutputStream out, ! BufferedImage image) ! throws IOException { // defer argument checking... --- 538,542 ---- */ public static void writeBufferedImageAsJPEG(OutputStream out, ! BufferedImage image) throws IOException { // defer argument checking... *************** *** 613,618 **** */ public static void writeBufferedImageAsJPEG(OutputStream out, float quality, ! BufferedImage image) ! throws IOException { EncoderUtil.writeBufferedImage(image, ImageFormat.JPEG, out, quality); --- 555,559 ---- */ public static void writeBufferedImageAsJPEG(OutputStream out, float quality, ! BufferedImage image) throws IOException { EncoderUtil.writeBufferedImage(image, ImageFormat.JPEG, out, quality); *************** *** 629,634 **** */ public static void writeBufferedImageAsPNG(OutputStream out, ! BufferedImage image) ! throws IOException { EncoderUtil.writeBufferedImage(image, ImageFormat.PNG, out); --- 570,574 ---- */ public static void writeBufferedImageAsPNG(OutputStream out, ! BufferedImage image) throws IOException { EncoderUtil.writeBufferedImage(image, ImageFormat.PNG, out); *************** *** 647,658 **** */ public static void writeBufferedImageAsPNG(OutputStream out, ! BufferedImage image, ! boolean encodeAlpha, ! int compression) ! throws IOException { ! EncoderUtil.writeBufferedImage( ! image, ImageFormat.PNG, out, compression, encodeAlpha ! ); } --- 587,595 ---- */ public static void writeBufferedImageAsPNG(OutputStream out, ! BufferedImage image, boolean encodeAlpha, int compression) ! throws IOException { ! EncoderUtil.writeBufferedImage(image, ImageFormat.PNG, out, ! compression, encodeAlpha); } *************** *** 683,690 **** public static byte[] encodeAsPNG(BufferedImage image, boolean encodeAlpha, int compression) ! throws IOException { ! return EncoderUtil.encode( ! image, ImageFormat.PNG, compression, encodeAlpha ! ); } --- 620,626 ---- public static byte[] encodeAsPNG(BufferedImage image, boolean encodeAlpha, int compression) ! throws IOException { ! return EncoderUtil.encode(image, ImageFormat.PNG, compression, ! encodeAlpha); } *************** *** 709,727 **** if (useOverLibForToolTips) { toolTipTagFragmentGenerator ! = new OverLIBToolTipTagFragmentGenerator(); } else { toolTipTagFragmentGenerator ! = new StandardToolTipTagFragmentGenerator(); } ! ImageMapUtilities.writeImageMap( ! writer, name, info, toolTipTagFragmentGenerator, ! new StandardURLTagFragmentGenerator() ! ); } /** ! * Writes an image map to an output stream. * * @param writer the writer (<code>null</code> not permitted). --- 645,662 ---- if (useOverLibForToolTips) { toolTipTagFragmentGenerator ! = new OverLIBToolTipTagFragmentGenerator(); } else { toolTipTagFragmentGenerator ! = new StandardToolTipTagFragmentGenerator(); } ! ImageMapUtilities.writeImageMap(writer, name, info, ! toolTipTagFragmentGenerator, ! new StandardURLTagFragmentGenerator()); } /** ! * Writes an image map to the specified writer. * * @param writer the writer (<code>null</code> not permitted). *************** *** 736,751 **** ChartRenderingInfo info, ToolTipTagFragmentGenerator toolTipTagFragmentGenerator, ! URLTagFragmentGenerator urlTagFragmentGenerator) throws IOException { ! writer.println( ! ImageMapUtilities.getImageMap( ! name, info, toolTipTagFragmentGenerator, urlTagFragmentGenerator ! ) ! ); } /** ! * Creates an HTML image map. * * @param name the map name (<code>null</code> not permitted). --- 671,686 ---- ChartRenderingInfo info, ToolTipTagFragmentGenerator toolTipTagFragmentGenerator, ! URLTagFragmentGenerator urlTagFragmentGenerator) throws IOException { ! writer.println(ImageMapUtilities.getImageMap(name, info, ! toolTipTagFragmentGenerator, urlTagFragmentGenerator)); } /** ! * Creates an HTML image map. This method maps to ! * {@link ImageMapUtilities#getImageMap(String, ChartRenderingInfo, ! * ToolTipTagFragmentGenerator, URLTagFragmentGenerator)}, using default ! * generators. * * @param name the map name (<code>null</code> not permitted). *************** *** 755,768 **** */ public static String getImageMap(String name, ChartRenderingInfo info) { ! return ImageMapUtilities.getImageMap( ! name, ! info, ! new StandardToolTipTagFragmentGenerator(), ! new StandardURLTagFragmentGenerator() ! ); } /** ! * Creates an HTML image map. * * @param name the map name (<code>null</code> not permitted). --- 690,702 ---- */ public static String getImageMap(String name, ChartRenderingInfo info) { ! return ImageMapUtilities.getImageMap(name, info, ! new StandardToolTipTagFragmentGenerator(), ! new StandardURLTagFragmentGenerator()); } /** ! * Creates an HTML image map. This method maps directly to ! * {@link ImageMapUtilities#getImageMap(String, ChartRenderingInfo, ! * ToolTipTagFragmentGenerator, URLTagFragmentGenerator)}. * * @param name the map name (<code>null</code> not permitted). *************** *** 773,784 **** * @return The map tag. */ ! public static String getImageMap(String name, ! ChartRenderingInfo info, ! ToolTipTagFragmentGenerator toolTipTagFragmentGenerator, ! URLTagFragmentGenerator urlTagFragmentGenerator) { ! return ImageMapUtilities.getImageMap( ! name, info, toolTipTagFragmentGenerator, urlTagFragmentGenerator ! ); } --- 707,716 ---- * @return The map tag. */ ! public static String getImageMap(String name, ChartRenderingInfo info, ! ToolTipTagFragmentGenerator toolTipTagFragmentGenerator, ! URLTagFragmentGenerator urlTagFragmentGenerator) { ! return ImageMapUtilities.getImageMap(name, info, ! toolTipTagFragmentGenerator, urlTagFragmentGenerator); } |