Graphs to support units.

git-svn-id: svn://svn.zabbix.com/trunk@820 97f52cf1-0a1b-0410-bd0e-c28be96e8082

3 files changed, 13 insertions, 3 deletions

diff --git a/frontends/php/chart2.php b/frontends/php/chart2.php
index f9c39d96..980fe15b 100644
--- a/frontends/php/chart2.php
+++ b/frontends/php/chart2.php
@@ -334,7 +334,15 @@
 	{
 		for($i=0;$i<=$my_steps;$i++)
 		{
-			ImageString($im, 1, $sizeX+5+$shiftX, $i/$my_steps*$sizeY+$shiftYup-4, $maxY-$i/$my_steps*($maxY-$minY) , $darkred);
+			if(isset($itemid))
+			{
+				$z=get_item_by_itemid($itemid);
+				ImageString($im, 1, $sizeX+5+$shiftX, $i/$my_steps*$sizeY+$shiftYup-4, convert_units($maxY-$i/$my_steps*($maxY-$minY),$z["units"],$z["multiplier"]) , $darkred);
+			}
+			else
+			{
+				ImageString($im, 1, $sizeX+5+$shiftX, $i/$my_steps*$sizeY+$shiftYup-4, $maxY-$i/$my_steps*($maxY-$minY) , $darkred);
+			}
 		}
 		for($j=$stepTime-$correctTime;$j<=($maxX-$minX);$j+=$stepTime)
 		{
diff --git a/frontends/php/chart3.php b/frontends/php/chart3.php
index 6386aee2..87829349 100644
--- a/frontends/php/chart3.php
+++ b/frontends/php/chart3.php
@@ -239,9 +239,10 @@
 
 	if(isset($nodata)&&($nodata == 0))
 	{
+		$item=get_item_by_itemid($HTTP_GET_VARS["itemid"]);
 		for($i=0;$i<=$sizeY;$i+=$sizeY/5)
 		{
-			ImageString($im, 1, $sizeX+5+$shiftX, $sizeY-$i-4+$shiftYup, $i*($maxY-$minY)/$sizeY+$minY , $darkred);
+			ImageString($im, 1, $sizeX+5+$shiftX, $sizeY-$i-4+$shiftYup, convert_units($i*($maxY-$minY)/$sizeY+$minY,$item["units"],$item["multiplier"]) , $darkred);
 		}
 
 //		date("dS of F Y h:i:s A",DBget_field($result,0,0));
diff --git a/frontends/php/trend.php b/frontends/php/trend.php
index 3c181b38..1c84dc43 100644
--- a/frontends/php/trend.php
+++ b/frontends/php/trend.php
@@ -233,9 +233,10 @@ else
 
 	if($nodata == 0)
 	{
+		$item=get_item_by_itemid($HTTP_GET_VARS["itemid"]);
 		for($i=0;$i<=$sizeY;$i+=$sizeY/5)
 		{
-			ImageString($im, 1, $sizeX+5+$shiftX, $sizeY-$i-4+$shiftY, $i*($maxY-$minY)/$sizeY+$minY , $darkred);
+			ImageString($im, 1, $sizeX+5+$shiftX, $sizeY-$i-4+$shiftY, convert_units($i*($maxY-$minY)/$sizeY+$minY,$item["units"],$item["multiplier"]) , $darkred);
 		}
 
 //		date("dS of F Y h:i:s A",DBget_field($result,0,0));