Changeset 8145 for trunk/sources/HeuristicLab.MainForm.WindowsForms/3.3

Timestamp:

06/28/12 12:00:51 (12 years ago)

Author:

ascheibe

Message:

#1762 implemented review comments:

• removed self disposing. The progress view now reacts if a progress is set and Finish() is now called on the progress object and not the view.
• Moved Cancel event from ProgressView to Progress
• throw ArgumentNullException if the parent view is null

File:

• trunk/sources/HeuristicLab.MainForm.WindowsForms/3.3/Views/ProgressView.cs (modified) (8 diffs)

trunk/sources/HeuristicLab.MainForm.WindowsForms/3.3/Views/ProgressView.cs

@@ -35 +35 @@
         progress = value;
         RegisterProgressEvents();
+        ShowProgress();
         OnProgressChanged();
       }
@@ -48 +49 @@
     }
 
-    /// <param name="parentView">This is the view which will be locked while progress is made.</param>
-    public ProgressView(ContentView parentView, IProgress progress) {
+    private void ShowProgress() {
+      this.Left = (parentView.ClientRectangle.Width / 2) - (this.Width / 2);
+      this.Top = (parentView.ClientRectangle.Height / 2) - (this.Height / 2);
+      this.Anchor = AnchorStyles.Left | AnchorStyles.Top;
+
+      LockBackground();
+
+      if (!parentView.Controls.Contains(this)) {
+        parentView.Controls.Add(this);
+      }
+
+      BringToFront();
+      Visible = true;
+    }
+
+    public ProgressView(ContentView parentView) {
       InitializeComponent();
-      Progress = progress;
       CancelEnabled = false;
 
       if (parentView != null) {
         this.parentView = parentView;
-        this.Left = (parentView.ClientRectangle.Width / 2) - (this.Width / 2);
-        this.Top = (parentView.ClientRectangle.Height / 2) - (this.Height / 2);
-        this.Anchor = AnchorStyles.Left | AnchorStyles.Top;
-
-        LockBackground();
-
-        parentView.Controls.Add(this);
-        BringToFront();
+      } else {
+        throw new ArgumentNullException("The parent view is null.");
       }
     }
@@ -72 +80 @@
       progress.StatusChanged += new EventHandler(progress_StatusChanged);
       progress.ProgressValueChanged += new EventHandler(progress_ProgressValueChanged);
+      progress.Canceled += new EventHandler(progress_Canceled);
     }
 
@@ -79 +88 @@
       progress.StatusChanged -= new EventHandler(progress_StatusChanged);
       progress.ProgressValueChanged -= new EventHandler(progress_ProgressValueChanged);
+      progress.Canceled -= new EventHandler(progress_Canceled);
     }
 
@@ -91 +101 @@
     private void progress_ProgressValueChanged(object sender, EventArgs e) {
       UpdateProgressValue();
+    }
+
+    void progress_Canceled(object sender, EventArgs e) {
+      Finish();
     }
 
@@ -128 +142 @@
     }
 
-    public void Finish() {
+    private void Finish() {
       if (InvokeRequired) {
         Invoke(new Action(Finish));
@@ -139 +153 @@
           c.Enabled = true;
         DeregisterProgressEvents();
-        Dispose();
+        progress = null;
+        this.Visible = false;
       }
     }
 
     private void cancelButton_Click(object sender, EventArgs e) {
-      OnCanceled();
-      Finish();
+      if (progress != null) {
+        progress.CancelRequested = true;
+        cancelButton.Enabled = false;
+      }
     }
 
@@ -160 +177 @@
       UpdateProgressValue();
     }
-
-    public event EventHandler Canceled;
-    protected virtual void OnCanceled() {
-      var handler = Canceled;
-      if (handler != null) Canceled(this, EventArgs.Empty);
-    }
   }
 }