Changeset 31 for trunk/Form

Timestamp:

Apr 30, 2016, 12:16:19 AM (9 years ago)

Author:

chronos

Message:

• Added: TFileStreamEx experimental class to support flags O_DIRECT and O_SYNC under Linux.

Location:

trunk/Form

Files:

• UFormMain.lfm (modified) (10 diffs)
• UFormMain.pas (modified) (1 diff)
• UFormProject.lfm (modified) (2 diffs)
• UFormProject.pas (modified) (4 diffs)

trunk/Form/UFormMain.lfm

@@ -62 +62 @@
         Height = 24
         Top = 179
-        Width = 101
+        Width = 96
         Caption = 'Sector size:'
         ParentColor = False
@@ -86 +86 @@
         Height = 24
         Top = 208
-        Width = 119
+        Width = 113
         Caption = 'Sector count:'
         ParentColor = False
@@ -102 +102 @@
         Height = 24
         Top = 240
-        Width = 136
+        Width = 127
         Caption = 'Current sector:'
         ParentColor = False
@@ -110 +110 @@
         Height = 24
         Top = 272
-        Width = 162
+        Width = 154
         Caption = 'Damaged sectors:'
         ParentColor = False
@@ -126 +126 @@
         Height = 24
         Top = 300
-        Width = 122
+        Width = 115
         Caption = 'Elapsed time:'
         ParentColor = False
@@ -142 +142 @@
         Height = 24
         Top = 328
-        Width = 142
+        Width = 135
         Caption = 'Estimated time:'
         ParentColor = False
@@ -158 +158 @@
         Height = 24
         Top = 148
-        Width = 160
+        Width = 153
         Caption = 'Sectors per Block:'
         ParentColor = False
@@ -182 +182 @@
         Height = 24
         Top = 356
-        Width = 94
+        Width = 88
         Caption = 'I/O speed:'
         ParentColor = False
@@ -190 +190 @@
         Height = 24
         Top = 116
-        Width = 40
+        Width = 38
         Caption = 'Size:'
         ParentColor = False
@@ -314 +314 @@
         Height = 24
         Top = 16
-        Width = 107
+        Width = 100
         Caption = 'Operations:'
         ParentColor = False

trunk/Form/UFormMain.pas

@@ -520 +520 @@
       BasePrefixMultipliers, SBytes);
     LabelSectorCount.Caption := IntToStr(Project.DriveInfo.SectorCount);
-    LabelSectorSize.Caption := IntToStr(Project.DriveInfo.SectorSize) + ' ' + SBytes;
+    LabelSectorSize.Caption := PrefixMultiplier.Add(Project.DriveInfo.SectorSize, BasePrefixMultipliers, SBytes);
   end else begin
     LabelSize.Caption := '';

trunk/Form/UFormProject.lfm

@@ -9 +9 @@
   LCLVersion = '1.7'
   object SpinEditSectorSize: TSpinEdit
-    Left = 192
+    Left = 224
     Height = 34
     Top = 152
     Width = 101
-    MaxValue = 100000
-    MinValue = 1
+    MaxValue = 63
+    OnChange = SpinEditSectorSizeChange
     TabOrder = 0
     Value = 1
@@ -92 +92 @@
     ParentColor = False
   end
+  object Label5: TLabel
+    Left = 192
+    Height = 24
+    Top = 160
+    Width = 22
+    Caption = '2^'
+    ParentColor = False
+  end
+  object Label6: TLabel
+    Left = 341
+    Height = 24
+    Top = 160
+    Width = 11
+    Caption = '='
+    ParentColor = False
+  end
 end

trunk/Form/UFormProject.pas

@@ -7 +7 @@
 uses
   Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, Spin,
-  StdCtrls, UProject;
+  StdCtrls, UProject, Math;
 
 type
@@ -22 +22 @@
     Label3: TLabel;
     Label4: TLabel;
+    Label5: TLabel;
+    Label6: TLabel;
     LabelSectorCount: TLabel;
     SpinEditSectorSize: TSpinEdit;
+    procedure SpinEditSectorSizeChange(Sender: TObject);
   private
+    procedure UpdateSectorSize;
   public
     procedure Load(Project: TProject);
@@ -42 +46 @@
 { TFormProject }
 
+procedure TFormProject.SpinEditSectorSizeChange(Sender: TObject);
+begin
+  UpdateSectorSize;
+end;
+
+procedure TFormProject.UpdateSectorSize;
+begin
+  Label6.Caption := '= ' + IntToStr(Trunc(IntPower(2, SpinEditSectorSize.Value))) + ' bytes';
+end;
+
 procedure TFormProject.Load(Project: TProject);
 begin
   Core.DriveList.LoadToStrings(ComboBoxDrive.Items);
   EditName.Text := Project.Name;
-  SpinEditSectorSize.Value := Project.DriveInfo.SectorSize;
+  SpinEditSectorSize.Value := Trunc(Log2(Project.DriveInfo.SectorSize));
   ComboBoxDrive.ItemIndex := Core.DriveList.IndexOf(Core.DriveList.FindByModel(Project.DriveInfo.Model));
+  UpdateSectorSize;
 end;
 
@@ -53 +68 @@
 begin
   Project.Name := EditName.Text;
-  Project.DriveInfo.SectorSize := SpinEditSectorSize.Value;
+  Project.DriveInfo.SectorSize := Trunc(IntPower(2, SpinEditSectorSize.Value));
 end;