Changeset 7 for trunk

Timestamp:

Mar 30, 2016, 11:32:54 PM (9 years ago)

Author:

chronos

Message:

• Added: Main menu with available actions.
• Added: Basic functionality to save project to file and open project from file.

Location:

trunk

Files:

• UBlockMap.pas (modified) (3 diffs)
• UDriveScan.pas (modified) (4 diffs)
• UFormMain.lfm (modified) (5 diffs)
• UFormMain.pas (modified) (6 diffs)
• UProject.pas (modified) (3 diffs)

trunk/UBlockMap.pas

@@ -6 +6 @@
 
 uses
-  Classes, SysUtils, Graphics, Math, Contnrs, Dialogs;
+  Classes, SysUtils, Graphics, Math, Contnrs, Dialogs, DOM, XMLRead, XMLWrite,
+  UXMLUtils;
 
 type
@@ -43 +44 @@
     constructor Create;
     destructor Destroy; override;
+    procedure SaveToNode(Node: TDOMNode);
+    procedure LoadFromNode(Node: TDOMNode);
     property BlockSize: TPoint read FBlockSize write SetBlockSize;
     property DrawSize: TPoint read FDrawSize write SetDrawSize;
@@ -321 +324 @@
 end;
 
+procedure TBlockMap.SaveToNode(Node: TDOMNode);
+var
+  NewNode: TDOMNode;
+  NewNode2: TDOMNode;
+  I: Integer;
+begin
+  WriteInteger(Node, 'SectorCount', SectorCount);
+
+  NewNode := Node.OwnerDocument.CreateElement('Changes');
+  Node.AppendChild(NewNode);
+  for I := 0 to FChanges.Count - 1 do begin
+    NewNode2 := NewNode.OwnerDocument.CreateElement('Change');
+    NewNode.AppendChild(NewNode2);
+    WriteInteger(NewNode2, 'Index', TChange(FChanges[I]).Index);
+    WriteInteger(NewNode2, 'Value', Integer(TChange(FChanges[I]).Value));
+  end;
+end;
+
+procedure TBlockMap.LoadFromNode(Node: TDOMNode);
+var
+  NewNode: TDOMNode;
+  NewNode2: TDOMNode;
+  NewChange: TChange;
+begin
+  SectorCount := ReadInteger(Node, 'SectorCount', 0);
+
+  NewNode := Node.FindNode('Changes');
+  if Assigned(NewNode) then begin
+    FChanges.Count := 0;
+    NewNode2 := NewNode.FirstChild;
+    while Assigned(NewNode2) and (NewNode2.NodeName = 'Change') do begin
+      NewChange := TChange.Create;
+      NewChange.Index := ReadInteger(NewNode2, 'Index', 0);
+      NewChange.Value := TSectorState(ReadInteger(NewNode2, 'Value', 0));
+      FChanges.Add(NewChange);
+      NewNode2 := NewNode2.NextSibling;
+    end;
+  end;
+end;
 
 end.

trunk/UDriveScan.pas

@@ -6 +6 @@
 
 uses
-  Classes, SysUtils, Syncobjs, UBlockMap, Forms, UConfig;
+  Classes, SysUtils, Syncobjs, UBlockMap, Forms, UConfig, DOM, XMLRead, XMLWrite,
+  UXMLUtils, Contnrs;
 
 type
@@ -47 +48 @@
     constructor Create;
     destructor Destroy; override;
+    procedure SaveToNode(Node: TDOMNode);
+    procedure LoadFromNode(Node: TDOMNode);
     property OnTerminate: TNotifyEvent read FOnTerminate write FOnTerminate;
     property OnChange: TNotifyEvent read FOnChange write FOnChange;
   end;
 
+  { TDriveScanList }
+
+  TDriveScanList = class(TObjectList)
+    procedure SaveToNode(Node: TDOMNode);
+    procedure LoadFromNode(Node: TDOMNode);
+  end;
+
 
 implementation
@@ -56 +66 @@
 resourcestring
   SUnknownRunMode = 'Unknown run mode';
+
+{ TDriveScanList }
+
+procedure TDriveScanList.SaveToNode(Node: TDOMNode);
+var
+  I: Integer;
+  NewNode2: TDOMNode;
+begin
+  for I := 0 to Count - 1 do
+  with TDriveScan(Items[I]) do begin
+    NewNode2 := Node.OwnerDocument.CreateElement('Scan');
+    Node.AppendChild(NewNode2);
+    SaveToNode(NewNode2);
+  end;
+end;
+
+procedure TDriveScanList.LoadFromNode(Node: TDOMNode);
+var
+  Node2: TDOMNode;
+  NewScan: TDriveScan;
+begin
+  Count := 0;
+  Node2 := Node.FirstChild;
+  while Assigned(Node2) and (Node2.NodeName = 'Scan') do begin
+    NewScan := TDriveScan.Create;
+    NewScan.LoadFromNode(Node2);
+    Add(NewScan);
+    Node2 := Node2.NextSibling;
+  end;
+end;
 
 
@@ -174 +214 @@
 end;
 
+procedure TDriveScan.SaveToNode(Node: TDOMNode);
+var
+  NewNode: TDOMNode;
+begin
+  with Node do begin
+    WriteInteger(Node, 'DamagedBlockCount', DamagedBlockCount);
+    WriteInteger(Node, 'WritePattern', WritePattern);
+    WriteString(Node, 'DriveName', Drive);
+
+    NewNode := OwnerDocument.CreateElement('SectorMap');
+    AppendChild(NewNode);
+    BlockMap.SaveToNode(NewNode);
+  end;
+end;
+
+procedure TDriveScan.LoadFromNode(Node: TDOMNode);
+var
+  NewNode: TDOMNode;
+begin
+  with Node do begin
+    DamagedBlockCount := ReadInteger(Node, 'DamagedBlockCount', 0);
+    WritePattern := ReadInteger(Node, 'WritePattern', 0);
+    Drive := ReadString(Node, 'DriveName', '');
+
+    NewNode := FindNode('SectorMap');
+    if Assigned(NewNode) then
+      BlockMap.LoadFromNode(NewNode);
+  end;
+end;
 
 end.

trunk/UFormMain.lfm

@@ -1 +1 @@
 object FormMain: TFormMain
-  Left = 301
+  Left = 442
   Height = 941
-  Top = 361
+  Top = 366
   Width = 1703
   Caption = 'CoolDisk'
-  ClientHeight = 939
+  ClientHeight = 909
   ClientWidth = 1703
   Menu = MainMenu1
@@ -36 +36 @@
   object Image1: TImage
     Left = 592
-    Height = 908
+    Height = 878
     Top = 10
     Width = 1092
@@ -248 +248 @@
     ParentColor = False
   end
-  object MainMenu1: TMainMenu
-    left = 323
-    top = 288
-  end
   object Timer1: TTimer
     Interval = 500
@@ -277 +273 @@
       OnExecute = ABrowseDiskExecute
     end
+    object AExit: TAction
+      Caption = 'Exit'
+      OnExecute = AExitExecute
+    end
+    object AFileSaveAs: TAction
+      Caption = 'Save as...'
+      OnExecute = AFileSaveAsExecute
+    end
+    object AFileOpen: TAction
+      Caption = 'Open'
+      OnExecute = AFileOpenExecute
+    end
   end
   object OpenDialog1: TOpenDialog
@@ -282 +290 @@
     top = 360
   end
+  object SaveDialog1: TSaveDialog
+    left = 672
+    top = 432
+  end
+  object MainMenu1: TMainMenu
+    left = 672
+    top = 504
+    object MenuItem1: TMenuItem
+      Caption = 'File'
+      object MenuItem2: TMenuItem
+        Action = AFileOpen
+      end
+      object MenuItem3: TMenuItem
+        Action = AFileSaveAs
+      end
+      object MenuItem4: TMenuItem
+        Action = AExit
+      end
+    end
+    object MenuItem5: TMenuItem
+      Caption = 'Scan'
+      object MenuItem6: TMenuItem
+        Action = AScanStart
+      end
+      object MenuItem7: TMenuItem
+        Action = AScanStop
+      end
+      object MenuItem8: TMenuItem
+        Action = AScanOptions
+      end
+    end
+  end
 end

trunk/UFormMain.pas

@@ -15 +15 @@
   TFormMain = class(TForm)
     ABrowseDisk: TAction;
+    AFileOpen: TAction;
+    AFileSaveAs: TAction;
+    AExit: TAction;
     AScanOptions: TAction;
     AScanStart: TAction;
@@ -48 +51 @@
     ListView1: TListView;
     MainMenu1: TMainMenu;
+    MenuItem1: TMenuItem;
+    MenuItem2: TMenuItem;
+    MenuItem3: TMenuItem;
+    MenuItem4: TMenuItem;
+    MenuItem5: TMenuItem;
+    MenuItem6: TMenuItem;
+    MenuItem7: TMenuItem;
+    MenuItem8: TMenuItem;
     OpenDialog1: TOpenDialog;
+    SaveDialog1: TSaveDialog;
     Timer1: TTimer;
     procedure ABrowseDiskExecute(Sender: TObject);
+    procedure AExitExecute(Sender: TObject);
+    procedure AFileOpenExecute(Sender: TObject);
+    procedure AFileSaveAsExecute(Sender: TObject);
     procedure AScanOptionsExecute(Sender: TObject);
     procedure AScanStartExecute(Sender: TObject);
@@ -102 +117 @@
 begin
   PrefixMultiplier := TPrefixMultiplier.Create;
-  DriveScan := TDriveScan.Create;
+  Project := TProject.Create;
+  Project.Scans.Add(TDriveScan.Create);
+  DriveScan := TDriveScan(Project.Scans[0]);
   DriveScan.OnChange := DriveScanChange;
   DriveScan.OnTerminate := DriveScanTerminate;
-  Project := TProject.Create;
   EditDrive.Text := '/dev/sdb';
 end;
@@ -137 +153 @@
 begin
   OpenDialog1.Title := 'Select drive for scan';
+  OpenDialog1.DefaultExt := '';
   OpenDialog1.FileName := EditDrive.Text;
   if OpenDialog1.Execute then
@@ -142 +159 @@
 end;
 
+procedure TFormMain.AExitExecute(Sender: TObject);
+begin
+  Close;
+end;
+
+procedure TFormMain.AFileOpenExecute(Sender: TObject);
+begin
+  OpenDialog1.Title := 'Open stored scan project';
+  OpenDialog1.DefaultExt := '.cdp';
+  if OpenDialog1.Execute then begin
+    Project.LoadFromFile(OpenDialog1.FileName);
+  end;
+end;
+
+procedure TFormMain.AFileSaveAsExecute(Sender: TObject);
+begin
+  SaveDialog1.Title := 'Save scan project';
+  SaveDialog1.DefaultExt := '.cdp';
+  if SaveDialog1.Execute then begin
+    Project.SaveToFile(SaveDialog1.FileName);
+  end;
+end;
+
 procedure TFormMain.FormClose(Sender: TObject; var CloseAction: TCloseAction);
 begin
@@ -150 +190 @@
   Timer1.Enabled := False;
   FreeAndNil(Project);
-  FreeAndNil(DriveScan);
   FreeAndNil(PrefixMultiplier);
 end;

trunk/UProject.pas

@@ -6 +6 @@
 
 uses
-  Classes, SysUtils;
+  Classes, SysUtils, Contnrs, DOM, XMLRead, XMLWrite, UXMLUtils, UDriveScan;
 
 type
@@ -20 +20 @@
     SectorCount: Integer;
     Modified: Boolean;
+    Scans: TDriveScanList;
     constructor Create;
+    destructor Destroy; override;
+    procedure LoadFromFile(FileName: string);
+    procedure SaveToFile(FileName: string);
   end;
 
+
 implementation
+
+resourcestring
+  SWrongFileFormat = 'Wrong file format';
+
 
 { TProject }
@@ -30 +39 @@
 begin
   SectorSize := 4096;
+  Scans := TDriveScanList.Create;
 end;
+
+destructor TProject.Destroy;
+begin
+  FreeAndNil(Scans);
+  inherited Destroy;
+end;
+
+procedure TProject.SaveToFile(FileName: string);
+var
+  NewNode: TDOMNode;
+  Doc: TXMLDocument;
+  RootNode: TDOMNode;
+begin
+  Self.FileName := FileName;
+  Doc := TXMLDocument.Create;
+  with Doc do try
+    RootNode := CreateElement('CoolDiskProject');
+    AppendChild(RootNode);
+    with RootNode do begin
+      WriteInteger(RootNode, 'SectorSize', SectorSize);
+
+      NewNode := OwnerDocument.CreateElement('Scans');
+      AppendChild(NewNode);
+      Scans.SaveToNode(NewNode);
+    end;
+    ForceDirectories(ExtractFileDir(FileName));
+    WriteXMLFile(Doc, FileName);
+  finally
+    Doc.Free;
+  end;
+end;
+
+procedure TProject.LoadFromFile(FileName: string);
+var
+  Doc: TXMLDocument;
+  RootNode: TDOMNode;
+  NewNode: TDOMNode;
+begin
+  Self.FileName := FileName;
+  ReadXMLFile(Doc, FileName);
+  with Doc do try
+    if Doc.DocumentElement.NodeName <> 'CoolDiskProject' then
+      raise Exception.Create(SWrongFileFormat);
+    RootNode := Doc.DocumentElement;
+    with RootNode do begin
+      SectorSize := ReadInteger(RootNode, 'SectorSize', 4096);
+
+      NewNode := FindNode('Scans');
+      if Assigned(NewNode) then
+        Scans.LoadFromNode(NewNode);
+    end;
+  finally
+    Doc.Free;
+  end;
+end;
+
 
 end.