Commit 1610370d authored by Richard Mansfield's avatar Richard Mansfield
Browse files

Bring Image_Graph up to latest to get PHP 5.3 fixes (bug #615210)


Signed-off-by: default avatarRichard Mansfield <richardm@catalyst.net.nz>
parent 22746312
This diff is collapsed.
This diff is collapsed.
<?php
/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
/**
* Class for axis handling.
*
* PHP versions 4 and 5
*
* LICENSE: This library is free software; you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation; either version 2.1 of the License, or (at your
* option) any later version. This library is distributed in the hope that it
* will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty
* of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser
* General Public 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
*
* @category Images
* @package Image_Graph
* @subpackage Axis
* @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: Logarithmic.php,v 1.15 2006/03/02 12:35:57 nosey Exp $
* @link http://pear.php.net/package/Image_Graph
*/
/**
* Include file Image/Graph/Axis.php
*/
require_once 'Image/Graph/Axis.php';
/**
* Diplays a logarithmic axis (either X- or Y-axis).
*
* @category Images
* @package Image_Graph
* @subpackage Axis
* @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 Release: @package_version@
* @link http://pear.php.net/package/Image_Graph
*/
class Image_Graph_Axis_Logarithmic extends Image_Graph_Axis
{
/**
* Image_Graph_AxisLogarithmic [Constructor].
*
* Normally a manual creation should not be necessary, axis are
* created automatically by the {@link Image_Graph_Plotarea} constructor
* unless explicitly defined otherwise
*
* @param int $type The type (direction) of the Axis, use IMAGE_GRAPH_AXIS_X
* for an X-axis (default, may be omitted) and IMAGE_GRAPH_AXIS_Y for Y-
* axis)
*/
function Image_Graph_Axis_Logarithmic($type = IMAGE_GRAPH_AXIS_X)
{
parent::Image_Graph_Axis($type);
$this->showLabel(IMAGE_GRAPH_LABEL_MINIMUM + IMAGE_GRAPH_LABEL_MAXIMUM);
$this->_minimum = 1;
$this->_minimumSet = true;
}
/**
* Calculate the label interval
*
* If explicitly defined this will be calucated to an approximate best.
*
* @return double The label interval
* @access private
*/
function _calcLabelInterval()
{
$result = parent::_calcLabelInterval();
$this->_axisValueSpan = $this->_value($this->_axisSpan);
return $result;
}
/**
* Preprocessor for values, ie for using logarithmic axis
*
* @param double $value The value to preprocess
* @return double The preprocessed value
* @access private
*/
function _value($value)
{
return log10($value) - log10($this->_minimum);
}
/**
* Get next label point
*
* @param doubt $point The current point, if omitted or false, the first is
* returned
* @return double The next label point
* @access private
*/
function _getNextLabel($currentLabel = false, $level = 1)
{
if (is_array($this->_labelOptions[$level]['interval'])) {
return parent::_getNextLabel($currentLabel, $level);
}
if ($currentLabel !== false) {
$value = log10($currentLabel);
$base = floor($value);
$frac = $value - $base;
for ($i = 2; $i < 10; $i++) {
if ($frac <= (log10($i)-0.01)) {
$label = pow(10, $base)*$i;
if ($label > $this->_getMaximum()) {
return false;
} else {
return $label;
}
}
}
return pow(10, $base+1);
}
return max(1, $this->_minimum);
}
/**
* Get the axis intersection pixel position
*
* This is only to be called prior to output! I.e. between the user
* invokation of Image_Graph::done() and any actual output is performed.
* This is because it can change the axis range.
*
* @param double $value the intersection value to get the pixel-point for
* @return double The pixel position along the axis
* @access private
*/
function _intersectPoint($value)
{
if (($value <= 0) && ($value !== 'max') && ($value !== 'min')) {
$value = 1;
}
return parent::_intersectPoint($value);
}
}
?>
\ No newline at end of file
<?php
/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
/**
* Class for axis handling.
*
* PHP version 5
*
* LICENSE: This library is free software; you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation; either version 2.1 of the License, or (at your
* option) any later version. This library is distributed in the hope that it
* will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty
* of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser
* General Public 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
*
* @category Images
* @package Image_Graph
* @subpackage Axis
* @author Jesper Veggerby <pear.nosey@veggerby.dk>
* @author Stefan Neufeind <pear.neufeind@speedpartner.de>
* @copyright 2003-2009 The PHP Group
* @license http://www.gnu.org/copyleft/lesser.html LGPL License 2.1
* @version SVN: $Id: Logarithmic.php 291170 2009-11-23 03:50:22Z neufeind $
* @link http://pear.php.net/package/Image_Graph
*/
/**
* Include file Image/Graph/Axis.php
*/
require_once 'Image/Graph/Axis.php';
/**
* Diplays a logarithmic axis (either X- or Y-axis).
*
* @category Images
* @package Image_Graph
* @subpackage Axis
* @author Jesper Veggerby <pear.nosey@veggerby.dk>
* @author Stefan Neufeind <pear.neufeind@speedpartner.de>
* @copyright 2003-2009 The PHP Group
* @license http://www.gnu.org/copyleft/lesser.html LGPL License 2.1
* @version Release: @package_version@
* @link http://pear.php.net/package/Image_Graph
*/
class Image_Graph_Axis_Logarithmic extends Image_Graph_Axis
{
/**
* Image_Graph_AxisLogarithmic [Constructor].
*
* Normally a manual creation should not be necessary, axis are
* created automatically by the {@link Image_Graph_Plotarea} constructor
* unless explicitly defined otherwise
*
* @param int $type The type (direction) of the Axis, use IMAGE_GRAPH_AXIS_X
* for an X-axis (default, may be omitted) and IMAGE_GRAPH_AXIS_Y for Y-
* axis)
*/
function Image_Graph_Axis_Logarithmic($type = IMAGE_GRAPH_AXIS_X)
{
parent::__construct($type);
$this->showLabel(IMAGE_GRAPH_LABEL_MINIMUM + IMAGE_GRAPH_LABEL_MAXIMUM);
$this->_minimum = 1;
$this->_minimumSet = true;
}
/**
* Calculate the label interval
*
* If explicitly defined this will be calucated to an approximate best.
*
* @return double The label interval
* @access private
*/
function _calcLabelInterval()
{
$result = parent::_calcLabelInterval();
$this->_axisValueSpan = $this->_value($this->_axisSpan);
return $result;
}
/**
* Preprocessor for values, ie for using logarithmic axis
*
* @param double $value The value to preprocess
*
* @return double The preprocessed value
* @access private
*/
function _value($value)
{
return log10($value) - log10($this->_minimum);
}
/**
* Get next label point
*
* @param doubt $currentLabel The current label point. If omitted or false, the first is
* returned
* @param int $level Label level
*
* @return double The next label point
* @access private
*/
function _getNextLabel($currentLabel = false, $level = 1)
{
if (is_array($this->_labelOptions[$level]['interval'])) {
return parent::_getNextLabel($currentLabel, $level);
}
if ($currentLabel !== false) {
$value = log10($currentLabel);
$base = floor($value);
$frac = $value - $base;
for ($i = 2; $i < 10; $i++) {
if ($frac <= (log10($i)-0.01)) {
$label = pow(10, $base)*$i;
if ($label > $this->_getMaximum()) {
return false;
} else {
return $label;
}
}
}
return pow(10, $base+1);
}
return max(1, $this->_minimum);
}
/**
* Get the axis intersection pixel position
*
* This is only to be called prior to output! I.e. between the user
* invokation of Image_Graph::done() and any actual output is performed.
* This is because it can change the axis range.
*
* @param double $value the intersection value to get the pixel-point for
*
* @return double The pixel position along the axis
* @access private
*/
function _intersectPoint($value)
{
if (($value <= 0) && ($value !== 'max') && ($value !== 'min')) {
$value = 1;
}
return parent::_intersectPoint($value);
}
}
?>
<?php
/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
/**
* Class file containing a axis marker used for explicitly highlighting a area
* on the graph, based on an interval specified on an axis.
*
* PHP versions 4 and 5
*
* LICENSE: This library is free software; you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation; either version 2.1 of the License, or (at your
* option) any later version. This library is distributed in the hope that it
* will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty
* of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser
* General Public 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
*
* @category Images
* @package Image_Graph
* @subpackage Grid
* @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: Area.php,v 1.11 2005/08/24 20:36:04 nosey Exp $
* @link http://pear.php.net/package/Image_Graph
*/
/**
* Include file Image/Graph/Grid.php
*/
require_once 'Image/Graph/Grid.php';
/**
* Display a grid
*
* {@link Image_Graph_Grid}
*
* @category Images
* @package Image_Graph
* @subpackage Grid
* @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 Release: @package_version@
* @link http://pear.php.net/package/Image_Graph
*/
class Image_Graph_Axis_Marker_Area extends Image_Graph_Grid
{
/**
* The lower bound
* @var double
* @access private
*/
var $_lower = false;
/**
* The upper bound
* @var double
* @access private
*/
var $_upper = false;
/**
* [Constructor]
*/
function Image_Graph_Axis_Marker_Area()
{
parent::Image_Graph_Grid();
$this->_lineStyle = false;
}
/**
* Sets the lower bound of the area (value on the axis)
*
* @param double $lower the lower bound
*/
function setLowerBound($lower)
{
$this->_lower = $lower;
}
/**
* Sets the upper bound of the area (value on the axis)
*
* @param double $upper the upper bound
*/
function setUpperBound($upper)
{
$this->_upper = $upper;
}
/**
* Output the grid
*
* @return bool Was the output 'good' (true) or 'bad' (false).
* @access private
*/
function _done()
{
if (parent::_done() === false) {
return false;
}
if (!$this->_primaryAxis) {
return false;
}
$this->_canvas->startGroup(get_class($this));
$i = 0;
$this->_lower = max($this->_primaryAxis->_getMinimum(), $this->_lower);
$this->_upper = min($this->_primaryAxis->_getMaximum(), $this->_upper);
$secondaryPoints = $this->_getSecondaryAxisPoints();
reset($secondaryPoints);
list ($id, $previousSecondaryValue) = each($secondaryPoints);
while (list ($id, $secondaryValue) = each($secondaryPoints)) {
if ($this->_primaryAxis->_type == IMAGE_GRAPH_AXIS_X) {
$p1 = array ('Y' => $secondaryValue, 'X' => $this->_lower);
$p2 = array ('Y' => $previousSecondaryValue, 'X' => $this->_lower);
$p3 = array ('Y' => $previousSecondaryValue, 'X' => $this->_upper);
$p4 = array ('Y' => $secondaryValue, 'X' => $this->_upper);
} else {
$p1 = array ('X' => $secondaryValue, 'Y' => $this->_lower);
$p2 = array ('X' => $previousSecondaryValue, 'Y' => $this->_lower);
$p3 = array ('X' => $previousSecondaryValue, 'Y' => $this->_upper);
$p4 = array ('X' => $secondaryValue, 'Y' => $this->_upper);
}
$this->_canvas->addVertex(array('x' => $this->_pointX($p1), 'y' => $this->_pointY($p1)));
$this->_canvas->addVertex(array('x' => $this->_pointX($p2), 'y' => $this->_pointY($p2)));
$this->_canvas->addVertex(array('x' => $this->_pointX($p3), 'y' => $this->_pointY($p3)));
$this->_canvas->addVertex(array('x' => $this->_pointX($p4), 'y' => $this->_pointY($p4)));
$previousSecondaryValue = $secondaryValue;
$this->_getLineStyle();
$this->_getFillStyle();
$this->_canvas->polygon(array('connect' => true));
}
$this->_canvas->endGroup();
return true;
}
}
<?php
/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
/**
* Class file containing a axis marker used for explicitly highlighting a area
* on the graph, based on an interval specified on an axis.
*
* PHP version 5
*
* LICENSE: This library is free software; you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation; either version 2.1 of the License, or (at your
* option) any later version. This library is distributed in the hope that it
* will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty
* of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser
* General Public 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
*
* @category Images
* @package Image_Graph
* @subpackage Grid
* @author Jesper Veggerby <pear.nosey@veggerby.dk>
* @author Stefan Neufeind <pear.neufeind@speedpartner.de>
* @copyright 2003-2009 The PHP Group
* @license http://www.gnu.org/copyleft/lesser.html LGPL License 2.1
* @version SVN: $Id: Area.php 291170 2009-11-23 03:50:22Z neufeind $
* @link http://pear.php.net/package/Image_Graph
*/
/**
* Include file Image/Graph/Grid.php
*/
require_once 'Image/Graph/Grid.php';
/**
* Display a grid
*
* {@link Image_Graph_Grid}
*
* @category Images
* @package Image_Graph
* @subpackage Grid
* @author Jesper Veggerby <pear.nosey@veggerby.dk>
* @author Stefan Neufeind <pear.neufeind@speedpartner.de>
* @copyright 2003-2009 The PHP Group
* @license http://www.gnu.org/copyleft/lesser.html LGPL License 2.1
* @version Release: @package_version@
* @link http://pear.php.net/package/Image_Graph
*/
class Image_Graph_Axis_Marker_Area extends Image_Graph_Grid
{
/**
* The lower bound
* @var double
* @access private
*/
var $_lower = false;
/**
* The upper bound
* @var double
* @access private
*/
var $_upper = false;
/**
* [Constructor]
*/
function Image_Graph_Axis_Marker_Area()
{
parent::Image_Graph_Grid();
$this->_lineStyle = false;
}
/**
* Sets the lower bound of the area (value on the axis)
*
* @param double $lower the lower bound
*
* @return void
*/
function setLowerBound($lower)
{
$this->_lower = $lower;
}
/**
* Sets the upper bound of the area (value on the axis)
*
* @param double $upper the upper bound
*
* @return void
*/
function setUpperBound($upper)
{
$this->_upper = $upper;
}
/**
* Output the grid
*
* @return bool Was the output 'good' (true) or 'bad' (false).
* @access private
*/
function _done()
{
if (parent::_done() === false) {
return false;
}
if (!$this->_primaryAxis) {
return false;
}
$this->_canvas->startGroup(get_class($this));
$i = 0;
$this->_lower = max($this->_primaryAxis->_getMinimum(), $this->_lower);
$this->_upper = min($this->_primaryAxis->_getMaximum(), $this->_upper);
$secondaryPoints = $this->_getSecondaryAxisPoints();
reset($secondaryPoints);
list ($id, $previousSecondaryValue) = each($secondaryPoints);
while (list ($id, $secondaryValue) = each($secondaryPoints)) {
if ($this->_primaryAxis->_type == IMAGE_GRAPH_AXIS_X) {
$p1 = array ('Y' => $secondaryValue, 'X' => $this->_lower);
$p2 = array ('Y' => $previousSecondaryValue, 'X' => $this->_lower);
$p3 = array ('Y' => $previousSecondaryValue, 'X' => $this->_upper);
$p4 = array ('Y' => $secondaryValue, 'X' => $this->_upper);