Changeset 91 for trunk

Timestamp:

Apr 7, 2020, 11:43:11 AM (5 years ago)

Author:

chronos

Message:

• Modified: Sum cumulative values.

File:

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

trunk/Modules/Measure/Measure.php

@@ -105 +105 @@
       if($this->Data['Continuity'] == 0) $this->Data['ContinuityEnabled'] = 0;  // non continuous
         else $this->Data['ContinuityEnabled'] = 2;    // continuous graph
-    } else die('Měřená veličina nenalezena');
+    } else die('Měřená veličina '.$Id.' nenalezena.');
   }
 
@@ -235 +235 @@
         if($ValueType == 'Avg')
         {
-          if($Values[$I + 1]['Continuity'] == $this->Data['ContinuityEnabled']);
+          if ($this->Data['Cumulative'])
+          {
+            $NewValue[$ValueType] = $NewValue[$ValueType] + $Values[$I][$ValueType];
+          } else
+          {
+            if($Values[$I + 1]['Continuity'] == $this->Data['ContinuityEnabled']);
             else if($this->Differential == 0)
             {
               $NewValue[$ValueType] = $NewValue[$ValueType] + ($Values[$I + 1]['Time'] - $Values[$I]['Time']) *
-                (($Values[$I + 1][$ValueType] - $Values[$I][$ValueType]) / 2 + $Values[$I][$ValueType]);
+              (($Values[$I + 1][$ValueType] - $Values[$I][$ValueType]) / 2 + $Values[$I][$ValueType]);
             } else {
               $NewValue[$ValueType] = $NewValue[$ValueType] + ($Values[$I + 1]['Time'] - $Values[$I]['Time']) *
                (($Values[$I + 1][$ValueType] - $Values[$I][$ValueType]) / 2);
             }
+          }
         }
         else if($ValueType == 'Max')
@@ -445 +451 @@
       $EndTime = $this->AlignTime($TimeRange['Right'], $TimeSegment);
       $BurstCount = 500;
-      echo('For 0 to '.round(($EndTime - $StartTime) / $TimeSegment / $BurstCount)."<br>\n");
-      for($I = 0; $I <= round(($EndTime - $StartTime) / $TimeSegment / $BurstCount); $I++)
+      $Count = round(($EndTime - $StartTime) / $TimeSegment / $BurstCount);
+      echo('For 0 to '.$Count."<br>\n");
+      for($I = 0; $I <= $Count; $I++)
       {
         echo($I.' ');