Changeset 19 for trunk/Form

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/Form

Files:

• UFormMain.pas (modified) (3 diffs)
• UFormOperation.pas (modified) (3 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);