Changeset 655 for trunk/Modules/TimeMeasure/Main.php

Timestamp:

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

Author:

chronos

Message:

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

File:

• trunk/Modules/TimeMeasure/Main.php (modified) (16 diffs)

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