Changeset 18

Timestamp:

Apr 2, 2016, 9:15:35 PM (9 years ago)

Author:

chronos

Message:

• Added: Mark written sectors with write flag and blue color.

Location:

trunk

Files:

• Form/UFormMain.pas (modified) (2 diffs)
• UBlockMap.pas (modified) (3 diffs)
• UDriveScan.pas (modified) (1 diff)

trunk/Form/UFormMain.pas

@@ -197 +197 @@
   Selected: Boolean);
 begin
-  Core.Project.CurrentScan := TDriveScan(Item.Data);
-  Redraw;
-  ReloadOperationList;
+  if Selected then begin
+    Core.Project.CurrentScan := TDriveScan(Item.Data);
+    Redraw;
+    ReloadOperationList;
+  end;
 end;
 
@@ -243 +245 @@
   with Core.Project do begin
     CurrentScan.DriveName := DriveInfo.Path;
+    CurrentScan.SectorCount := DriveInfo.SectorCount;
     CurrentScan.SectorSize := DriveInfo.SectorSize;
     CurrentScan.Reset;

trunk/UBlockMap.pas

@@ -6 +6 @@
 
 uses
-  Classes, SysUtils, Graphics, Math, Contnrs, Dialogs, DOM, XMLRead, XMLWrite,
-  UXMLUtils;
+  Classes, SysUtils, Graphics, Math, Contnrs, Dialogs, DOM, UXMLUtils;
 
 type
-  TSectorState = (bsNone, bsOk, bsDamaged);
+  TSectorState = (bsNone, bsRead, bsDamaged, bsWrite);
 
   TChange = class
@@ -270 +269 @@
     while (ChangeIndex < FChanges.Count) and
      (TChange(FChanges[ChangeIndex]).Index <= EndIndex) do begin
-      if (Result = bsNone) and (TChange(FChanges[ChangeIndex]).Value = bsOk) then Result := bsOk
+      if (Result <> bsDamaged) and (TChange(FChanges[ChangeIndex]).Value = bsRead) then Result := bsRead
+        else if (Result <> bsDamaged) and (TChange(FChanges[ChangeIndex]).Value = bsWrite) then Result := bsWrite
         else if TChange(FChanges[ChangeIndex]).Value = bsDamaged then Result := bsDamaged;
       Inc(ChangeIndex);
@@ -296 +296 @@
         (I div ItemsCount.X) * BlockSize.Y, BlockSize.X - 1, BlockSize.Y - 1);
       BlockState := GetCombinedSectors(I * SectorPerBlock, (I + 1) * SectorPerBlock);
-      if BlockState = bsOk then Canvas.Brush.Color := clGreen
+      if BlockState = bsRead then Canvas.Brush.Color := clGreen
         else if BlockState = bsDamaged then Canvas.Brush.Color := clRed
+        else if BlockState = bsWrite then Canvas.Brush.Color := clBlue
         else Canvas.Brush.Color := clSilver;
       Canvas.FillRect(Rect);

trunk/UDriveScan.pas

@@ -212 +212 @@
           BlockMap.Sectors[FSectorCurrent] := bsDamaged;
           Inc(DamagedBlockCount);
-        end else BlockMap.Sectors[FSectorCurrent] := bsOk;
+        end else begin
+          if Mode = rmRead then BlockMap.Sectors[FSectorCurrent] := bsRead
+            else if Mode = rmWrite then BlockMap.Sectors[FSectorCurrent] := bsWrite;
+        end;
         Inc(FSectorCurrent);
         if Terminated then Break;