Changeset 4 for trunk/UFormMain.pas

Timestamp:

Mar 29, 2016, 10:52:51 PM (8 years ago)

Author:

chronos

Message:

• Modified: Show drive size and I/O speed with proper units.

File:

• trunk/UFormMain.pas (modified) (7 diffs)

trunk/UFormMain.pas

@@ -8 +8 @@
   Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, StdCtrls,
   Menus, ComCtrls, ExtCtrls, ActnList, dateutils, syncobjs, UProject,
-  UDriveScan;
+  UDriveScan, UPrefixMultiplier;
 
 type
@@ -61 +61 @@
     procedure Timer1Timer(Sender: TObject);
   private
+    PrefixMultiplier: TPrefixMultiplier;
     LastBlockPos: Integer;
     ScanThread: TScanThread;
@@ -101 +102 @@
 procedure TFormMain.FormCreate(Sender: TObject);
 begin
+  PrefixMultiplier := TPrefixMultiplier.Create;
   DriveScan := TDriveScan.Create;
   DriveScan.OnChange := DriveScanChange;
@@ -107 +109 @@
   ScanThread.Form := Self;
   Project := TProject.Create;
-  EditDrive.Text := '/dev/sda';
+  EditDrive.Text := '/dev/sdb';
 end;
 
@@ -156 +158 @@
   FreeAndNil(ScanThread);
   FreeAndNil(DriveScan);
+  FreeAndNil(PrefixMultiplier);
 end;
 
@@ -178 +181 @@
         Picture.Bitmap.EndUpdate;
       end;
-      LabelSize.Caption := IntToStr(DriveScan.BlockMap.SectorCount * DriveScan.SectorSize) + ' bytes';
+      LabelSize.Caption := PrefixMultiplier.Add(DriveScan.BlockMap.SectorCount * DriveScan.SectorSize,
+        BasePrefixMultipliers, 'bytes');
       LabelSectorPerBlock.Caption := IntToStr(DriveScan.BlockMap.SectorPerBlock);
       LabelBlockSize.Caption := IntToStr(DriveScan.SectorSize) + ' bytes';
@@ -195 +199 @@
       LabelEstimatedTime.Caption := TimeToStr((Now - DriveScan.TimeStart) /
         DriveScan.SectorCurrent * (DriveScan.BlockMap.SectorCount - DriveScan.SectorCurrent));
-      LabelIOSpeed.Caption := IntToStr(Trunc((DriveScan.SectorCurrent - LastBlockPos) *
-        DriveScan.SectorSize / (1024 * 1024) / (Timer1.Interval / 1000))) + ' MB/s';
+      LabelIOSpeed.Caption := PrefixMultiplier.Add((DriveScan.SectorCurrent - LastBlockPos) *
+        DriveScan.SectorSize / (Timer1.Interval / 1000), BasePrefixMultipliers, 'B/s');
       LastBlockPos := DriveScan.SectorCurrent;
     end else begin