Changeset 52 for branches

Timestamp:

Feb 20, 2015, 9:31:53 AM (10 years ago)

Author:

chronos

Message:

• Modified: Used newer separate PrefixMultiplier class for value rounding.

Location:

branches/old

Files:

• Common (added)
• Common/PrefixMultiplier.php (added)
• global.php (modified) (3 diffs)
• graph.php (modified) (2 diffs)
• index.php (modified) (2 diffs)
• stat_functions.php (modified) (1 diff)

branches/old/global.php

@@ -12 +12 @@
 include_once('types.php');
 include_once('classes.php');
+include_once('Common/PrefixMultiplier.php');
+$PrefixMultiplier = new PrefixMultiplier();
 include_once('stat_functions.php');
 $Database = new Database($Config['Database']['Host'], $Config['Database']['User'], $Config['Database']['Password'], $Config['Database']['Database']);
@@ -79 +81 @@
     switch($Item['Type'])
     {
-      case 'Boolean':       
+      case 'Boolean':
         if($Values[$Index] == 0) $Checked = ''; else $Checked = ' checked="yes"';
         $Edit = '<input type="checkbox" name="'.$Index.'"'.$Checked.'>';
         break;
-      case 'String': 
+      case 'String':
         $Edit = '<input type="text" name="'.$Index.'" value="'.$Values[$Index].'">';
         break;
-      case 'Integer': 
+      case 'Integer':
         $Edit = '<input type="text" name="'.$Index.'" value="'.$Values[$Index].'">';
         break;
@@ -95 +97 @@
   }
   $Output = '<h3>Tabulka '.$ClassName.'</h3>'.Table($Table).MakeLink('?Operation=Add2', 'Přidat');
-  return($Output); 
+  return($Output);
 }

branches/old/graph.php

@@ -161 +161 @@
     $Y = $Height - 1 - ($VerticalLinesDistance * $I);
     //$Y = $Height - 1 - ($VerticalLinesDistance * $I / ($MaxValue - $MinValue) * $K * $Height);
-    $Text = AddPrefixMultipliers(round(($I * $VerticalLinesDistance / $Height / $K * ($MaxValue - $MinValue) + $MinValue)), $Measure['Unit'], 3);
+    $Text = $PrefixMultiplier->Add(round(($I * $VerticalLinesDistance / $Height / $K * ($MaxValue - $MinValue) + $MinValue)), $Measure['Unit'], 3);
     $BoundBox = imagettfbbox($FontSize, 0, $FontFile, $Text);
     if(($Y - ($BoundBox[5] - $BoundBox[1]) / 2) > 10)
@@ -169 +169 @@
 
   $Left = $Width - 10;
-  $Text = "    Max. ".AddPrefixMultipliers($MaxValue, $Measure['Unit']);
+  $Text = "    Max. ".$PrefixMultiplier->Add($MaxValue, $Measure['Unit']);
   $BoundingBox = imagettfbbox($FontSize, 0, $FontFile, $Text);
   $Left -= ($BoundingBox[2] - $BoundingBox[0]);
   imagettftext($Image, $FontSize, 0, $Left, 14, $Red, $FontFile, $Text);
 
-  $Text = "    Avg.  ".AddPrefixMultipliers($AvgValue, $Measure['Unit'], 4);
+  $Text = "    Avg.  ".$PrefixMultiplier->Add($AvgValue, $Measure['Unit'], 4);
   $BoundingBox = imagettfbbox($FontSize, 0, $FontFile, $Text);
   $Left -= ($BoundingBox[2] - $BoundingBox[0]);
   imagettftext($Image, $FontSize, 0, $Left, 14, $Green, $FontFile, $Text);
 
-  $Text = "    Min.  ".AddPrefixMultipliers($MinValue, $Measure['Unit']);
+  $Text = "    Min.  ".$PrefixMultiplier->Add($MinValue, $Measure['Unit']);
   $BoundingBox = imagettfbbox($FontSize, 0, $FontFile, $Text);
   $Left -= ($BoundingBox[2] - $BoundingBox[0]);

branches/old/index.php

@@ -182 +182 @@
     $RowCount = $RowCount[0];
   }
-  $Result2 = $Database->select($Measure['DataTable'], 'time, avg', 'measure='.$Measure['Id'].' AND level=0 ORDER BY time DESC LIMIT 1');
+  $Result2 = $Database->select($Measure['DataTable'], 'time, avg', '(measure='.$Measure['Id'].') AND (level=0) ORDER BY time DESC LIMIT 1');
   if($Result2->num_rows > 0)
   {
     $Row = $Result2->fetch_array();
     $LastMeasureTime = date('j.n.Y G:i:s', MysqlDateTimeToTime($Row['time']));
-    $LastMeasureValue = AddPrefixMultipliers($Row['avg'], $Measure['Unit']);
+    $LastMeasureValue = $PrefixMultiplier->Add($Row['avg'], $Measure['Unit']);
   } else {
     $LastMeasureTime = ' ';
@@ -195 +195 @@
   if($Measure['Info'] == '') $Measure['Info'] = ' ';
   $GenerationTime = floor((GetMicrotime() - $StopWatchStart) * 1000  ) / 1000;
-  $Output .= '<tr><td><a href="?Measure='.$Measure['Id'].'&amp;Differential=0">'.$Measure['Description'].'</a></td><td align="center">'.$LastMeasureValue.'</td><td align="center">'.$LastMeasureTime.'</td><td align="center">'.$Interpolate.'</td><td>'.$Measure['Info'].'</td>';
+  $Output .= '<tr><td style="text-align: left"><a href="?Measure='.$Measure['Id'].'&amp;Differential=0">'.$Measure['Description'].'</a></td><td align="center">'.$LastMeasureValue.'</td><td align="center">'.$LastMeasureTime.'</td><td align="center">'.$Interpolate.'</td><td>'.$Measure['Info'].'</td>';
   if(array_key_exists('Debug', $_GET)) $Output .= '<td>'.$RowCount.'</td><td>'.$GenerationTime.'</td>';
   $Output .= '</tr>';

branches/old/stat_functions.php

@@ -2 +2 @@
 
 $ValueTypes = array('min', 'avg', 'max');
-$PrefixMultipliers = array(
-  array('y', 'yocto', pow(10, -24)),
-  array('z', 'zepto', pow(10, -21)),
-  array('a', 'atto', pow(10, -18)),
-  array('f', 'femto', pow(10, -15)),
-  array('p', 'piko', pow(10, -12)),
-  array('n', 'nano', pow(10, -9)),
-  array('u', 'mikro', pow(10, -6)),
-  array('m', 'mili', pow(10, -3)),
-  array('', '', pow(10, 0)),
-  array('k', 'kilo', pow(10, 3)),
-  array('M', 'mega', pow(10, 6)),
-  array('G', 'giga', pow(10, 9)),
-  array('T', 'tera', pow(10, 12)),
-  array('P', 'peta', pow(10, 15)),
-  array('E', 'exa', pow(10, 18)),
-  array('Z', 'zetta', pow(10, 21)),
-  array('Y', 'yotta', pow(10, 24)),
-);
-
-function TruncateDigits($Value, $Digits = 4)
-{
-  for($II = 2; $II > -6; $II--)
-  {
-    if($Value >= pow(10, $II))
-    {
-      if($Digits < ($II + 1)) $RealDigits = $II + 1; 
-        else $RealDigits = $Digits;
-      $Value = round($Value / pow(10, $II - $RealDigits + 1)) * pow(10, $II - $RealDigits + 1);
-      break;
-    }
-  }
-  return($Value);
-}
-
-function AddPrefixMultipliers($Value, $Unit, $Digits = 4)
-{
-  global $PrefixMultipliers;
-
-  if($Unit == '') return(TruncateDigits($Value, $Digits));
-  $I = 8;
-  if($Value > 0) $II = 1;
-  else if($Value < 0) $II = -1;
-  else $II = 0;
-  while((($Value / $PrefixMultipliers[$I + $II][2]) > $II) and (($I + $II) >= 0) 
-    and (($I + $II) <= count($PrefixMultipliers))) $I = $I + $II;
-  $Value = $Value / $PrefixMultipliers[$I][2];
-
-  // Truncate digits count
-  $Value = TruncateDigits($Value, $Digits);
-
-  return($Value.' '.$PrefixMultipliers[$I][0].$Unit);
-}
 
 function GetMicrotime()