- new draw type for graphs: Dot (Alexei)

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

3 files changed, 8 insertions, 0 deletions

diff --git a/frontends/php/include/classes.inc.php b/frontends/php/include/classes.inc.php
index 09a64f8f..732be9c5 100644
--- a/frontends/php/include/classes.inc.php
+++ b/frontends/php/include/classes.inc.php
@@ -290,6 +290,11 @@
 
 				ImageFilledPolygon($this->im,$a,4,$this->colors[$this->items[$item]["color"]]);
 			}
+			else if($this->items[$item]["drawtype"] == GRAPH_DRAW_TYPE_DOT)
+			{
+				ImageFilledRectangle($this->im,$x1-1,$y1-1,$x1+1,$y1+1,$this->colors[$this->items[$item]["color"]]);
+				ImageFilledRectangle($this->im,$x2-1,$y2-1,$x2+1,$y2+1,$this->colors[$this->items[$item]["color"]]);
+			}
 		}
 
 // Calculation of maximum Y
diff --git a/frontends/php/include/config.inc.php b/frontends/php/include/config.inc.php
index e11ba5c9..8b407207 100644
--- a/frontends/php/include/config.inc.php
+++ b/frontends/php/include/config.inc.php
@@ -4352,6 +4352,8 @@ where h.hostid=i.hostid and i.itemid=f.itemid and f.triggerid=$triggerid";
 			return "Filled region";
 		if($drawtype==2)
 			return "Bold line";
+		if($drawtype==3)
+			return "Dot";
 		return "Unknown";
         }
 
diff --git a/frontends/php/include/defines.inc.php b/frontends/php/include/defines.inc.php
index 83472cf6..e3f10158 100644
--- a/frontends/php/include/defines.inc.php
+++ b/frontends/php/include/defines.inc.php
@@ -22,6 +22,7 @@
 	define("GRAPH_DRAW_TYPE_LINE",0);
 	define("GRAPH_DRAW_TYPE_FILL",1);
 	define("GRAPH_DRAW_TYPE_BOLDLINE",2);
+	define("GRAPH_DRAW_TYPE_DOT",3);
 
 	define("ITEM_VALUE_TYPE_FLOAT",0);
 	define("ITEM_VALUE_TYPE_STR",1);