Changeset 368

Timestamp:

May 29, 2012, 7:46:31 AM (12 years ago)

Author:

chronos

Message:

• Modified: TJobProgressView is now TComponent descendant registred in component pallete group Samples. Component placed by user to form or datamodule replace original global variable JobProgressView. Usage of global variable wasn't proper object oriented approach.

Location:

Common

Files:

• Common.lpk (modified) (1 diff)
• Common.pas (modified) (1 diff)
• UJobProgressView.lfm (modified) (1 diff)
• UJobProgressView.pas (modified) (20 diffs)

Common/Common.lpk

@@ -74 +74 @@
       <Item13>
         <Filename Value="UJobProgressView.pas"/>
+        <HasRegisterProc Value="True"/>
         <UnitName Value="UJobProgressView"/>
       </Item13>

Common/Common.pas

@@ -17 +17 @@
 begin
   RegisterUnit('UDebugLog', @UDebugLog.Register);
+  RegisterUnit('UJobProgressView', @UJobProgressView.Register);
 end;
 

Common/UJobProgressView.lfm

@@ -1 @@
-object JobProgressView: TJobProgressView
+object FormJobProgressView: TFormJobProgressView
   Left = 466
   Height = 248

Common/UJobProgressView.pas

@@ -38 +38 @@
   end;
 
+  TFormJobProgressView = class;
   TJobProgressView = class;
   TJobThread = class;
   TJob = class;
 
-  TJobProgressViewMethod = procedure of object;
+  TJobProgressViewMethod = procedure(Job: TJob) of object;
 
   { TJob }
@@ -76 +77 @@
   end;
 
-  { TJobProgressView }
-
-  TJobProgressView = class(TForm)
+  { TFormJobProgressView }
+
+  TFormJobProgressView = class(TForm)
     ImageList1: TImageList;
     Label2: TLabel;
@@ -100 +101 @@
     procedure FormCreate(Sender: TObject);
     procedure FormCloseQuery(Sender: TObject; var CanClose: Boolean);
+  public
+    JobProgressView: TJobProgressView;
+  end;
+
+  { TJobProgressView }
+
+  TJobProgressView = class(TComponent)
   private
+    FAutoClose: Boolean;
     Finished: Boolean;
     FOnJobFinish: TJobProgressViewMethod;
+    FShowDelay: Integer;
     FTerminate: Boolean;
     FormList: TList;
+    TotalStartTime: TDateTime;
     Log: TStringList;
+    Form: TFormJobProgressView;
     procedure SetTerminate(const AValue: Boolean);
     procedure UpdateProgress;
@@ -112 +124 @@
     procedure UpdateHeight;
   public
-    TotalStartTime: TDateTime;
     Jobs: TObjectList; // TListObject<TJob>
     CurrentJob: TJob;
     CurrentJobIndex: Integer;
-    ShowDelay: Integer;
-    AutoClose: Boolean;
     constructor Create(TheOwner: TComponent); override;
     destructor Destroy; override;
@@ -127 +136 @@
     procedure TermSleep(Delay: Integer);
     property Terminate: Boolean read FTerminate write SetTerminate;
+  published
+    property ShowDelay: Integer read FShowDelay write FShowDelay;
+    property AutoClose: Boolean read FAutoClose write FAutoClose;
     property OnJobFinish: TJobProgressViewMethod read FOnJobFinish
       write FOnJobFinish;
   end;
 
-  var
-    JobProgressView: TJobProgressView;
+  //var
+  //  FormJobProgressView: TFormJobProgressView;
+
+procedure Register;
 
 resourcestring
@@ -159 +173 @@
     try
       //raise Exception.Create('Exception in job');
-      JobProgressView.CurrentJob.Method;
+      ProgressView.CurrentJob.Method(Job);
     except
       on E: Exception do begin
@@ -201 +215 @@
   Terminate := False;
 
-  BringToFront;
+  Form.BringToFront;
 
   Finished := False;
-  Caption := SPleaseWait;
+  Form.Caption := SPleaseWait;
   try
-    FormList := Screen.DisableForms(Self);
+    FormList := Screen.DisableForms(Form);
     Log.Clear;
-    MemoLog.Clear;
-
-    LabelEstimatedTimePart.Visible := False;
-    LabelEstimatedTimeTotal.Visible := False;
+    Form.MemoLog.Clear;
+
+    Form.LabelEstimatedTimePart.Visible := False;
+    Form.LabelEstimatedTimeTotal.Visible := False;
 
     CurrentJob := nil;
     if ShowDelay = 0 then begin
-      TimerUpdate.Interval := UpdateInterval;
-      TimerUpdate.Enabled := True;
-      TimerUpdateTimer(Self);
+      Form.TimerUpdate.Interval := UpdateInterval;
+      Form.TimerUpdate.Enabled := True;
+      Form.TimerUpdateTimer(Self);
     end else begin
-      TimerUpdate.Interval := ShowDelay;
-      TimerUpdate.Enabled := True;
+      Form.TimerUpdate.Interval := ShowDelay;
+      Form.TimerUpdate.Enabled := True;
     end;
 
     TotalStartTime := Now;
-    ProgressBarTotal.Position := 0;
-    ProgressBarTotal.Visible := False;
+    Form.ProgressBarTotal.Position := 0;
+    Form.ProgressBarTotal.Visible := False;
     //UpdateHeight;
 
@@ -234 +248 @@
       CurrentJob := TJob(Jobs[I]);
       StartTime := Now;
-      LabelEstimatedTimePart.Caption := Format(SEstimatedTime, ['']);
-      ProgressBarPart.Position := 0;
-      ProgressBarPart.Visible := False;
+      Form.LabelEstimatedTimePart.Caption := Format(SEstimatedTime, ['']);
+      Form.ProgressBarPart.Position := 0;
+      Form.ProgressBarPart.Visible := False;
       //Show;
       ReloadJobList;
@@ -242 +256 @@
       if NoThreaded then begin
         Thread := nil;
-        Method;
+        Method(CurrentJob);
       end else begin
         try
@@ -262 +276 @@
         end;
       end;
-      ProgressBarPart.Hide;
+      Form.ProgressBarPart.Hide;
       if Terminate then Break;
       EndTime := Now;
       Finished := True;
       if Assigned(FOnJobFinish) then
-        FOnJobFinish;
+        FOnJobFinish(CurrentJob);
       Inc(I);
     end;
   finally
     CurrentJob := nil;
-    TimerUpdate.Enabled := False;
+    Form.TimerUpdate.Enabled := False;
     Screen.EnableForms(FormList);
     //if Visible then Hide;
-    MemoLog.Lines.Assign(Log);
-    if (MemoLog.Lines.Count = 0) and AutoClose then begin
-      Hide;
+    Form.MemoLog.Lines.Assign(Log);
+    if (Form.MemoLog.Lines.Count = 0) and AutoClose then begin
+      Form.Hide;
     end;
     Clear;
-    Caption := SFinished;
+    Form.Caption := SFinished;
     //LabelEstimatedTimePart.Visible := False;
     Finished := True;
@@ -297 +311 @@
   PanelLogVisible: Boolean;
 begin
+  with Form do begin
   H := PanelOperationsTitle.Height;
   PanelOperationsVisible := Jobs.Count > 0;
@@ -324 +339 @@
     H := H + MemoLogHeight;
   if Height <> H then Height := H;
-end;
-
-procedure TJobProgressView.TimerUpdateTimer(Sender: TObject);
+  end;
+end;
+
+procedure TFormJobProgressView.TimerUpdateTimer(Sender: TObject);
 var
   ProgressBarPartVisible: Boolean;
   ProgressBarTotalVisible: Boolean;
 begin
-  UpdateProgress;
-  if Visible and (not ProgressBarPart.Visible) and Assigned(CurrentJob) and
-  (CurrentJob.Progress.Value > 0) then begin
+  JobProgressView.UpdateProgress;
+  if Visible and (not ProgressBarPart.Visible) and
+  Assigned(JobProgressView.CurrentJob) and
+  (JobProgressView.CurrentJob.Progress.Value > 0) then begin
     ProgressBarPartVisible := True;
     if ProgressBarPartVisible <> ProgressBarPart.Visible then
@@ -347 +364 @@
 end;
 
-procedure TJobProgressView.FormDestroy(Sender:TObject);
-begin
-end;
-
-procedure TJobProgressView.ListViewJobsData(Sender: TObject; Item: TListItem);
-begin
-  if (Item.Index >= 0) and (Item.Index < Jobs.Count) then
-  with TJob(Jobs[Item.Index]) do begin
+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
     Item.Caption := Title;
-    if Item.Index = CurrentJobIndex then Item.ImageIndex := 1
+    if Item.Index = JobProgressView.CurrentJobIndex then Item.ImageIndex := 1
       else if Finished then Item.ImageIndex := 0
       else Item.ImageIndex := 2;
-    Item.Data := Jobs[Item.Index];
-  end;
-end;
-
-procedure TJobProgressView.FormClose(Sender: TObject;
+    Item.Data := JobProgressView.Jobs[Item.Index];
+  end;
+end;
+
+procedure TFormJobProgressView.FormClose(Sender: TObject;
   var CloseAction: TCloseAction);
 begin
@@ -369 +386 @@
 end;
 
-procedure TJobProgressView.FormCreate(Sender: TObject);
+procedure TFormJobProgressView.FormCreate(Sender: TObject);
 begin
   Caption := SPleaseWait;
@@ -399 +416 @@
 end;
 
-procedure TJobProgressView.FormCloseQuery(Sender: TObject; var CanClose: Boolean);
-begin
-  CanClose := Finished;
-  Terminate := True;
+procedure TFormJobProgressView.FormCloseQuery(Sender: TObject; var CanClose: Boolean);
+begin
+  CanClose := JobProgressView.Finished;
+  JobProgressView.Terminate := True;
   Caption := SPleaseWait + STerminate;
 end;
@@ -427 +444 @@
 begin
   if Assigned(CurrentJob) then
-  with CurrentJob do begin
+  with CurrentJob, Form do begin
     // Part progress
     ProgressBarPart.Max := Progress.Max;
@@ -468 +485 @@
   UpdateHeight;
   // Workaround for not showing first line
-  ListViewJobs.Items.Count := Jobs.Count + 1;
-  ListViewJobs.Refresh;
-
-  if ListViewJobs.Items.Count <> Jobs.Count then
-    ListViewJobs.Items.Count := Jobs.Count;
-  ListViewJobs.Refresh;
+  Form.ListViewJobs.Items.Count := Jobs.Count + 1;
+  Form.ListViewJobs.Refresh;
+
+  if Form.ListViewJobs.Items.Count <> Jobs.Count then
+    Form.ListViewJobs.Items.Count := Jobs.Count;
+  Form.ListViewJobs.Refresh;
   //Application.ProcessMessages;
 end;
@@ -480 +497 @@
 begin
   inherited;
+  if not (csDesigning in ComponentState) then begin
+    Form := TFormJobProgressView.Create(Self);
+    Form.JobProgressView := Self;
+  end;
   Jobs := TObjectList.Create;
   Log := TStringList.Create;
@@ -501 +522 @@
 procedure TProgress.SetMax(const AValue: Integer);
 begin
-  FMax := AValue;
-  if FValue >= FMax then FValue := FMax;
+  try
+    FLock.Acquire;
+    FMax := AValue;
+    if FValue >= FMax then FValue := FMax;
+  finally
+    FLock.Release;
+  end;
 end;
 
@@ -509 +535 @@
   Change: Boolean;
 begin
-  if AValue < Max then begin
-    Change := AValue <> FValue;
-    FValue := AValue;
-    if Change and Assigned(FOnChange) then FOnChange(Self);
+  try
+    FLock.Acquire;
+    if AValue < Max then begin
+      Change := AValue <> FValue;
+      FValue := AValue;
+      if Change and Assigned(FOnChange) then
+      try
+        FLock.Release;
+        FOnChange(Self);
+      finally
+        FLock.Acquire;
+      end;
+    end;
+  finally
+    FLock.Release;
   end;
 end;