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

2013-07-03 Miguel de Dios <miguel.dedios@artica.es> 

* include/graphs/fgraph.php: change the source code style to make
	more easy the merges with the last branch.
	
	* include/graphs/functions_pchart.php: fixed the water mark for
	pie graph as image.
	
	MERGED FROM THE BRANCH 4.0




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8462 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
mdtrooper 2013-07-03 11:01:53 +00:00
parent 696f14235b
commit 8909befbc7
3 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pandora_console/ChangeLog
View File

@ -1,3 +1,13 @@
2013-07-03 Miguel de Dios <miguel.dedios@artica.es>
* include/graphs/fgraph.php: change the source code style to make
more easy the merges with the last branch.
* include/graphs/functions_pchart.php: fixed the water mark for
pie graph as image.
MERGED FROM THE BRANCH 4.0
2013-07-03 Miguel de Dios <miguel.dedios@artica.es>
* mobile/operation/networkmap.php: fixed the scroll for browser

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

@ -235,7 +235,7 @@ function area_graph($flash_chart, $chart_data, $width, $height, $color, $legend,
$water_mark = "", $font = '', $font_size = '', $unit = '', $ttl = 1, $series_type = array(),
$chart_extra_data = array(), $yellow_threshold = 0, $red_threshold = 0, $adapt_key = '', $force_integer = false,
$series_suffix_str = '', $menu = true) {
setup_watermark($water_mark, $water_mark_file, $water_mark_url);
// ATTENTION: The min size is 110x150
@ -320,6 +320,7 @@ function stacked_line_graph($flash_chart, $chart_data, $width, $height, $color,
return '<img src="' . $no_data_image . '" />';
}
if($flash_chart) {
return flot_line_stacked_graph($chart_data, $width, $height, $color, $legend, $long_index, $homeurl, $unit, $water_mark_url);
}
@ -350,7 +351,7 @@ function line_graph($flash_chart, $chart_data, $width, $height, $color, $legend,
$water_mark = "", $font = '', $font_size = '', $unit = '', $ttl = 1, $homeurl = '') {
setup_watermark($water_mark, $water_mark_file, $water_mark_url);
if (empty($chart_data)) {
return '<img src="' . $no_data_image . '" />';
}

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

@ -397,6 +397,12 @@ function pch_pie_graph ($graph_type, $data_values, $legend_values, $width,
$water_mark_height = 0;
$water_mark_width = 0;
if (!empty($water_mark)) {
if (is_array($water_mark)) {
if (!empty($water_mark['file'])) {
$water_mark = $water_mark['file'];
}
}
$size_water_mark = getimagesize($water_mark);
$water_mark_height = $size_water_mark[1];
$water_mark_width = $size_water_mark[0];
@ -414,7 +420,7 @@ function pch_pie_graph ($graph_type, $data_values, $legend_values, $width,
$PieChart->setSliceColor($key, hex_2_rgb($colors[$key]));
}
}
/* Draw an AA pie chart */
switch($graph_type) {
case "pie2d":