Changeset 19 for trunk

Timestamp:

Apr 2, 2016, 10:01:11 PM (9 years ago)

Author:

chronos

Message:

• Modified: Parameters for next scan operation is not stored separatelly from scans itself. So changing parameters will not affect current selected scan item.

Location:

trunk

Files:

• Form/UFormMain.pas (modified) (3 diffs)
• Form/UFormOperation.pas (modified) (3 diffs)
• UDriveScan.pas (modified) (3 diffs)
• UProject.pas (modified) (4 diffs)

trunk/Form/UFormMain.pas

@@ -230 +230 @@
     DriveInfo.Assign(TDriveInfo(ComboBoxDrive.Items.Objects[ComboBoxDrive.ItemIndex]));
     Modified := True;
-    CurrentScan.SectorCount := DriveInfo.SectorCount;
-    CurrentScan.SectorSize := DriveInfo.SectorSize;
-    CurrentScan.SectorStart := 0;
-    CurrentScan.SectorEnd := CurrentScan.SectorCount - 1;
-    CurrentScan.Reset;
+    Core.Project.ScanProfile.SectorCount := DriveInfo.SectorCount;
+    Core.Project.ScanProfile.SectorStart := 0;
+    Core.Project.ScanProfile.SectorEnd := Core.Project.ScanProfile.SectorCount - 1;
     UpdateInterface;
     Redraw;
@@ -247 +245 @@
     CurrentScan.SectorCount := DriveInfo.SectorCount;
     CurrentScan.SectorSize := DriveInfo.SectorSize;
+    Core.Project.ScanProfile.SectorCount := Core.Project.DriveInfo.SectorCount;
+    CurrentScan.LoadProfile(Core.Project.ScanProfile);;
     CurrentScan.Reset;
     CurrentScan.OnChange := DriveScanChange;
@@ -353 +353 @@
 procedure TFormMain.AOperationOptionsExecute(Sender: TObject);
 begin
-  FormOperation.Load(Core.Project.CurrentScan);
+  Core.Project.ScanProfile.SectorCount := Core.Project.DriveInfo.SectorCount;
+  FormOperation.Load(Core.Project.ScanProfile);
   if FormOperation.ShowModal = mrOk then begin
-    FormOperation.Save(Core.Project.CurrentScan);
+    FormOperation.Save(Core.Project.ScanProfile);
     Core.Project.Modified := True;
     UpdateInterface;

trunk/Form/UFormOperation.pas

@@ -28 +28 @@
     procedure UpdateMaxValues;
   public
-    procedure Load(DriveScan: TDriveScan);
-    procedure Save(DriveScan: TDriveScan);
+    procedure Load(DriveScan: TDriveScanProfile);
+    procedure Save(DriveScan: TDriveScanProfile);
   end;
 
@@ -57 +57 @@
 end;
 
-procedure TFormOperation.Load(DriveScan: TDriveScan);
+procedure TFormOperation.Load(DriveScan: TDriveScanProfile);
 begin
   ComboBoxRunMode.ItemIndex := Integer(DriveScan.Mode);
@@ -67 +67 @@
 end;
 
-procedure TFormOperation.Save(DriveScan: TDriveScan);
+procedure TFormOperation.Save(DriveScan: TDriveScanProfile);
 begin
   DriveScan.Mode := TRunMode(ComboBoxRunMode.ItemIndex);

trunk/UDriveScan.pas

@@ -25 +25 @@
     procedure Execute; override;
     property OnException: TExceptionEvent read FOnException write FOnException;
+  end;
+
+  TDriveScanProfile = class
+    SectorCount: Integer;
+    SectorStart: Integer;
+    SectorEnd: Integer;
+    Mode: TRunMode;
+    WritePattern: Byte;
   end;
 
@@ -61 +69 @@
     procedure Start;
     procedure Stop;
+    procedure LoadProfile(Profile: TDriveScanProfile);
     constructor Create;
     destructor Destroy; override;
@@ -253 +262 @@
 end;
 
+procedure TDriveScan.LoadProfile(Profile: TDriveScanProfile);
+begin
+  SectorStart := Profile.SectorStart;
+  SectorEnd := Profile.SectorEnd;
+  Mode := Profile.Mode;
+  WritePattern := Profile.WritePattern;
+end;
+
 constructor TDriveScan.Create;
 begin

trunk/UProject.pas

@@ -24 +24 @@
     Scans: TDriveScanList;
     DriveInfo: TDriveInfo;
+    ScanProfile: TDriveScanProfile;
     constructor Create;
     destructor Destroy; override;
@@ -56 +57 @@
   Scans := TDriveScanList.Create;
   DriveInfo := TDriveInfo.Create;
+  ScanProfile := TDriveScanProfile.Create;
 end;
 
 destructor TProject.Destroy;
 begin
+  FreeAndNil(ScanProfile);
   FreeAndNil(DriveInfo);
   FreeAndNil(Scans);
@@ -82 +85 @@
       WriteString(RootNode, 'DrivePath', DriveInfo.Path);
       WriteInt64(RootNode, 'DriveSize', DriveInfo.Size);
+
+      NewNode := OwnerDocument.CreateElement('ScanProfile');
+      AppendChild(NewNode);
+      WriteInteger(NewNode, 'SectorStart', ScanProfile.SectorStart);
+      WriteInteger(NewNode, 'SectorEnd', ScanProfile.SectorEnd);
+      WriteInteger(NewNode, 'WritePattern', ScanProfile.WritePattern);
+      WriteInteger(NewNode, 'Mode', Integer(ScanProfile.Mode));
 
       NewNode := OwnerDocument.CreateElement('Scans');
@@ -111 +121 @@
       DriveInfo.SectorSize := ReadInteger(RootNode, 'SectorSize', 4096);
       DriveInfo.SectorCount := ReadInteger(RootNode, 'SectorCount', 0);
+      ScanProfile.SectorCount := DriveInfo.SectorCount;
       DriveInfo.Model := ReadString(RootNode, 'DriveName', '');
       DriveInfo.Path := ReadString(RootNode, 'DrivePath', '');
       DriveInfo.Size := ReadInt64(RootNode, 'DriveSize', 0);
+
+      NewNode := FindNode('ScanProfile');
+      if Assigned(NewNode) then begin
+        ScanProfile.SectorStart := ReadInteger(NewNode, 'SectorStart', 0);
+        ScanProfile.SectorEnd := ReadInteger(NewNode, 'SectorEnd', ScanProfile.SectorCount - 1);
+        ScanProfile.WritePattern := ReadInteger(NewNode, 'WritePattern', 0);
+        ScanProfile.Mode := TRunMode(ReadInteger(NewNode, 'Mode', 0));
+      end;
 
       NewNode := FindNode('Scans');