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

[Bettina Gille <address@hidden>]

Update of /cvsroot/phpgroupware/phpgwapi/inc
In directory subversions:/tmp/cvs-serv7527

Modified Files:
        class.gdgraph.inc.php 
Log Message:
update

Index: class.gdgraph.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.gdgraph.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** class.gdgraph.inc.php       29 Sep 2003 14:56:35 -0000      1.2
--- class.gdgraph.inc.php       6 Nov 2003 17:21:04 -0000       1.3
***************
*** 102,109 ****
                        $this->img->height = $this->graph_height;
                        $this->img->Init();
!                       $this->img->SetColor(255, 255, 255);
  
                        // Draw the captions
!                       $this->img->SetFont(2);
                        $this->img->SetColor(0, 0, 0);
                        $this->img->MoveTo($this->graph_width / 2, 2);
--- 102,109 ----
                        $this->img->height = $this->graph_height;
                        $this->img->Init();
!                       $this->img->SetColor(255, 255, 255, True);
  
                        // Draw the captions
!                       $this->img->SetFont(3);
                        $this->img->SetColor(0, 0, 0);
                        $this->img->MoveTo($this->graph_width / 2, 2);
***************
*** 163,167 ****
                        // Draw the x axis text
                        $this->img->SetColor(0, 0, 0);
!                       $this->img->SetFont(1);
                        $linespace = ($this->graph_width - $this->margin_left - 
$this->margin_right) / ($this->num_lines_x - 1);
                        reset($this->line_captions_x);
--- 163,167 ----
                        // Draw the x axis text
                        $this->img->SetColor(0, 0, 0);
!                       $this->img->SetFont(2);
                        $linespace = ($this->graph_width - $this->margin_left - 
$this->margin_right) / ($this->num_lines_x - 1);
                        reset($this->line_captions_x);
***************
*** 174,190 ****
                        }
  
-                       // Draw the y axis text
-                       $linespace = ($this->graph_height - $this->margin_top - 
$this->margin_bottom) / ($this->num_lines_y - 1);
-                       $space = 1;
-                       for ($i = 0;$i<count($this->data);$i++)
-                       {
-                               $y = $this->graph_height - $this->margin_bottom 
- ($space * $linespace);
-                               $this->img->MoveTo($this->margin_left - 6, $y);
-                               $this->img->DrawText(array('text' => 
$this->data[$i]['title'],'justification' => 'right','margin_left' => 
$this->margin_left));
-                               $space++;
-                       }
- 
                        // Draw the lines for the data
- 
                        $this->img->SetColor(255, 0, 0);
                        reset($this->data);
--- 174,178 ----
***************
*** 270,277 ****
                                }
  
!                               $this->img->Line($x1,$y1,$x2,$y2);
                                $color_index++;
                                $i++;
                        }
                        $this->img->ToBrowser();
                        $this->img->Done();
--- 258,282 ----
                                }
  
!                               for($w=-3;$w<4;$w++)
!                               {
!                                       
$this->img->Line(1+$x1,$y1+$w,$x2,$y2+$w);
!                               }
! 
!                               //$this->img->Line($x1,$y1,$x2,$y2);
                                $color_index++;
                                $i++;
                        }
+ 
+                       // Draw the y axis text
+                       $linespace = ($this->graph_height - $this->margin_top - 
$this->margin_bottom) / ($this->num_lines_y - 1);
+                       $space = 1;
+                       for ($i = 0;$i<count($this->data);$i++)
+                       {
+                               $y = $this->graph_height - $this->margin_bottom 
- ($space * $linespace);
+                               $this->img->MoveTo($this->margin_left - 6, $y);
+                               $this->img->DrawText(array('text' => 
$this->data[$i]['title'],'justification' => 'right','margin_left' => 
$this->margin_left));
+                               $space++;
+                       }
+ 
                        $this->img->ToBrowser();
                        $this->img->Done();