Changeset 8156

Timestamp:

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

Author:

ascheibe

Message:

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

Location:

trunk/sources

Files:

• HeuristicLab.Clients.Hive.JobManager/3.3/Views/HiveResourceSelector.cs (modified) (2 diffs)
• HeuristicLab.Clients.Hive.JobManager/3.3/Views/RefreshableHiveJobView.cs (modified) (1 diff)
• HeuristicLab.Clients.Hive/3.3/HiveClient.cs (modified) (4 diffs)
• HeuristicLab.Clients.Hive/3.3/RefreshableJob.cs (modified) (5 diffs)
• HeuristicLab.MainForm.WindowsForms/3.3/Views/ProgressView.cs (modified) (4 diffs)
• HeuristicLab.MainForm/3.3/HeuristicLab.MainForm-3.3.csproj (modified) (1 diff)
• HeuristicLab.MainForm/3.3/Interfaces/IProgress.cs (modified) (1 diff)
• HeuristicLab.MainForm/3.3/Interfaces/IProgressReporter.cs (deleted)

trunk/sources/HeuristicLab.Clients.Hive.JobManager/3.3/Views/HiveResourceSelector.cs

@@ -69 +69 @@
       imageList.Images.Add(HeuristicLab.Common.Resources.VSImageLibrary.MonitorLarge);
       imageList.Images.Add(HeuristicLab.Common.Resources.VSImageLibrary.NetworkCenterLarge);
-      progressView = new ProgressView(this);
     }
 
@@ -78 +77 @@
         currentProgress = new Progress();
         currentProgress.Status = "Downloading resources. Please be patient.";
+        if (progressView == null) {
+          progressView = new ProgressView(this);
+        }
         progressView.Progress = currentProgress;
       }

trunk/sources/HeuristicLab.Clients.Hive.JobManager/3.3/Views/RefreshableHiveJobView.cs

@@ -464 +464 @@
         Invoke(new EventHandler(Content_IsProgressingChanged), sender, e);
       } else {
-        if (Content != null && Content.IsProgressing) {
+        if (Content != null && Content.Progress != null && Content.IsProgressing) {
           SetProgressView();
         } else {
-          FinishProgressView();
+          progressView.Progress = null;
         }
       }

trunk/sources/HeuristicLab.Clients.Hive/3.3/HiveClient.cs

@@ -258 +258 @@
     private void UploadJob(RefreshableJob refreshableJob, CancellationToken cancellationToken) {
       try {
+        refreshableJob.IsProgressing = true;
         refreshableJob.Progress = new Progress("Connecting to server...");
-        refreshableJob.IsProgressing = true;
-
         IEnumerable<string> resourceNames = ToResourceNameList(refreshableJob.Job.ResourceNames);
         var resourceIds = new List<Guid>();
@@ -316 +315 @@
       }
       finally {
+        refreshableJob.Progress.Finish();
         refreshableJob.IsProgressing = false;
       }
@@ -427 +427 @@
     public static void LoadJob(RefreshableJob refreshableJob) {
       var hiveExperiment = refreshableJob.Job;
+      refreshableJob.IsProgressing = true;
       refreshableJob.Progress = new Progress();
 
       try {
-        refreshableJob.IsProgressing = true;
         int totalJobCount = 0;
         IEnumerable<LightweightTask> allTasks;
@@ -471 +471 @@
       }
       finally {
+        refreshableJob.Progress.Finish();
         refreshableJob.IsProgressing = false;
       }

trunk/sources/HeuristicLab.Clients.Hive/3.3/RefreshableJob.cs

@@ -31 +31 @@
 
 namespace HeuristicLab.Clients.Hive {
-  public class RefreshableJob : IHiveItem, IDeepCloneable, IContent, IProgressReporter, IComparable<RefreshableJob> {
+  public class RefreshableJob : IHiveItem, IDeepCloneable, IContent, IComparable<RefreshableJob> {
     private JobResultPoller jobResultPoller;
     private ConcurrentTaskDownloader<ItemTask> jobDownloader;
     private static object locker = new object();
+
+    public bool IsProgressing { get; set; }
 
     private Job job;
@@ -165 +167 @@
     }
 
-    private bool isProgressing;
-    public bool IsProgressing {
-      get { return isProgressing; }
-      set {
-        if (isProgressing != value) {
-          isProgressing = value;
-          OnIsProgressingChanged();
-        }
-      }
-    }
-
     private IProgress progress;
     public IProgress Progress {
       get { return progress; }
-      set { this.progress = value; }
-    }
+      set {
+        this.progress = value;
+        OnIsProgressingChanged();
+      }
+    }
+
 
     private ThreadSafeLog log;
@@ -229 +224 @@
 
     #region JobResultPoller Events
-
     public void StartResultPolling() {
       if (jobResultPoller == null) {
@@ -410 +404 @@
     }
 
-    public event EventHandler IsProgressingChanged;
-    protected virtual void OnIsProgressingChanged() {
-      var handler = IsProgressingChanged;
-      if (handler != null) handler(this, EventArgs.Empty);
-    }
-
     public event EventHandler IsDownloadableChanged;
     private void OnIsDownloadableChanged() {
@@ -473 +461 @@
     protected virtual void OnTaskReceived() {
       var handler = TaskReceived;
+      if (handler != null) handler(this, EventArgs.Empty);
+    }
+    public event EventHandler IsProgressingChanged;
+    private void OnIsProgressingChanged() {
+      var handler = IsProgressingChanged;
       if (handler != null) handler(this, EventArgs.Empty);
     }

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;
+        }
       }
     }

trunk/sources/HeuristicLab.MainForm/3.3/HeuristicLab.MainForm-3.3.csproj

@@ -117 +117 @@
     <Compile Include="Interfaces\IConfigureableView.cs" />
     <Compile Include="Interfaces\IProgress.cs" />
-    <Compile Include="Interfaces\IProgressReporter.cs" />
     <Compile Include="Plugin.cs" />
     <Compile Include="Progress.cs" />

trunk/sources/HeuristicLab.MainForm/3.3/Interfaces/IProgress.cs

@@ -30 +30 @@
     void SignalSuccessfulCancelation();
 
+    bool CancelRequested { get; set; }
+
     event EventHandler Finished;
     event EventHandler StatusChanged;
     event EventHandler ProgressValueChanged;
-
-    bool CancelRequested { get; set; }
     event EventHandler Canceled;
-
-
   }
 }