cvs: pear /Image_Graph Graph.php /Image_Graph/Graph Legend.php Plot.php /Image_Graph/Graph/Axis/Marker Line.php /Image_Graph/Graph/Driver GD.php
/Image_Graph/Graph/Plot BoxWhisker.php /Image_Graph/docs ChangeLog

nosey Tue May 17 17:15:32 2005 EDT Modified files: /pear/Image_Graph/docs ChangeLog /pear/Image_Graph/Graph/Plot BoxWhisker.php /pear/Image_Graph/Graph Plot.php Legend.php /pear/Image_Graph Graph.php /pear/Image_Graph/Graph/Driver GD.php /pear/Image_Graph/Graph/Axis/Marker Line.php Log: Fixed bug #4113 "Image_Graph_Driver_GD::pieSlice() warnings" Fixed bug #4333 "Legend division by zero error on PieChart" Code "refresh"

http://cvs.php.net/diff.php/pear/Image_Graph/docs/ChangeLog?r1=1.23&r2=1.24&ty=u Index: pear/Image_Graph/docs/ChangeLog diff -u pear/Image_Graph/docs/ChangeLog:1.23 pear/Image_Graph/docs/ChangeLog:1.24 --- pear/Image_Graph/docs/ChangeLog:1.23 Sat Mar 19 14:09:37 2005 +++ pear/Image_Graph/docs/ChangeLog Tue May 17 17:15:30 2005 @@ -6,6 +6,9 @@ * Added possibility to specify horizontal title alignment (left, right or center) * Fixed an "off-by-one" problem with secondary axis * Included all on-line examples in package + * Removed some memory leaks mentioned as described in bug #3958 "Memory leaks in Image_Graph 0.3.0-alpha" + * Fixed bug #4113 "Image_Graph_Driver_GD::pieSlice() warnings" + * Fixed bug #4333 "Legend division by zero error on PieChart" Version 0.3.0-alpha [2005-Feb-25] - Jesper Veggerby <pear.nosey@veggerby.dk> * Added possibility to use arrays of the type $data[$id] = array('x' => $x, 'y' => $y) for easy data addition to a dataset http://cvs.php.net/diff.php/pear/Image_Graph/Graph/Plot/BoxWhisker.php?r1=1.8&r2=1.9&ty=u Index: pear/Image_Graph/Graph/Plot/BoxWhisker.php diff -u pear/Image_Graph/Graph/Plot/BoxWhisker.php:1.8 pear/Image_Graph/Graph/Plot/BoxWhisker.php:1.9 --- pear/Image_Graph/Graph/Plot/BoxWhisker.php:1.8 Mon Feb 21 15:49:53 2005 +++ pear/Image_Graph/Graph/Plot/BoxWhisker.php Tue May 17 17:15:31 2005 @@ -24,7 +24,7 @@ * @author Jesper Veggerby <pear.nosey@veggerby.dk> * @copyright Copyright (C) 2003, 2004 Jesper Veggerby Hansen * @license http://www.gnu.org/copyleft/lesser.html LGPL License 2.1 - * @version CVS: $Id: BoxWhisker.php,v 1.8 2005/02/21 20:49:53 nosey Exp $ + * @version CVS: $Id: BoxWhisker.php,v 1.9 2005/05/17 21:15:31 nosey Exp $ * @link http://pear.php.net/package/Image_Graph * @since File available since Release 0.3.0dev2 */ @@ -49,6 +49,8 @@ */ class Image_Graph_Plot_BoxWhisker extends Image_Graph_Plot { + // TODO Possibility to handle outliers (see http://pear.veggerby.dk/forum/read.php?board=1&id=265) + /** * Whisker circle size * @var int http://cvs.php.net/diff.php/pear/Image_Graph/Graph/Plot.php?r1=1.10&r2=1.11&ty=u Index: pear/Image_Graph/Graph/Plot.php diff -u pear/Image_Graph/Graph/Plot.php:1.10 pear/Image_Graph/Graph/Plot.php:1.11 --- pear/Image_Graph/Graph/Plot.php:1.10 Mon Feb 21 15:49:47 2005 +++ pear/Image_Graph/Graph/Plot.php Tue May 17 17:15:31 2005 @@ -24,7 +24,7 @@ * @author Jesper Veggerby <pear.nosey@veggerby.dk> * @copyright Copyright (C) 2003, 2004 Jesper Veggerby Hansen * @license http://www.gnu.org/copyleft/lesser.html LGPL License 2.1 - * @version CVS: $Id: Plot.php,v 1.10 2005/02/21 20:49:47 nosey Exp $ + * @version CVS: $Id: Plot.php,v 1.11 2005/05/17 21:15:31 nosey Exp $ * @link http://pear.php.net/package/Image_Graph */ @@ -716,7 +716,8 @@ $prevPoint = $dataset->_nearby(-2); $nextPoint = $dataset->_nearby(); - $point = $this->_getMarkerData($point, $nextPoint, $prevPoint, $i); + $tmp = array(); + $point = $this->_getMarkerData($point, $nextPoint, $prevPoint, $tmp); if (is_array($point)) { $point['MARKER_X'] = $x+$param['width']/2; $point['MARKER_Y'] = $y; http://cvs.php.net/diff.php/pear/Image_Graph/Graph/Legend.php?r1=1.10&r2=1.11&ty=u Index: pear/Image_Graph/Graph/Legend.php diff -u pear/Image_Graph/Graph/Legend.php:1.10 pear/Image_Graph/Graph/Legend.php:1.11 --- pear/Image_Graph/Graph/Legend.php:1.10 Wed Feb 23 15:32:46 2005 +++ pear/Image_Graph/Graph/Legend.php Tue May 17 17:15:31 2005 @@ -24,7 +24,7 @@ * @author Jesper Veggerby <pear.nosey@veggerby.dk> * @copyright Copyright (C) 2003, 2004 Jesper Veggerby Hansen * @license http://www.gnu.org/copyleft/lesser.html LGPL License 2.1 - * @version CVS: $Id: Legend.php,v 1.10 2005/02/23 20:32:46 nosey Exp $ + * @version CVS: $Id: Legend.php,v 1.11 2005/05/17 21:15:31 nosey Exp $ * @link http://pear.php.net/package/Image_Graph */ @@ -53,6 +53,8 @@ */ class Image_Graph_Legend extends Image_Graph_Layout { + + // TODO Possibility to wrap legend titles /** * Alignment of the text http://cvs.php.net/diff.php/pear/Image_Graph/Graph.php?r1=1.48&r2=1.49&ty=u Index: pear/Image_Graph/Graph.php diff -u pear/Image_Graph/Graph.php:1.48 pear/Image_Graph/Graph.php:1.49 --- pear/Image_Graph/Graph.php:1.48 Mon Feb 21 15:49:58 2005 +++ pear/Image_Graph/Graph.php Tue May 17 17:15:31 2005 @@ -23,7 +23,7 @@ * @author Jesper Veggerby <pear.nosey@veggerby.dk> * @copyright Copyright (C) 2003, 2004 Jesper Veggerby Hansen * @license http://www.gnu.org/copyleft/lesser.html LGPL License 2.1 - * @version CVS: $Id: Graph.php,v 1.48 2005/02/21 20:49:58 nosey Exp $ + * @version CVS: $Id: Graph.php,v 1.49 2005/05/17 21:15:31 nosey Exp $ * @link http://pear.php.net/package/Image_Graph */ @@ -840,5 +840,5 @@ // General to-do's // TODO Create bar-chart-type where bar have individual widths (i.e. in the dataset fx). // TODO Update private tags to protected wherever necessary -// +// TODO Create a simple table element ?> \ No newline at end of file http://cvs.php.net/diff.php/pear/Image_Graph/Graph/Driver/GD.php?r1=1.13&r2=1.14&ty=u Index: pear/Image_Graph/Graph/Driver/GD.php diff -u pear/Image_Graph/Graph/Driver/GD.php:1.13 pear/Image_Graph/Graph/Driver/GD.php:1.14 --- pear/Image_Graph/Graph/Driver/GD.php:1.13 Thu Mar 24 13:55:28 2005 +++ pear/Image_Graph/Graph/Driver/GD.php Tue May 17 17:15:32 2005 @@ -29,7 +29,7 @@ * @author Jesper Veggerby <pear.nosey@veggerby.dk> * @copyright Copyright (C) 2003, 2004 Jesper Veggerby Hansen * @license http://www.gnu.org/copyleft/lesser.html LGPL License 2.1 - * @version CVS: $Id: GD.php,v 1.13 2005/03/24 18:55:28 nosey Exp $ + * @version CVS: $Id: GD.php,v 1.14 2005/05/17 21:15:32 nosey Exp $ * @link http://pear.php.net/package/Image_Graph * @since File available since Release 0.3.0dev2 */ @@ -1150,12 +1150,22 @@ $polygon[] = ($y + $ry * sin(deg2rad(max($v1, $v2) % 360))); } - if (($fill = $this->_getFillStyle($fillColor, $x - $rx - 1, $y - $ry - 1, $x + $rx + 1, $y + $ry + 1)) !== false) { + // If there are fewer than six points in the polygon, then by + // definition the slice is actually a line and need not be filled. + if ( + (count($polygon) >= 6) && + (($fill = $this->_getFillStyle($fillColor, $x - $rx - 1, $y - $ry - 1, $x + $rx + 1, $y + $ry + 1)) !== false) + ) { ImageFilledPolygon($this->_canvas, $polygon, count($polygon) / 2, $fill); } if (($line = $this->_getLineStyle($lineColor)) !== false) { - ImagePolygon($this->_canvas, $polygon, count($polygon) / 2, $line); + if (count($polygon) < 6) { + // The slice is actually a line and should be rendered as such. + ImageLine($this->_canvas, $polygon[0], $polygon[1], $polygon[2], $polygon[3], $line); + } else { + ImagePolygon($this->_canvas, $polygon, count($polygon) / 2, $line); + } } parent::pieSlice($x, $y, $rx, $ry, $v1, $v2, $fillColor, $lineColor); http://cvs.php.net/diff.php/pear/Image_Graph/Graph/Axis/Marker/Line.php?r1=1.8&r2=1.9&ty=u Index: pear/Image_Graph/Graph/Axis/Marker/Line.php diff -u pear/Image_Graph/Graph/Axis/Marker/Line.php:1.8 pear/Image_Graph/Graph/Axis/Marker/Line.php:1.9 --- pear/Image_Graph/Graph/Axis/Marker/Line.php:1.8 Wed Feb 23 15:20:25 2005 +++ pear/Image_Graph/Graph/Axis/Marker/Line.php Tue May 17 17:15:32 2005 @@ -25,7 +25,7 @@ * @author Jesper Veggerby <pear.nosey@veggerby.dk> * @copyright Copyright (C) 2003, 2004 Jesper Veggerby Hansen * @license http://www.gnu.org/copyleft/lesser.html LGPL License 2.1 - * @version CVS: $Id: Line.php,v 1.8 2005/02/23 20:20:25 nosey Exp $ + * @version CVS: $Id: Line.php,v 1.9 2005/05/17 21:15:32 nosey Exp $ * @link http://pear.php.net/package/Image_Graph */ @@ -76,6 +76,8 @@ */ function _done() { + // TODO Implement a label mechanism when using axis markers. + if (parent::_done() === false) { return false; }