From 6084c4dc956a95e2d907b457f930388933bd536f Mon Sep 17 00:00:00 2001 From: slerena Date: Mon, 25 Jun 2007 17:33:22 +0000 Subject: [PATCH] 2007-06-25 Sancho Lerena First commit for Beta2 :-) * reporting/fgraph.php: Fixed problem with combined graph that makes long time graphs more smaller and slightly visible. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@544 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 7 +++++++ pandora_console/index.php | 4 ++-- pandora_console/reporting/fgraph.php | 4 ++-- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 916d398192..06e9d0828a 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,10 @@ +2007-06-25 Sancho Lerena + + First commit for Beta2 :-) + + * reporting/fgraph.php: Fixed problem with combined graph that + makes long time graphs more smaller and slightly visible. + 2007-06-25 Raul Mateos * include/sytles/pandora.css: Updated "error" and "success" messages diff --git a/pandora_console/index.php b/pandora_console/index.php index 6eaca337e3..9de8057751 100644 --- a/pandora_console/index.php +++ b/pandora_console/index.php @@ -25,8 +25,8 @@ // Pandora FMS 1.x uses Pear Image::Graph code //Pandora Version, if not defined here it would take from config.php -$build_version="PC070622"; -$pandora_version="v1.3 Beta 1"; +$build_version="PC070623"; +$pandora_version="v1.3 Beta 2"; global $build_version; global $pandora_version; diff --git a/pandora_console/reporting/fgraph.php b/pandora_console/reporting/fgraph.php index 57ec8b3836..0a30673f6a 100644 --- a/pandora_console/reporting/fgraph.php +++ b/pandora_console/reporting/fgraph.php @@ -280,7 +280,7 @@ function graphic_combined_module ($module_list, $weight_list, $periodo, $width, } // ... and populated with data ... - for ($cc=0; $cc <= $resolution; $cc++) { + for ($cc=0; $cc < $resolution; $cc++) { $tdate = date('d/m', $valores[$cc][2])."\n".date('H:i', $valores[$cc][2]); for ($y = 0; $y < $module_number; $y++){ $dataset[$y]->addPoint($tdate, $real_data[$y][$cc] * $weight_list[$y]); @@ -324,7 +324,7 @@ function graphic_combined_module ($module_list, $weight_list, $periodo, $width, $AxisY->setTitle($unit_name, 'vertical'); $AxisX->setLabelInterval($resolution / 10); //$AxisY->forceMinimum($minvalue); - $AxisY->forceMaximum($max_value+($max_value/12)) ; + //$AxisY->forceMaximum($max_value+($max_value/12)) ; $GridY2 =& $Plotarea->addNew('bar_grid', IMAGE_GRAPH_AXIS_Y_SECONDARY); $GridY2->setLineColor('gray'); $GridY2->setFillColor('lightgray@0.05');