Changeset 28 for graph.php

Timestamp:

Feb 13, 2008, 1:59:20 PM (17 years ago)

Author:

george

Message:

Upraveno: Změna kódování stránek na UTF-8.
Přidáno: Verze 3.1 v sekci vývoje.
Přidáno: Odkaz pod grafem na vybraný časový úsek.
Opraveno: Zobrazování desetinných míst u čísel bez jednotek.
Opraveno: Zobrazování textů Min, Avg, Max v grafu.

File:

• graph.php (modified) (7 diffs)

graph.php

@@ -5 +5 @@
   else $Debug = 0;
   
-if(!array_key_exists('From',$_GET)) die('Musíte zadat èas poèátku');
+if(!array_key_exists('From',$_GET)) die('Musíte zadat čas počátku');
 $StartTime = addslashes($_GET['From']);
-if(!array_key_exists('To',$_GET)) die('Musíte zadat èas konce');
+if(!array_key_exists('To',$_GET)) die('Musíte zadat čas konce');
 $EndTime = addslashes($_GET['To']);
 if($EndTime < $StartTime) $EndTime = $StartTime + 60;
 $TimeDifference = $EndTime - $StartTime;
-if(!array_key_exists('Measure',$_GET)) die('Musíte zadat mìøenou velièinu');
+if(!array_key_exists('Measure',$_GET)) die('Musíte zadat měřenou veličinu');
 $MeasureId = addslashes($_GET['Measure']);
 if(!array_key_exists('Width', $_GET)) $Width = $DefaultWidth; 
@@ -17 +17 @@
 if(!array_key_exists('Height', $_GET)) $Height = $DefaultHeight;
 else $Height = addslashes($_GET['Height']);
+if(!array_key_exists('Differential', $_GET)) $Differential = $Config['DefaultVariables']['Differential'];
+else $Differential = addslashes($_GET['Differential']);
 $VerticalLinesCount = round($Height / ($FontSize + 4));
 
@@ -41 +43 @@
 foreach($Points as $Index => $Item)
 {
-  $Points[$Index]['min'] =  $Points[$Index]['min'] / $Measure['Divider'];
-  $Points[$Index]['avg'] =  $Points[$Index]['avg'] / $Measure['Divider'];
-  $Points[$Index]['max'] =  $Points[$Index]['max'] / $Measure['Divider'];
+  //$Points[$Index]['min'] =  $Points[$Index]['min'] / $Measure['Divider'];
+  //$Points[$Index]['avg'] =  $Points[$Index]['avg'] / $Measure['Divider'];
+  //$Points[$Index]['max'] =  $Points[$Index]['max'] / $Measure['Divider'];
   if($Points[$Index]['avg'] > $MaxValue) $MaxValue = $Points[$Index]['avg'];
   if($Points[$Index]['avg'] < $MinValue) $MinValue = $Points[$Index]['avg'];
@@ -50 +52 @@
   $AvgValue = $AvgValue + $Points[$Index]['avg'];
 }
-$MinValue = round($MinValue * $Measure['Divider']) / $Measure['Divider'];
-$MaxValue = round($MaxValue * $Measure['Divider']) / $Measure['Divider'];
-$AvgValue = round($AvgValue / count($Points) * $Measure['Divider']) / $Measure['Divider'];
+//$MinValue = round($MinValue * $Measure['Divider']) / $Measure['Divider'];
+//$MaxValue = round($MaxValue * $Measure['Divider']) / $Measure['Divider'];
+$AvgValue = $AvgValue / count($Points); //round( * $Measure['Divider']) / $Measure['Divider'];
 
 // Generate polygon and recalculate y values to fit graph height 
@@ -126 +128 @@
   //imagestring($Image, 10, 40, 50, $TimeShift, $Black);
   
-  // Zobraz mìøítko Y
+  // Zobraz měřítko Y
   $VerticalLinesDistance = $Height / $VerticalLinesCount;
   for($I=1; $I<=$VerticalLinesCount; $I++)
@@ -136 +138 @@
 
   $TimeShift = AlignTime($StartTime, $MinorTimeMarks) - $StartTime; 
-
-  /*
-  if(($MinorTimeMarks / $TimeRange * $Width) > 3)
-  for($Time = $StartTime; $Time < $EndTime; $Time += $MinorTimeMarks)
-  {
-    $X = round(($Time - $StartTime + $TimeShift) / $TimeRange * $Width) % $Width; 
-    for($Y=0; $Y < $Height; $Y = $Y + 3) imagesetpixel($Image, $X, $Y, $Gray);
-    //imageline($Image, 30, $Y, $Width-1, $Y, IMG_COLOR_STYLED);
-    //imagestring($Image, 2, 2, $Y - 6, round(($I * $VerticalLinesDistance + $MinValue)*$Measure['divider']) / $Measure['divider'], $Black);
-  } 
-  */
-  
-  // Zobraz mìøítko X
+ 
+  // Zobraz měřítko X
   $LastTextEnd = 0;
   for($Time = $StartTime; $Time < $EndTime; $Time += $MajorTimeMarks)
@@ -178 +169 @@
   $GenerationTime = floor((GetMicrotime() - $StopWatchStart) * 1000  ) / 1000;
 
-  imagettftext($Image, $FontSize, 0, $Width-94, 14, $Red, $FontFile, "Max. ".AddPrefixMultipliers($MaxValue, $Measure['Unit']));
-  imagettftext($Image, $FontSize, 0, $Width-194, 14, $Green, $FontFile, "Avg.  ".AddPrefixMultipliers($AvgValue, $Measure['Unit']));
-  imagettftext($Image, $FontSize, 0, $Width-294, 14, $Blue, $FontFile, "Min.  ".AddPrefixMultipliers($MinValue, $Measure['Unit']));
+  $Left = $Width - 10;
+  $Text = "    Max. ".AddPrefixMultipliers($MaxValue, $Measure['Unit']);
+  $BoundingBox = imagettfbbox($FontSize, 0, $FontFile, $Text);
+  $Left -= ($BoundingBox[2] - $BoundingBox[0]);
+  imagettftext($Image, $FontSize, 0, $Left, 14, $Red, $FontFile, $Text);
+
+  $Text = "    Avg.  ".AddPrefixMultipliers($AvgValue, $Measure['Unit']);
+  $BoundingBox = imagettfbbox($FontSize, 0, $FontFile, $Text);
+  $Left -= ($BoundingBox[2] - $BoundingBox[0]);
+  imagettftext($Image, $FontSize, 0, $Left, 14, $Green, $FontFile, $Text);
+
+  $Text = "    Min.  ".AddPrefixMultipliers($MinValue, $Measure['Unit']);
+  $BoundingBox = imagettfbbox($FontSize, 0, $FontFile, $Text);
+  $Left -= ($BoundingBox[2] - $BoundingBox[0]);
+  imagettftext($Image, $FontSize, 0, $Left, 14, $Blue, $FontFile, $Text);
   //imagestring($Image, 2, 70, 20, 'Vygenerováno za '.$GenerationTime.' sekund', $Black);
   //imagestring($Image, 2, 50, 30, 'Level: '.$Level, $Black);
 
-  imagettftext($Image, $FontSize, 0, 70, 14, $Black, $FontFile, to_utf8($Measure['Description']));
+  imagettftext($Image, $FontSize, 0, 70, 14, $Black, $FontFile, $Measure['Description']);
   imagerectangle($Image, 0, 0, $Width - 1, $Height - 1, $Black);   // Frame border
   imagepng($Image);