Changeset 655 for trunk/Common/PrefixMultiplier.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/Common/PrefixMultiplier.php (modified) (4 diffs)

trunk/Common/PrefixMultiplier.php

@@ -78 +78 @@
       if($Value >= pow(10, $II))
       {
-        if($Digits < ($II + 1)) $RealDigits = $II + 1; 
+        if($Digits < ($II + 1)) $RealDigits = $II + 1;
           else $RealDigits = $Digits;
         $Value = round($Value / pow(10, $II - $RealDigits + 1)) * pow(10, $II - $RealDigits + 1);
@@ -87 +87 @@
   }
 
-  function AddPrefixMultipliers($Value, $Unit, $Digits = 4, $PrefixType = 'Decimal')
+  function Add($Value, $Unit, $Digits = 4, $PrefixType = 'Decimal')
   {
     global $PrefixMultipliers;
@@ -98 +98 @@
     $I = $PrefixMultipliers[$PrefixType]['BaseIndex'];
     if($Value == 0) return($Value.' '.$PrefixMultipliers[$PrefixType]['Definition'][$I][0].$Unit);
-     
-    if($Value > 1) 
+
+    if($Value > 1)
     {
       while((($I + 1) <= count($PrefixMultipliers[$PrefixType]['Definition'])) and (($Value / $PrefixMultipliers[$PrefixType]['Definition'][$I + 1][2]) > 1))
         $I = $I + 1;
-    } else 
+    } else
     if($Value < 1)
     {
@@ -110 +110 @@
     }
     $Value = $Value / $PrefixMultipliers[$PrefixType]['Definition'][$I][2];
-    
+
     // Truncate digits count
     $Value = $this->TruncateDigits($Value, $Digits);
     if($Negative) $Value = -$Value;
     return($Value.' '.$PrefixMultipliers[$PrefixType]['Definition'][$I][0].$Unit);
-  }  
+  }
 }