From 9848b90bd9eddf0324ffdc0d8f089c6c24683fe8 Mon Sep 17 00:00:00 2001 From: artem Date: Fri, 22 Feb 2008 15:28:41 +0000 Subject: - [DEV-118] added dashboard screen to monitoring (Artem) - [ZBX-206] merged rev.5367:5370 of 1.4/ (Artem) [fixed case sensitive hosts sorting] - [DEV-119] changes how users online are counted (Artem) - implemented patch [added y axis calculation type: "Calculated [Min=0]"] (Artem) - changes in schema.sql (Artem) - fixed JS lib, url class (Artem) - some other small fixes (Artem) git-svn-id: svn://svn.zabbix.com/trunk@5387 97f52cf1-0a1b-0410-bd0e-c28be96e8082 --- frontends/php/include/classes/chart.inc.php | 7 ++++--- frontends/php/include/classes/graph.inc.php | 1 + 2 files changed, 5 insertions(+), 3 deletions(-) (limited to 'frontends/php/include/classes') diff --git a/frontends/php/include/classes/chart.inc.php b/frontends/php/include/classes/chart.inc.php index 8fb74055..4a6668fa 100644 --- a/frontends/php/include/classes/chart.inc.php +++ b/frontends/php/include/classes/chart.inc.php @@ -504,8 +504,9 @@ class Chart extends Graph{ function calculateMinY($side){ if($this->yaxistype==GRAPH_YAXIS_TYPE_FIXED){ return $this->yaxismin; - } - else{ + } else if ($this->yaxistype==GRAPH_YAXIS_TYPE_CALCULATED_0_MIN) { + return 0; + } else{ unset($minY); for($i=0;$i<$this->num;$i++){ @@ -1102,4 +1103,4 @@ class Chart extends Graph{ ImageOut($this->im); } } -?> \ No newline at end of file +?> diff --git a/frontends/php/include/classes/graph.inc.php b/frontends/php/include/classes/graph.inc.php index c6b6f2d0..0cc74dc2 100644 --- a/frontends/php/include/classes/graph.inc.php +++ b/frontends/php/include/classes/graph.inc.php @@ -24,6 +24,7 @@ require_once "include/hosts.inc.php"; define("GRAPH_YAXIS_TYPE_CALCULATED",0); define("GRAPH_YAXIS_TYPE_FIXED",1); +define("GRAPH_YAXIS_TYPE_CALCULATED_0_MIN",2); define("GRAPH_YAXIS_SIDE_LEFT",0); define("GRAPH_YAXIS_SIDE_RIGHT",1); -- cgit