tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

2011-03-31 Sergio Martin <sergio.martin@artica.es> 

* include/graphs/pChart/pDraw.class.php: Added to 
	library an option to avoid draw zeros in area 
	charts



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4155 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
zarzuelo 2011-03-31 12:13:23 +00:00
parent e123451372
commit 8278b498ed
2 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pandora_console/ChangeLog
View File

@ -1,3 +1,9 @@
2011-03-31 Sergio Martin <sergio.martin@artica.es>
* include/graphs/pChart/pDraw.class.php: Added to
library an option to avoid draw zeros in area
charts
2011-03-31 Sergio Martin <sergio.martin@artica.es> 2011-03-31 Sergio Martin <sergio.martin@artica.es>
* include/graphs/pChart/pDraw.class.php: Fixed * include/graphs/pChart/pDraw.class.php: Fixed

9
pandora_console/include/graphs/pChart/pDraw.class.php
View File

@ -3660,6 +3660,7 @@
function drawAreaChart($Format=NULL) function drawAreaChart($Format=NULL)
{ {
$DisplayValues = isset($Format["DisplayValues"]) ? $Format["DisplayValues"] : FALSE; $DisplayValues = isset($Format["DisplayValues"]) ? $Format["DisplayValues"] : FALSE;
$DisplayZeros = isset($Format["DisplayZeros"]) ? $Format["DisplayZeros"] : TRUE;
$DisplayOffset = isset($Format["DisplayOffset"]) ? $Format["DisplayOffset"] : 2; $DisplayOffset = isset($Format["DisplayOffset"]) ? $Format["DisplayOffset"] : 2;
$DisplayColor = isset($Format["DisplayColor"]) ? $Format["DisplayColor"] : DISPLAY_MANUAL; $DisplayColor = isset($Format["DisplayColor"]) ? $Format["DisplayColor"] : DISPLAY_MANUAL;
$DisplayR = isset($Format["DisplayR"]) ? $Format["DisplayR"] : 0; $DisplayR = isset($Format["DisplayR"]) ? $Format["DisplayR"] : 0;
@ -3700,8 +3701,16 @@
$X = $this->GraphAreaX1 + $XMargin; $LastX = NULL; $LastY = NULL; $X = $this->GraphAreaX1 + $XMargin; $LastX = NULL; $LastY = NULL;
if ( !is_array($PosArray) ) { $Value = $PosArray; $PosArray = ""; $PosArray[0] = $Value; } if ( !is_array($PosArray) ) { $Value = $PosArray; $PosArray = ""; $PosArray[0] = $Value; }
$lastKey = 0;
foreach($PosArray as $Key => $Y) foreach($PosArray as $Key => $Y)
{ {
// Hack to avoid draw zero values
debugPrint($Serie["Data"][$Key]." - ".$lastKey, '/tmp/logo');
if(!$DisplayZeros && $Serie["Data"][$Key] == 0 && $lastKey == 0) {
$Y = VOID;
}
$lastKey = $Serie["Data"][$Key];
if ( $DisplayValues && $Serie["Data"][$Key] != VOID ) if ( $DisplayValues && $Serie["Data"][$Key] != VOID )
{ {
if ( $Serie["Data"][$Key] > 0 ) { $Align = TEXT_ALIGN_BOTTOMMIDDLE; $Offset = $DisplayOffset; } else { $Align = TEXT_ALIGN_TOPMIDDLE; $Offset = -$DisplayOffset; } if ( $Serie["Data"][$Key] > 0 ) { $Align = TEXT_ALIGN_BOTTOMMIDDLE; $Offset = $DisplayOffset; } else { $Align = TEXT_ALIGN_TOPMIDDLE; $Offset = -$DisplayOffset; }