--- zabbix-1.8.15-2/frontends/php/include/classes/class.cchart.php.bk 2012-12-19 11:51:51.923551279 +0900 +++ zabbix-1.8.15-2/frontends/php/include/classes/class.cchart.php 2012-12-19 11:52:59.774521048 +0900 @@ -2089,6 +2089,8 @@ class CChart extends CGraphDraw{ // For each metric + $cell = ($this->to_time - $this->from_time)/$this->sizeX; + $skip_cell = ZBX_GRAPH_MAX_SKIP_CELL * $cell; for($item = 0; $item < $this->num; $item++){ $minY = $this->m_minY[$this->items[$item]['axisside']]; $maxY = $this->m_maxY[$this->items[$item]['axisside']]; @@ -2131,22 +2133,26 @@ class CChart extends CGraphDraw{ // For each X $draw = true; $prevDraw = true; + $delay = $this->items[$item]['delay']; + $skip_delay = ZBX_GRAPH_MAX_SKIP_DELAY * $delay; for($i = 1, $j = 0; $i < $maxX; $i++){ // new point if(($data['count'][$i] == 0) && ($i != ($maxX-1))) continue; $diff = abs($data['clock'][$i] - $data['clock'][$j]); - $cell = ($this->to_time - $this->from_time)/$this->sizeX; - $delay = $this->items[$item]['delay']; - if($cell > $delay) - $draw = (boolean) ($diff < (ZBX_GRAPH_MAX_SKIP_CELL * $cell)); - else - $draw = (boolean) ($diff < (ZBX_GRAPH_MAX_SKIP_DELAY * $delay)); - - if(($draw == false) && ($this->items[$item]['calc_type'] == GRAPH_ITEM_AGGREGATED)) - $draw = $i - $j < 5; + if($this->items[$item]['type'] == ITEM_TYPE_TRAPPER) + { + $draw = true; + } + else{ + if($cell > $delay) + $draw = (boolean) ($diff < $skip_cell); + else + $draw = (boolean) ($diff < $skip_delay); - if($this->items[$item]['type'] == ITEM_TYPE_TRAPPER) $draw = true; + if(($draw == false) && ($this->items[$item]['calc_type'] == GRAPH_ITEM_AGGREGATED)) + $draw = $i - $j < 5; + } if(!$draw && !$prevDraw){ $draw = true;