mirror of
https://bitbucket.org/jsuto/piler.git
synced 2025-06-13 03:17:01 +02:00
Updated libchart and model/stat/chart.php
Signed-off-by: Janos SUTO <sj@acts.hu>
This commit is contained in:
@ -1,130 +1,130 @@
|
||||
<?php
|
||||
/* Libchart - PHP chart library
|
||||
* Copyright (C) 2005-2010 Jean-Marc Tr<54>meaux (jm.tremeaux at gmail.com)
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program 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 General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*
|
||||
*/
|
||||
|
||||
/**
|
||||
* Automatic axis boundaries and ticks calibration
|
||||
*
|
||||
* @author Jean-Marc Tr<54>meaux (jm.tremeaux at gmail.com)
|
||||
*/
|
||||
class Axis {
|
||||
private $min;
|
||||
private $max;
|
||||
private $guide;
|
||||
private $delta;
|
||||
private $magnitude;
|
||||
private $displayMin;
|
||||
private $displayMax;
|
||||
private $tics;
|
||||
|
||||
/**
|
||||
* Creates a new axis formatter.
|
||||
*
|
||||
* @param integer minimum value on the axis
|
||||
* @param integer maximum value on the axis
|
||||
*/
|
||||
public function Axis($min, $max) {
|
||||
$this->min = $min;
|
||||
$this->max = $max;
|
||||
/* Libchart - PHP chart library
|
||||
* Copyright (C) 2005-2011 Jean-Marc Tr<54>meaux (jm.tremeaux at gmail.com)
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program 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 General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*
|
||||
*/
|
||||
|
||||
/**
|
||||
* Automatic axis boundaries and ticks calibration
|
||||
*
|
||||
* @author Jean-Marc Tr<54>meaux (jm.tremeaux at gmail.com)
|
||||
*/
|
||||
class Axis {
|
||||
private $min;
|
||||
private $max;
|
||||
private $guide;
|
||||
private $delta;
|
||||
private $magnitude;
|
||||
private $displayMin;
|
||||
private $displayMax;
|
||||
private $tics;
|
||||
|
||||
/**
|
||||
* Creates a new axis formatter.
|
||||
*
|
||||
* @param integer minimum value on the axis
|
||||
* @param integer maximum value on the axis
|
||||
*/
|
||||
public function Axis($min, $max) {
|
||||
$this->min = $min;
|
||||
$this->max = $max;
|
||||
|
||||
$this->guide = 10;
|
||||
}
|
||||
$this->guide = 10;
|
||||
}
|
||||
|
||||
/**
|
||||
* Computes value between two ticks.
|
||||
*/
|
||||
public function quantizeTics() {
|
||||
// Approximate number of decades, in [1..10[
|
||||
$norm = $this->delta / $this->magnitude;
|
||||
/**
|
||||
* Computes value between two ticks.
|
||||
*/
|
||||
public function quantizeTics() {
|
||||
// Approximate number of decades, in [1..10[
|
||||
$norm = $this->delta / $this->magnitude;
|
||||
|
||||
// Approximate number of tics per decade
|
||||
$posns = $this->guide / $norm;
|
||||
// Approximate number of tics per decade
|
||||
$posns = $this->guide / $norm;
|
||||
|
||||
if ($posns > 20) {
|
||||
$tics = 0.05; // e.g. 0, .05, .10, ...
|
||||
} else if ($posns > 10) {
|
||||
$tics = 0.2; // e.g. 0, .1, .2, ...
|
||||
} else if ($posns > 5) {
|
||||
$tics = 0.4; // e.g. 0, 0.2, 0.4, ...
|
||||
} else if ($posns > 3) {
|
||||
$tics = 0.5; // e.g. 0, 0.5, 1, ...
|
||||
} else if ($posns > 2) {
|
||||
$tics = 1; // e.g. 0, 1, 2, ...
|
||||
} else if ($posns > 0.25) {
|
||||
$tics = 2; // e.g. 0, 2, 4, 6
|
||||
} else {
|
||||
$tics = ceil($norm);
|
||||
}
|
||||
|
||||
$this->tics = $tics * $this->magnitude;
|
||||
}
|
||||
if ($posns > 20) {
|
||||
$tics = 0.05; // e.g. 0, .05, .10, ...
|
||||
} else if ($posns > 10) {
|
||||
$tics = 0.2; // e.g. 0, .1, .2, ...
|
||||
} else if ($posns > 5) {
|
||||
$tics = 0.4; // e.g. 0, 0.2, 0.4, ...
|
||||
} else if ($posns > 3) {
|
||||
$tics = 0.5; // e.g. 0, 0.5, 1, ...
|
||||
} else if ($posns > 2) {
|
||||
$tics = 1; // e.g. 0, 1, 2, ...
|
||||
} else if ($posns > 0.25) {
|
||||
$tics = 2; // e.g. 0, 2, 4, 6
|
||||
} else {
|
||||
$tics = ceil($norm);
|
||||
}
|
||||
|
||||
$this->tics = $tics * $this->magnitude;
|
||||
}
|
||||
|
||||
/**
|
||||
* Computes automatic boundaries on the axis
|
||||
*/
|
||||
public function computeBoundaries() {
|
||||
// Range
|
||||
$this->delta = abs($this->max - $this->min);
|
||||
/**
|
||||
* Computes automatic boundaries on the axis
|
||||
*/
|
||||
public function computeBoundaries() {
|
||||
// Range
|
||||
$this->delta = abs($this->max - $this->min);
|
||||
|
||||
// Check for null distribution
|
||||
if ($this->delta == 0)
|
||||
$this->delta = 1;
|
||||
|
||||
// Order of magnitude of range
|
||||
$this->magnitude = pow(10, floor(log10($this->delta)));
|
||||
|
||||
$this->quantizeTics();
|
||||
// Check for null distribution
|
||||
if ($this->delta == 0)
|
||||
$this->delta = 1;
|
||||
|
||||
// Order of magnitude of range
|
||||
$this->magnitude = pow(10, floor(log10($this->delta)));
|
||||
|
||||
$this->quantizeTics();
|
||||
|
||||
$this->displayMin = floor($this->min / $this->tics) * $this->tics;
|
||||
$this->displayMax = ceil($this->max / $this->tics) * $this->tics;
|
||||
$this->displayDelta = $this->displayMax - $this->displayMin;
|
||||
|
||||
// Check for null distribution
|
||||
if ($this->displayDelta == 0) {
|
||||
$this->displayDelta = 1;
|
||||
}
|
||||
}
|
||||
$this->displayMin = floor($this->min / $this->tics) * $this->tics;
|
||||
$this->displayMax = ceil($this->max / $this->tics) * $this->tics;
|
||||
$this->displayDelta = $this->displayMax - $this->displayMin;
|
||||
|
||||
// Check for null distribution
|
||||
if ($this->displayDelta == 0) {
|
||||
$this->displayDelta = 1;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the lower boundary on the axis3
|
||||
*
|
||||
* @return integer lower boundary on the axis
|
||||
*/
|
||||
public function getLowerBoundary() {
|
||||
return $this->displayMin;
|
||||
}
|
||||
/**
|
||||
* Get the lower boundary on the axis3
|
||||
*
|
||||
* @return integer lower boundary on the axis
|
||||
*/
|
||||
public function getLowerBoundary() {
|
||||
return $this->displayMin;
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the upper boundary on the axis3
|
||||
*
|
||||
* @return integer upper boundary on the axis
|
||||
*/
|
||||
public function getUpperBoundary() {
|
||||
return $this->displayMax;
|
||||
}
|
||||
/**
|
||||
* Get the upper boundary on the axis3
|
||||
*
|
||||
* @return integer upper boundary on the axis
|
||||
*/
|
||||
public function getUpperBoundary() {
|
||||
return $this->displayMax;
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the value between two ticks3
|
||||
*
|
||||
* @return integer value between two ticks
|
||||
*/
|
||||
public function getTics() {
|
||||
return $this->tics;
|
||||
}
|
||||
}
|
||||
/**
|
||||
* Get the value between two ticks3
|
||||
*
|
||||
* @return integer value between two ticks
|
||||
*/
|
||||
public function getTics() {
|
||||
return $this->tics;
|
||||
}
|
||||
}
|
||||
?>
|
@ -1,156 +1,156 @@
|
||||
<?php
|
||||
/* Libchart - PHP chart library
|
||||
* Copyright (C) 2005-2010 Jean-Marc Tr<54>meaux (jm.tremeaux at gmail.com)
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program 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 General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*
|
||||
*/
|
||||
|
||||
/**
|
||||
* Object representing the bounds of a dataset (its minimal and maximal values) on its vertical axis.
|
||||
* The bounds are automatically calculated from a XYDataSet or XYSeriesDataSet.
|
||||
* Default (calculated) bounds can be overriden using the setLowerBound() and setUpperBound() methods.
|
||||
*
|
||||
* @author Jean-Marc Tr<54>meaux (jm.tremeaux at gmail.com)
|
||||
* Created on 25 july 2007
|
||||
*/
|
||||
class Bound {
|
||||
/**
|
||||
* Manually set lower bound, overrides the value calculated by computeBound().
|
||||
*/
|
||||
private $lowerBound = null;
|
||||
/* Libchart - PHP chart library
|
||||
* Copyright (C) 2005-2011 Jean-Marc Tr<54>meaux (jm.tremeaux at gmail.com)
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program 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 General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*
|
||||
*/
|
||||
|
||||
/**
|
||||
* Object representing the bounds of a dataset (its minimal and maximal values) on its vertical axis.
|
||||
* The bounds are automatically calculated from a XYDataSet or XYSeriesDataSet.
|
||||
* Default (calculated) bounds can be overriden using the setLowerBound() and setUpperBound() methods.
|
||||
*
|
||||
* @author Jean-Marc Tr<54>meaux (jm.tremeaux at gmail.com)
|
||||
* Created on 25 july 2007
|
||||
*/
|
||||
class Bound {
|
||||
/**
|
||||
* Manually set lower bound, overrides the value calculated by computeBound().
|
||||
*/
|
||||
private $lowerBound = null;
|
||||
|
||||
/**
|
||||
* Manually set upper bound, overrides the value calculated by computeBound().
|
||||
*/
|
||||
private $upperBound = null;
|
||||
|
||||
/**
|
||||
* Computed min bound.
|
||||
*/
|
||||
private $yMinValue = null;
|
||||
|
||||
/**
|
||||
* Computed max bound.
|
||||
*/
|
||||
private $yMaxValue = null;
|
||||
|
||||
/**
|
||||
* Compute the boundaries on the axis.
|
||||
*
|
||||
* @param dataSet The data set
|
||||
*/
|
||||
public function computeBound($dataSet) {
|
||||
// Check if the data set is empty
|
||||
$dataSetEmpty = true;
|
||||
$serieList = null;
|
||||
if ($dataSet instanceof XYDataSet) {
|
||||
$pointList = $dataSet->getPointList();
|
||||
$dataSetEmpty = count($pointList) == 0;
|
||||
|
||||
if (!$dataSetEmpty) {
|
||||
// Process it as a serie
|
||||
$serieList = array();
|
||||
array_push($serieList, $dataSet);
|
||||
}
|
||||
} else if ($dataSet instanceof XYSeriesDataSet) {
|
||||
$serieList = $dataSet->getSerieList();
|
||||
if (count($serieList) > 0) {
|
||||
$serie = current($serieList);
|
||||
$dataSetEmpty = count($serie) == 0;
|
||||
}
|
||||
} else {
|
||||
die("Error: unknown dataset type");
|
||||
}
|
||||
|
||||
// If the dataset is empty, default some bounds
|
||||
$yMin = 0;
|
||||
$yMax = 1;
|
||||
if (!$dataSetEmpty) {
|
||||
// Compute lower and upper bound on the value axis
|
||||
unset($yMin);
|
||||
unset($yMax);
|
||||
/**
|
||||
* Manually set upper bound, overrides the value calculated by computeBound().
|
||||
*/
|
||||
private $upperBound = null;
|
||||
|
||||
/**
|
||||
* Computed min bound.
|
||||
*/
|
||||
private $yMinValue = null;
|
||||
|
||||
/**
|
||||
* Computed max bound.
|
||||
*/
|
||||
private $yMaxValue = null;
|
||||
|
||||
/**
|
||||
* Compute the boundaries on the axis.
|
||||
*
|
||||
* @param dataSet The data set
|
||||
*/
|
||||
public function computeBound($dataSet) {
|
||||
// Check if the data set is empty
|
||||
$dataSetEmpty = true;
|
||||
$serieList = null;
|
||||
if ($dataSet instanceof XYDataSet) {
|
||||
$pointList = $dataSet->getPointList();
|
||||
$dataSetEmpty = count($pointList) == 0;
|
||||
|
||||
if (!$dataSetEmpty) {
|
||||
// Process it as a serie
|
||||
$serieList = array();
|
||||
array_push($serieList, $dataSet);
|
||||
}
|
||||
} else if ($dataSet instanceof XYSeriesDataSet) {
|
||||
$serieList = $dataSet->getSerieList();
|
||||
if (count($serieList) > 0) {
|
||||
$serie = current($serieList);
|
||||
$dataSetEmpty = count($serie) == 0;
|
||||
}
|
||||
} else {
|
||||
die("Error: unknown dataset type");
|
||||
}
|
||||
|
||||
// If the dataset is empty, default some bounds
|
||||
$yMin = 0;
|
||||
$yMax = 1;
|
||||
if (!$dataSetEmpty) {
|
||||
// Compute lower and upper bound on the value axis
|
||||
unset($yMin);
|
||||
unset($yMax);
|
||||
|
||||
foreach ($serieList as $serie) {
|
||||
foreach ($serie->getPointList() as $point) {
|
||||
$y = $point->getY();
|
||||
|
||||
if (!isset($yMin)) {
|
||||
$yMin = $y;
|
||||
$yMax = $y;
|
||||
} else {
|
||||
if ($y < $yMin) {
|
||||
$yMin = $y;
|
||||
}
|
||||
|
||||
if ($y > $yMax) {
|
||||
$yMax = $y;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
foreach ($serieList as $serie) {
|
||||
foreach ($serie->getPointList() as $point) {
|
||||
$y = $point->getY();
|
||||
|
||||
if (!isset($yMin)) {
|
||||
$yMin = $y;
|
||||
$yMax = $y;
|
||||
} else {
|
||||
if ($y < $yMin) {
|
||||
$yMin = $y;
|
||||
}
|
||||
|
||||
if ($y > $yMax) {
|
||||
$yMax = $y;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// If user specified bounds and they are actually greater than computer bounds, override computed bounds
|
||||
if (isset($this->lowerBound) && $this->lowerBound < $yMin) {
|
||||
$this->yMinValue = $this->lowerBound;
|
||||
} else {
|
||||
$this->yMinValue = $yMin;
|
||||
}
|
||||
// If user specified bounds and they are actually greater than computer bounds, override computed bounds
|
||||
if (isset($this->lowerBound) && $this->lowerBound < $yMin) {
|
||||
$this->yMinValue = $this->lowerBound;
|
||||
} else {
|
||||
$this->yMinValue = $yMin;
|
||||
}
|
||||
|
||||
if (isset($this->upperBound) && $this->upperBound > $yMax) {
|
||||
$this->yMaxValue = $this->upperBound;
|
||||
} else {
|
||||
$this->yMaxValue = $yMax;
|
||||
}
|
||||
}
|
||||
if (isset($this->upperBound) && $this->upperBound > $yMax) {
|
||||
$this->yMaxValue = $this->upperBound;
|
||||
} else {
|
||||
$this->yMaxValue = $yMax;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Getter of yMinValue.
|
||||
*
|
||||
* @return min bound
|
||||
*/
|
||||
public function getYMinValue() {
|
||||
return $this->yMinValue;
|
||||
}
|
||||
/**
|
||||
* Getter of yMinValue.
|
||||
*
|
||||
* @return min bound
|
||||
*/
|
||||
public function getYMinValue() {
|
||||
return $this->yMinValue;
|
||||
}
|
||||
|
||||
/**
|
||||
* Getter of yMaxValue.
|
||||
*
|
||||
* @return max bound
|
||||
*/
|
||||
public function getYMaxValue() {
|
||||
return $this->yMaxValue;
|
||||
}
|
||||
/**
|
||||
* Getter of yMaxValue.
|
||||
*
|
||||
* @return max bound
|
||||
*/
|
||||
public function getYMaxValue() {
|
||||
return $this->yMaxValue;
|
||||
}
|
||||
|
||||
/**
|
||||
* Set manually the lower boundary value (overrides the automatic formatting).
|
||||
* Typical usage is to set the bars starting from zero.
|
||||
*
|
||||
* @param double lower boundary value
|
||||
*/
|
||||
public function setLowerBound($lowerBound) {
|
||||
$this->lowerBound = $lowerBound;
|
||||
}
|
||||
/**
|
||||
* Set manually the lower boundary value (overrides the automatic formatting).
|
||||
* Typical usage is to set the bars starting from zero.
|
||||
*
|
||||
* @param double lower boundary value
|
||||
*/
|
||||
public function setLowerBound($lowerBound) {
|
||||
$this->lowerBound = $lowerBound;
|
||||
}
|
||||
|
||||
/**
|
||||
* Set manually the upper boundary value (overrides the automatic formatting).
|
||||
*
|
||||
* @param double upper boundary value
|
||||
*/
|
||||
public function setUpperBound($upperBound) {
|
||||
$this->upperBound = $upperBound;
|
||||
}
|
||||
}
|
||||
/**
|
||||
* Set manually the upper boundary value (overrides the automatic formatting).
|
||||
*
|
||||
* @param double upper boundary value
|
||||
*/
|
||||
public function setUpperBound($upperBound) {
|
||||
$this->upperBound = $upperBound;
|
||||
}
|
||||
}
|
||||
?>
|
Reference in New Issue
Block a user