Changeset 92 for trunk/Graph.php

Timestamp:

Apr 7, 2020, 11:53:58 AM (5 years ago)

Author:

chronos

Message:

• Modified: Improved code formatting.

File:

• trunk/Graph.php (modified) (8 diffs)

trunk/Graph.php

@@ -26 +26 @@
     global $Config;
 
-    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;
+    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 = $this->DefaultWidth;
+    if (!array_key_exists('Width', $_GET)) $Width = $this->DefaultWidth;
     else $Width = addslashes($_GET['Width']);
-    if(!array_key_exists('Height', $_GET)) $Height = $this->DefaultHeight;
+    if (!array_key_exists('Height', $_GET)) $Height = $this->DefaultHeight;
     else $Height = addslashes($_GET['Height']);
-    if(!array_key_exists('Differential', $_GET)) $Differential = $Config['DefaultVariables']['Differential'];
+    if (!array_key_exists('Differential', $_GET)) $Differential = $Config['DefaultVariables']['Differential'];
     else $Differential = addslashes($_GET['Differential']);
     $VerticalLinesCount = round($Height / ($this->FontSize + 4));
@@ -54 +54 @@
 
     $Level = floor(log(($EndTime - $StartTime) / $Measure->DivisionCount / 60) / log($Measure->LevelReducing)) - 1;
-    if($Level < 0) $Level = 0;
-    if($Level > $Measure->MaxLevel) $Level = $Measure->MaxLevel;
+    if ($Level < 0) $Level = 0;
+    if ($Level > $Measure->MaxLevel) $Level = $Measure->MaxLevel;
 
     $Points = $Measure->GetValues($StartTime, $EndTime, $Level);
@@ -63 +63 @@
     $AvgValue = 0;
     $MinValue = 1000000000000000000;
-    foreach($Points as $Index => $Item)
+    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'];
-      if($Points[$Index]['Avg'] > $MaxValue) $MaxValue = $Points[$Index]['Avg'];
-      if($Points[$Index]['Avg'] < $MinValue) $MinValue = $Points[$Index]['Avg'];
-      if($Points[$Index]['Max'] > $MaxValue) $MaxValue = $Points[$Index]['Max'];
-      if($Points[$Index]['Min'] < $MinValue) $MinValue = $Points[$Index]['Min'];
+      if ($Points[$Index]['Avg'] > $MaxValue) $MaxValue = $Points[$Index]['Avg'];
+      if ($Points[$Index]['Avg'] < $MinValue) $MinValue = $Points[$Index]['Avg'];
+      if ($Points[$Index]['Max'] > $MaxValue) $MaxValue = $Points[$Index]['Max'];
+      if ($Points[$Index]['Min'] < $MinValue) $MinValue = $Points[$Index]['Min'];
       $AvgValue = $AvgValue + $Points[$Index]['Avg'];
     }
@@ -82 +82 @@
     $PointsAvg = array(0, $Height - 1);
     $PointsMax = array(0, $Height - 1);
-    if(($MaxValue - $MinValue) == 0) $MaxValue = $MinValue + 1;
-    {
-      foreach($Points as $Index => $Item)
+    if (($MaxValue - $MinValue) == 0) $MaxValue = $MinValue + 1;
+    {
+      foreach ($Points as $Index => $Item)
       {
         $PointsMin[] = $Index * $Width / $Measure->DivisionCount;
@@ -138 +138 @@
     $TimeRange = $EndTime - $StartTime;
     $TimeMarksIndex = 0;
-    while((($TimeRange / $TimeMarks[$TimeMarksIndex]) > 1) and ($TimeMarksIndex < (count($TimeMarks) - 1))) 
+    while ((($TimeRange / $TimeMarks[$TimeMarksIndex]) > 1) and ($TimeMarksIndex < (count($TimeMarks) - 1))) 
       $TimeMarksIndex += 1;
-    if($TimeMarksIndex < 2) $TimeMarksIndex = 2;
+    if ($TimeMarksIndex < 2) $TimeMarksIndex = 2;
     $MajorTimeMarks = $TimeMarks[$TimeMarksIndex - 1];
     $MinorTimeMarks = $TimeMarks[$TimeMarksIndex - 2];
@@ -149 +149 @@
     // Zobraz měřítko Y
     $VerticalLinesDistance = $Height / $VerticalLinesCount;
-    for($I = 1; $I <= $VerticalLinesCount; $I++)
+    for ($I = 1; $I <= $VerticalLinesCount; $I++)
     {
       $Y = $Height - 1 - ($VerticalLinesDistance * $I);
-      for($X = 1; $X < $Width; $X = $X + 3) imagesetpixel($Image, $X, $Y, $Gray);
+      for ($X = 1; $X < $Width; $X = $X + 3) imagesetpixel($Image, $X, $Y, $Gray);
       //imageline($Image, 30, $Y, $Width-1, $Y, IMG_COLOR_STYLED);
     }
@@ -160 +160 @@
     // Zobraz měřítko X
     $LastTextEnd = 0;
-    for($Time = $StartTime; $Time < $EndTime; $Time += $MajorTimeMarks)
+    for ($Time = $StartTime; $Time < $EndTime; $Time += $MajorTimeMarks)
     {
       $X = round(($Time - $StartTime + $TimeShift) / $TimeRange * $Width) % $Width;
       //imageline($Image, 30, $Y, $Width-1, $Y, IMG_COLOR_STYLED);
-      if(($MajorTimeMarks > 60*60*24)) $Text = date('j.n.Y', $Time + $TimeShift);
+      if (($MajorTimeMarks > 60*60*24)) $Text = date('j.n.Y', $Time + $TimeShift);
         else $Text = date('j.n.Y G:i', $Time + $TimeShift);
       $BoundBox = imagettfbbox($this->FontSize, 0, $this->FontFileName, $Text);
-      if($LastTextEnd < ($X - ($BoundBox[2] - $BoundBox[0] + 20) / 2))
+      if ($LastTextEnd < ($X - ($BoundBox[2] - $BoundBox[0] + 20) / 2))
       {
-        for($Y = 0; $Y < $Height; $Y = $Y + 1) imagesetpixel($Image, $X, $Y, $Gray);
+        for ($Y = 0; $Y < $Height; $Y = $Y + 1) imagesetpixel($Image, $X, $Y, $Gray);
         imagettftext($Image, $this->FontSize, 0, $X - ($BoundBox[2] - $BoundBox[0]) / 2,  $Height - 2, $Black, $this->FontFileName, $Text);
         $LastTextEnd = $X + ($BoundBox[2] - $BoundBox[0]) / 2;
       }
-      else for($Y=0; $Y < $Height; $Y = $Y + 3) imagesetpixel($Image, $X, $Y, $Gray);
+      else for ($Y=0; $Y < $Height; $Y = $Y + 3) imagesetpixel($Image, $X, $Y, $Gray);
     }
 
     // Popisky osy Y
-    for($I = 1; $I <= $VerticalLinesCount; $I++)
+    for ($I = 1; $I <= $VerticalLinesCount; $I++)
     {
       $Y = $Height - 1 - ($VerticalLinesDistance * $I);
@@ -185 +185 @@
           $Measure->Data['Unit'], 3);
       $BoundBox = imagettfbbox($this->FontSize, 0, $this->FontFileName, $Text);
-      if(($Y - ($BoundBox[5] - $BoundBox[1]) / 2) > 10)
+      if (($Y - ($BoundBox[5] - $BoundBox[1]) / 2) > 10)
         imagettftext($Image, $this->FontSize, 0, 2,  $Y - ($BoundBox[5] - $BoundBox[1]) / 2, $Black, $this->FontFileName, $Text);
     }