Changeset 62 for trunk/graph.php

Timestamp:

Jan 1, 2016, 12:13:34 PM (9 years ago)

Author:

chronos

Message:

• Modified: stat_functions changed to PHP class.

File:

• trunk/graph.php (modified) (9 diffs)

trunk/graph.php

@@ -12 +12 @@
 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;
@@ -24 +24 @@
 $StopWatchStart = GetMicrotime();
 
-$Measure = GetMeasureById($MeasureId);
+$Measure = new Measure($Database);
+$Measure->Load($MeasureId);
+$Measure->DivisionCount = $Config['DivisionCount'];
+$Measure->LevelReducing = $Config['LevelReducing'];
+$Measure->MaxLevel = $Config['MaxLevel'];
+$Measure->ReferenceTime = $Config['ReferenceTime'];
+$Measure->Differential = $Differential;
 
-$Level = floor(log(($EndTime - $StartTime) / $DivisionCount / 60) / log($LevelReducing)) - 1;
+$Level = floor(log(($EndTime - $StartTime) / $Measure->DivisionCount / 60) / log($Measure->LevelReducing)) - 1;
 if($Level < 0) $Level = 0;
-if($Level > $MaxLevel) $Level = $MaxLevel;
+if($Level > $Measure->MaxLevel) $Level = $Measure->MaxLevel;
 
-$Points = GetValues($Measure, $StartTime, $EndTime, $Level);
+$Points = $Measure->GetValues($StartTime, $EndTime, $Level);
 
 if($Debug) echo('Points count: '.count($Points).'<br>');
@@ -56 +62 @@
 
 // Generate polygon and recalculate y values to fit graph height
-$PointsMin = array(0, $Height-1);
-$PointsAvg = array(0, $Height-1);
-$PointsMax = array(0, $Height-1);
+$PointsMin = array(0, $Height - 1);
+$PointsAvg = array(0, $Height - 1);
+$PointsMax = array(0, $Height - 1);
 if(($MaxValue - $MinValue) == 0) $MaxValue = $MinValue + 1;
 {
   foreach($Points as $Index => $Item)
   {
-    $PointsMin[] = $Index*$Width/$DivisionCount;
+    $PointsMin[] = $Index * $Width / $Measure->DivisionCount;
     $PointsMin[] = $Height - 1 - ($Points[$Index]['min'] - $MinValue) / ($MaxValue - $MinValue) * $Height * $K;
-    $PointsAvg[] = $Index*$Width/$DivisionCount;
+    $PointsAvg[] = $Index * $Width / $Measure->DivisionCount;
     $PointsAvg[] = $Height - 1 - ($Points[$Index]['avg'] - $MinValue) / ($MaxValue - $MinValue) * $Height * $K;
-    $PointsMax[] = $Index*$Width/$DivisionCount;
+    $PointsMax[] = $Index * $Width / $Measure->DivisionCount;
     $PointsMax[] = $Height - 1 - ($Points[$Index]['max'] - $MinValue) / ($MaxValue - $MinValue) * $Height * $K;
     //echo($Index.' - '.$Item.' '.$Points[$Index].'<br>');
@@ -90 +96 @@
 //$Points[] = $Width - 1;
 //$Points[] = $Height - 1;
-
-//print_r($PointsMax);
 
 // Generate image
@@ -124 +128 @@
   $MinorTimeMarks = $TimeMarks[$TimeMarksIndex - 2];
 
-  $TimeShift = AlignTime($StartTime, $MajorTimeMarks) - $StartTime;
+  $TimeShift = $Measure->AlignTime($StartTime, $MajorTimeMarks) - $StartTime;
   //imagestring($Image, 10, 40, 50, $TimeShift, $Black);
 
@@ -136 +140 @@
   }
 
-  $TimeShift = AlignTime($StartTime, $MinorTimeMarks) - $StartTime;
+  $TimeShift = $Measure->AlignTime($StartTime, $MinorTimeMarks) - $StartTime;
 
   // Zobraz měřítko X
@@ -161 +165 @@
     $Y = $Height - 1 - ($VerticalLinesDistance * $I);
     //$Y = $Height - 1 - ($VerticalLinesDistance * $I / ($MaxValue - $MinValue) * $K * $Height);
-    $Text = $PrefixMultiplier->Add(round(($I * $VerticalLinesDistance / $Height / $K * ($MaxValue - $MinValue) + $MinValue)), $Measure['Unit'], 3);
+    $Text = $PrefixMultiplier->Add(round(($I * $VerticalLinesDistance / $Height /
+      $K * ($MaxValue - $MinValue) + $MinValue)), $Measure->Data['Unit'], 3);
     $BoundBox = imagettfbbox($FontSize, 0, $FontFile, $Text);
     if(($Y - ($BoundBox[5] - $BoundBox[1]) / 2) > 10)
@@ -169 +174 @@
 
   $Left = $Width - 10;
-  $Text = "    Max. ".$PrefixMultiplier->Add($MaxValue, $Measure['Unit']);
+  $Text = "    Max. ".$PrefixMultiplier->Add($MaxValue, $Measure->Data['Unit']);
   $BoundingBox = imagettfbbox($FontSize, 0, $FontFile, $Text);
   $Left -= ($BoundingBox[2] - $BoundingBox[0]);
   imagettftext($Image, $FontSize, 0, $Left, 14, $Red, $FontFile, $Text);
 
-  $Text = "    Avg.  ".$PrefixMultiplier->Add($AvgValue, $Measure['Unit'], 4);
+  $Text = "    Avg.  ".$PrefixMultiplier->Add($AvgValue, $Measure->Data['Unit'], 4);
   $BoundingBox = imagettfbbox($FontSize, 0, $FontFile, $Text);
   $Left -= ($BoundingBox[2] - $BoundingBox[0]);
   imagettftext($Image, $FontSize, 0, $Left, 14, $Green, $FontFile, $Text);
 
-  $Text = "    Min.  ".$PrefixMultiplier->Add($MinValue, $Measure['Unit']);
+  $Text = "    Min.  ".$PrefixMultiplier->Add($MinValue, $Measure->Data['Unit']);
   $BoundingBox = imagettfbbox($FontSize, 0, $FontFile, $Text);
   $Left -= ($BoundingBox[2] - $BoundingBox[0]);
@@ -186 +191 @@
   //imagestring($Image, 2, 50, 30, 'Level: '.$Level, $Black);
 
-  imagettftext($Image, $FontSize, 0, 70, 14, $Black, $FontFile, $Measure['Description']);
+  imagettftext($Image, $FontSize, 0, 70, 14, $Black, $FontFile, $Measure->Data['Description']);
   imagerectangle($Image, 0, 0, $Width - 1, $Height - 1, $Black);   // Frame border
   imagepng($Image);