Changeset 96 for trunk/Modules/Measure/Measure.php

Timestamp:

Jan 5, 2026, 6:38:18 PM (41 hours ago)

Author:

chronos

Message:

• Modfied: Allow to add measurements with different min, avg and max values.

File:

• trunk/Modules/Measure/Measure.php (modified) (7 diffs)

trunk/Modules/Measure/Measure.php

@@ -64 +64 @@
   function __construct(Database $Database)
   {
-    $this->Id = 0;
     $this->ValueTypes = array('Min', 'Avg', 'Max');
     $this->Database = &$Database;
@@ -103 +102 @@
   }
 
-  function AddValue(float $Value, int $Time): void
+  function AddValue(int $Time, float $Min, float $Avg, float $Max): void
   {
     $Result = $this->Database->select($this->Data['DataTable'], '*', '(`Measure`='.$this->Data['Id'].') AND '.
@@ -110 +109 @@
       // No measure value found. Simply insert new first value.
       $this->Database->insert($this->Data['DataTable'],
-        array('Min' => $Value, 'Avg' => $Value, 'Max' => $Value, 'Level' => 0,
+        array('Min' => $Min, 'Avg' => $Avg, 'Max' => $Max, 'Level' => 0,
         'Measure' => $this->Data['Id'], 'Time' => TimeToMysqlDateTime($Time),
         'Continuity' => 0));
@@ -116 +115 @@
       // One value exists. Add second value.
       $this->Database->insert($this->Data['DataTable'],
-      array('Min' => $Value, 'Avg' => $Value, 'Max' => $Value, 'Level' => 0,
+      array('Min' => $Min, 'Avg' => $Avg, 'Max' => $Max, 'Level' => 0,
       'Measure' => $this->Data['Id'], 'Time' => TimeToMysqlDateTime($Time),
       'Continuity' => 1));
@@ -138 +137 @@
           $Continuity = 0;
         }
-        if (($LastValue['Avg'] == $NextToLastValue['Avg']) and ($LastValue['Avg'] == $Value) and
+        if (($LastValue['Min'] == $NextToLastValue['Min']) and ($LastValue['Min'] == $Min) and
+          ($LastValue['Avg'] == $NextToLastValue['Avg']) and ($LastValue['Avg'] == $Avg) and
+          ($LastValue['Max'] == $NextToLastValue['Max']) and ($LastValue['Max'] == $Max) and
           ($LastValue['Continuity'] == 1) and ($Continuity == 1))
         {
@@ -148 +149 @@
         {
           // Last value is different or not with continuity flag. Need to add new value.
-          $this->Database->insert($this->Data['DataTable'], array('Min' => $Value,
-            'Avg' => $Value, 'max' => $Value, 'Level' => 0, 'Measure' => $this->Data['Id'],
+          $this->Database->insert($this->Data['DataTable'], array('Min' => $Min,
+            'Avg' => $Avg, 'Max' => $Max, 'Level' => 0, 'Measure' => $this->Data['Id'],
             'Time' => TimeToMysqlDateTime($Time),
             'Continuity' => $Continuity));
@@ -561 +562 @@
     $this->Database->query('DROP TABLE `'.$Measure->GetDataTable().'`');
   }
-
 }