X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Fincludes%2Fclass.graphic.inc;h=81e93d25e6eab66374455f2c8b040103902f1b6a;hb=3f5a61dd5f2abfbaa853c6777c95ea8e780e6472;hp=60b41021fa124846d56b9ca86b3564d7e276a545;hpb=8ffddf50ffbe93672c769e2cf0501d0f9125e2a0;p=fa-stable.git

diff --git a/reporting/includes/class.graphic.inc b/reporting/includes/class.graphic.inc
index 60b41021..81e93d25 100644
--- a/reporting/includes/class.graphic.inc
+++ b/reporting/includes/class.graphic.inc
@@ -149,7 +149,7 @@ class graph
 	var $fontfile = "";
 	var $encoding;
 	
-    function graph()
+    function __construct()
     {
     	global $SysPrefs;
 		$this->encoding = strtoupper($_SESSION['language']->encoding);
@@ -160,7 +160,7 @@ class graph
 		// You can also use another UTF-8 font and put it in config.php with the name in $UTF8_fontfile 
 		$this->fontfile = $this->encoding == 'UTF-8' ? (isset($SysPrefs->UTF8_fontfile) && $SysPrefs->UTF8_fontfile != "" ?
 			$path.$SysPrefs->UTF8_fontfile : $path.'FreeSans.ttf') : $path.'LiberationSans-Regular.ttf';
-		
+        
         $this->x = $this->y = $this->z = array();
         $this->biggest_x        = NULL;
         $this->biggest_y        = NULL;
@@ -233,9 +233,6 @@ class graph
 
         // Fill background
         imagefill($this->img, 0, 0, $this->color['background']);
-        //imagefilledrectangle($this->img, 0, 0, $this->width, $this->height, $this->color['background']);
-        //if ($border)
-        //	imagerectangle($this->img, 0, 0, $this->width-1, $this->height-1, imagecolorallocate($this->img, 100, 150, 200));
 
         // Draw title
         if (!empty($this->title))
@@ -278,13 +275,11 @@ class graph
                     if ($len2 < $len1)
                     	$len2 += ($len1-$len2-1);
                     $less = 7 * $len2;
-                    //$this->_imagestring($this->img, $this->size, ($x1-$less-7), ($y2-7), $value, $this->color['axis_values']);
                     $this->_imagestring($this->img, $this->size, ($x1-$less-7), ($y2-7), $value, $this->color['axis_values']);
                 }
             }
 
             // Axis X
-            //$this->_imagestring($this->img, $this->size, $this->graphic_area_x2+10, $this->graphic_area_y2+3, $this->axis_x, $this->color['title']);
             $this->_imagestring($this->img, $this->size, $this->graphic_area_x2+40, $this->graphic_area_y2+3, $this->axis_x, $this->color['title']);
             imageline($this->img, $this->graphic_area_x1, $this->graphic_area_y2, $this->graphic_area_x2, $this->graphic_area_y2, $this->color['axis_line']);
             // Axis Y
@@ -373,7 +368,6 @@ class graph
                 imageline($this->img, ($x2+1), ($y1-1), ($x2+1), $y2, $this->color['bars_shadow']);
                 imageline($this->img, ($x2+2), ($y1-1), ($x2+2), $y2, $this->color['bars_shadow']);
                 imagefilledrectangle($this->img, $x1, $y1, $x2, $y2, $this->color['bars']);
-                //$this->_imagestring($this->img, $this->size, ((($x1+$x2)/2) - (strlen($parameter)*7/2)), ($y2+2), $parameter, $this->color['axis_values'], $alt);
                 $this->_imagestring($this->img, $this->size, $x1, ($y2+2), $parameter, $this->color['axis_values'], $alt);
             }
         }
@@ -415,7 +409,6 @@ class graph
                 imagefilledrectangle($this->img, $x1, $y1, $x2, $y2, $this->color['bars']);
                 $this->_imagestring($this->img, $this->size, ($x2+7), ($y1+2), $this->number_formated($this->y[$i], $this->dec2), $this->color['bars_shadow']);
 
-                //$this->_imagestring($this->img, $this->size, ($x1 - ((strlen($parameter)*7)+7)), ($y1+2), $parameter, $this->color['axis_values']);
                 $this->_imagestring($this->img, $this->size, 30, ($y1+2), $parameter, $this->color['axis_values']);
             }
         }
@@ -445,7 +438,6 @@ class graph
                 {
                     imageline($this->img, $x[$i], ($this->graphic_area_y1+10), $x[$i], ($this->graphic_area_y2-1), $this->color['bg_lines']);
                 }
-                //$this->_imagestring($this->img, $this->size, ($x[$i] - (strlen($parameter)*7/2 )), ($this->graphic_area_y2+2), $parameter, $this->color['axis_values'], $alt);
                 $this->_imagestring($this->img, $this->size, $x[$i], ($this->graphic_area_y2+2), $parameter, $this->color['axis_values'], $alt);
 
                 $x[$i+1] = $x[$i] + 40;
@@ -529,7 +521,6 @@ class graph
 
                     for ($i = $this->h3d; $i >= 0; $i--)
                     {
-                        //imagearc($this->img, $center_x, ($center_y+$i), $width, $height, $start, ($start+$size), $this->color[$color]);
                         if ($size >= 1)
                         	imagefilledarc($this->img, $center_x, ($center_y+$i), $width, $height, $start, ($start+$size), $this->color[$color], IMG_ARC_NOFILL);
                     }
@@ -841,9 +832,7 @@ class graph
         {
             // Office
             case 1:
-                //$this->color['title']       = imagecolorallocate($this->img,  50,  50,  50);
                 $this->color['title']       = imagecolorallocate($this->img,  40,  70,  130);
-                //$this->color['background']  = imagecolorallocate($this->img, 238, 255, 238);
                 $this->color['background']  = imagecolorallocate($this->img, 255, 255, 255);
                 $this->color['axis_values'] = imagecolorallocate($this->img,  50,  50,  50);
                 $this->color['axis_line']   = imagecolorallocate($this->img, 100, 100, 100);
@@ -925,7 +914,6 @@ class graph
             // Spring
             case 3:
                 $this->color['title']       = imagecolorallocate($this->img, 250,  50,  50);
-                //$this->color['background']  = imagecolorallocate($this->img, 250, 250, 220);
                 $this->color['background']  = imagecolorallocate($this->img, 255, 255, 255);
                 $this->color['axis_values'] = imagecolorallocate($this->img,  50, 150,  50);
                 $this->color['axis_line']   = imagecolorallocate($this->img,  50, 100,  50);
@@ -976,7 +964,7 @@ class graph
 				$string = mb_convert_encoding($string, 'UTF-8', $this->encoding);
 		}
 		
-		// New 2014-06-26 Joe Hunt for handling ev. RTL languages
+		// Handling ev. RTL languages
 		if ($alt)
 		{
 			if ($this->encoding == 'UTF-8' && is_arabic($string))
@@ -1011,10 +999,13 @@ class graph
     		else
     			$size = 12;
     		$y += $size + 3;	
-    		//if ($alt)
-    		//	$angle = -15;
-    		//else
-   				$angle = 0;
+			$angle = 0;
+
+			if ($this->encoding == 'UTF-8' && is_arabic($string))
+			{
+				$size += 2;
+				$string = str_replace(" ", "  ", $string);
+			}	
    			
    			imagettftext($img, $size, $angle, $x, $y + $alt, $col, $this->fontfile, $string);
     	}