Changeset 5 for trunk

Timestamp:

Mar 29, 2016, 11:01:28 PM (9 years ago)

Author:

chronos

Message:

• Modified: TScanThread is now internal part of TDriveScan class.
• Fixed: Now scan can be stopped and rerun again in runtime.

Location:

trunk

Files:

• UDriveScan.pas (modified) (7 diffs)
• UFormMain.pas (modified) (5 diffs)

trunk/UDriveScan.pas

@@ -9 +9 @@
 
 type
+  TDriveScan = class;
+
   TRunMode = (rmRead, rmWrite);
+
+  { TScanThread }
+
+  TScanThread = class(TThread)
+    Scan: TDriveScan;
+    procedure Execute; override;
+  end;
 
   { TDriveScan }
@@ -17 +26 @@
     FOnChange: TNotifyEvent;
     FOnTerminate: TNotifyEvent;
+    ScanThread: TScanThread;
     procedure DoChange;
     procedure DoTerminate;
+    procedure Run;
   public
     Lock: TCriticalSection;
@@ -32 +43 @@
     WritePattern: Byte;
     function GetElapsedTime: TDateTime;
-    procedure Run;
+    procedure Start;
+    procedure Stop;
     constructor Create;
     destructor Destroy; override;
@@ -39 +51 @@
   end;
 
-  { TScanThread }
-
-  TScanThread = class(TThread)
-    Form: TForm;
-    procedure Execute; override;
-  end;
-
 
 implementation
 
-uses
-  UFormMain;
 
 { TScanThread }
@@ -56 +59 @@
 procedure TScanThread.Execute;
 begin
-  TFormMain(Form).DriveScan.Run;
+  Scan.Run;
 end;
 
@@ -75 +78 @@
   if TimeEnd <> 0 then Result := TimeEnd - TimeStart
     else Result := Now - TimeStart;
+end;
+
+procedure TDriveScan.Start;
+begin
+  ScanThread := TScanThread.Create(True);
+  ScanThread.Scan := Self;
+  ScanThread.Start;
 end;
 
@@ -132 +142 @@
 end;
 
+procedure TDriveScan.Stop;
+begin
+  Terminated := True;
+  ScanThread.Terminate;
+  ScanThread.WaitFor;
+  FreeAndNil(ScanThread);
+end;
+
 constructor TDriveScan.Create;
 begin

trunk/UFormMain.pas

@@ -63 +63 @@
     PrefixMultiplier: TPrefixMultiplier;
     LastBlockPos: Integer;
-    ScanThread: TScanThread;
     RedrawPending: Boolean;
     procedure DriveScanChange(Sender: TObject);
@@ -106 +105 @@
   DriveScan.OnChange := DriveScanChange;
   DriveScan.OnTerminate := DriveScanTerminate;
-  ScanThread := TScanThread.Create(True);
-  ScanThread.Form := Self;
   Project := TProject.Create;
   EditDrive.Text := '/dev/sdb';
@@ -114 +111 @@
 procedure TFormMain.AScanStopExecute(Sender: TObject);
 begin
-  DriveScan.Terminated := True;
-  ScanThread.Terminate;
-  ScanThread.WaitFor;
+  DriveScan.Stop;
   UpdateInterface;
 end;
@@ -128 +123 @@
   DriveScan.Mode := TRunMode(ComboBoxRunMode.ItemIndex);
   DriveScan.WritePattern := StrToInt(EditPattern.Text);
-  ScanThread.Start;
+  DriveScan.Start;
   UpdateInterface;
 end;
@@ -156 +151 @@
 begin
   FreeAndNil(Project);
-  FreeAndNil(ScanThread);
   FreeAndNil(DriveScan);
   FreeAndNil(PrefixMultiplier);