Changeset 15

Timestamp:

Apr 2, 2016, 1:39:42 PM (8 years ago)

Author:

chronos

Message:

• Added: UCore unit as main application unit. UFormMain serve for as main form interface.
• Added: Remember main form dimensions.

Location:

trunk

Files:

• CoolDisk.lpi (modified) (2 diffs)
• CoolDisk.lpr (modified) (2 diffs)
• Form/UFormMain.lfm (modified) (2 diffs)
• Form/UFormMain.pas (modified) (27 diffs)
• Form/UFormProject.pas (modified) (2 diffs)
• Packages/Common/UXMLUtils.pas (modified) (1 diff)
• UCore.lfm (added)
• UCore.pas (added)

trunk/CoolDisk.lpi

@@ -83 +83 @@
       </Item5>
     </RequiredPackages>
-    <Units Count="10">
+    <Units Count="11">
       <Unit0>
         <Filename Value="CoolDisk.lpr"/>
@@ -136 +136 @@
         <IsPartOfProject Value="True"/>
       </Unit9>
+      <Unit10>
+        <Filename Value="UCore.pas"/>
+        <IsPartOfProject Value="True"/>
+        <ComponentName Value="Core"/>
+        <ResourceBaseClass Value="DataModule"/>
+      </Unit10>
     </Units>
   </ProjectOptions>

trunk/CoolDisk.lpr

@@ -10 +10 @@
   Forms, tachartlazaruspkg, UFormBenchmark, UProject,
   UConfig, UBlockMap, UDriveScan, Common, TemplateGenerics, UFormOperation,
-  UFormProject, UFormMain, UPhysDrive;
+  UFormProject, UFormMain, UPhysDrive, UCore;
 
 {$R *.res}
@@ -17 +17 @@
   RequireDerivedFormResource:=True;
   Application.Initialize;
+  Application.CreateForm(TCore, Core);
   Application.CreateForm(TFormMain, FormMain);
   Application.CreateForm(TFormBenchmark, FormBenchmark);

trunk/Form/UFormMain.lfm

@@ -23 +23 @@
   end
   object Image1: TImage
-    Left = 592
-    Height = 848
+    Left = 600
+    Height = 856
     Top = 40
     Width = 1092
@@ -408 +408 @@
   object LastOpenedList1: TLastOpenedList
     MaxCount = 10
-    left = 906
-    top = 167
+    left = 904
+    top = 144
   end
 end

trunk/Form/UFormMain.pas

@@ -8 +8 @@
   Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, StdCtrls,
   Menus, ComCtrls, ExtCtrls, ActnList, dateutils, syncobjs, UProject,
-  UDriveScan, UPrefixMultiplier, ULastOpenedList, XMLConf, UPhysDrive;
+  UDriveScan, UPrefixMultiplier, ULastOpenedList, UPersistentForm, XMLConf,
+  UPhysDrive;
 
 type
@@ -115 +116 @@
     procedure UpdateInterface;
   public
-    DriveList: TDriveList;
-    Project: TProject;
     procedure SaveConfig;
     procedure LoadConfig;
@@ -131 +130 @@
 
 uses
-  UFormProject, UFormOperation;
+  UCore, UFormProject, UFormOperation;
 
 resourcestring
@@ -149 +148 @@
   Detect;
   LoadConfig;
+  Core.PersistentForm1.Load(Self);
   if (LastOpenedList1.Items.Count > 0) then
     ProjectOpen(LastOpenedList1.Items[0])
@@ -165 +165 @@
 procedure TFormMain.ListView1Data(Sender: TObject; Item: TListItem);
 begin
-  if (Item.Index >= 0) and (Item.Index < Project.Scans.Count) then
-  with TDriveScan(Project.Scans[Item.Index]) do begin
+  if (Item.Index >= 0) and (Item.Index < Core.Project.Scans.Count) then
+  with TDriveScan(Core.Project.Scans[Item.Index]) do begin
     Item.Caption := IntToStr(Item.Index);
     Item.SubItems.Add(DateTimeToStr(TimeStart));
@@ -179 +179 @@
   PrefixMultiplier := TPrefixMultiplier.Create;
   XMLConfig1.Filename := 'config.xml';
-  Project := nil;
-  DriveList := TDriveList.Create;
 end;
 
 procedure TFormMain.AScanStopExecute(Sender: TObject);
 begin
-  if Assigned(Project) and Assigned(Project.CurrentScan) then begin
-    Project.CurrentScan.Stop;
+  if Assigned(Core.Project) and Assigned(Core.Project.CurrentScan) then begin
+    Core.Project.CurrentScan.Stop;
     UpdateInterface;
   end;
@@ -193 +191 @@
 procedure TFormMain.ComboBoxDriveChange(Sender: TObject);
 begin
-  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;
+  with Core.Project do
+  if DriveInfo.Path <> TDriveInfo(ComboBoxDrive.Items.Objects[ComboBoxDrive.ItemIndex]).Path then begin
+    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;
     UpdateInterface;
     Redraw;
@@ -209 +208 @@
 begin
   LastBlockPos := 0;
-  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;
+  with Core.Project do begin
+    CurrentScan.DriveName := DriveInfo.Path;
+    CurrentScan.SectorSize := DriveInfo.SectorSize;
+    CurrentScan.Reset;
+    CurrentScan.OnChange := DriveScanChange;
+    CurrentScan.OnTerminate := DriveScanTerminate;
+    CurrentScan.Start;
+    Modified := True;
+  end;
   UpdateInterface;
 end;
@@ -221 +222 @@
 procedure TFormMain.AProjectOptionsExecute(Sender: TObject);
 begin
-  FormProject.Load(Project);
+  FormProject.Load(Core.Project);
   if FormProject.ShowModal = mrOk then begin
-    FormProject.Save(Project);
-    Project.Modified := True;
+    FormProject.Save(Core.Project);
+    Core.Project.Modified := True;
     UpdateInterface;
   end;
@@ -231 +232 @@
 procedure TFormMain.AScanContinueExecute(Sender: TObject);
 begin
-  Project.CurrentScan.Start;
-  Project.Modified := True;
+  Core.Project.CurrentScan.Start;
+  Core.Project.Modified := True;
   UpdateInterface;
 end;
@@ -243 +244 @@
 procedure TFormMain.AFileCloseExecute(Sender: TObject);
 begin
-  FreeAndNil(Project);
+  FreeAndNil(Core.Project);
   UpdateInterface;
 end;
@@ -250 +251 @@
 begin
   AFileClose.Execute;
-  Project := TProject.Create;
-  Project.FileName := SNewProject;
-  Project.Modified := False;
-  Project.Scans.Add(TDriveScan.Create);
-
-  ComboBoxDrive.ItemIndex := DriveList.IndexOf(DriveList.FindByModel(Project.DriveInfo.Model));
+  Core.Project := TProject.Create;
+  Core.Project.FileName := SNewProject;
+  Core.Project.Modified := False;
+  Core.Project.Scans.Add(TDriveScan.Create);
+
+  ComboBoxDrive.ItemIndex := Core.DriveList.IndexOf(Core.DriveList.FindByModel(Core.Project.DriveInfo.Model));
   if (ComboBoxDrive.ItemIndex = -1) and (ComboBoxDrive.Items.Count > 0) then ComboBoxDrive.ItemIndex := 0;
   ComboBoxDriveChange(Self);
@@ -267 +268 @@
   OpenDialog1.Title := SOpenStoredProject;
   OpenDialog1.DefaultExt := '.cdp';
-  if Assigned(Project) then
-    OpenDialog1.FileName := Project.FileName;
+  if Assigned(Core.Project) then
+    OpenDialog1.FileName := Core.Project.FileName;
   if OpenDialog1.Execute then begin
     ProjectOpen(OpenDialog1.FileName);
@@ -278 +279 @@
   SaveDialog1.Title := SSaveProject;
   SaveDialog1.DefaultExt := '.cdp';
-  SaveDialog1.FileName := Project.FileName;
+  SaveDialog1.FileName := Core.Project.FileName;
   if SaveDialog1.Execute then begin
-    Project.SaveToFile(SaveDialog1.FileName);
+    Core.Project.SaveToFile(SaveDialog1.FileName);
     LastOpenedList1.AddItem(SaveDialog1.FileName);
     LastOpenedList1.LoadToMenuItem(MenuItemOpenRecent, OpenRecentClick);
@@ -289 +290 @@
 procedure TFormMain.AFileSaveExecute(Sender: TObject);
 begin
-  if not FileExists(Project.FileName) then
+  if not FileExists(Core.Project.FileName) then
     AFileSaveAs.Execute
     else begin
-      Project.SaveToFile(Project.FileName);
+      Core.Project.SaveToFile(Core.Project.FileName);
       LastOpenedList1.AddItem(SaveDialog1.FileName);
       LastOpenedList1.LoadToMenuItem(MenuItemOpenRecent, OpenRecentClick);
@@ -301 +302 @@
 procedure TFormMain.AOperationOptionsExecute(Sender: TObject);
 begin
-  FormOperation.Load(Project.CurrentScan);
+  FormOperation.Load(Core.Project.CurrentScan);
   if FormOperation.ShowModal = mrOk then begin
-    FormOperation.Save(Project.CurrentScan);
-    Project.Modified := True;
+    FormOperation.Save(Core.Project.CurrentScan);
+    Core.Project.Modified := True;
     UpdateInterface;
   end;
@@ -313 +314 @@
   AFileClose.Execute;
   SaveConfig;
+  Core.PersistentForm1.Save(Self);
 end;
 
@@ -319 +321 @@
   R: TModalResult;
 begin
-  if Assigned(Project) and Project.Modified then begin
+  if Assigned(Core.Project) and Core.Project.Modified then begin
     R := MessageDlg(SProjectModified, SProjectModifiedQuestion, mtConfirmation, [mbYes, mbNo, mbCancel], 0);
     if R = mrCancel then begin
@@ -334 +336 @@
 begin
   Timer1.Enabled := False;
-  if Assigned(Project) then FreeAndNil(Project);
   FreeAndNil(PrefixMultiplier);
-  FreeAndNil(DriveList);
 end;
 
@@ -347 +347 @@
 procedure TFormMain.DoDraw;
 begin
-  if Assigned(Project) then begin
+  if Assigned(Core.Project) then
+  with Core.Project do begin
   if RedrawPending then
   with Image1 do begin
@@ -353 +354 @@
       Picture.Bitmap.SetSize(Width, Height);
     try
-      Project.CurrentScan.Lock.Acquire;
+      Core.Project.CurrentScan.Lock.Acquire;
       try
         Picture.Bitmap.BeginUpdate(True);
-        Project.CurrentScan.BlockMap.Draw(Picture.Bitmap.Canvas);
+        CurrentScan.BlockMap.Draw(Picture.Bitmap.Canvas);
       finally
         Picture.Bitmap.EndUpdate;
       end;
-      LabelSectorPerBlock.Caption := IntToStr(Project.CurrentScan.BlockMap.SectorPerBlock);
-      LabelBlockCurrent.Caption := IntToStr(Project.CurrentScan.SectorCurrent);
-      LabelBlockDamaged.Caption := IntToStr(Project.CurrentScan.DamagedBlockCount);
+      LabelSectorPerBlock.Caption := IntToStr(CurrentScan.BlockMap.SectorPerBlock);
+      LabelBlockCurrent.Caption := IntToStr(CurrentScan.SectorCurrent);
+      LabelBlockDamaged.Caption := IntToStr(CurrentScan.DamagedBlockCount);
     finally
-      Project.CurrentScan.Lock.Release;
+      CurrentScan.Lock.Release;
     end;
     RedrawPending := False;
   end;
   try
-    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;
+    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 := '';
@@ -383 +384 @@
     end;
   finally
-    Project.CurrentScan.Lock.Release;
+    CurrentScan.Lock.Release;
   end;
   end else
@@ -401 +402 @@
   Title: string;
 begin
+  with Core do begin
   if Assigned(Project) and Assigned(Project.CurrentScan) then begin
     AScanStart.Enabled := Project.CurrentScan.Terminated = True;
@@ -438 +440 @@
     LabelSectorSize.Caption := '';
   end;
+  end;
 end;
 
@@ -464 +467 @@
 procedure TFormMain.ReloadOperationList;
 begin
-  if Assigned(Project) then begin
-    ListView1.Items.Count := Project.Scans.Count;
+  if Assigned(Core.Project) then begin
+    ListView1.Items.Count := Core.Project.Scans.Count;
   end else begin
     ListView1.Items.Count := 0;
@@ -475 +478 @@
 begin
   AFileNew.Execute;
-  Project.LoadFromFile(FileName);
-  ComboBoxDrive.ItemIndex := DriveList.IndexOf(DriveList.FindByModel(Project.DriveInfo.Model));
+  Core.Project.LoadFromFile(FileName);
+  ComboBoxDrive.ItemIndex := Core.DriveList.IndexOf(Core.DriveList.FindByModel(Core.Project.DriveInfo.Model));
   if (ComboBoxDrive.ItemIndex = -1) and (ComboBoxDrive.Items.Count > 0) then ComboBoxDrive.ItemIndex := 0;
   LastOpenedList1.AddItem(FileName);
@@ -496 +499 @@
 procedure TFormMain.Detect;
 begin
-  DriveList.Detect;
-  DriveList.LoadToStrings(ComboBoxDrive.Items);
+  Core.DriveList.Detect;
+  Core.DriveList.LoadToStrings(ComboBoxDrive.Items);
 end;
 

trunk/Form/UFormProject.pas

@@ -38 +38 @@
 
 uses
-  UFormMain;
+  UCore;
 
 { TFormProject }
@@ -44 +44 @@
 procedure TFormProject.Load(Project: TProject);
 begin
-  FormMain.DriveList.LoadToStrings(ComboBoxDrive.Items);
+  Core.DriveList.LoadToStrings(ComboBoxDrive.Items);
   EditName.Text := Project.Name;
   SpinEditSectorSize.Value := Project.DriveInfo.SectorSize;
-  ComboBoxDrive.ItemIndex := FormMain.DriveList.IndexOf(FormMain.DriveList.FindByModel(Project.DriveInfo.Model));
+  ComboBoxDrive.ItemIndex := Core.DriveList.IndexOf(Core.DriveList.FindByModel(Project.DriveInfo.Model));
 end;
 

trunk/Packages/Common/UXMLUtils.pas

@@ -197 +197 @@
   NewNode := Node.FindNode(Name);
   if Assigned(NewNode) then
-    Result := StrToInt(NewNode.TextContent);
+    Result := StrToInt64(NewNode.TextContent);
 end;