Changeset 4423 for branches/3.3-Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Experiment.Views/3.3/ProgressView.cs

Timestamp:

09/17/10 10:26:55 (14 years ago)

Author:

cneumuel

Message:

• Refactored HL.Hive.Experiment. JobItems are not called HiveJobs and OptimizerJobs do not contain a hierarchy anymore.
• Dynamic generation of jobs on a slave are not reflected on the client user interface.
• Optimizer-Trees are now strictly synchronized with the HiveJob-Trees (also the ComputeInParallel property is taken into account when the Child HiveJobs are created)
• Improved the way a class can report progress and lock the UI (IProgressReporter, IProgress, Progress, ProgressView)
• Changes were made to the config-files, so that server and clients work with blade12.hpc.fh-hagenberg.at
• Lots of small changes and bugfixes

File:

• branches/3.3-Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Experiment.Views/3.3/ProgressView.cs (modified) (5 diffs)

branches/3.3-Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Experiment.Views/3.3/ProgressView.cs

@@ -12 +12 @@
 namespace HeuristicLab.Hive.Experiment.Views {
   public partial class ProgressView : HeuristicLab.MainForm.WindowsForms.View {
-    private ContentView parentView = null;
-    private bool simulateProgress = false;
+    private ContentView parentView;
+    private IProgress progress;
+    public IProgress Progress {
+      get {
+        return this.progress;
+      }
+      set {
+        if (this.progress != value) {
+          if (this.progress != null) {
+            DeregisterProgressEvents();
+          }
+          this.progress = value;
+          RegisterProgressEvents();
+          OnProgressChanged();
+        }
+      }
+    }
 
     public bool CancelEnabled {
@@ -28 +43 @@
     }
 
-    private string status;
-    public string Status {
-      get { return status; }
-      set {
-        if (InvokeRequired) {
-          Invoke(new Action<string>((s) => { Status = s;}), value);
-        } else {
-          status = value;
-          statusLabel.Text = status;
-        }
-        
-      }
-    }
-
-    public ProgressView(ContentView parentView)
-      : this(parentView, "", false, true) {
-    }
-
-    public ProgressView(ContentView parentView, string initialStatus)
-      : this(parentView, initialStatus, false, true) {
-    }
-
-    public ProgressView(ContentView parentView, string initialStatus, bool simulateProgress)
-      : this(parentView, initialStatus, simulateProgress, true) {
-    }
-
     /// <param name="parentView">This is the View which will be locked if lockParentView is true</param>
-    /// <param name="initialStatus">Status message</param>
-    /// <param name="simulateProgress">If true, the progress will be simulated by a timer which addes some progress every second</param>
-    /// <param name="lockParentView">if true parentView will be locked</param>
-    public ProgressView(ContentView parentView, string initialStatus, bool simulateProgress, bool lockParentView) {
+    public ProgressView(ContentView parentView, IProgress progress) {
       InitializeComponent();
       this.parentView = parentView;
+      this.Progress = progress;
+
       this.CancelEnabled = false;
-      this.Status = initialStatus;
-      this.simulateProgress = simulateProgress;
 
-      if (simulateProgress) {
-        Timer progressSimulator = new Timer();
-        progressSimulator.Interval = 2000;
-        progressSimulator.Tick += new EventHandler(progressSimulator_Tick);
-        progressSimulator.Start();
-      }
+      progressBar.Style = ProgressBarStyle.Marquee;
 
       this.Left = (parentView.ClientRectangle.Width / 2) - (this.Width / 2);
@@ -76 +57 @@
       this.Anchor = AnchorStyles.Left | AnchorStyles.Top;
 
-      if (lockParentView)
-        LockBackground();
+      LockBackground();
 
       parentView.Controls.Add(this);
@@ -83 +63 @@
     }
 
-    private void progressSimulator_Tick(object sender, EventArgs e) {
-      progressBar.Value = Math.Min(progressBar.Value + (progressBar.Maximum - progressBar.Value) / 10 + 1, progressBar.Maximum - 1);
+    private void RegisterProgressEvents() {
+      progress.Finished += new EventHandler(progress_Finished);
+      progress.StatusChanged += new EventHandler(progress_StatusChanged);
+      progress.ProgressValueChanged += new EventHandler(progress_ProgressChanged);
+    }
+
+    private void DeregisterProgressEvents() {
+      progress.Finished -= new EventHandler(progress_Finished);
+      progress.StatusChanged -= new EventHandler(progress_StatusChanged);
+      progress.ProgressValueChanged -= new EventHandler(progress_ProgressChanged);
+    }
+
+    void progress_Finished(object sender, EventArgs e) {
+      Finish();
+    }
+
+    void progress_ProgressChanged(object sender, EventArgs e) {
+      if (InvokeRequired) {
+        Invoke(new EventHandler(progress_ProgressChanged), sender, e);
+      } else {
+        progressBar.Style = ProgressBarStyle.Blocks;
+        this.progressBar.Value = Math.Min(this.progressBar.Maximum, (int)(progress.ProgressValue * progressBar.Maximum));
+      }
+    }
+
+    void progress_StatusChanged(object sender, EventArgs e) {
+      if (InvokeRequired) {
+        Invoke(new EventHandler(progress_StatusChanged), sender, e);
+      } else {
+        statusLabel.Text = progress.Status;
+      }
     }
 
     private void LockBackground() {
-      this.parentView.Locked = true;
-      foreach (Control c in this.parentView.Controls) {
-        c.Enabled = false;
-      }
-      this.Enabled = true;
-      this.ReadOnly = false;
-    }
-
-    public void SetProgress(double progress) {
       if (InvokeRequired) {
-        Invoke(new Action<double>(SetProgress), progress);
+        Invoke(new Action(LockBackground));
       } else {
-        this.progressBar.Value = Math.Max(this.progressBar.Value, (int)(progress * progressBar.Maximum));
+        this.parentView.Locked = true;
+        foreach (Control c in this.parentView.Controls) {
+          c.Enabled = false;
+        }
+        this.Enabled = true;
+        this.ReadOnly = false;
       }
     }
@@ -122 +127 @@
     }
 
+    private void OnProgressChanged() {
+      progress_StatusChanged(this, EventArgs.Empty);
+      progress_ProgressChanged(this, EventArgs.Empty);
+    }
+
     public event EventHandler Canceled;
     protected virtual void OnCanceled() {