X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Fincludes%2Fclass.graphic.inc;h=0a3591afa575d97923d8d4796669d70aa76c16a4;hb=8a16c90606ab7f98b5238de10397a3da3bb2a6e9;hp=3f976f73d2f4b986d981996ef7ef7269a64e8cc8;hpb=0bb9ce50f39b09b93005c45a49d9c47c4521267c;p=fa-stable.git

diff --git a/reporting/includes/class.graphic.inc b/reporting/includes/class.graphic.inc
index 3f976f73..0a3591af 100644
--- a/reporting/includes/class.graphic.inc
+++ b/reporting/includes/class.graphic.inc
@@ -4,14 +4,13 @@
 $pg = new Chart('bar'); // Width and Height is set automatically4
 $pg->setTitle("Testing the Chart");
 $pg->setLabels(array('Jan', 'Feb', 'Mar'));
-$pg->addSerie(array(10345, 15666, 12222), 'Sales', false, true); 
-$pg->addSerie(array(20767, 10456, 2888), 'Costs', false, false);
-$pg->addSerie(array(15657, 7567, 12890), 'Result', 'spline', false);
+$pg->addSerie('Sales', array(10345, 15666, 12222), false, true); 
+$pg->addSerie('Costs', array(20767, 10456, 2888), false, false);
+$pg->addSerie('Result', array(15657, 7567, 12890), 'spline', false);
 $pg->setXTitle("Names");
 $pg->setYTitle("Amount");
-$pg->setDValues(False);
 $pg->setDTitle(number_format("15666")); // only printed on donut or half donut
-$filename = "test.png";
+//$filename = "test.png";
 $pg->display(); // with filename to file
 
 In your html file you set it up as:
@@ -60,7 +59,7 @@ file for later presentation.
 
 	Joe Hunt
 */
-
+define('MAXLEN', 27); // we cut after 25 chars + ...
 class Chart 
 {
 	var $id;
@@ -138,7 +137,7 @@ class Chart
 		elseif (!is_numeric($type)) $type = 1;
 		$this->width = $width;
 		$this->height = $height;
-		$this->max_label   = NULL;
+		$this->max_label   = "";
 		$this->max_value	= NULL;
 		$this->num_labels = 0;
 		$this->type = $type;
@@ -186,6 +185,7 @@ class Chart
 	{
 		if ($label == false)
 			$label = "Serie $this->num_series";
+		$type = $type == 'line' ? 4 : ($type == 'spline' ? 8 : $type);
 		$this->series[$this->num_series]['label'] = $label;
 		$this->series[$this->num_series]['data'] = $data;
 		$this->series[$this->num_series]['type'] = $type;
@@ -245,6 +245,8 @@ class Chart
 		$this->legend_box_height  += (14 * $this->num_labels);
 		for ($i = 0; $i < $this->num_labels; $i++)
 		{
+			if (strlen($this->labels[$i]) > MAXLEN)
+				$this->labels[$i] = substr($this->labels[$i], 0, MAXLEN)."...";
 			if (strlen($this->labels[$i]) > strlen($this->max_label))
 				$this->max_label = $this->labels[$i];
 		}
@@ -328,9 +330,9 @@ class Chart
 			for ($i = 1; $i < 10; $i++)
 			{
 				$dec_y = $i * ($this->higher_value_size / 10);
-				$x1 = $this->graphic_area_x1;
-				$y1 = $this->graphic_area_y2 - $dec_y;
-				$x2 = $this->graphic_area_x2;
+				$x1 = round($this->graphic_area_x1);
+				$y1 = round($this->graphic_area_y2 - $dec_y);
+				$x2 = round($this->graphic_area_x2);
 				$y2 = $y1;
 				if ($this->stream == 'svg')
 					$this->svg->line($x1, $y1, $x2, $y2, $this->color['bg_lines']);
@@ -412,7 +414,7 @@ class Chart
 			// Axis X
 			if ($this->stream == 'svg')
 			{
-				$this->svg->text(($this->graphic_area_x2+10), ($this->graphic_area_y2+10), $this->axis_y, $this->size, $this->color['title'], false, $this->align);
+				$this->svg->text($this->graphic_area_x2+10, ($this->graphic_area_y2+10), $this->axis_y, $this->size, $this->color['title'], false, $this->align);
 				$this->svg->line($this->graphic_area_x1, $this->graphic_area_y2, $this->graphic_area_x2, $this->graphic_area_y2, $this->color['axis_line']);
 			}
 			else
@@ -423,7 +425,8 @@ class Chart
 			// Axis Y
 			if ($this->stream == 'svg')
 			{
-				$this->svg->text(20, ($this->graphic_area_y1-10), $this->axis_x, $this->size, $this->color['title'], false, $this->align);
+				$lex = ($this->string_width($this->max_label, $this->size)) / 2;
+				$this->svg->text($lex, ($this->graphic_area_y1-10), $this->axis_x, $this->size, $this->color['title'], false, $this->align);
 				$this->svg->line($this->graphic_area_x1, $this->graphic_area_y1, $this->graphic_area_x1, $this->graphic_area_y2, $this->color['axis_line']);
 			}
 			else
@@ -635,6 +638,7 @@ class Chart
 	function draw_horizontal_bars()
 	{
 		$y = 10;
+		$label_len = $this->string_width($this->max_label, $this->size);
 		foreach ($this->labels as $i => $parameter)
 		{
 			for ($j = 0; $j < $this->num_series; $j++)
@@ -660,12 +664,14 @@ class Chart
 			}
 			if ($this->stream == 'svg')
 			{
-				$this->svg->text(20, ($y2-5), $parameter, $this->size, $this->color['axis_values'], false, $this->align);
+				$lex = $this->dir == 'rtl' ? $label_len : 20;
+				$this->svg->text($lex, ($y2-5), $parameter, $this->size, $this->color['axis_values'], false, "start");
 				$y += 8;
 			}
 			else
 			{
-				$this->_imagestring($this->img, $this->size, 20, ($y1-5), $parameter, $this->color['axis_values'], 0);
+				$lex = $this->dir == 'rtl' ? $label_len+10 : 20;
+				$this->_imagestring($this->img, $this->size, $lex, ($y1-5), $parameter, $this->color['axis_values'], 0, 0, $this->align);
 				$y	 += 10;
 			}
 		}
@@ -829,13 +835,13 @@ class Chart
 					$j = $n - 1;
 					while ($i + 1 < $j) {
 						$k = $i + ($j - $i) / 2;
-						if ($x <= $splines[$k]['x']) {
+						if ($x <= $splines[round($k)]['x']) {
 							$j = $k;
 						} else {
 							$i = $k;
 						}
 					}
-					$s = $splines[$j];
+					$s = $splines[round($j)];
 				}
 			}
 			$dx = ($x - $s['x']);
@@ -866,6 +872,7 @@ class Chart
 			$ang1=0;	  // start angle
 			foreach ($this->labels as $i => $num)
 			{
+				$n = count(self::$palette);
 				$pct[$i] = round($this->series[0]['data'][$i] / $this->sum_total[0] * 100, 1);
 				$dang = $this->series[0]['data'][$i] * $area;		// delta angle
 				$laf  = $dang > 180 ? 1 : 0; // Large Arc Flag
@@ -880,7 +887,7 @@ class Chart
 				$p4 = sprintf('%0.2f,%0.2f', $cx + $rc * cos($a), $cy + $rc * sin($a));
 				$a = ($ang1 - $start) * $rad + asin($gap / $rc); 
 				$p5 = sprintf('%0.2f,%0.2f', $cx + $rc * cos($a), $cy + $rc * sin($a));
-				$this->svg->path("M$p1 L$p2 A$r,$r 0 $laf,1 $p3 L$p4 A$rc,$rc 0 $laf,0 $p5", $this->color[$i], 0, $this->color[$i], "class=\"tips\"", "$num: ".number_format($pct[$i], 1)."&#x25;");
+				$this->svg->path("M$p1 L$p2 A$r,$r 0 $laf,1 $p3 L$p4 A$rc,$rc 0 $laf,0 $p5", $this->color[$i % $n], 0, $this->color[$i % $n], "class=\"tips\"", "$num: ".number_format($pct[$i], 1)."&#x25;");
 				$ang1=$ang2;
 			}
 			if (!empty($this->donut_title) && $this->type != 5)
@@ -943,16 +950,16 @@ class Chart
 	function draw_table()
 	{
 		$cs = $this->num_labels + 1;
-		$html = "<table cellspacing='0' style='width:{$this->width}px;font-family:{$this->font};font-size:12px;background:inherit;text-align:center;'>\n";
+		$html = "<table cellspacing='0' //style='width:{$this->width}px;font-family:{$this->font};font-size:12px;background:inherit;'>\n";
 		if (!empty($this->title))
 			$html .= "<tr><th colspan=$cs style='text-align:center;'><h3>$this->title</th><tr>\n";
-		$html .= "<tr><th style='text-align:left;border-bottom:1px solid #444'>#</th>"; 
+		$html .= "<tr><th style='border-bottom:1px solid #444'>#</th>"; 
 		for ($i = 0; $i < $this->num_labels; $i++)
 			$html .= "<th style='text-align:right;border-bottom:1px solid #444'>{$this->labels[$i]}</th>";
 		$html .= "</tr>\n";
 		for ($j = 0; $j < $this->num_series; $j++)
 		{
-			$html .= "<tr><td style='text-align:left;'>{$this->series[$j]['label']}</td>";
+			$html .= "<tr><td style=''>{$this->series[$j]['label']}</td>";
 			for ($i = 0; $i < $this->num_labels; $i++)
 				$html .= "<td style='text-align:right;'>".number_format($this->series[$j]['data'][$i], 0)."</td>";
 			$html .= "</tr>\n";
@@ -1127,21 +1134,22 @@ class Chart
 			for ($j = 0; $j < $this->num_series; $j++)
 			{
 				$color = (preg_match("/^(1|2)$/", $this->type)) ? $this->color['bars'][$j]	 : $this->color['line'][$j];
+				$len = $this->string_width($this->max_legend_str, $this->size)-20;
 				if ($this->stream == 'svg')
 				{
-					$lex = $this->dir == 'rtl' ? $x1+$this->string_width($this->max_legend_str, $this->size)-20 : $x1-5;
+					$lex = $this->dir == 'rtl' ? $x1+$len : $x1-5;
 					$this->svg->circle($lex, $y-5, 6, "#fff", 1, $color);
 					//$this->svg->rect($lex, $y-10, 10, 10, "#fff", 1, $color);
-					$lex = $this->dir == 'rtl' ? $x-20 : $x-5; 
-					$this->svg->text($lex, ($y-2), $this->series[$j]['label'], $this->size, $this->color['axis_values'], false, $this->align);
+					$lex = $this->dir == 'rtl' ? $x1+$len-15 : $x-5; 
+					$this->svg->text($lex, ($y-2), $this->series[$j]['label'], $this->size, $this->color['axis_values'], false, "start");
 				}
 				else
 				{
-					$lex = $this->dir == 'rtl' ? $x2-60 : $x-10;
+					$lex = $this->dir == 'rtl' ? $x1+$len+20 : $x-10;
 					imagefilledrectangle($this->img, $lex, $y, ($lex+10), ($y+10), $color);
 					imagerectangle($this->img, $lex, $y, ($lex+10), ($y+10), $this->color['title']);
-					$lex = $this->dir == 'rtl' ? $x-10 : $x+10;
-					$this->_imagestring($this->img, $this->size, $lex, ($y-2), $this->series[$j]['label'], $this->color['axis_values']);
+					$lex = $this->dir == 'rtl' ? $x1+$len+20 : $x+10;
+					$this->_imagestring($this->img, $this->size, $lex, ($y-2), $this->series[$j]['label'], $this->color['axis_values'], 0, 0, $this->align);
 				}
 				$y += 20;
 			}
@@ -1152,12 +1160,17 @@ class Chart
 			$n = count(self::$palette);
 			if ($this->sum_total[0] == 0)
 				return;
+			$label_len = $this->string_width($this->max_label, $this->size);
+			//$value_len = $this->string_width($this->max_value, $this->size);
+			$value_len = $this->string_width(number_format($this->max_value), $this->size);
+			$total_len = $label_len + $value_len;
+			$total_len = max($total_len, $x2-$x1);
 			if (!empty($this->axis_x)) // Only first serie [0]
 			{
 				if ($this->stream == 'svg')
-					$this->svg->text(((($x1+$x2)/2) - (strlen($this->axis_x)*7/2)), $y, $this->axis_x." (".$this->series[0]['label'].")", $this->size, $this->color['title'], false, $this->align);
+					$this->svg->text(((($x1+$x1+$total_len)/2) - (strlen($this->axis_x)*7/2)), $y, $this->axis_x." (".$this->series[0]['label'].")", $this->size, $this->color['title'], false, $this->align);
 				else
-					$this->_imagestring($this->img, $this->size, (($x1+$x2)/2 - strlen($this->axis_x)*7/2)+30, $y, 
+					$this->_imagestring($this->img, $this->size, (($x1+$x1+$total_len)/2 - strlen($this->axis_x)*7/2)+30, $y, 
 					$this->axis_x."-".$this->series[0]['label'], $this->color['title']);
 				$y += 25;
 			}
@@ -1170,32 +1183,33 @@ class Chart
 				if ($this->stream == 'svg')
 				{
 					$j = $i % $n;
-					$lex = $this->dir == 'rtl' ? $x2+60 : $x+5;
+					$lex = $this->dir == 'rtl' ? $x1+$total_len-25 : $x1;
 					$this->svg->circle($lex, $y-5, 6, "#fff", 1, $this->color[$j]);
-					//$this->svg->rect($cx, $cy-10, 10, 10, "#fff", 1, $this->color[$j]);
+					// $this->svg->rect($lex-5, $y-10, 10, 10, "#fff", 1, $this->color[$j]);
 					// Display label text
-					$lex = $this->dir == 'rtl' ? $x2-100 : $x+15;
-					$this->svg->text($lex, ($y-2), $parameter, $this->size, $this->color['axis_values'], false, $this->align);
-					$lex = $this->dir == 'rtl' ? $x1+25 : $x2;
+					$lex = $this->dir == 'rtl' ? $x1+$total_len-40 : $x1+15;
+					$this->svg->text($lex, ($y-2), $parameter, $this->size, $this->color['axis_values'], false, "start");	
+					$lex = $this->dir == 'rtl' ? $x1+$value_len-25 : $x1+$total_len;
 					$al = $this->dir == 'rtl' ? "start" : "end";
 					$this->svg->text($lex, ($y-2), $text, $this->size, $this->color['axis_values'], false, $al);
-					$lex = $this->dir == 'rtl' ? $x1-10 : $x1+10;
-					$lex2 = $this->dir == 'rtl' ? $x2+50 : $x2;
-					$this->svg->line($lex, $y+1, $lex2, $y+1, $this->color['bg_lines']);
+					$lex2 = $this->dir == 'rtl' ? $x1+$total_len-25 : $x1+$total_len;
+					$this->svg->line($x1, $y+1, $lex2, $y+1, $this->color['bg_lines']);
 				}
 				else
 				{
 					$j = $i % $n;
 					$color = 'arc_' . $j;
 					$width = $this->string_width($text, $this->size);
-					imageline($this->img, $x1+15, ($y-2), $x2+20, ($y-2), $this->color['bg_lines']);
+					imageline($this->img, $x1+15, ($y+11), $x2+20, ($y+11), $this->color['bg_lines']);
 					$lex = $this->dir == 'rtl' ? $x2+20 : $x;
 					imagefilledrectangle($this->img, $lex, $y, ($lex+10), ($y+10), $this->color[$color]);
 					imagerectangle($this->img, $lex, $y, ($lex+10), ($y+10), $this->color['title']);
-					$lex = $this->dir == 'rtl' ? $x2+10 : $x+15;
+					$lex = $this->dir == 'rtl' ? $x2+5 : $x+15;
 					$this->_imagestring($this->img, $this->size, $lex, ($y-2), $parameter, $this->color['axis_values'], 0, 0, $this->align);
-					$lex = $this->dir == 'rtl' ? $x+10 : $x2-$width;
-					$this->_imagestring($this->img, $this->size, $lex, ($y-2), $text, $this->color['axis_values'], 0, 0, $this->align);
+					//$lex = $this->dir == 'rtl' ? $x+10 : $x2-$width;
+					$lex = $this->dir == 'rtl' ? $x1+$value_len : $x2-$width;
+					$al = $this->dir == 'rtl' ? "end" : $this->align;
+					$this->_imagestring($this->img, $this->size, $lex, ($y-2), $text, $this->color['axis_values'], 0, 0, $al);
 				}
 				$y += 18;
 			}
@@ -1204,7 +1218,9 @@ class Chart
 
 	function string_width($string, $size) 
 	{
-		$p = imagettfbbox($size, 0, $this->fontfile, $string);
+		if ($string == NULL)
+			return $size;
+		$p = imageftbbox($size, 0, $this->fontfile, $string);
 		return $p[4] - $p[0];
 	}
 
@@ -1212,7 +1228,7 @@ class Chart
 	{
 		$digits	  = strlen(round($this->max_value));
 		$interval = pow(10, ($digits-1));
-		$this->higher_value = round(($this->max_value - ($this->max_value % $interval) + $interval), 1);
+		$this->higher_value = round(($this->max_value - (round($this->max_value) % $interval) + $interval), 1);
 		$this->higher_value_str = $this->number_formated($this->higher_value, $this->dec1);
 	}
 
@@ -1329,8 +1345,14 @@ class Chart
 			round($x2 + (1+$k)*$a), round($y2 - (1-$k)*$a),
 			round($x2 + (1-$k)*$a), round($y2 + (1+$k)*$a),
 		);
-		imagefilledpolygon($image, $points, 4, $color);
-		return imagepolygon($image, $points, 4, $color);
+		if (PHP_MAJOR_VERSION >= 8) { // num_points is deprecated
+			imagefilledpolygon($image, $points, $color);
+			return imagepolygon($image, $points, $color);
+		}
+		else {
+			imagefilledpolygon($image, $points, 4, $color);
+			return imagepolygon($image, $points, 4, $color);
+		}
 	}
 
 	function _imagestring($img, $size, $x, $y, $string, $col, $alt=0, $angle=0, $align=false)
@@ -1372,7 +1394,7 @@ class Chart
 			$size += 2;
 			$string = str_replace(" ", "  ", $string);
 		}	
-		imagettftext($img, $size, $angle, $x, $y  + $alt, $col, $this->fontfile, $string);
+		imagettftext($img, $size, $angle, round($x), $y  + $alt, $col, $this->fontfile, $string);
 	}
 
 	function hex2rgb($hex)