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

2011-04-14 Miguel de Dios <miguel.dedios@artica.es> 

* include/graphs/functions_pchart.php: setted the xmargin to 0.
	
	* include/graphs/fgraph.php: in function "pie_graph" reduce to 8 the
	portions for the pie.
	
	* include/functions_db.php: changed the call "debug" to "ui_debug".



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4220 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
mdtrooper 2011-04-14 12:02:45 +00:00
parent 79af995118
commit 1110c2d103
4 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pandora_console/ChangeLog
View File

@ -1,3 +1,12 @@
2011-04-14 Miguel de Dios <miguel.dedios@artica.es>
* include/graphs/functions_pchart.php: setted the xmargin to 0.
* include/graphs/fgraph.php: in function "pie_graph" reduce to 8 the
portions for the pie.
* include/functions_db.php: changed the call "debug" to "ui_debug".
2011-04-14 Sergio Martin <sergio.martin@artica.es> 2011-04-14 Sergio Martin <sergio.martin@artica.es>
* include/graphs/functions_pchart.php * include/graphs/functions_pchart.php

2
pandora_console/include/functions_db.php
View File

@ -2573,7 +2573,7 @@ function sql_error_handler ($errno, $errstr) {
global $config; global $config;
/* If debug is activated, this will also show the backtrace */ /* If debug is activated, this will also show the backtrace */
if (debug ($errstr)) if (ui_debug ($errstr))
return false; return false;
if (error_reporting () <= $errno) if (error_reporting () <= $errno)

11
pandora_console/include/graphs/fgraph.php
View File

@ -53,7 +53,7 @@ switch($graph_type) {
$title = get_parameter('title'); $title = get_parameter('title');
$mode = get_parameter('mode', 1); $mode = get_parameter('mode', 1);
gd_progress_bar ($width, $height, $progress, $title, $font, $out_of_lim_str, $out_of_lim_image, $mode); gd_progress_bar ($width, $height, $progress, $title, $font, $out_of_lim_str, $out_of_lim_image, $mode);
break; break;
} }
@ -289,8 +289,8 @@ function pie2d_graph($flash_chart, $chart_data, $width, $height, $others_str = "
} }
function pie_graph($graph_type, $flash_chart, $chart_data, $width, $height, $others_str) { function pie_graph($graph_type, $flash_chart, $chart_data, $width, $height, $others_str) {
// This library allows only 9 colors // This library allows only 8 colors
$max_values = 9; $max_values = 8;
if(count($chart_data) > $max_values) { if(count($chart_data) > $max_values) {
$chart_data_trunc = array(); $chart_data_trunc = array();
@ -300,6 +300,9 @@ function pie_graph($graph_type, $flash_chart, $chart_data, $width, $height, $oth
$chart_data_trunc[$key] = $value; $chart_data_trunc[$key] = $value;
} }
else { else {
if (!isset($chart_data_trunc[$others_str])) {
$chart_data_trunc[$others_str] = 0;
}
$chart_data_trunc[$others_str] += $value; $chart_data_trunc[$others_str] += $value;
} }
$n++; $n++;
@ -324,7 +327,7 @@ function pie_graph($graph_type, $flash_chart, $chart_data, $width, $height, $oth
$graph['height'] = $height; $graph['height'] = $height;
$id_graph = serialize_in_temp($graph); $id_graph = serialize_in_temp($graph);
switch($graph_type) { switch($graph_type) {
case "2d": case "2d":
return "<img src='include/graphs/functions_pchart.php?graph_type=pie2d&id_graph=".$id_graph."'>"; return "<img src='include/graphs/functions_pchart.php?graph_type=pie2d&id_graph=".$id_graph."'>";

2
pandora_console/include/graphs/functions_pchart.php
View File

@ -605,7 +605,7 @@ function pch_vertical_graph ($graph_type, $index, $data, $width, $height, $rgb_c
"GridG"=>200, "GridG"=>200,
"GridB"=>200, "GridB"=>200,
"DrawSubTicks"=>TRUE, "DrawSubTicks"=>TRUE,
"CycleBackground"=>TRUE, "Mode"=>SCALE_MODE_START0, "LabelRotation" => 60); "CycleBackground"=>TRUE, "Mode"=>SCALE_MODE_START0, "LabelRotation" => 60, "XMargin" => 0);
$myPicture->drawScale($scaleSettings); $myPicture->drawScale($scaleSettings);
/* Turn on shadow computing */ /* Turn on shadow computing */