Changeset 5 for trunk/UFormMain.pas

Timestamp:

Mar 29, 2016, 11:01:28 PM (8 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.

File:

• trunk/UFormMain.pas (modified) (5 diffs)

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);