Changeset 8156 for trunk/sources/HeuristicLab.MainForm.WindowsForms

Timestamp:

06/28/12 18:49:22 (12 years ago)

Author:

ascheibe

Message:

#1762 Removed IProgressReporter and changed the Hive Job Manager accordingly.

File:

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

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

@@ -32 +32 @@
       set {
         if (progress == value) return;
-        DeregisterProgressEvents();
+        Finish();
         progress = value;
         RegisterProgressEvents();
@@ -50 +50 @@
 
     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;
+      if (progress != null) {
+        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();
+        LockBackground();
 
-      if (!parentView.Controls.Contains(this)) {
-        parentView.Controls.Add(this);
+        if (!parentView.Controls.Contains(this)) {
+          parentView.Controls.Add(this);
+        }
+
+        BringToFront();
+        Visible = true;
       }
-
-      BringToFront();
-      Visible = true;
     }
 
@@ -123 +125 @@
       if (InvokeRequired) Invoke((Action)UpdateProgressValue);
       else {
-        double progressValue = progress.ProgressValue;
-        if (progressValue < progressBar.Minimum || progressValue > progressBar.Maximum) {
-          progressBar.Style = ProgressBarStyle.Marquee;
-          progressBar.Value = progressBar.Minimum;
-        } else {
-          progressBar.Style = ProgressBarStyle.Blocks;
-          progressBar.Value = (int)Math.Round(progressBar.Minimum + progressValue * (progressBar.Maximum - progressBar.Minimum));
+        if (progress != null) {
+          double progressValue = progress.ProgressValue;
+          if (progressValue < progressBar.Minimum || progressValue > progressBar.Maximum) {
+            progressBar.Style = ProgressBarStyle.Marquee;
+            progressBar.Value = progressBar.Minimum;
+          } else {
+            progressBar.Style = ProgressBarStyle.Blocks;
+            progressBar.Value = (int)Math.Round(progressBar.Minimum + progressValue * (progressBar.Maximum - progressBar.Minimum));
+          }
         }
       }
@@ -137 +141 @@
       if (InvokeRequired) Invoke((Action)UpdateProgressStatus);
       else {
-        string status = progress.Status;
-        statusLabel.Text = progress.Status;
+        if (progress != null) {
+          string status = progress.Status;
+          statusLabel.Text = progress.Status;
+        }
       }
     }