diff options
| author | hugetoad <hugetoad@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2004-01-10 22:47:33 +0000 |
|---|---|---|
| committer | hugetoad <hugetoad@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2004-01-10 22:47:33 +0000 |
| commit | 4b33c1b8ff10d12775335075b05f23e6a325da5f (patch) | |
| tree | ce01cdb2651549cb61f8f25742137c9941e83fe2 | |
| parent | 32451614f9d27e745d310b335ec0068ffa5a8d70 (diff) | |
| download | zabbix-4b33c1b8ff10d12775335075b05f23e6a325da5f.tar.gz zabbix-4b33c1b8ff10d12775335075b05f23e6a325da5f.tar.xz zabbix-4b33c1b8ff10d12775335075b05f23e6a325da5f.zip | |
Dashed line type for map's lines.
git-svn-id: svn://svn.zabbix.com/trunk@1164 97f52cf1-0a1b-0410-bd0e-c28be96e8082
| -rw-r--r-- | frontends/php/graph.php | 2 | ||||
| -rw-r--r-- | frontends/php/include/config.inc.php | 2 | ||||
| -rw-r--r-- | frontends/php/include/defines.inc.php | 1 | ||||
| -rw-r--r-- | frontends/php/map.php | 9 | ||||
| -rw-r--r-- | frontends/php/sysmap.php | 6 |
5 files changed, 17 insertions, 3 deletions
diff --git a/frontends/php/graph.php b/frontends/php/graph.php index 157187b8..a95d3267 100644 --- a/frontends/php/graph.php +++ b/frontends/php/graph.php @@ -178,7 +178,7 @@ echo "<OPTION VALUE='0' ".iif(isset($drawtype)&&($drawtype==0),"SELECTED","").">".get_drawtype_description(0); echo "<OPTION VALUE='1' ".iif(isset($drawtype)&&($drawtype==1),"SELECTED","").">".get_drawtype_description(1); echo "<OPTION VALUE='2' ".iif(isset($drawtype)&&($drawtype==2),"SELECTED","").">".get_drawtype_description(2); - echo "<OPTION VALUE='3' ".iif(isset($drawtype)&&($drawtype==4),"SELECTED","").">".get_drawtype_description(3); + echo "<OPTION VALUE='3' ".iif(isset($drawtype)&&($drawtype==3),"SELECTED","").">".get_drawtype_description(3); echo "</SELECT>"; show_table2_v_delimiter(); diff --git a/frontends/php/include/config.inc.php b/frontends/php/include/config.inc.php index c45bdbe1..5d9024f0 100644 --- a/frontends/php/include/config.inc.php +++ b/frontends/php/include/config.inc.php @@ -4903,6 +4903,8 @@ where h.hostid=i.hostid and i.itemid=f.itemid and f.triggerid=$triggerid"; return "Bold line"; if($drawtype==3) return "Dot"; + if($drawtype==4) + return "Dashed line"; return "Unknown"; } diff --git a/frontends/php/include/defines.inc.php b/frontends/php/include/defines.inc.php index ea52dbae..95a26ac6 100644 --- a/frontends/php/include/defines.inc.php +++ b/frontends/php/include/defines.inc.php @@ -29,6 +29,7 @@ define("GRAPH_DRAW_TYPE_FILL",1); define("GRAPH_DRAW_TYPE_BOLDLINE",2); define("GRAPH_DRAW_TYPE_DOT",3); + define("GRAPH_DRAW_TYPE_DASHEDLINE",4); define("ITEM_VALUE_TYPE_FLOAT",0); define("ITEM_VALUE_TYPE_STR",1); diff --git a/frontends/php/map.php b/frontends/php/map.php index a999447b..4d60c7a6 100644 --- a/frontends/php/map.php +++ b/frontends/php/map.php @@ -153,6 +153,10 @@ ImageLine($im,$x1+$size,$y1+$size,$x2+$size,$y2+$size,$colors[$color_on]); ImageLine($im,$x1+$size,$y1+$size+1,$x2+$size,$y2+$size+1,$colors[$color_on]); } + else if($drawtype_on == GRAPH_DRAW_TYPE_DASHEDLINE) + { + DashedLine($im,$x1+$size,$y1+$size,$x2+$size,$y2+$size,$colors[$color_on]); + } else { ImageLine($im,$x1+$size,$y1+$size,$x2+$size,$y2+$size,$colors[$color_on]); @@ -163,6 +167,11 @@ if($drawtype_off == GRAPH_DRAW_TYPE_BOLDLINE) { ImageLine($im,$x1+$size,$y1+$size,$x2+$size,$y2+$size,$colors[$color_off]); + ImageLine($im,$x1+$size,$y1+$size+1,$x2+$size,$y2+$size+1,$colors[$color_off]); + } + else if($drawtype_off == GRAPH_DRAW_TYPE_DASHEDLINE) + { + DashedLine($im,$x1+$size,$y1+$size,$x2+$size,$y2+$size,$colors[$color_off]); } else { diff --git a/frontends/php/sysmap.php b/frontends/php/sysmap.php index ac792f4f..bc58a1de 100644 --- a/frontends/php/sysmap.php +++ b/frontends/php/sysmap.php @@ -398,7 +398,8 @@ echo "<OPTION VALUE='0' ".iif(isset($drawtype_off)&&($drawtype_off==0),"SELECTED","").">".get_drawtype_description(0); // echo "<OPTION VALUE='1' ".iif(isset($drawtype_off)&&($drawtype_off==1),"SELECTED","").">".get_drawtype_description(1); echo "<OPTION VALUE='2' ".iif(isset($drawtype_off)&&($drawtype_off==2),"SELECTED","").">".get_drawtype_description(2); -// echo "<OPTION VALUE='3' ".iif(isset($drawtype_off)&&($drawtype_off==4),"SELECTED","").">".get_drawtype_description(3); +// echo "<OPTION VALUE='3' ".iif(isset($drawtype_off)&&($drawtype_off==3),"SELECTED","").">".get_drawtype_description(3); + echo "<OPTION VALUE='4' ".iif(isset($drawtype_off)&&($drawtype_off==4),"SELECTED","").">".get_drawtype_description(4); echo "</SELECT>"; show_table2_v_delimiter(); @@ -425,7 +426,8 @@ echo "<OPTION VALUE='0' ".iif(isset($drawtype_on)&&($drawtype_on==0),"SELECTED","").">".get_drawtype_description(0); // echo "<OPTION VALUE='1' ".iif(isset($drawtype_on)&&($drawtype_on==1),"SELECTED","").">".get_drawtype_description(1); echo "<OPTION VALUE='2' ".iif(isset($drawtype_on)&&($drawtype_on==2),"SELECTED","").">".get_drawtype_description(2); -// echo "<OPTION VALUE='3' ".iif(isset($drawtype_on)&&($drawtype_on==4),"SELECTED","").">".get_drawtype_description(3); +// echo "<OPTION VALUE='3' ".iif(isset($drawtype_on)&&($drawtype_on==3),"SELECTED","").">".get_drawtype_description(3); + echo "<OPTION VALUE='4' ".iif(isset($drawtype_on)&&($drawtype_on==4),"SELECTED","").">".get_drawtype_description(4); echo "</SELECT>"; show_table2_v_delimiter(); |