Changeset 888 for trunk/Modules/TimeMeasure/Measure.php

Timestamp:

Nov 24, 2020, 10:58:56 AM (3 years ago)

Author:

chronos

Message:

• Modified: More static types added.

File:

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

trunk/Modules/TimeMeasure/Measure.php

@@ -3 +3 @@
 class Measure extends Model
 {
-  var $Data;
-  var $LevelReducing = 5;
-  var $ReferenceTime = 0;
-  var $MaxLevel = 4;
-  var $Differential = 0;
-  var $Debug = 0;
-  var $DivisionCount = 500;
-  var $ValueTypes = array('Min', 'Avg', 'Max');
-
-  function Load($Id)
+  public array $Data;
+  public int $LevelReducing = 5;
+  public int $ReferenceTime = 0;
+  public int $MaxLevel = 4;
+  public int $Differential = 0;
+  public int $Debug = 0;
+  public int $DivisionCount = 500;
+  public array $ValueTypes = array('Min', 'Avg', 'Max');
+
+  function Load(int $Id): void
   {
     $Result = $this->Database->select('Measure', '*', 'Id='.$Id);
@@ -28 +28 @@
   }
 
-  function StatTableName($Level)
+  function StatTableName(int $Level): string
   {
     if ($Level == 0) return 'Data';
@@ -419 +419 @@
     // Load measures
     $Measures = array();
-    $Result = $Database->select('Measure', '*');
+    $Result = $this->Database->select('Measure', '*');
     while ($Row = $Result->fetch_assoc())
     {
-      $Measures = new Measure();
+      $Measure = new Measure($this->System);
       $Measure->Load($Row['Id']);
     }