Changeset 85 for trunk/Packages/Common/JobProgressView.pas

Timestamp:

Jun 7, 2024, 11:59:43 AM (5 months ago)

Author:

chronos

Message:

• Modified: Updated Common package.

File:

• trunk/Packages/Common/JobProgressView.pas (moved) (moved from trunk/Packages/Common/UJobProgressView.pas ) (14 diffs)

trunk/Packages/Common/JobProgressView.pas

@@ -1 @@
-unit UJobProgressView;
-
-{$MODE Delphi}
+unit JobProgressView;
 
 interface
@@ -7 +5 @@
 uses
   SysUtils, Variants, Classes, Graphics, Controls, Forms, Syncobjs,
-  Dialogs, ComCtrls, StdCtrls, ExtCtrls, Contnrs, UThreading, Math,
+  Dialogs, ComCtrls, StdCtrls, ExtCtrls, Generics.Collections, Threading, Math,
   DateUtils;
 
@@ -71 +69 @@
   end;
 
-  TJobs = class(TObjectList)
+  TJobs = class(TObjectList<TJob>)
   end;
 
@@ -105 +103 @@
     procedure ReloadJobList;
     procedure FormClose(Sender: TObject; var CloseAction: TCloseAction);
-    procedure FormDestroy(Sender: TObject);
     procedure ListViewJobsData(Sender: TObject; Item: TListItem);
     procedure TimerUpdateTimer(Sender: TObject);
@@ -157 +154 @@
   end;
 
-  //var
-  //  FormJobProgressView: TFormJobProgressView;
-
 procedure Register;
 
 resourcestring
   SExecuted = 'Executed';
+
 
 implementation
@@ -187 +182 @@
   try
     try
-      //raise Exception.Create('Exception in job');
       ProgressView.CurrentJob.Method(Job);
     except
@@ -286 +280 @@
 end;
 
-procedure TFormJobProgressView.FormDestroy(Sender:TObject);
-begin
-end;
-
 procedure TFormJobProgressView.ListViewJobsData(Sender: TObject; Item: TListItem);
 begin
   if (Item.Index >= 0) and (Item.Index < JobProgressView.Jobs.Count) then
-  with TJob(JobProgressView.Jobs[Item.Index]) do begin
+  with JobProgressView.Jobs[Item.Index] do begin
     Item.Caption := Title;
     if Item.Index = JobProgressView.CurrentJobIndex then Item.ImageIndex := 1
@@ -405 +395 @@
     I := 0;
     while I < Jobs.Count do
-    with TJob(Jobs[I]) do begin
+    with Jobs[I] do begin
       CurrentJobIndex := I;
-      CurrentJob := TJob(Jobs[I]);
+      CurrentJob := Jobs[I];
       JobProgressChange(Self);
       StartTime := Now;
@@ -420 +410 @@
         Method(CurrentJob);
       end else begin
+        Thread := TJobThread.Create(True);
         try
-          Thread := TJobThread.Create(True);
           with Thread do begin
             FreeOnTerminate := False;
@@ -494 +484 @@
   if AValue = FTerminate then Exit;
   for I := 0 to Jobs.Count - 1 do
-    TJob(Jobs[I]).Terminate := AValue;
+    Jobs[I].Terminate := AValue;
   FTerminate := AValue;
 end;
@@ -620 +610 @@
 procedure TProgress.Increment;
 begin
-  try
-    FLock.Acquire;
+  FLock.Acquire;
+  try
     Value := Value + 1;
   finally
@@ -630 +620 @@
 procedure TProgress.Reset;
 begin
-  try
-    FLock.Acquire;
+  FLock.Acquire;
+  try
     FValue := 0;
   finally
@@ -647 +637 @@
 begin
   FLock.Free;
-  inherited Destroy;
+  inherited;
 end;
 
@@ -678 +668 @@
 destructor TJob.Destroy;
 begin
-  Progress.Free;
+  FreeAndNil(Progress);
   inherited;
 end;