Changeset 655 for trunk/Modules/TimeMeasure

Timestamp:

May 11, 2014, 4:28:01 PM (11 years ago)

Author:

chronos

Message:

• Opraveno: Zobrazování grafů mřených veličin.

Location:

trunk/Modules/TimeMeasure

Files:

• Graph.php (modified) (10 diffs)
• Main.php (modified) (16 diffs)
• Measure.php (modified) (21 diffs)
• TimeMeasure.php (modified) (3 diffs)

trunk/Modules/TimeMeasure/Graph.php

@@ -1 +1 @@
 <?php
 
-class GraphView extends View
+class PageGraph extends Page
 {
+  var $FontSize;
+  var $FontFileName;
+  var $ValueToImageHeigthCoefficient;
+  var $DefaultWidth;
+  var $DefaultHeight;
+
+  function __construct($System)
+  {
+    parent::__construct($System);
+    $this->FontSize = 10;
+    $this->FontFileName = 'Arial.ttf';
+    $this->ValueToImageHeigthCoefficient = 0.9;
+  }
+
+  function Show()
+  {
+    $this->ClearPage = true;
+        return($this->Render());
+  }
+
   function Render()
   {
-    if(array_key_exists('Debug', $_GET)) $Debug = $_GET['Debug']; 
+    $PrefixMultiplier = new PrefixMultiplier();
+
+    if(array_key_exists('Debug', $_GET)) $Debug = $_GET['Debug'];
       else $Debug = 0;
-  
+
     if(!array_key_exists('From', $_GET)) die('Musíte zadat čas počátku');
     $StartTime = addslashes($_GET['From']);
@@ -15 +37 @@
     $TimeDifference = $EndTime - $StartTime;
     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; 
+    $MeasureId = addslashes($_GET['Measure']);
+    if(!array_key_exists('Width', $_GET)) $Width = $this->DefaultWidth;
       else $Width = addslashes($_GET['Width']);
-    if(!array_key_exists('Height', $_GET)) $Height = $DefaultHeight;
+    if(!array_key_exists('Height', $_GET)) $Height = $this->DefaultHeight;
       else $Height = addslashes($_GET['Height']);
     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));
-
-    $StopWatchStart = $this->System->GetMicrotime();
+    $VerticalLinesCount = round($Height / ($this->FontSize + 4));
+
+    $StopWatchStart = GetMicrotime();
 
     $Measure = new Measure($this->System);
     $Measure->Load($MeasureId);
-    $Measure->LevelReducing = $this->Config['Application']['LevelReducing'];
-    $Measure->ReferenceTime = $this->Config['Application']['ReferenceTime'];
-    $Measure->MaxLevel = $this->Config['Application']['MaxLevel'];
-    $Measure->DivisionCount = $this->Config['Application']['DivisionCount'];
-    $Measure->Differential = $this->Config['Application']['DefaultVariables']['Differential'];
+    //$Measure->LevelReducing = $this->LevelReducing;
+    //$Measure->ReferenceTime = $this->Config['Application']['ReferenceTime'];
+    //$Measure->MaxLevel = $this->Config['Application']['MaxLevel'];
+    //$Measure->DivisionCount = $this->Config['Application']['DivisionCount'];
+    //$Measure->Differential = $this->Config['Application']['DefaultVariables']['Differential'];
     $Measure->Debug = $Debug;
     $DbResult2 = $this->Database->select('MeasureMethod', '*', 'Id='.$Measure->Data['Method']);
     $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->System->Config['Web']['Style'].'/'.$this->FontFileName;
 
     $Level = floor(log(($EndTime - $StartTime) / $Measure->DivisionCount / 60) / log($Measure->LevelReducing)) - 1;
@@ -47 +69 @@
     $Points = $Measure->GetValues($StartTime, $EndTime, $Level);
 
-    if($Debug) echo('Points count: '.count($Points).'<br/>'); 
-    //if($Debug) foreach($Points as $Index => $Item) 
+    if($Debug) echo('Points count: '.count($Points).'<br/>');
+    //if($Debug) foreach($Points as $Index => $Item)
     // echo($Index.': '.$Item['min'].'<br>');
 
@@ -70 +92 @@
     $AvgValue = $AvgValue / count($Points); //round( * $Measure['Divider']) / $Measure['Divider'];
 
-    // Generate polygon and recalculate y values to fit graph height 
+    // 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);
     if(($MaxValue - $MinValue) == 0) $MaxValue = $MinValue + 1;
-    { 
+    {
       foreach($Points as $Index => $Item)
       {
         $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>');
       }
@@ -107 +129 @@
 
     //print_r($PointsMax);
- 
+
     // Generate image
-    if(!$Debug) 
+    if(!$Debug)
     {
       Header('Content-type: image/png');
-      Header('Cache-Control: no-cache');  // Dynamic graph - no cache 
+      Header('Cache-Control: no-cache');  // Dynamic graph - no cache
       $Image = @imagecreate($Width, $Height);
       $BackgroundColor = imagecolorallocate($Image, 255, 255, 255);
@@ -129 +151 @@
       imagefilledpolygon($Image, $PointsAvg, count($PointsAvg) / 2, $LightGreen);
       imagefilledpolygon($Image, $PointsMin, count($PointsMin) / 2, $LightBlue);
-  
+
       $TimeMarks = array(1, 60, 60*60, 60*60*24, 60*60*24*7, 60*60*24*30, 60*60*24*365, 60*60*24*365*10);
-  
+
       $TimeRange = $EndTime - $StartTime;
       $TimeMarksIndex = 0;
@@ -137 +159 @@
       if($TimeMarksIndex < 2) $TimeMarksIndex = 2;
       $MajorTimeMarks = $TimeMarks[$TimeMarksIndex - 1];
-      $MinorTimeMarks = $TimeMarks[$TimeMarksIndex - 2];  
-   
-      $TimeShift = $Measure->AlignTime($StartTime, $MajorTimeMarks) - $StartTime; 
+      $MinorTimeMarks = $TimeMarks[$TimeMarksIndex - 2];
+
+      $TimeShift = $Measure->AlignTime($StartTime, $MajorTimeMarks) - $StartTime;
       //imagestring($Image, 10, 40, 50, $TimeShift, $Black);
-  
+
       // Zobraz měřítko Y
       $VerticalLinesDistance = $Height / $VerticalLinesCount;
@@ -149 +171 @@
         for($X = 1; $X < $Width; $X = $X + 3) imagesetpixel($Image, $X, $Y, $Gray);
         //imageline($Image, 30, $Y, $Width-1, $Y, IMG_COLOR_STYLED);
-      } 
-
-      $TimeShift = $Measure->AlignTime($StartTime, $MinorTimeMarks) - $StartTime; 
- 
+      }
+
+      $TimeShift = $Measure->AlignTime($StartTime, $MinorTimeMarks) - $StartTime;
+
       // Zobraz měřítko X
       $LastTextEnd = 0;
       for($Time = $StartTime; $Time < $EndTime; $Time += $MajorTimeMarks)
       {
-        $X = round(($Time - $StartTime + $TimeShift) / $TimeRange * $Width) % $Width; 
+        $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);
@@ -169 +191 @@
         }
         else for($Y = 0; $Y < $Height; $Y = $Y + 3) imagesetpixel($Image, $X, $Y, $Gray);
-      } 
-  
+      }
+
       // Popisky osy Y
       for($I = 1; $I <= $VerticalLinesCount; $I++)
       {
         $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);
+        //$Y = $Height - 1 - ($VerticalLinesDistance * $I / ($MaxValue - $MinValue) *
+        //  $this->ValueToImageHeigthCoefficient * $Height);
+        $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)
           imagettftext($Image, $FontSize, 0, 2,  $Y - ($BoundBox[5] - $BoundBox[1]) / 2, $Black, $FontFile, $Text);
-      } 
-      $GenerationTime = floor(($this->System->GetMicrotime() - $StopWatchStart) * 1000  ) / 1000;
+      }
+      $GenerationTime = floor((GetMicrotime() - $StopWatchStart) * 1000  ) / 1000;
 
       $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]);
@@ -205 +229 @@
       imagepng($Image);
       imagedestroy($Image);
-    }    
+    }
   }
 }

trunk/Modules/TimeMeasure/Main.php

@@ -3 +3 @@
 class PageMeasure extends Page
 {
-  var $Months = array('', 'Leden', 'Únor', 'Březen', 'Duben', 'Květen', 'Červen', 'Červenec', 'Srpen', 'Září', 'Říjen', 'Listopad', 'Prosinec');
-
-  var $GraphTimeRanges = array
+  var $Months;
+  var $GraphTimeRanges;
+  var $DefaultVariables;
+  var $ImageHeight;
+  var $ImageWidth;
+
+  function __construct($System)
+  {
+    parent::__construct($System);
+    $this->ShortTitle = 'Grafy';
+    $this->FullTitle = 'Časové grafy veličin';
+    $this->ImageWidth = 800;
+    $this->ImageHeight = 200;
+    $this->ParentClass = 'PagePortal';
+        $this->DefaultVariables = array(
+      'TimeSpecify' => 0,
+      'Period' => 'day',
+      'Measure' => 1,
+      'Differential' => 0,
+    );
+    $this->Months = array('', 'Leden', 'Únor', 'Březen', 'Duben', 'Květen',
+      'Červen', 'Červenec', 'Srpen', 'Září', 'Říjen', 'Listopad', 'Prosinec');
+    $this->GraphTimeRanges = array
   (
     'hour' => array(
@@ -22 +42 @@
       'caption' => 'Měsíc',
       'period' => 2592000, // 3600 * 24 * 30,
-    ),  
+    ),
     'year' => array(
       'caption' => 'Rok',
@@ -32 +52 @@
     ),
   );
+  }
 
   function EditTime($Time)
@@ -44 +65 @@
     for($I = 1; $I < 32; $I++)
     {
-      if($I == $TimeParts['mday']) $Selected = ' selected="1"'; else $Selected = ''; 
+      if($I == $TimeParts['mday']) $Selected = ' selected="1"'; else $Selected = '';
       $Output .= '<option value="'.$I.'"'.$Selected.'>'.$I.'</option>';
     }
@@ -52 +73 @@
     $Output .= '<select name="Month">';
     foreach($this->Months as $Index => $Month)
-    { 
+    {
       if($Index == $TimeParts['mon']) $Selected = ' selected="1"'; else $Selected = '';
       if($Index > 0) $Output .= '<option value="'.$Index.'"'.$Selected.'>'.$Month.'</option>';
@@ -61 +82 @@
     $Output .= '<select name="Year">';
     for($I = 2000; $I < 2010; $I++)
-    { 
+    {
       if($I == $TimeParts['year']) $Selected = ' selected="1"'; else $Selected = '';
       $Output .= '<option value="'.$I.'"'.$Selected.'>'.$I.'</option>';
@@ -70 +91 @@
     $Output .= '<select name="Hour">';
     for($I = 0; $I < 24; $I++)
-    { 
+    {
       if($I == $TimeParts['hours']) $Selected = ' selected="1"'; else $Selected = '';
       $Output .= '<option value="'.$I.'"'.$Selected.'>'.$I.'</option>';
@@ -78 +99 @@
     // Minute selection
     $Output .= '<select name="Minute">';
-    for($I = 0; $I < 60; $I++) 
+    for($I = 0; $I < 60; $I++)
     {
       if($I == $TimeParts['minutes']) $Selected = ' selected="1"'; else $Selected = '';
@@ -98 +119 @@
     $Debug = 0;
 
-    foreach($this->System->Config['Application']['DefaultVariables'] as $Index => $Variable)
+    foreach($this->DefaultVariables as $Index => $Variable)
     {
       if(!array_key_exists($Index, $_SESSION)) $_SESSION[$Index] = $Variable;
@@ -110 +131 @@
       $_SESSION['TimeEnd'] = time() - 60;
       $_SESSION['TimeStart'] = $_SESSION['TimeEnd'] - $this->GraphTimeRanges[$_SESSION['Period']]['period'];
-    } 
-
-    $Output = '<div class="Title">Statistiky</div>';
+    }
+
+    $Output = '';
 
     if(!array_key_exists('Operation', $_GET)) $_GET['Operation'] = '';
@@ -128 +149 @@
           }
         }
-        break; 
+        break;
       case 'SetTimeNow':
-        if(array_key_exists('Time', $_GET)) 
+        if(array_key_exists('Time', $_GET))
         {
           if(($_GET['Time'] == 'TimeStart') or ($_GET['Time'] == 'TimeEnd'))
@@ -160 +181 @@
     $Output .= '<br/>'.$this->MeasureTable();
     return($Output);
-  }  
-  
+  }
+
   function Graph()
   {
     $Output = '<strong>Graf:</strong><br/>';
-    $Output .= '<img alt="Graf" src="?M=Graph&amp;Measure='.$_SESSION['Measure'].'&amp;From='.$_SESSION['TimeStart'].'&amp;To='.$_SESSION['TimeEnd'].'&amp;Width='.$this->Config['Application']['GraphSize']['Width'].'&amp;Height='.$this->Config['Application']['GraphSize']['Height'].'&amp;Differential='.$_SESSION['Differential'].'" width="'.$this->Config['Application']['GraphSize']['Width'].'" height="'.$this->Config['Application']['GraphSize']['Height'].'"><br>';
-    $Output .= '<a href="?Measure='.$_SESSION['Measure'].'&amp;TimeStart='.$_SESSION['TimeStart'].'&amp;TimeEnd='.$_SESSION['TimeEnd'].'&amp;TimeSpecify=1&amp;Differential='.$_SESSION['Differential'].'">Odkaz na vybraný graf</a><br>';
-    return($Output);
-  }
-  
+    $Output .= '<img alt="Graf" src="'.$this->System->Link('/grafy/graf.png?Measure='.$_SESSION['Measure'].
+      '&amp;From='.$_SESSION['TimeStart'].'&amp;To='.$_SESSION['TimeEnd'].'&amp;Width='.
+      $this->ImageWidth.'&amp;Height='.$this->ImageHeight.'&amp;Differential='.
+      $_SESSION['Differential']).'" width="'.$this->ImageWidth.'" height="'.$this->ImageHeight.'"><br>';
+    $Output .= '<a href="?Measure='.$_SESSION['Measure'].'&amp;TimeStart='.
+      $_SESSION['TimeStart'].'&amp;TimeEnd='.$_SESSION['TimeEnd'].'&amp;TimeSpecify=1&amp;Differential='.$_SESSION['Differential'].'">Odkaz na vybraný graf</a><br>';
+    return($Output);
+  }
+
   function MeasureTable()
   {
+    $PrefixMultiplier = new PrefixMultiplier();
     $Output = '<table border="1" cellspacing="0" cellpadding="2" style="font-size: small;">';
     $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>';
@@ -181 +207 @@
       $DbResult2 = $this->Database->select('MeasureMethod', '*', 'Id='.$Measure['Method']);
       $MeasureMethod = $DbResult2->fetch_assoc();
-      $StopWatchStart = $this->System->GetMicrotime();
+      $StopWatchStart = GetMicrotime();
       if(array_key_exists('Debug', $_GET))
       {
@@ -192 +218 @@
       {
         $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']);
+        $LastMeasureTime = date('j.n.Y G:i:s', MysqlDateTimeToTime($Row['Time']));
+        $LastMeasureValue = $PrefixMultiplier->Add($Row['Avg'], $MeasureMethod['Unit']);
       } else
       {
@@ -199 +225 @@
         $LastMeasureValue = '&nbsp;';
       }
-      if($Measure['Continuity'] == 1) $Interpolate = 'Ano'; 
+      if($Measure['Continuity'] == 1) $Interpolate = 'Ano';
         else $Interpolate = 'Ne';
-      if($Measure['Info'] == '') $Measure['Info'] = '&nbsp;';
-      $GenerationTime = floor(($this->System->GetMicrotime() - $StopWatchStart) * 1000  ) / 1000;
+      //if($Measure['Description'] == '') $Measure['Description'] = '&nbsp;';
+      $GenerationTime = floor((GetMicrotime() - $StopWatchStart) * 1000  ) / 1000;
       $Output .= '<tr><td><a href="?Measure='.$Measure['Id'].'&amp;Differential=0">'.$Measure['Name'].'</a></td><td align="center">'.$LastMeasureValue.'</td><td align="center">'.$LastMeasureTime.'</td><td align="center">'.$Interpolate.'</td><td>'.$Measure['Description'].'</td>';
       if(array_key_exists('Debug', $_GET)) $Output .= '<td>'.$RowCount.'</td><td>'.$GenerationTime.'</td>';
@@ -211 +237 @@
     //print_r(gd_info());
     //print_r($_SESSION);
- 
+
     //ShowPage($Output);
-    //echo(AddPrefixMultipliers('-0.000000071112345', 'B'));
+    //echo($PrefixMultiplier->Add('-0.000000071112345', 'B'));
     return($Output);
   }

trunk/Modules/TimeMeasure/Measure.php

@@ -11 +11 @@
   var $DivisionCount = 500;
   var $ValueTypes = array('Min', 'Avg', 'Max');
-  
+
   function Load($Id)
   {
@@ -22 +22 @@
     } else throw new Exception('Measure not found');
   }
- 
+
   function TimeSegment($Base, $Level)
   {
@@ -48 +48 @@
     $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)); 
+    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));
        //echo($Database->LastQuery."\n");
     } else if($Result->num_rows == 1)
@@ -61 +61 @@
       $NextToLastValue = $Result->fetch_assoc();
       //echo($Level.': '.$Time.' - '.MysqlDateTimeToTime($LastValue['Time']).' '.($Time - MysqlDateTimeToTime($LastValue['Time'])).' = '.$Measure['Period']."\n");
-      if((($Time - $this->Database->MysqlDateTimeToTime($LastValue['Time'])) < 0.75 * $this->Data['Period']) and ($Level == 0))
-      { 
+      if((($Time - MysqlDateTimeToTime($LastValue['Time'])) < 0.75 * $this->Data['Period']) and ($Level == 0))
+      {
         echo('Too short period\n');
       } else
       {
-        if(($Time - $this->Database->MysqlDateTimeToTime($LastValue['Time'])) < 1.25 * $this->Data['Period']) $Continuity = 1;
+        if(($Time - MysqlDateTimeToTime($LastValue['Time'])) < 1.25 * $this->Data['Period']) $Continuity = 1;
           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='.$Measure['Id'].')', array('Time' => $this->Database->TimeToMysqlDateTime($Time)));
+          $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
@@ -77 +77 @@
           $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));
         }
-      }  
+      }
 
       // Update next level
@@ -95 +95 @@
         $Values = array();
         //.'" AND Time < "'.TimeToMysqlDateTime($EndTime).'" AND Measure='.$Measure['Id'].' AND Level='.($Level - 1).' ORDER BY Time');
-        $Result = $this->Database->select($this->Data['DataTable'], '*', '(Time > "'.$this->Database->TimeToMysqlDateTime($StartTime).'") AND (Time < "'.$this->Database->TimeToMysqlDateTime($EndTime).'") AND (Measure='.$this->Data['Id'].') AND (Level='.($Level - 1).') ORDER BY Time');
+        $Result = $this->Database->select($this->Data['DataTable'], '*', '(Time > "'.TimeToMysqlDateTime($StartTime).'") AND (Time < "'.$this->Database->TimeToMysqlDateTime($EndTime).'") AND (Measure='.$this->Data['Id'].') AND (Level='.($Level - 1).') ORDER BY Time');
         while($Row = $Result->fetch_assoc())
         {
-          $Row['Time'] = $this->Database->MysqlDateTimeToTime($Row['Time']);
+          $Row['Time'] = MysqlDateTimeToTime($Row['Time']);
           $Values[] = $Row;
         }
@@ -108 +108 @@
           // Load subsidary values
           print_r($Values);
-          $Values = array_merge($this->LoadLeftSideValue($Level - 1, $this->Data, $StartTime), $Values, $this->LoadRightSideValue($Level - 1, $EndTime));
+          $Values = array_merge($this->LoadLeftSideValue($Level - 1, $this->Data,
+            $StartTime), $Values, $this->LoadRightSideValue($Level - 1, $EndTime));
           print_r($Values);
 
@@ -114 +115 @@
         //print_r($Point);
 
-          $this->Database->delete($this->Data['DataTable'], '(Time > "'.$this->Database->TimeToMysqlDateTime($StartTime).'") AND (Time < "'.$this->Database->TimeToMysqlDateTime($EndTime).'") AND Measure='.$this->Data['Id'].' AND Level='.$Level);
+          $this->Database->delete($this->Data['DataTable'], '(Time > "'.TimeToMysqlDateTime($StartTime).
+            '") AND (Time < "'.TimeToMysqlDateTime($EndTime).'") AND Measure='.$this->Data['Id'].' AND Level='.$Level);
           $this->Data['Period'] = $TimeSegment;
-          $this->AddValue(array('Min' => $Point['Min'], 'Avg' => $Point['Avg'], 'Max' => $Point['Max']), $Level, $StartTime + ($EndTime - $StartTime) / 2);
+          $this->AddValue(array('Min' => $Point['Min'], 'Avg' => $Point['Avg'],
+            'Max' => $Point['Max']), $Level, $StartTime + ($EndTime - $StartTime) / 2);
         }
       }
@@ -180 +183 @@
             }
           }
-        } 
-        else if($ValueType == 'Min') 
-        {
-          //echo($Values[$I+1]['continuity'].'=='.$Measure['ContinuityEnabled'].'<br>'); 
+        }
+        else if($ValueType == 'Min')
+        {
+          //echo($Values[$I+1]['continuity'].'=='.$Measure['ContinuityEnabled'].'<br>');
           if($Values[$I + 1]['Continuity'] == $this->Data['ContinuityEnabled'])
           {
@@ -201 +204 @@
       $NewValue[$ValueType] = $NewValue[$ValueType];
     }
-    //if(($RightTime - $LeftTime) > 0) 
-    if($this->Data['Cumulative'] == 0) 
+    //if(($RightTime - $LeftTime) > 0)
+    if($this->Data['Cumulative'] == 0)
     {
       $NewValue['Avg'] = $NewValue['Avg'] / ($RightTime - $LeftTime);
@@ -214 +217 @@
   {
     // Get first and last time
-    //echo($Measure['Id'].','.$Level.','.StatTableName($Level)."\n"); 
+    //echo($Measure['Id'].','.$Level.','.StatTableName($Level)."\n");
     $Result = $this->Database->select($this->Data['DataTable'], '*', 'Measure='.$this->Data['Id'].' AND Level='.$Level.' ORDER BY Time LIMIT 1');
     if($Result->num_rows > 0)
@@ -229 +232 @@
     } else $AbsoluteRightTime = 0;
 
-    if($this->Debug) 
-    {
-      echo('AbsoluteLeftTime: '.$AbsoluteLeftTime.'('.$this->Database->TimeToMysqlDateTime($AbsoluteLeftTime).')<br>');
-      echo('AbsoluteRightTime: '.$AbsoluteRightTime.'('.$this->Database->TimeToMysqlDateTime($AbsoluteRightTime).')<br>');
+    if($this->Debug)
+    {
+      echo('AbsoluteLeftTime: '.$AbsoluteLeftTime.'('.TimeToMysqlDateTime($AbsoluteLeftTime).')<br>');
+      echo('AbsoluteRightTime: '.$AbsoluteRightTime.'('.TimeToMysqlDateTime($AbsoluteRightTime).')<br>');
     }
     return(array('Left' => $AbsoluteLeftTime, 'Right' => $AbsoluteRightTime));
@@ -238 +241 @@
 
   function LoadRightSideValue($Level, $Time)
-  { 
+  {
     $Result = array();
-    $DbResult = $this->Database->select($this->Data['DataTable'], '*', 'Time > "'.$this->Database->TimeToMysqlDateTime($Time).'" AND Measure='.$this->Data['Id'].' AND Level='.$Level.' ORDER BY Time ASC LIMIT 1');
+    $DbResult = $this->Database->select($this->Data['DataTable'], '*', 'Time > "'.TimeToMysqlDateTime($Time).'" AND Measure='.$this->Data['Id'].' AND Level='.$Level.' ORDER BY Time ASC LIMIT 1');
     if($DbResult->num_rows > 0)
     {
       $Row = $DbResult->fetch_assoc();
-      $Row['Time'] = $this->Database->MysqlDateTimeToTime($Row['Time']);
+      $Row['Time'] = MysqlDateTimeToTime($Row['Time']);
       return(array($Row));
     } else
@@ -251 +254 @@
       //array_push($Values, array('Time' => $Time, 'Min' => 0, 'Avg' => 0, 'Max' => 0, 'Continuity' => 0));
       $Result[] = array('Time' => ($Time + $this->TimeSegment($this->Data['Period'], $Level)), 'Min' => 0, 'Avg' => 0, 'Max' => 0, 'Continuity' => 0);
-      $DbResult = $this->Database->select($this->Data['DataTable'], '*', 'Time < "'.$this->Database->TimeToMysqlDateTime($Time).'" AND Measure='.$this->Data['Id'].' AND Level='.$Level.' ORDER BY Time DESC LIMIT 1');
+      $DbResult = $this->Database->select($this->Data['DataTable'], '*', 'Time < "'.
+        TimeToMysqlDateTime($Time).'" AND Measure='.$this->Data['Id'].' AND Level='.$Level.' ORDER BY Time DESC LIMIT 1');
       if($DbResult->num_rows > 0)
       {
         $Row = $DbResult->fetch_assoc();
-        array_unshift($Result, array('Time' => ($this->Database->MysqlDateTimeToTime($Row['Time']) + 10), 'Min' => 0, 'Avg' => 0, 'Max' => 0, 'Continuity' => 0));
+        array_unshift($Result, array('Time' => (MysqlDateTimeToTime($Row['Time']) + 10), 'Min' => 0, 'Avg' => 0, 'Max' => 0, 'Continuity' => 0));
       }
      // if($Debug) print_r($Result);
@@ -266 +270 @@
     $Result = array();
     //echo('SELECT * FROM '.StatTableName($Level). ' WHERE '. 'Time < "'.TimeToMysqlDateTime($Time).'" AND measure='.$Measure['Id'].' AND level='.$Level.' ORDER BY Time DESC LIMIT 1'."<br>\n");
-    $DbResult = $this->Database->select($this->Data['DataTable'], '*', 'Time < "'.$this->Database->TimeToMysqlDateTime($Time).'" AND Measure='.$this->Data['Id'].' AND Level='.$Level.' ORDER BY Time DESC LIMIT 1');
+    $DbResult = $this->Database->select($this->Data['DataTable'], '*', 'Time < "'.TimeToMysqlDateTime($Time).'" AND Measure='.$this->Data['Id'].' AND Level='.$Level.' ORDER BY Time DESC LIMIT 1');
     if($DbResult->num_rows > 0)
     {
       $Row = $DbResult->fetch_assoc();
-      $Row['Time'] = $this->Database->MysqlDateTimeToTime($Row['Time']);
+      $Row['Time'] = MysqlDateTimeToTime($Row['Time']);
       return(array($Row));
     } else
@@ -279 +283 @@
       $Result[] = array('Time' => ($Time - $this->TimeSegment($this->Data['Period'], $Level)), 'Min' => 0, 'Avg' => 0, 'Max' => 0, 'Continuity' => 0);
 
-      $DbResult = $this->Database->select($this->Data['DataTable'], '*', 'Time > "'.$this->Database->TimeToMysqlDateTime($Time).'" AND Measure='.$this->Data['Id'].' AND Level='.$Level.' ORDER BY Time ASC LIMIT 1');
+      $DbResult = $this->Database->select($this->Data['DataTable'], '*', 'Time > "'.TimeToMysqlDateTime($Time).'" AND Measure='.$this->Data['Id'].' AND Level='.$Level.' ORDER BY Time ASC LIMIT 1');
       if($DbResult->num_rows > 0)
       {
         $Row = $DbResult->fetch_assoc();
-        array_push($Result, array('Time' => ($this->Database->MysqlDateTimeToTime($Row['Time']) - 10), 'Min' => 0, 'Avg' => 0, 'Max' => 0, 'Continuity' => 0));
+        array_push($Result, array('Time' => (MysqlDateTimeToTime($Row['Time']) - 10), 'Min' => 0, 'Avg' => 0, 'Max' => 0, 'Continuity' => 0));
       }
 //    if($Debug) print_r($Result);
@@ -292 +296 @@
   function GetValues($TimeFrom, $TimeTo, $Level)
   {
-    if($this->Debug) echo('TimeFrom: '.$TimeFrom.'('.$this->Database->TimeToMysqlDateTime($TimeFrom).')<br>');
-    if($this->Debug) echo('TimeTo: '.$TimeTo.'('.$this->Database->TimeToMysqlDateTime($TimeTo).')<br>');
+    if($this->Debug) echo('TimeFrom: '.$TimeFrom.'('.TimeToMysqlDateTime($TimeFrom).')<br>');
+    if($this->Debug) echo('TimeTo: '.$TimeTo.'('.TimeToMysqlDateTime($TimeTo).')<br>');
 
     //$AbsoluteTime = GetTimeRange($MeasureId);
 
-    //  if(($TimeFrom > $AbsoluteLeftTime) and ($TimeStart < $AbsoluteRightTime) and 
+    //  if(($TimeFrom > $AbsoluteLeftTime) and ($TimeStart < $AbsoluteRightTime) and
     //    ($TimeTo > $AbsoluteLeftTime) and ($TimeTo < $AbsoluteRightTime))
     //  {
 
     // Load values in time range
-    $Result = $this->Database->select($this->Data['DataTable'], 'Time, Min, Avg, Max, Continuity', '(Time > "'.$this->Database->TimeToMysqlDateTime($TimeFrom).'") AND (Time < "'.$this->Database->TimeToMysqlDateTime($TimeTo).'") AND (Measure='.$this->Data['Id'].') AND (Level='.$Level.') ORDER BY Time');
+    $Result = $this->Database->select($this->Data['DataTable'], 'Time, Min, Avg, Max, Continuity', '(Time > "'.
+      TimeToMysqlDateTime($TimeFrom).'") AND (Time < "'.
+      TimeToMysqlDateTime($TimeTo).'") AND (Measure='.
+      $this->Data['Id'].') AND (Level='.$Level.') ORDER BY Time');
     //  echo($Level.' '.TimeToMysqlDateTime($TimeFrom).' '.TimeToMysqlDateTime($TimeTo));
     $Values = array();
@@ -311 +318 @@
       //    echo($III.' '.$Row['Time'].' '.memory_get_usage().',');
       //    $III++;
-      $Values[] = array('Time' => $this->Database->MysqlDateTimeToTime($Row['Time']), 'Min' => $Row['Min'], 'Avg' => $Row['Avg'], 'Max' => $Row['Max'], 'Continuity' => $Row['Continuity']);
+      $Values[] = array('Time' => MysqlDateTimeToTime($Row['Time']), 'Min' => $Row['Min'],
+        'Avg' => $Row['Avg'], 'Max' => $Row['Max'], 'Continuity' => $Row['Continuity']);
     }
     // array_pop($Values);
@@ -317 +325 @@
     //  die();
     if($this->Debug) echo('Item count: '.count($Values));
- 
+
     $Points = array();
     if(count($Values) > 0)
@@ -385 +393 @@
         while($Row = $DbResult->fetch_assoc())
         {
-          $Row['Time'] = $this->Database->MysqlDateTimeToTime($Row['Time']);
+          $Row['Time'] = MysqlDateTimeToTime($Row['Time']);
           $Values[] = $Row;
         }
@@ -416 +424 @@
         // Load values in time range
         //array_pop($NextValues);
-      }  
+      }
       echo("Uroven dokoncena<br>\n");
       $DbResult = $this->Database->select($this->Data['DataTable'], 'COUNT(*)', 'Level='.$Level.' AND Measure='.$this->Data['Id']);

trunk/Modules/TimeMeasure/TimeMeasure.php

@@ -17 +17 @@
     $this->Dependencies = array('User');
   }
-  
+
   function DoInstall()
   {
   }
-  
+
   function DoUnInstall()
   {
@@ -28 +28 @@
   function DoStart()
   {
-    $this->System->Pages['grafy'] = 'PageMeasure';
+    $this->System->RegisterPage('grafy', 'PageMeasure');
+    $this->System->RegisterPage(array('grafy', 'graf.png'), 'PageGraph');
     $this->System->FormManager->RegisterClass('Measure', array(
       'Title' => 'Měření',
@@ -45 +46 @@
         'DataTable' => array('Type' => 'String', 'Caption' => 'Tabulka měřených dat', 'Default' => 'data'),
       ),
-    ));    
+    ));
   }