Changeset 16 for trunk/Form/UFormMain.pas

Timestamp:

Apr 2, 2016, 8:18:30 PM (8 years ago)

Author:

chronos

Message:

• Added: Ability to add and remove scan operation.
• Modified: XMLConfig moved from TMainForm to TCore as more proper place for general object.

File:

• trunk/Form/UFormMain.pas (modified) (19 diffs)

trunk/Form/UFormMain.pas

@@ -15 +15 @@
 
   TFormMain = class(TForm)
+    AOperationAdd: TAction;
+    AOperationRemove: TAction;
+    AViewToolbar: TAction;
     ADriveSelect: TAction;
     AOperationOptions: TAction;
@@ -28 +31 @@
     AScanStop: TAction;
     ActionList1: TActionList;
+    Button1: TButton;
     Button2: TButton;
     Button3: TButton;
+    Button4: TButton;
     ButtonScan: TButton;
     ButtonScan1: TButton;
@@ -35 +40 @@
     ComboBoxDrive: TComboBox;
     Image1: TImage;
-    ImageList1: TImageList;
     Label1: TLabel;
     Label10: TLabel;
@@ -46 +50 @@
     Label7: TLabel;
     Label8: TLabel;
-    LabelElapsedTime: TLabel;
-    LabelSectorSize: TLabel;
-    LabelSectorCount: TLabel;
     LabelBlockCurrent: TLabel;
     LabelBlockDamaged: TLabel;
+    LabelElapsedTime: TLabel;
     LabelEstimatedTime: TLabel;
     LabelIOSpeed: TLabel;
+    LabelSectorCount: TLabel;
+    LabelSectorPerBlock: TLabel;
+    LabelSectorSize: TLabel;
     LabelSize: TLabel;
-    LabelSectorPerBlock: TLabel;
     LastOpenedList1: TLastOpenedList;
     ListView1: TListView;
@@ -65 +69 @@
     MenuItem14: TMenuItem;
     MenuItem15: TMenuItem;
+    MenuItem16: TMenuItem;
+    MenuItem17: TMenuItem;
+    MenuItem18: TMenuItem;
+    MenuItem19: TMenuItem;
     MenuItemOpenRecent: TMenuItem;
     MenuItem2: TMenuItem;
@@ -75 +83 @@
     MenuItem9: TMenuItem;
     OpenDialog1: TOpenDialog;
+    Panel1: TPanel;
+    Panel2: TPanel;
+    PopupMenu1: TPopupMenu;
     SaveDialog1: TSaveDialog;
+    Splitter1: TSplitter;
     Timer1: TTimer;
     ToolBar1: TToolBar;
@@ -81 +93 @@
     ToolButton2: TToolButton;
     ToolButton3: TToolButton;
-    XMLConfig1: TXMLConfig;
     procedure AExitExecute(Sender: TObject);
     procedure AFileCloseExecute(Sender: TObject);
@@ -88 +99 @@
     procedure AFileSaveAsExecute(Sender: TObject);
     procedure AFileSaveExecute(Sender: TObject);
+    procedure AOperationAddExecute(Sender: TObject);
     procedure AOperationOptionsExecute(Sender: TObject);
+    procedure AOperationRemoveExecute(Sender: TObject);
     procedure AProjectOptionsExecute(Sender: TObject);
     procedure AScanContinueExecute(Sender: TObject);
     procedure AScanStartExecute(Sender: TObject);
     procedure AScanStopExecute(Sender: TObject);
+    procedure AViewToolbarExecute(Sender: TObject);
     procedure ComboBoxDriveChange(Sender: TObject);
     procedure FormClose(Sender: TObject; var CloseAction: TCloseAction);
@@ -101 +115 @@
     procedure Image1Resize(Sender: TObject);
     procedure ListView1Data(Sender: TObject; Item: TListItem);
+    procedure ListView1SelectItem(Sender: TObject; Item: TListItem;
+      Selected: Boolean);
     procedure Timer1Timer(Sender: TObject);
   private
@@ -107 +123 @@
     RedrawPending: Boolean;
     LastDriveName: string;
+    ShowToolBar: Boolean;
     procedure OpenRecentClick(Sender: TObject);
     procedure ReloadOperationList;
@@ -165 +182 @@
 procedure TFormMain.ListView1Data(Sender: TObject; Item: TListItem);
 begin
-  if (Item.Index >= 0) and (Item.Index < Core.Project.Scans.Count) then
-  with TDriveScan(Core.Project.Scans[Item.Index]) do begin
+  with Core.Project do
+  if (Item.Index >= 0) and (Item.Index < Scans.Count) then
+  with TDriveScan(Scans[Item.Index]) do begin
     Item.Caption := IntToStr(Item.Index);
+    Item.Data := TDriveScan(Scans[Item.Index]);
     Item.SubItems.Add(DateTimeToStr(TimeStart));
     Item.SubItems.Add(DateTimeToStr(TimeEnd));
@@ -175 +194 @@
 end;
 
+procedure TFormMain.ListView1SelectItem(Sender: TObject; Item: TListItem;
+  Selected: Boolean);
+begin
+  Core.Project.CurrentScan := TDriveScan(Item.Data);
+  Redraw;
+  ReloadOperationList;
+end;
+
 procedure TFormMain.FormCreate(Sender: TObject);
 begin
   PrefixMultiplier := TPrefixMultiplier.Create;
-  XMLConfig1.Filename := 'config.xml';
 end;
 
@@ -187 +213 @@
     UpdateInterface;
   end;
+end;
+
+procedure TFormMain.AViewToolbarExecute(Sender: TObject);
+begin
+  ShowToolBar := not ShowToolBar;
+  ToolBar1.Visible := ShowToolBar;
+  AViewToolbar.Checked := ShowToolBar;
 end;
 
@@ -255 +288 @@
   Core.Project.Modified := False;
   Core.Project.Scans.Add(TDriveScan.Create);
+  Core.Project.CurrentScan := TDriveScan(Core.Project.Scans.Last);
 
   ComboBoxDrive.ItemIndex := Core.DriveList.IndexOf(Core.DriveList.FindByModel(Core.Project.DriveInfo.Model));
@@ -300 +334 @@
 end;
 
+procedure TFormMain.AOperationAddExecute(Sender: TObject);
+var
+  NewOperation: TDriveScan;
+begin
+  with Core.Project do begin
+    NewOperation := TDriveScan.Create;
+    Scans.Add(NewOperation);
+    CurrentScan := TDriveScan(Scans.Last);
+    ReloadOperationList;
+    Redraw;
+    Core.Project.Modified := True;
+  end;
+end;
+
 procedure TFormMain.AOperationOptionsExecute(Sender: TObject);
 begin
@@ -308 +356 @@
     UpdateInterface;
   end;
+end;
+
+procedure TFormMain.AOperationRemoveExecute(Sender: TObject);
+begin
+  Core.Project.CurrentScan := nil;
+  Core.Project.Scans.Remove(ListView1.Selected.Data);
+  ReloadOperationList;
+  Redraw;
+  Core.Project.Modified := True;
 end;
 
@@ -347 +404 @@
 procedure TFormMain.DoDraw;
 begin
-  if Assigned(Core.Project) then
+  if Assigned(Core.Project) and Assigned(Core.Project.CurrentScan) then
   with Core.Project do begin
-  if RedrawPending then
-  with Image1 do begin
-    if (Width <> Picture.Bitmap.Width) or (Height <> Picture.Bitmap.Height) then
-      Picture.Bitmap.SetSize(Width, Height);
+    if RedrawPending then
+    with Image1 do begin
+      if (Width <> Picture.Bitmap.Width) or (Height <> Picture.Bitmap.Height) then
+        Picture.Bitmap.SetSize(Width, Height);
+      try
+        Core.Project.CurrentScan.Lock.Acquire;
+        try
+          Picture.Bitmap.BeginUpdate(True);
+          CurrentScan.BlockMap.Draw(Picture.Bitmap.Canvas);
+        finally
+          Picture.Bitmap.EndUpdate;
+        end;
+        LabelSectorPerBlock.Caption := IntToStr(CurrentScan.BlockMap.SectorPerBlock);
+        LabelBlockCurrent.Caption := IntToStr(CurrentScan.SectorCurrent);
+        LabelBlockDamaged.Caption := IntToStr(CurrentScan.DamagedBlockCount);
+      finally
+        CurrentScan.Lock.Release;
+      end;
+      RedrawPending := False;
+    end;
     try
-      Core.Project.CurrentScan.Lock.Acquire;
-      try
-        Picture.Bitmap.BeginUpdate(True);
-        CurrentScan.BlockMap.Draw(Picture.Bitmap.Canvas);
-      finally
-        Picture.Bitmap.EndUpdate;
+      CurrentScan.Lock.Acquire;
+      if not CurrentScan.Terminated then begin
+        LabelElapsedTime.Caption := TimeToStr(CurrentScan.GetElapsedTime);
+        LabelEstimatedTime.Caption := TimeToStr((Now - CurrentScan.TimeStart) /
+          CurrentScan.SectorCurrent * (CurrentScan.BlockMap.SectorCount - CurrentScan.SectorCurrent));
+        LabelIOSpeed.Caption := PrefixMultiplier.Add((CurrentScan.SectorCurrent - LastBlockPos) *
+          CurrentScan.SectorSize / (Timer1.Interval / 1000), BasePrefixMultipliers, 'B/s');
+        LastBlockPos := CurrentScan.SectorCurrent;
+      end else begin
+        LabelElapsedTime.Caption := '';
+        LabelEstimatedTime.Caption := '';
+        LabelIOSpeed.Caption := '';
       end;
-      LabelSectorPerBlock.Caption := IntToStr(CurrentScan.BlockMap.SectorPerBlock);
-      LabelBlockCurrent.Caption := IntToStr(CurrentScan.SectorCurrent);
-      LabelBlockDamaged.Caption := IntToStr(CurrentScan.DamagedBlockCount);
     finally
       CurrentScan.Lock.Release;
     end;
-    RedrawPending := False;
-  end;
-  try
-    CurrentScan.Lock.Acquire;
-    if not CurrentScan.Terminated then begin
-      LabelElapsedTime.Caption := TimeToStr(CurrentScan.GetElapsedTime);
-      LabelEstimatedTime.Caption := TimeToStr((Now - CurrentScan.TimeStart) /
-        CurrentScan.SectorCurrent * (CurrentScan.BlockMap.SectorCount - CurrentScan.SectorCurrent));
-      LabelIOSpeed.Caption := PrefixMultiplier.Add((CurrentScan.SectorCurrent - LastBlockPos) *
-        CurrentScan.SectorSize / (Timer1.Interval / 1000), BasePrefixMultipliers, 'B/s');
-      LastBlockPos := CurrentScan.SectorCurrent;
-    end else begin
-      LabelElapsedTime.Caption := '';
-      LabelEstimatedTime.Caption := '';
-      LabelIOSpeed.Caption := '';
-    end;
-  finally
-    CurrentScan.Lock.Release;
-  end;
   end else
   with Image1 do begin
@@ -445 +502 @@
 procedure TFormMain.SaveConfig;
 begin
-  XMLConfig1.SetValue('DriveName', LastDriveName);
-  LastOpenedList1.SaveToXMLConfig(XMLConfig1, 'RecentProjects');
+  Core.XMLConfig1.SetValue('DriveName', LastDriveName);
+  LastOpenedList1.SaveToXMLConfig(Core.XMLConfig1, 'RecentProjects');
+  Core.XMLConfig1.SetValue('ShowToolBar', ShowToolBar);
 end;
 
 procedure TFormMain.LoadConfig;
 begin
-  LastDriveName := XMLConfig1.GetValue('DriveName', '');
-  LastOpenedList1.LoadFromXMLConfig(XMLConfig1, 'RecentProjects');
+  LastDriveName := Core.XMLConfig1.GetValue('DriveName', '');
+  LastOpenedList1.LoadFromXMLConfig(Core.XMLConfig1, 'RecentProjects');
+  ShowToolBar := Core.XMLConfig1.GetValue('ShowToolBar', False);
+  ToolBar1.Visible := ShowToolBar;
+  AViewToolbar.Checked := ShowToolBar;
 end;
 
@@ -473 +534 @@
   end;
   ListView1.Refresh;
+
+  AOperationRemove.Enabled := Assigned(ListView1.Selected);
 end;