Changeset 13 for trunk/Form/UFormMain.pas

Timestamp:

Apr 2, 2016, 1:06:34 PM (8 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/Form/UFormMain.pas (modified) (23 diffs)

trunk/Form/UFormMain.pas

@@ -14 +14 @@
 
   TFormMain = class(TForm)
-    ABrowseDisk: TAction;
+    ADriveSelect: TAction;
     AOperationOptions: TAction;
     AFileClose: TAction;
@@ -34 +34 @@
     ComboBoxDrive: TComboBox;
     Image1: TImage;
+    ImageList1: TImageList;
     Label1: TLabel;
     Label10: TLabel;
@@ -45 +46 @@
     Label8: TLabel;
     LabelElapsedTime: TLabel;
-    LabelBlockSize: TLabel;
-    LabelBlockCount: TLabel;
+    LabelSectorSize: TLabel;
+    LabelSectorCount: TLabel;
     LabelBlockCurrent: TLabel;
     LabelBlockDamaged: TLabel;
@@ -73 +74 @@
     SaveDialog1: TSaveDialog;
     Timer1: TTimer;
+    ToolBar1: TToolBar;
+    ToolButton1: TToolButton;
+    ToolButton2: TToolButton;
+    ToolButton3: TToolButton;
     XMLConfig1: TXMLConfig;
     procedure AExitExecute(Sender: TObject);
@@ -87 +92 @@
     procedure ComboBoxDriveChange(Sender: TObject);
     procedure FormClose(Sender: TObject; var CloseAction: TCloseAction);
+    procedure FormCloseQuery(Sender: TObject; var CanClose: boolean);
     procedure FormCreate(Sender: TObject);
     procedure FormDestroy(Sender: TObject);
@@ -98 +104 @@
     RedrawPending: Boolean;
     LastProjectFileName: string;
+    LastDriveName: string;
     procedure ReloadOperationList;
     procedure ProjectOpen(FileName: string);
@@ -107 +114 @@
   public
     DriveList: TDriveList;
-    DriveScan: TDriveScan;
     Project: TProject;
     procedure SaveConfig;
@@ -126 +132 @@
 
 resourcestring
-  SProjectModified = '(modified)';
+  SModifiedFlag = '(modified)';
   SNewProject = 'New project';
   SSelectDriveForScan = 'Select drive for scan';
@@ -132 +138 @@
   SSaveProject = 'Save scan project';
   SBytes = 'bytes';
+  SProjectModified = 'Project modified';
+  SProjectModifiedQuestion = 'Project was modified. Do you want to save it?';
 
 { TFormMain }
@@ -175 +183 @@
 procedure TFormMain.AScanStopExecute(Sender: TObject);
 begin
-  DriveScan.Stop;
-  UpdateInterface;
+  if Assigned(Project) and Assigned(Project.CurrentScan) then begin
+    Project.CurrentScan.Stop;
+    UpdateInterface;
+  end;
 end;
 
 procedure TFormMain.ComboBoxDriveChange(Sender: TObject);
 begin
-  DriveScan.SectorCount := TDriveInfo(DriveList[ComboBoxDrive.ItemIndex]).SectorCount;
-  DriveScan.DriveName := TDriveInfo(DriveList[ComboBoxDrive.ItemIndex]).Path;
-  DriveScan.SectorStart := 0;
-  DriveScan.SectorEnd := DriveScan.SectorCount - 1;
+  if Project.DriveInfo.Path <> TDriveInfo(ComboBoxDrive.Items.Objects[ComboBoxDrive.ItemIndex]).Path then begin
+    Project.DriveInfo.Assign(TDriveInfo(ComboBoxDrive.Items.Objects[ComboBoxDrive.ItemIndex]));
+    Project.Modified := True;
+    Project.CurrentScan.SectorCount := Project.DriveInfo.SectorCount;
+    Project.CurrentScan.SectorSize := Project.DriveInfo.SectorSize;
+    Project.CurrentScan.SectorStart := 0;
+    Project.CurrentScan.SectorEnd := Project.CurrentScan.SectorCount - 1;
+    Project.CurrentScan.Reset;
+    UpdateInterface;
+    Redraw;
+  end;
 end;
 
@@ -190 +207 @@
 begin
   LastBlockPos := 0;
-  DriveScan.DriveName := TDriveInfo(DriveList[ComboBoxDrive.ItemIndex]).Path;
-  DriveScan.Reset;
-  DriveScan.SectorSize := Project.SectorSize;
-  DriveScan.OnChange := DriveScanChange;
-  DriveScan.OnTerminate := DriveScanTerminate;
-  DriveScan.Start;
+  Project.CurrentScan.DriveName := Project.DriveInfo.Path;
+  Project.CurrentScan.SectorSize := Project.DriveInfo.SectorSize;
+  Project.CurrentScan.Reset;
+  Project.CurrentScan.OnChange := DriveScanChange;
+  Project.CurrentScan.OnTerminate := DriveScanTerminate;
+  Project.CurrentScan.Start;
   Project.Modified := True;
   UpdateInterface;
@@ -212 +229 @@
 procedure TFormMain.AScanContinueExecute(Sender: TObject);
 begin
-  DriveScan.Start;
+  Project.CurrentScan.Start;
   Project.Modified := True;
   UpdateInterface;
@@ -224 +241 @@
 procedure TFormMain.AFileCloseExecute(Sender: TObject);
 begin
-  DriveScan := nil;
   FreeAndNil(Project);
   UpdateInterface;
@@ -236 +252 @@
   Project.Modified := False;
   Project.Scans.Add(TDriveScan.Create);
-  DriveScan := TDriveScan(Project.Scans[0]);
-
-  DriveScan.SectorStart := 0;
-  DriveScan.SectorEnd := DriveScan.SectorCount - 1;
-  DriveScan.Reset;
+
+  ComboBoxDrive.ItemIndex := DriveList.IndexOf(DriveList.FindByModel(Project.DriveInfo.Model));
+  if (ComboBoxDrive.ItemIndex = -1) and (ComboBoxDrive.Items.Count > 0) then ComboBoxDrive.ItemIndex := 0;
+  ComboBoxDriveChange(Self);
+
   Redraw;
   UpdateInterface;
@@ -279 +295 @@
 procedure TFormMain.AOperationOptionsExecute(Sender: TObject);
 begin
-  FormOperation.Load(DriveScan);
+  FormOperation.Load(Project.CurrentScan);
   if FormOperation.ShowModal = mrOk then begin
-    FormOperation.Save(DriveScan);
+    FormOperation.Save(Project.CurrentScan);
     Project.Modified := True;
     UpdateInterface;
@@ -291 +307 @@
   AFileClose.Execute;
   SaveConfig;
+end;
+
+procedure TFormMain.FormCloseQuery(Sender: TObject; var CanClose: boolean);
+var
+  R: TModalResult;
+begin
+  if Assigned(Project) and Project.Modified then begin
+    R := MessageDlg(SProjectModified, SProjectModifiedQuestion, mtConfirmation, [mbYes, mbNo, mbCancel], 0);
+    if R = mrCancel then begin
+      CanClose := False;
+      Exit;
+    end else
+    if R = mrYes then begin
+      AFileSave.Execute;
+    end;
+  end;
 end;
 
@@ -315 +347 @@
       Picture.Bitmap.SetSize(Width, Height);
     try
-      DriveScan.Lock.Acquire;
+      Project.CurrentScan.Lock.Acquire;
       try
         Picture.Bitmap.BeginUpdate(True);
-        DriveScan.BlockMap.Draw(Picture.Bitmap.Canvas);
+        Project.CurrentScan.BlockMap.Draw(Picture.Bitmap.Canvas);
       finally
         Picture.Bitmap.EndUpdate;
       end;
-      LabelSize.Caption := PrefixMultiplier.Add(DriveScan.BlockMap.SectorCount * DriveScan.SectorSize,
-        BasePrefixMultipliers, SBytes);
-      LabelSectorPerBlock.Caption := IntToStr(DriveScan.BlockMap.SectorPerBlock);
-      LabelBlockSize.Caption := IntToStr(DriveScan.SectorSize) + ' ' + SBytes;
-      LabelBlockCount.Caption := IntToStr(DriveScan.BlockMap.SectorCount);
-      LabelBlockCurrent.Caption := IntToStr(DriveScan.SectorCurrent);
-      LabelBlockDamaged.Caption := IntToStr(DriveScan.DamagedBlockCount);
+      LabelSectorPerBlock.Caption := IntToStr(Project.CurrentScan.BlockMap.SectorPerBlock);
+      LabelBlockCurrent.Caption := IntToStr(Project.CurrentScan.SectorCurrent);
+      LabelBlockDamaged.Caption := IntToStr(Project.CurrentScan.DamagedBlockCount);
     finally
-      DriveScan.Lock.Release;
+      Project.CurrentScan.Lock.Release;
     end;
     RedrawPending := False;
   end;
   try
-    DriveScan.Lock.Acquire;
-    if not DriveScan.Terminated then begin
-      LabelElapsedTime.Caption := TimeToStr(DriveScan.GetElapsedTime);
-      LabelEstimatedTime.Caption := TimeToStr((Now - DriveScan.TimeStart) /
-        DriveScan.SectorCurrent * (DriveScan.BlockMap.SectorCount - DriveScan.SectorCurrent));
-      LabelIOSpeed.Caption := PrefixMultiplier.Add((DriveScan.SectorCurrent - LastBlockPos) *
-        DriveScan.SectorSize / (Timer1.Interval / 1000), BasePrefixMultipliers, 'B/s');
-      LastBlockPos := DriveScan.SectorCurrent;
+    Project.CurrentScan.Lock.Acquire;
+    if not Project.CurrentScan.Terminated then begin
+      LabelElapsedTime.Caption := TimeToStr(Project.CurrentScan.GetElapsedTime);
+      LabelEstimatedTime.Caption := TimeToStr((Now - Project.CurrentScan.TimeStart) /
+        Project.CurrentScan.SectorCurrent * (Project.CurrentScan.BlockMap.SectorCount - Project.CurrentScan.SectorCurrent));
+      LabelIOSpeed.Caption := PrefixMultiplier.Add((Project.CurrentScan.SectorCurrent - LastBlockPos) *
+        Project.CurrentScan.SectorSize / (Timer1.Interval / 1000), BasePrefixMultipliers, 'B/s');
+      LastBlockPos := Project.CurrentScan.SectorCurrent;
     end else begin
       LabelElapsedTime.Caption := '';
@@ -349 +377 @@
     end;
   finally
-    DriveScan.Lock.Release;
+    Project.CurrentScan.Lock.Release;
   end;
   end else
@@ -367 +395 @@
   Title: string;
 begin
-  if Assigned(DriveScan) then begin
-    AScanStart.Enabled := DriveScan.Terminated = True;
-    AScanStop.Enabled := DriveScan.Terminated = False;
-    AScanContinue.Enabled := (DriveScan.Terminated = True) and (DriveScan.SectorCurrent > DriveScan.SectorStart) and
-      (DriveScan.SectorCurrent < DriveScan.SectorEnd);
+  if Assigned(Project) and Assigned(Project.CurrentScan) then begin
+    AScanStart.Enabled := Project.CurrentScan.Terminated = True;
+    AScanStop.Enabled := Project.CurrentScan.Terminated = False;
+    AScanContinue.Enabled := (Project.CurrentScan.Terminated = True) and
+      (Project.CurrentScan.SectorCurrent > Project.CurrentScan.SectorStart) and
+      (Project.CurrentScan.SectorCurrent < Project.CurrentScan.SectorEnd);
+  end else begin
+    AScanStart.Enabled := False;
+    AScanStop.Enabled := False;
+    AScanContinue.Enabled := False;
   end;
   AFileSave.Enabled := Assigned(Project) and Project.Modified;
   AFileSaveAs.Enabled := Assigned(Project);
   AFileClose.Enabled := Assigned(Project);
+  ComboBoxDrive.Enabled := Assigned(Project);
+  AProjectOptions.Enabled := Assigned(Project);;
+  AOperationOptions.Enabled := Assigned(Project);;
   ReloadOperationList;
 
@@ -383 +419 @@
   Title := Title + Application.Title;
   if Assigned(Project) and Project.Modified then
-    Title := Title + ' ' + SProjectModified;
+    Title := Title + ' ' + SModifiedFlag;
   Caption := Title;
+
+  if Assigned(Project) then begin
+    LabelSize.Caption := PrefixMultiplier.Add(Project.DriveInfo.Size,
+      BasePrefixMultipliers, SBytes);
+    LabelSectorCount.Caption := IntToStr(Project.DriveInfo.SectorCount);
+    LabelSectorSize.Caption := IntToStr(Project.DriveInfo.SectorSize) + ' ' + SBytes;
+  end else begin
+    LabelSize.Caption := '';
+    LabelSectorCount.Caption := '';
+    LabelSectorSize.Caption := '';
+  end;
 end;
 
 procedure TFormMain.SaveConfig;
 begin
-  XMLConfig1.SetValue('DriveName', TDriveInfo(DriveList[ComboBoxDrive.ItemIndex]).Model);
+  XMLConfig1.SetValue('DriveName', LastDriveName);
   XMLConfig1.SetValue('LastProjectFileName', LastProjectFileName);
 end;
@@ -395 +442 @@
 procedure TFormMain.LoadConfig;
 begin
-  ComboBoxDrive.ItemIndex := DriveList.IndexOf(DriveList.FindByModel(XMLConfig1.GetValue('DriveName', '')));
+  LastDriveName := XMLConfig1.GetValue('DriveName', '');
   LastProjectFileName := XMLConfig1.GetValue('LastProjectFileName', '');
 end;
@@ -418 +465 @@
   AFileNew.Execute;
   Project.LoadFromFile(FileName);
+  ComboBoxDrive.ItemIndex := DriveList.IndexOf(DriveList.FindByModel(Project.DriveInfo.Model));
+  if (ComboBoxDrive.ItemIndex = -1) and (ComboBoxDrive.Items.Count > 0) then ComboBoxDrive.ItemIndex := 0;
   LastProjectFileName := FileName;
   UpdateInterface;
@@ -438 +487 @@
 begin
   DriveList.Detect;
-  while ComboBoxDrive.Items.Count > DriveList.Count do
-    ComboBoxDrive.Items.Delete(ComboBoxDrive.Items.Count - 1);
-  while ComboBoxDrive.Items.Count < DriveList.Count do
-    ComboBoxDrive.Items.Add('');
-  for I := 0 to DriveList.Count - 1 do
-    ComboBoxDrive.Items[I] := TDriveInfo(DriveList[I]).Model + ' (' +
-      PrefixMultiplier.Add(TDriveInfo(DriveList[I]).Size, BasePrefixMultipliers, 'B') + ')';
+  DriveList.LoadToStrings(ComboBoxDrive.Items);
 end;