[Phpgroupware-cvs] phpgwapi/inc/class.gdgraph.inc.php, 1.17

[nomail]

Update of /phpgwapi/inc
Modified Files:
        Branch: 
          class.gdgraph.inc.php

date: 2004/06/08 00:12:06;  author: ceb;  state: Exp;  lines: +10 -5

Log Message:
update
=====================================================================
Index: phpgwapi/inc/class.gdgraph.inc.php
diff -u phpgwapi/inc/class.gdgraph.inc.php:1.16 
phpgwapi/inc/class.gdgraph.inc.php:1.17
--- phpgwapi/inc/class.gdgraph.inc.php:1.16     Thu Jun  3 13:58:29 2004
+++ phpgwapi/inc/class.gdgraph.inc.php  Tue Jun  8 00:12:06 2004
@@ -308,6 +308,11 @@
                                $this->num_lines_x = $this->num_lines_x+1;
                        }
 
+                       if($this->num_lines_x < 2)
+                       {
+                               $this->num_lines_x = 2;
+                       }
+
                        /*case 'y': case 'Y': //calculates difference in years
                        $diff=$year_to-$year_from;
                        $adjust=0;
@@ -497,7 +502,7 @@
 
                                $linespace = ($this->graph_width - 
$this->margin_left - $this->margin_right) / ($this->num_lines_x - 1);
 
-                               if ($line['sdate'] <= 
$this->line_captions_x[0]['date']) // && $line['edate'] > 
$this->line_captions_x[0]['date'])
+                               if ($line['sdate'] <= 
$this->line_captions_x[0]['date'] && $line['edate'] >= 
$this->line_captions_x[0]['date'])
                                {
                                        if($this->debug)
                                        {
@@ -536,8 +541,8 @@
                                                }
                                        }
                                }
-                               else if($line['sdate'] <= 
$this->line_captions_x[0]['date'] && $line['edate'] <= 
$this->line_captions_x[0]['date'] || 
-                                               $line['sdate'] >= 
$this->line_captions_x[$largest]['date'] && $line['edate'] >= 
$this->line_captions_x[$largest]['date'])
+                               else if(($line['sdate'] <= 
$this->line_captions_x[0]['date'] && $line['edate'] <= 
$this->line_captions_x[0]['date']) || 
+                                               ($line['sdate'] >= 
$this->line_captions_x[$largest]['date'] && $line['edate'] >= 
$this->line_captions_x[$largest]['date']))
                                {
                                        $x1 = 0;
                                }
@@ -651,7 +656,7 @@
 
                                // progress
                                $this->img->SetColor(180, 180, 180);
-                               if($x1 > 0 && $gx > 0 && $y1 > 0 && $y2 > 0)
+                               if($x1 > 0 && $x2 > 0 && $gx > 0 && $y1 > 0 && 
$y2 > 0)
                                {
                                        
$this->img->draw_rectangle(array($x1,$y1-2,$gx,$y2+2));
                                }
@@ -698,7 +703,7 @@
                                        }
                                }
 
-                               if($line['previous'] > 0 && $px > 0 && $py > 0)
+                               if($line['previous'] > 0 && $px > 0 && $py > 0 
&& $x1 > 0 && $x2 > 0 && $y1 > 0 && $y2 > 0)
                                {
                                        $this->img->SetColor(0, 0, 0);