[Vagrant-commits] CVS: vagrant VAGRANT.class,1.30,1.31

[Ariel G. <ag...@us...>]

Update of /cvsroot/vagrant/vagrant
In directory usw-pr-cvs1:/tmp/cvs-serv22317

Modified Files:
	VAGRANT.class 
Log Message:
Legend was not correct when x axis text was made vertical

Index: VAGRANT.class
===================================================================
RCS file: /cvsroot/vagrant/vagrant/VAGRANT.class,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** VAGRANT.class	2001/10/25 18:47:13	1.30
--- VAGRANT.class	2001/10/25 19:03:03	1.31
***************
*** 843,847 ****
  		} // for draw the vertical grid lines
  
! 		$this->max_x_label_height += $max_label_height;
  
  		// Draw the horizontal grid lines
--- 843,847 ----
  		} // for draw the vertical grid lines
  
! 		$this->max_x_label_height = $max_label_height;
  
  		// Draw the horizontal grid lines
***************
*** 909,917 ****
  	function DrawLegend() {
  		if (@sizeof($this->legend)) {
- 			$legend_top  = $this->graph_height + $this->ypad + $this->max_x_label_height + $this->x_label_y_mod * 2;
- 
  			$legend_title = "Legend:";
  			$legend_text_size = $this->GetTextSize($legend_title,0);
  
  			$this->DrawText($this->font,10,$legend_top,"Legend:","black",0);
  			$this->DrawLine(10,$legend_top + $legend_text_size['height'],47,$legend_top + $legend_text_size['height'],"black");
--- 909,917 ----
  	function DrawLegend() {
  		if (@sizeof($this->legend)) {
  			$legend_title = "Legend:";
  			$legend_text_size = $this->GetTextSize($legend_title,0);
  
+ 			$legend_top  = $this->graph_height + $this->ypad + $this->max_x_label_height + $this->x_label_y_mod * 2 + $this->xTickPadding + $legend_text_size['height'];
+ 
  			$this->DrawText($this->font,10,$legend_top,"Legend:","black",0);
  			$this->DrawLine(10,$legend_top + $legend_text_size['height'],47,$legend_top + $legend_text_size['height'],"black");
***************
*** 1707,1713 ****
  	function DrawxTitle() {
  		$titleSize = $this->GetTextSize($this->xTitle,0);
  		$text_left = ($this->image_width / 2) - ($titleSize['width'] / 2);
  
! 		$this->DrawText($this->font,$text_left,($this->graph_height + $this->ypad + $this->max_x_label_height + $this->x_label_y_mod * 2),$this->xTitle,"black",0);
  	} // function DrawxTitle
  
--- 1707,1715 ----
  	function DrawxTitle() {
  		$titleSize = $this->GetTextSize($this->xTitle,0);
+ 
  		$text_left = ($this->image_width / 2) - ($titleSize['width'] / 2);
+ 		$text_top  = $this->graph_height + $this->ypad + $this->max_x_label_height + $this->x_label_y_mod * 2 + $this->xTickPadding + $titleSize['height'];
  
! 		$this->DrawText($this->font,$text_left,$text_top,$this->xTitle,"black",0);
  	} // function DrawxTitle