Changeset 59 for branches/mvc/Application/View/Graph.php

Timestamp:

Mar 1, 2015, 12:43:56 PM (10 years ago)

Author:

chronos

Message:

• Moved trunk as mvc branch.

Location:

branches/mvc

Files:

• . (moved) (moved from trunk )
• Application/View/Graph.php (modified) (9 diffs)

branches/mvc/Application/View/Graph.php

@@ -6 +6 @@
 class GraphView extends View
 {
+  var $FontSize;
+  var $FontFileName;
+  var $ValueToImageHeigthCoefficient;
   var $DefaultWidth;
   var $DefaultHeight;
@@ -14 +17 @@
     $this->DefaultWidth = 800;
     $this->DefaultHeight = 200;
+    $this->FontSize = 10;
+    $this->FontFileName = 'Arial.ttf';
+    $this->ValueToImageHeigthCoefficient = 0.9;
   }
 
@@ -35 +41 @@
     if(!array_key_exists('Differential', $_GET)) $Differential = $this->Config['Application']['DefaultVariables']['Differential'];
       else $Differential = addslashes($_GET['Differential']);
-    $VerticalLinesCount = round($Height / ($this->Config['Application']['FontSize'] + 4));
-
+    $VerticalLinesCount = round($Height / ($this->FontSize + 4));
+
+    $PrefixMultiplier = new PrefixMultiplier();
     $StopWatchStart = $this->System->GetMicrotime();
 
@@ -50 +57 @@
     $MeasureMethod = $DbResult2->fetch_assoc();
 
-    $FontSize = $this->Config['Application']['FontSize'];
-    $FontFile = dirname(__FILE__).'/../Style/'.$this->Config['System']['Style'].'/'.$this->Config['Application']['FontFileName'];
+    $FontSize = $this->FontSize;
+    $FontFile = dirname(__FILE__).'/../Style/'.$this->Config['System']['Style'].'/'.$this->FontFileName;
 
     $Level = floor(log(($EndTime - $StartTime) / $Measure->DivisionCount / 60) / log($Measure->LevelReducing)) - 1;
@@ -92 +99 @@
       {
         $PointsMin[] = $Index * $Width / $Measure->DivisionCount;
-        $PointsMin[] = $Height - 1 - ($Points[$Index]['Min'] - $MinValue) / ($MaxValue - $MinValue) * $Height * $this->Config['Application']['ValueToImageHeigthCoefficient'];
+        $PointsMin[] = $Height - 1 - ($Points[$Index]['Min'] - $MinValue) /
+          ($MaxValue - $MinValue) * $Height * $this->ValueToImageHeigthCoefficient;
         $PointsAvg[] = $Index * $Width / $Measure->DivisionCount;
-        $PointsAvg[] = $Height - 1 - ($Points[$Index]['Avg'] - $MinValue) / ($MaxValue - $MinValue) * $Height * $this->Config['Application']['ValueToImageHeigthCoefficient'];
+        $PointsAvg[] = $Height - 1 - ($Points[$Index]['Avg'] - $MinValue) /
+          ($MaxValue - $MinValue) * $Height * $this->ValueToImageHeigthCoefficient;
         $PointsMax[] = $Index * $Width / $Measure->DivisionCount;
-        $PointsMax[] = $Height - 1 - ($Points[$Index]['Max'] - $MinValue) / ($MaxValue - $MinValue) * $Height * $this->Config['Application']['ValueToImageHeigthCoefficient'];
+        $PointsMax[] = $Height - 1 - ($Points[$Index]['Max'] - $MinValue) /
+          ($MaxValue - $MinValue) * $Height * $this->ValueToImageHeigthCoefficient;
         //echo($Index.' - '.$Item.' '.$Points[$Index].'<br/>');
       }
@@ -113 +123 @@
     $PointsMax[] = $Height - 1;
 
-
     //array_unshift($Points, $Height - 1);
     //array_unshift($Points, 0);
     //$Points[] = $Width - 1;
     //$Points[] = $Height - 1;      echo('sds');
-
-
     //print_r($PointsMax);
 
@@ -179 +186 @@
         {
           for($Y = 0; $Y < $Height; $Y = $Y + 1) imagesetpixel($Image, $X, $Y, $Gray);
-          imagettftext($Image, $FontSize, 0, $X - ($BoundBox[2] - $BoundBox[0]) / 2,  $Height - 2, $Black, $FontFile, $Text);
+          imagettftext($Image, $FontSize, 0, $X - ($BoundBox[2] - $BoundBox[0]) / 2,
+            $Height - 2, $Black, $FontFile, $Text);
           $LastTextEnd = $X + ($BoundBox[2] - $BoundBox[0]) / 2;
         }
@@ -190 +198 @@
         $Y = $Height - 1 - ($VerticalLinesDistance * $I);
         //$Y = $Height - 1 - ($VerticalLinesDistance * $I / ($MaxValue - $MinValue) * $this->Config['Application']['ValueToImageHeigthCoefficient'] * $Height);
-        $Text = $this->System->AddPrefixMultipliers(round(($I * $VerticalLinesDistance / $Height / $this->Config['Application']['ValueToImageHeigthCoefficient'] * ($MaxValue - $MinValue) + $MinValue)), $MeasureMethod['Unit'], 3);
+        $Text = $PrefixMultiplier->Add(round(($I * $VerticalLinesDistance /
+          $Height / $this->ValueToImageHeigthCoefficient * ($MaxValue - $MinValue) + $MinValue)), $MeasureMethod['Unit'], 3);
         $BoundBox = imagettfbbox($FontSize, 0, $FontFile, $Text);
         if(($Y - ($BoundBox[5] - $BoundBox[1]) / 2) > 10)
@@ -198 +207 @@
 
       $Left = $Width - 10;
-      $Text = '    Max. '.$this->System->AddPrefixMultipliers($MaxValue, $MeasureMethod['Unit']);
+      $Text = '    Max. '.$PrefixMultiplier->Add($MaxValue, $MeasureMethod['Unit']);
       $BoundingBox = imagettfbbox($FontSize, 0, $FontFile, $Text);
       $Left -= ($BoundingBox[2] - $BoundingBox[0]);
       imagettftext($Image, $FontSize, 0, $Left, 14, $Red, $FontFile, $Text);
 
-      $Text = '    Avg.  '.$this->System->AddPrefixMultipliers($AvgValue, $MeasureMethod['Unit']);
+      $Text = '    Avg.  '.$PrefixMultiplier->Add($AvgValue, $MeasureMethod['Unit']);
       $BoundingBox = imagettfbbox($FontSize, 0, $FontFile, $Text);
       $Left -= ($BoundingBox[2] - $BoundingBox[0]);
       imagettftext($Image, $FontSize, 0, $Left, 14, $Green, $FontFile, $Text);
 
-      $Text = '    Min.  '.$this->System->AddPrefixMultipliers($MinValue, $MeasureMethod['Unit']);
+      $Text = '    Min.  '.$PrefixMultiplier->Add($MinValue, $MeasureMethod['Unit']);
       $BoundingBox = imagettfbbox($FontSize, 0, $FontFile, $Text);
       $Left -= ($BoundingBox[2] - $BoundingBox[0]);