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

2011-08-29 Miguel de Dios <miguel.dedios@artica.es> 

* include/graphs/functions_fsgraph.php, include/graphs/fgraph.php: added
	$homeurl parameter to graph vertical column in flash.
	
	Fixes: #3398097



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4845 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
mdtrooper 2011-08-29 17:30:48 +00:00
parent 2f09c48527
commit 39a180eb66
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pandora_console/ChangeLog
View File

@ -1,3 +1,10 @@
2011-08-29 Miguel de Dios <miguel.dedios@artica.es>
* include/graphs/functions_fsgraph.php, include/graphs/fgraph.php: added
$homeurl parameter to graph vertical column in flash.
Fixes: #3398097
2011-08-29 Dario Rodriguez <dario.rodriguez@artica.es> 2011-08-29 Dario Rodriguez <dario.rodriguez@artica.es>
* include/functions_graph.php: Fixed a bug setting graphic resolution * include/functions_graph.php: Fixed a bug setting graphic resolution

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

@ -159,7 +159,7 @@ function vbar_graph($flash_chart, $chart_data, $width, $height, $color = array()
$water_mark = '', $font = '', $font_size = '', $force_steps = true, $ttl = 1) { $water_mark = '', $font = '', $font_size = '', $force_steps = true, $ttl = 1) {
if($flash_chart) { if($flash_chart) {
echo fs_2d_column_chart ($chart_data, $width, $height); echo fs_2d_column_chart ($chart_data, $width, $height, $homedir);
} }
else { else {
$graph = array(); $graph = array();

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

@ -520,7 +520,7 @@ function fs_2d_pie_chart ($data, $names, $width, $height, $background = "EEEEEE"
} }
// Returns a 2D column chart // Returns a 2D column chart
function fs_2d_column_chart ($data, $width, $height) { function fs_2d_column_chart ($data, $width, $height, $homeurl = '') {
if (sizeof ($data) == 0) { if (sizeof ($data) == 0) {
return; return;
} }
@ -540,7 +540,6 @@ function fs_2d_column_chart ($data, $width, $height) {
$step = round($ndata/$xdata_display); $step = round($ndata/$xdata_display);
if(is_array(reset($data))) { if(is_array(reset($data))) {
$data2 = array(); $data2 = array();
$count = 0; $count = 0;
@ -591,7 +590,7 @@ function fs_2d_column_chart ($data, $width, $height) {
. ($empty == 1 ? ';yAxisMinValue=0;yAxisMaxValue=1' : '')); . ($empty == 1 ? ';yAxisMinValue=0;yAxisMaxValue=1' : ''));
// Return the code // Return the code
return get_chart_code ($chart, $width, $height, 'include/graphs/FusionCharts/FCF_Column2D.swf'); return get_chart_code ($chart, $width, $height, $homeurl . 'include/graphs/FusionCharts/FCF_Column2D.swf');
} }
// Returns a BAR Horizontalchart // Returns a BAR Horizontalchart