Changeset 13 for trunk/UProject.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/UProject.pas (modified) (5 diffs)

trunk/UProject.pas

@@ -6 +6 @@
 
 uses
-  Classes, SysUtils, Contnrs, DOM, XMLRead, XMLWrite, UXMLUtils, UDriveScan;
+  Classes, SysUtils, Contnrs, DOM, XMLRead, XMLWrite, UXMLUtils, UDriveScan,
+  UPhysDrive;
 
 type
@@ -13 +14 @@
 
   TProject = class
+  private
+    function GetCurrentScan: TDriveScan;
+    function GetSectorCount: Integer;
+  public
     Name: string;
     FileName: string;
-    SectorSize: Integer;
-    SectorCount: Integer;
     Modified: Boolean;
     Scans: TDriveScanList;
-    DriveName: string;
+    DriveInfo: TDriveInfo;
     constructor Create;
     destructor Destroy; override;
     procedure LoadFromFile(FileName: string);
     procedure SaveToFile(FileName: string);
+    property SectorCount: Integer read GetSectorCount;
+    property CurrentScan: TDriveScan read GetCurrentScan;
   end;
 
@@ -35 +40 @@
 { TProject }
 
+function TProject.GetCurrentScan: TDriveScan;
+begin
+  if Scans.Count > 0 then Result := TDriveScan(Scans[Scans.Count - 1])
+    else Result := nil;
+end;
+
+function TProject.GetSectorCount: Integer;
+begin
+  Result := DriveInfo.SectorCount;
+end;
+
 constructor TProject.Create;
 begin
-  SectorSize := 4096;
   Scans := TDriveScanList.Create;
+  DriveInfo := TDriveInfo.Create;
 end;
 
 destructor TProject.Destroy;
 begin
+  FreeAndNil(DriveInfo);
   FreeAndNil(Scans);
   inherited Destroy;
@@ -59 +76 @@
     AppendChild(RootNode);
     with RootNode do begin
-      WriteInteger(RootNode, 'SectorSize', SectorSize);
-      WriteInteger(RootNode, 'SectorCount', SectorCount);
-      WriteString(RootNode, 'DriveName', DriveName);
+      WriteInteger(RootNode, 'SectorCount', DriveInfo.SectorCount);
+      WriteInteger(RootNode, 'SectorSize', DriveInfo.SectorSize);
+      WriteString(RootNode, 'DriveName', DriveInfo.Model);
+      WriteString(RootNode, 'DrivePath', DriveInfo.Path);
+      WriteInt64(RootNode, 'DriveSize', DriveInfo.Size);
 
       NewNode := OwnerDocument.CreateElement('Scans');
@@ -89 +108 @@
     RootNode := Doc.DocumentElement;
     with RootNode do begin
-      SectorSize := ReadInteger(RootNode, 'SectorSize', 4096);
-      SectorCount := ReadInteger(RootNode, 'SectorCount', 0);
-      DriveName := ReadString(RootNode, 'DriveName', '');
+      DriveInfo.SectorSize := ReadInteger(RootNode, 'SectorSize', 4096);
+      DriveInfo.SectorCount := ReadInteger(RootNode, 'SectorCount', 0);
+      DriveInfo.Model := ReadString(RootNode, 'DriveName', '');
+      DriveInfo.Path := ReadString(RootNode, 'DrivePath', '');
+      DriveInfo.Size := ReadInt64(RootNode, 'DriveSize', 0);
 
       NewNode := FindNode('Scans');