Changeset 59 for branches/mvc/Application

Timestamp:

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

Author:

chronos

Message:

• Moved trunk as mvc branch.

Location:

branches/mvc

Files:

• . (moved) (moved from trunk )
• Application/CustomOutput.php (modified) (1 diff)
• Application/Model/Measure.php (modified) (3 diffs)
• Application/Style/Basic/Style.css (modified) (2 diffs)
• Application/View/Graph.php (modified) (9 diffs)
• Application/View/Main.php (modified) (5 diffs)

branches/mvc/Application/CustomOutput.php

@@ -35 +35 @@
       $Tag->SubElements[] = $ExecutionTimeTag;
       $UsedMemoryTag = new XMLTag('li');
-      $UsedMemoryTag->SubElements = 'Použitá paměť: '.$this->System->AddPrefixMultipliers(memory_get_peak_usage(FALSE), 'B').' / '.ini_get('memory_limit').'B';
+      $PrefixMultiplier = new PrefixMultiplier();
+      $UsedMemoryTag->SubElements = 'Použitá paměť: '.$PrefixMultiplier->Add(memory_get_peak_usage(FALSE), 'B').' / '.ini_get('memory_limit').'B';
       $Tag->SubElements[] = $UsedMemoryTag;
     }

branches/mvc/Application/Model/Measure.php

@@ -41 +41 @@
   }
 
-
   function AddValue($Value = array('Min' => 0, 'Avg' => 0, 'Max' => 0), $Level = 0, $Time = 0)
   {
@@ -48 +47 @@
     //echo(TimeToMysqlDateTime($Time).'|'.$Level."\n");
 
-    $Result = $this->Database->select($this->Data['DataTable'], '*', 'Measure='.$this->Data['Id'].' AND Level='.$Level.' ORDER BY Time DESC LIMIT 2');
+    $Result = $this->Database->select($this->Data['DataTable'], '*', '(Measure='.$this->Data['Id'].') AND '.
+      '(Level='.$Level.') ORDER BY Time DESC LIMIT 2');
     //echo($Database->LastQuery."\n");
     if($Result->num_rows == 0)
     {
-       $this->Database->insert($this->Data['DataTable'], array('Min' => $Value['Min'], 'Avg' => $Value['Avg'], 'Max' => $Value['Max'], 'Level' => $Level, 'Measure' => $this->Data['Id'], 'Time' => $this->Database->TimeToMysqlDateTime($Time), 'Continuity' => 0));
+       $this->Database->insert($this->Data['DataTable'], array('Min' => $Value['Min'], 
+         'Avg' => $Value['Avg'], 'Max' => $Value['Max'], 'Level' => $Level, 
+         'Measure' => $this->Data['Id'], 'Time' => $this->Database->TimeToMysqlDateTime($Time), 'Continuity' => 0));
        //echo($Database->LastQuery."\n");
     } else if($Result->num_rows == 1)
     {
-      $this->Database->insert($this->Data['DataTable'], array('Min' => $Value['Min'], 'Avg' => $Value['Avg'], 'Max' => $Value['Max'], 'Level' => $Level, 'Measure' => $this->Data['Id'], 'Time' => $this->Database->TimeToMysqlDateTime($Time), 'Continuity' => 1));
+      $this->Database->insert($this->Data['DataTable'], array('Min' => $Value['Min'], 
+        'Avg' => $Value['Avg'], 'Max' => $Value['Max'], 'Level' => $Level, 
+        'Measure' => $this->Data['Id'], 'Time' => $this->Database->TimeToMysqlDateTime($Time), 'Continuity' => 1));
       //echo($Database->LastQuery."\n");
     } else
@@ -71 +75 @@
           else $Continuity = 0;
         echo('('.$LastValue['Avg'].'=='.$NextToLastValue['Avg'].') and ('.$LastValue['Avg'].' == '.$Value.') and ('.$LastValue['Continuity'].' == 1) and ('.$Continuity.' == 1))'."\n");
-        if(($LastValue['Min'] == $NextToLastValue['Min']) and ($LastValue['Min'] == $Value['Min']) and ($LastValue['Avg'] == $NextToLastValue['Avg']) and ($LastValue['Avg'] == $Value['Avg']) and ($LastValue['Max'] == $NextToLastValue['Max']) and ($LastValue['Max'] == $Value['Max']) and ($LastValue['Continuity'] == 1) and ($Continuity == 1))
-        {
-          $this->Database->update($this->Data['DataTable'], '(Time="'.$LastValue['Time'].'") AND (Level='.$Level.') AND (Measure='.$this->Data['Id'].')', array('Time' => $this->Database->TimeToMysqlDateTime($Time)));
+        if(($LastValue['Min'] == $NextToLastValue['Min']) and ($LastValue['Min'] == $Value['Min']) and 
+        ($LastValue['Avg'] == $NextToLastValue['Avg']) and ($LastValue['Avg'] == $Value['Avg']) and 
+        ($LastValue['Max'] == $NextToLastValue['Max']) and ($LastValue['Max'] == $Value['Max']) and 
+        ($LastValue['Continuity'] == 1) and ($Continuity == 1))
+        {
+          $this->Database->update($this->Data['DataTable'], '(Time="'.$LastValue['Time'].'") '.
+            'AND (Level='.$Level.') AND (Measure='.$this->Data['Id'].')', array(
+            'Time' => $this->Database->TimeToMysqlDateTime($Time)));
           //echo($this->Database->LastQuery."\n");
         } else
         {
-          $this->Database->insert($this->Data['DataTable'], array('Min' => $Value['Min'], 'Avg' => $Value['Avg'], 'Max' => $Value['Max'], 'Level' => $Level, 'Measure' => $this->Data['Id'], 'Time' => $this->Database->TimeToMysqlDateTime($Time), 'Continuity' => $Continuity));
+          $this->Database->insert($this->Data['DataTable'], array('Min' => $Value['Min'], 
+            'Avg' => $Value['Avg'], 'Max' => $Value['Max'], 'Level' => $Level, 
+            'Measure' => $this->Data['Id'], 'Time' => $this->Database->TimeToMysqlDateTime($Time), 
+            'Continuity' => $Continuity));
         }
       }

branches/mvc/Application/Style/Basic/Style.css

@@ -3 +3 @@
   font-family :  Arial, sans-serif;
 }
+
+.Main
+{
+  text-align: center;
+}
+
 .BasicTable
 {
@@ -25 +31 @@
   padding: 2px;
 }
+
+.WideTable
+{
+  border-color: #A0A0A0;
+  border-style: solid;
+  border-width: 1px 1px 0px 0px;
+  border-spacing: 0px;
+  text-align: center;
+  margin-left: auto;
+  margin-right: auto;  
+}
+
+.WideTable th
+{
+  border-color: #A0A0A0;
+  border-style: solid;
+  border-width: 0px 0px 1px 1px;
+  padding: 1px 5px 1px 5px;
+  background-color: #F0F0FF
+}
+
+.WideTable td
+{
+  border-color: #A0A0A0;
+  border-style: solid;
+  border-width: 0px 0px 1px 1px;
+  padding: 1px 5px 1px 5px;
+  text-align: center;
+}
+
 h3
 {

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]);

branches/mvc/Application/View/Main.php

@@ -113 +113 @@
     }
 
-    $Output = '<div class="Title">Statistiky</div>';
+    $Output = '<div class="Main">';
+    $Output .= '<div class="Title">Statistiky</div>';
 
     if(!array_key_exists('Operation', $_GET)) $_GET['Operation'] = '';
@@ -160 +161 @@
 
     $Output .= '<br/>'.$this->MeasureTable();
+    $Output .= '</div>';
     return($Output);
   }
@@ -178 +180 @@
   function MeasureTable()
   {
-    $Output = '<table border="1" cellspacing="0" cellpadding="2" style="font-size: small;">';
+    $Output = '<table class="WideTable">';
     $Output .= '<tr><th>Měřená veličina</th><th>Poslední hodnota</th><th>Čas posledního měření</th><th>Interpolace</th><th>Poznámky</th>';
     if(array_key_exists('Debug', $_GET)) $Output .= '<th>Počet položek</th><th>Čas vykonání</th>';
     $Output .= '</tr>';
+    $PrefixMultiplier = new PrefixMultiplier();
     $Result = $this->Database->select('Measure', '*', 'Enabled=1 ORDER BY Description');
     while($Measure = $Result->fetch_array())
@@ -199 +202 @@
         $Row = $Result2->fetch_array();
         $LastMeasureTime = date('j.n.Y G:i:s', $this->Database->MysqlDateTimeToTime($Row['Time']));
-        $LastMeasureValue = $this->System->AddPrefixMultipliers($Row['Avg'], $MeasureMethod['Unit']);
+        $LastMeasureValue = $PrefixMultiplier->Add($Row['Avg'], $MeasureMethod['Unit']);
       } else
       {
@@ -219 +222 @@
 
     //ShowPage($Output);
-    //echo(AddPrefixMultipliers('-0.000000071112345', 'B'));
     return($Output);
   }