From b6b117e0248f09a1919b2b852a679d2fceca0884 Mon Sep 17 00:00:00 2001
From: slerena <slerena@gmail.com>
Date: Thu, 31 May 2007 18:49:14 +0000
Subject: [PATCH] 2007-05-31 Sancho Lerena <slerena@artica.es>
* fgraph.php: Small improvements in combined graphs.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@482 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
---
pandora_console/ChangeLog | 4 ++++
pandora_console/reporting/fgraph.php | 5 +++--
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index 0caded5fdf..b1bf9add4a 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,7 @@
+2007-05-31 Sancho Lerena <slerena@artica.es>
+
+ * fgraph.php: Small improvements in combined graphs.
+
2007-05-30 Sancho Lerena <slerena@artica.es>
* pandoradb_data.sql: Added "style" token for default config.
diff --git a/pandora_console/reporting/fgraph.php b/pandora_console/reporting/fgraph.php
index 43a7424eec..d19360a73f 100644
--- a/pandora_console/reporting/fgraph.php
+++ b/pandora_console/reporting/fgraph.php
@@ -109,7 +109,7 @@ function graphic_combined_module ($module_list, $weight_list, $periodo, $width,
$id_agente = dame_agente_id($nombre_agente);
$nombre_modulo = dame_nombre_modulo_agentemodulo($id_agente_modulo);
- $module_list_name[$y] = substr($nombre_agente,0,8)."/".substr($nombre_modulo,0,8);
+ $module_list_name[$y] = substr($nombre_agente,0,8)."/".substr($nombre_modulo,0,18);
for ($x = 0; $x <= $resolution; $x++) {
$valores[$x][0] = 0; // SUM of all values for this interval
$valores[$x][1] = 0; // counter
@@ -212,6 +212,7 @@ function graphic_combined_module ($module_list, $weight_list, $periodo, $width,
$weight_list[$y] = ($max_value / $mod_data[$y]) + ($weight_list[$y]-1);
if ($weight_list[$y] != 1)
$module_list_name[$y] .= " (x". format_numeric($weight_list[$y],1).")";
+ $module_list_name[$y] = $module_list_name[$y]." (MAX: ".format_numeric($mod_data[$y]).")";
}
// Create graph
@@ -240,7 +241,7 @@ function graphic_combined_module ($module_list, $weight_list, $periodo, $width,
$Subtitle = Image_Graph::factory('title', array(' '.$title, 7)),
90
),
- Image_Graph::horizontal(
+ Image_Graph::vertical(
$Plotarea = Image_Graph::factory('plotarea'),
$Legend = Image_Graph::factory('legend'),
80