Changeset 13 for trunk/UPhysDrive.pas

Timestamp:

Apr 2, 2016, 1:06:34 PM (9 years ago)

Author:

chronos

Message:

• Modified: All drive dimensions are now stored in project file.
• Added: Confirmation dialog for saving project on application exit.
• Modified: ComboBox for selection of current drive now behaves correctly to update project parameters.

File:

• trunk/UPhysDrive.pas (modified) (4 diffs)

trunk/UPhysDrive.pas

@@ -9 +9 @@
 
 type
+
+  { TDriveInfo }
+
   TDriveInfo = class
     Model: string;
     Size: Int64;
     SectorCount: Int64;
+    SectorSize: Integer;
     Path: string;
+    procedure Assign(Source: TDriveInfo);
   end;
 
@@ -20 +25 @@
   TDriveList = class(TObjectList)
     function FindByModel(Model: string): TDriveInfo;
+    procedure LoadToStrings(Strings: TStrings);
     procedure Detect;
   end;
 
 implementation
+
+uses
+  UPrefixMultiplier;
+
+{ TDriveInfo }
+
+procedure TDriveInfo.Assign(Source: TDriveInfo);
+begin
+  Path := Source.Path;
+  Model := Source.Model;
+  Size := Source.Size;
+  SectorCount := Source.SectorCount;
+  SectorSize := Source.SectorSize;
+end;
 
 { TDriveList }
@@ -35 +55 @@
   if I < Count then Result := TDriveInfo(Items[I])
     else Result := nil;
+end;
+
+procedure TDriveList.LoadToStrings(Strings: TStrings);
+var
+  I: Integer;
+  PrefixMultiplier: TPrefixMultiplier;
+begin
+  PrefixMultiplier := TPrefixMultiplier.Create;
+  try
+    while Strings.Count > Count do
+      Strings.Delete(Strings.Count - 1);
+    while Strings.Count < Count do
+      Strings.Add('');
+    for I := 0 to Count - 1 do begin
+      Strings[I] := TDriveInfo(Items[I]).Model + ' (' +
+        PrefixMultiplier.Add(TDriveInfo(Items[I]).Size, BasePrefixMultipliers, 'B') + ')';
+      Strings.Objects[I] := Items[I];
+    end;
+  finally
+    PrefixMultiplier.Free;
+  end;
 end;
 
@@ -57 +98 @@
       NewDriveInfo := TDriveInfo.Create;
       NewDriveInfo.Model := Trim(LoadFileToStr(List[I] + '/device/model'));
-      NewDriveInfo.SectorCount := StrToInt(Trim(LoadFileToStr(List[I] + '/size')));
-      NewDriveInfo.Size := NewDriveInfo.SectorCount * 512;
+      NewDriveInfo.SectorSize := StrToInt(Trim(LoadFileToStr(List[I] + '/queue/physical_block_size')));
+      NewDriveInfo.SectorCount := StrToInt(Trim(LoadFileToStr(List[I] + '/size'))) * 512 div NewDriveInfo.SectorSize;
+      NewDriveInfo.Size := NewDriveInfo.SectorCount * NewDriveInfo.SectorSize;
       NewDriveInfo.Path := '/dev/' + ExtractFileName(List[I]);
       Add(NewDriveInfo);