Changeset 656 for trunk/Modules/TimeMeasure

Timestamp:

May 16, 2014, 10:44:07 PM (11 years ago)

Author:

chronos

Message:

• Opraveno: Zobrazení tabulky seznamu měření.
• Opraveno: Přidávání nových hodnot přes web.

Location:

trunk/Modules/TimeMeasure

Files:

• Graph.php (modified) (2 diffs)
• Main.php (modified) (9 diffs)
• Measure.php (modified) (17 diffs)
• TimeMeasure.php (modified) (1 diff)

trunk/Modules/TimeMeasure/Graph.php

@@ -106 +106 @@
         $PointsMax[] = $Index * $Width / $Measure->DivisionCount;
         $PointsMax[] = $Height - 1 - ($Points[$Index]['Max'] - $MinValue) / ($MaxValue - $MinValue) * $Height * $this->ValueToImageHeigthCoefficient;
-        //echo($Index.' - '.$Item.' '.$Points[$Index].'<br>');
       }
     }
@@ -127 +126 @@
     //$Points[] = $Width - 1;
     //$Points[] = $Height - 1;
-
-    //print_r($PointsMax);
 
     // Generate image

trunk/Modules/TimeMeasure/Main.php

@@ -3 +3 @@
 class PageMeasure extends Page
 {
-  var $Months;
   var $GraphTimeRanges;
   var $DefaultVariables;
@@ -23 +22 @@
       'Differential' => 0,
     );
-    $this->Months = array('', 'Leden', 'Únor', 'Březen', 'Duben', 'Květen',
-      'Červen', 'Červenec', 'Srpen', 'Září', 'Říjen', 'Listopad', 'Prosinec');
     $this->GraphTimeRanges = array
   (
@@ -56 +53 @@
   function EditTime($Time)
   {
+    global $MonthNames;
+
     $Output = '<form style="display: inline;" action="?Operation=SetTime&amp;Time='.$Time.'" method="post">';
 
@@ -72 +71 @@
     // Month selection
     $Output .= '<select name="Month">';
-    foreach($this->Months as $Index => $Month)
+    foreach($MonthNames as $Index => $Month)
     {
       if($Index == $TimeParts['mon']) $Selected = ' selected="1"'; else $Selected = '';
@@ -133 +132 @@
     }
 
-    $Output = '';
+    $Output = '<div style="text-align: center;">';
 
     if(!array_key_exists('Operation', $_GET)) $_GET['Operation'] = '';
@@ -171 +170 @@
       $Output .= '<a href="?TimeSpecify=1">Přesnější nastavení...</a><br>';
     } else {
-      $Output .= '<table cellspacing="0" cellpadding="2" border="0">';
+      $Output .= '<table style="margin: 10px auto; " cellspacing="0" cellpadding="2" border="0">';
       $Output .= '<tr><td>Počátek:</td><td>'.$this->EditTime('TimeStart').'</td></tr>';
       $Output .= '<tr><td>Konec:</td><td>'.$this->EditTime('TimeEnd').'</td></tr>';
@@ -198 +197 @@
   {
     $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>';
-    if(array_key_exists('Debug', $_GET)) $Output .= '<th>Počet položek</th><th>Čas vykonání</th>';
-    $Output .= '</tr>';
-    $Result = $this->Database->select('Measure', '*', 'Enabled=1 ORDER BY Description');
+
+    $DbResult = $this->Database->query('SELECT COUNT(*) FROM `Measure` WHERE `Enabled`=1');
+    $DbRow = $DbResult->fetch_row();
+    $PageList = GetPageList($DbRow[0]);
+
+    $Output = $PageList['Output'];
+    $Output .= '<table class="WideTable" style="font-size: small;">';
+
+    $TableColumns = array(
+      array('Name' => 'Name', 'Title' => 'Měřená veličina'),
+      array('Name' => 'LastValue', 'Title' => 'Poslední hodnota'),
+      array('Name' => 'LastValueTime', 'Title' => 'Čas posledního měření'),
+      array('Name' => 'Continuous', 'Title' => 'Interpolace'),
+      array('Name' => 'Description', 'Title' => 'Popis'),
+    );
+    if(array_key_exists('Debug', $_GET))
+    {
+      $TableColumns[] = array('Name' => 'ItemCount', 'Title' => 'Počet položek');
+      $TableColumns[] = array('Name' => 'MeasureDuration', 'Title' => 'Čas vykonání');
+    }
+    $Order = GetOrderTableHeader($TableColumns, 'Name', 0);
+    $Output .= $Order['Output'];
+
+    $Result = $this->Database->select('Measure', '*', '`Enabled`=1 '.$Order['SQL'].$PageList['SQLLimit']);
     while($Measure = $Result->fetch_array())
     {
-      $DbResult2 = $this->Database->select('MeasureMethod', '*', 'Id='.$Measure['Method']);
+      $DbResult2 = $this->Database->select('MeasureMethod', '*', '`Id`='.$Measure['Method']);
       $MeasureMethod = $DbResult2->fetch_assoc();
       $StopWatchStart = GetMicrotime();
@@ -234 +252 @@
     }
     $Output .= '</table>';
+    $Output .= $PageList['Output'];
     //echo(time());
     //print_r(gd_info());
@@ -240 +259 @@
     //ShowPage($Output);
     //echo($PrefixMultiplier->Add('-0.000000071112345', 'B'));
+    $Output .= '</div>';
     return($Output);
   }
 }
+
+class PageMeasureAddValue extends Page
+{
+  function Show()
+  {
+    $this->ClearPage = true;
+
+    $Output = '';
+    if(!array_key_exists('MeasureId', $_GET)) return('Nebylo zadáno Id měření.');
+    if(!array_key_exists('Value', $_GET)) return('Nebyla zadána hodnota.');
+    $Measure = new Measure($this->System);
+    $Measure->Load($_GET['MeasureId']);
+    if(!isset($Measure->Data['Id'])) return('Měření s Id '.$_GET['MeasureId'].' nenalezeno.');
+    $Measure->AddValue(array('Min' => $_GET['Value'], 'Avg' => $_GET['Value'], 'Max' => $_GET['Value']));
+    return($Output);
+  }
+}

trunk/Modules/TimeMeasure/Measure.php

@@ -39 +39 @@
   }
 
-
   function AddValue($Value = array('Min' => 0, 'Avg' => 0, 'Max' => 0), $Level = 0, $Time = 0)
   {
     if($Time == 0) $Time = time();
-    //$Value = round($Measure['divider'] * $Value);
-    //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');
-    //echo($Database->LastQuery."\n");
+
+    $Result = $this->Database->select($this->Data['DataTable'], '*', 'Measure='.
+      $this->Data['Id'].' AND Level='.$Level.' ORDER BY Time DESC LIMIT 2');
     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");
+       $this->Database->insert($this->Data['DataTable'], array('Min' => $Value['Min'],
+         'Avg' => $Value['Avg'], 'Max' => $Value['Max'], 'Level' => $Level,
+         'Measure' => $this->Data['Id'], 'Time' => TimeToMysqlDateTime($Time), 'Continuity' => 0));
     } 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));
-      //echo($Database->LastQuery."\n");
+      $this->Database->insert($this->Data['DataTable'], array('Min' => $Value['Min'],
+        'Avg' => $Value['Avg'], 'Max' => $Value['Max'], 'Level' => $Level,
+        'Measure' => $this->Data['Id'], 'Time' => TimeToMysqlDateTime($Time), 'Continuity' => 1));
     } else
     {
       $LastValue = $Result->fetch_assoc();
       $NextToLastValue = $Result->fetch_assoc();
-      //echo($Level.': '.$Time.' - '.MysqlDateTimeToTime($LastValue['Time']).' '.($Time - MysqlDateTimeToTime($LastValue['Time'])).' = '.$Measure['Period']."\n");
       if((($Time - MysqlDateTimeToTime($LastValue['Time'])) < 0.75 * $this->Data['Period']) and ($Level == 0))
       {
-        echo('Too short period\n');
+        echo('Too short period. Minimal period is '.(0.75 * $this->Data['Period'])." seconds\n");
       } else
       {
         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='.$this->Data['Id'].')', array('Time' => $this->Database->TimeToMysqlDateTime($Time)));
-          //echo($this->Database->LastQuery."\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' => TimeToMysqlDateTime($Time)));
         } 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' => TimeToMysqlDateTime($Time), 'Continuity' => $Continuity));
         }
       }
@@ -83 +85 @@
       {
         $Level = $Level + 1;
-        //echo('Level '.$Level."<br>\n");
         $TimeSegment = $this->TimeSegment($this->Data['Period'], 1);
         $EndTime = $this->AlignTime($Time, $TimeSegment);
@@ -89 +90 @@
         $StartTime = $EndTime - $TimeSegment;
 
-        //echo(" ".$TimeSegment." ".$StartTime.'-'.$EndTime."<br>\n");
-        //flush();
-
         // Load values in time range
         $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 > "'.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 < "'.TimeToMysqlDateTime($EndTime).
+            '") AND (Measure='.$this->Data['Id'].') AND (Level='.($Level - 1).') ORDER BY Time');
         while($Row = $Result->fetch_assoc())
         {
@@ -103 +103 @@
         //if(count($Values) > 2)
         {
-          //print_r($Values);
           //array_pop($Values);
 
           // Load subsidary values
-          print_r($Values);
-          $Values = array_merge($this->LoadLeftSideValue($Level - 1, $this->Data,
+          $Values = array_merge($this->LoadLeftSideValue($Level - 1,
             $StartTime), $Values, $this->LoadRightSideValue($Level - 1, $EndTime));
-          print_r($Values);
 
           $Point = $this->ComputeOneValue($StartTime, $EndTime, $Values, $Level);
-        //print_r($Point);
 
           $this->Database->delete($this->Data['DataTable'], '(Time > "'.TimeToMysqlDateTime($StartTime).
@@ -128 +124 @@
   {
     $Y = ($Y2 - $Y1) / ($X2 - $X1) * ($X - $X1) + $Y1;
-    //echo($Y1.'-'.$Y.'-'.$Y2.' '.$X1.'-'.$X.'-'.$X2.'<br>');
     return($Y);
   }
@@ -186 +181 @@
         else if($ValueType == 'Min')
         {
-          //echo($Values[$I+1]['continuity'].'=='.$Measure['ContinuityEnabled'].'<br>');
           if($Values[$I + 1]['Continuity'] == $this->Data['ContinuityEnabled'])
           {
@@ -210 +204 @@
     }
     return($NewValue);
-    //echo($NewValue['avg'].'<br>');
-    //return(array('min' => rand(0,1), 'avg' => $NewValue['avg'], 'max' => rand(0,1)));
   }
 
@@ -217 +209 @@
   {
     // Get first and last time
-    //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)
@@ -269 +260 @@
   {
     $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 < "'.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)
     {
@@ -289 +280 @@
         array_push($Result, array('Time' => (MysqlDateTimeToTime($Row['Time']) - 10), 'Min' => 0, 'Avg' => 0, 'Max' => 0, 'Continuity' => 0));
       }
-//    if($Debug) print_r($Result);
       return($Result);
     }
@@ -330 +320 @@
     {
       $Values = array_merge($this->LoadLeftSideValue($Level, $TimeFrom), $Values, $this->LoadRightSideValue($Level, $TimeTo));
-      //echo(count($Values).'<br>');
-      //echo($TimeFrom.','.$TimeTo.'<br>');
-      //echo($Values[0]['Time'].'<br>');
       $StartIndex = 0;
       $Points = array();
-      //echo($DivisionCount.'<br>');
       if($this->Debug) print_r($Values);
-      //die();
       for($I = 0; $I < $this->DivisionCount; $I++)
       {
         $TimeStart = $TimeFrom + (($TimeTo - $TimeFrom) / $this->DivisionCount) * $I;
-        //if($Debug) echo('TimeStart '.$I.': '.$TimeStart.'('.TimeToMysqlDateTime($TimeStart).')<br>');
         $TimeEnd = $TimeFrom + (($TimeTo - $TimeFrom) / $this->DivisionCount) * ($I + 1);
-        if($this->Debug) echo('TimeEnd '.$I.': '.$TimeEnd.'('.$this->Database->TimeToMysqlDateTime($TimeEnd).')<br>');
-        //echo($TimeStart.','.$TimeEnd.'<br>');
+        if($this->Debug) echo('TimeEnd '.$I.': '.$TimeEnd.'('.TimeToMysqlDateTime($TimeEnd).')<br>');
 
         $EndIndex = $StartIndex;
@@ -350 +333 @@
         //while(($Values[$EndIndex]['Time'] < $TimeEnd)) $EndIndex = $EndIndex + 1;
         $SubValues = array_slice($Values, $StartIndex, $EndIndex - $StartIndex + 1);
-        //echo($StartIndex.','.$EndIndex.' '.count($SubValues).'<br>');
-        //print_r($SubValues);
         $Points[] = $this->ComputeOneValue($TimeStart, $TimeEnd, $SubValues, $Level);
         $StartIndex = $EndIndex - 1;
@@ -362 +343 @@
   function RebuildMeasureCache()
   {
-    echo('Velicina '.$this->Data['Name']."<br>\n");
+    echo('Veličina '.$this->Data['Name']."<br>\n");
     if($this->Data['Continuity'] == 0) $this->Data['ContinuityEnabled'] = 0;  // non continuous
       else $this->Data['ContinuityEnabled'] = 2;    // continuous graph
@@ -377 +358 @@
       echo('Uroven '.$Level."<br>\n");
       $TimeRange = $this->GetTimeRange($Level - 1);
-      //echo($Measure['Id'].','.($Level-1)."\n");
-      //echo(TimeToMysqlDateTime($TimeRange['left']).'-'.TimeToMysqlDateTime($TimeRange['right'])."\n");
       $TimeSegment = $this->TimeSegment($this->Data['Period'], $Level);
       $StartTime = $this->AlignTime($TimeRange['Left'], $TimeSegment) - $TimeSegment;
@@ -390 +369 @@
         $EndTime2 = $StartTime + ($I + 1) * $BurstCount * $TimeSegment;
         $Values = array();
-        $DbResult = $this->Database->select($this->Data['DataTable'], '*', 'Time > "'.$this->Database->TimeToMysqlDateTime($StartTime2).'" AND Time < "'.$this->Database->TimeToMysqlDateTime($EndTime2).'" AND Measure='.$Measure['Id'].' AND Level='.($Level - 1).' ORDER BY Time');
+        $DbResult = $this->Database->select($this->Data['DataTable'], '*', 'Time > "'.
+          TimeToMysqlDateTime($StartTime2).'" AND Time < "'.TimeToMysqlDateTime($EndTime2).'" AND Measure='.$this->Data['Id'].' AND Level='.($Level - 1).' ORDER BY Time');
         while($Row = $DbResult->fetch_assoc())
         {
@@ -399 +379 @@
         if(count($Values) > 0)
         {
-          $Values = array_merge($this->LoadLeftSideValue($Level - 1, $StartTime2), $Values, $this->LoadRightSideValue($Level - 1, $Measure, $EndTime2));
+          $Values = array_merge($this->LoadLeftSideValue($Level - 1, $StartTime2),
+          $Values, $this->LoadRightSideValue($Level - 1, $this->Data, $EndTime2));
 
           $StartIndex = 0;
@@ -411 +392 @@
             while($Values[$EndIndex]['Time'] < $EndTime3) $EndIndex = $EndIndex + 1;
             $SubValues = array_slice($Values, $StartIndex, $EndIndex - $StartIndex + 1);
-            //echo($StartIndex.','.$EndIndex.' '.count($SubValues).'<br>');
-            //print_r($SubValues);
             if(count($SubValues) > 2)
             {
               $Point = $this->ComputeOneValue($StartTime3, $EndTime3, $SubValues, $Level);
               $Continuity = $SubValues[1]['Continuity'];
-              $this->Database->insert($this->Data['DataTable'], array('Level' => $Level, 'Measure' => $this->Data['Id'], 'Min' => $Point['Min'], 'Avg' => $Point['avg'], 'max' => $Point['Max'], 'Continuity' => $Continuity, 'Time' => $this->Database->TimeToMysqlDateTime($StartTime3 + ($EndTime3 - $StartTime3) / 2)));
+              $this->Database->insert($this->Data['DataTable'], array('Level' => $Level,
+                'Measure' => $this->Data['Id'], 'Min' => $Point['Min'], 'Avg' => $Point['avg'],
+                'max' => $Point['Max'], 'Continuity' => $Continuity, 'Time' =>
+                TimeToMysqlDateTime($StartTime3 + ($EndTime3 - $StartTime3) / 2)));
             }
             $StartIndex = $EndIndex - 1;

trunk/Modules/TimeMeasure/TimeMeasure.php

@@ -30 +30 @@
     $this->System->RegisterPage('grafy', 'PageMeasure');
     $this->System->RegisterPage(array('grafy', 'graf.png'), 'PageGraph');
+    $this->System->RegisterPage(array('grafy', 'add.php'), 'PageMeasureAddValue');
     $this->System->FormManager->RegisterClass('Measure', array(
       'Title' => 'Měření',