Changeset 7215 for branches/HeuristicLab.Hive.Azure/HeuristicLab.Clients.Hive.JobManager

Timestamp:

12/20/11 13:54:57 (13 years ago)

Author:

spimming

Message:

#1680:

• merged changes from trunk into branch

' removed pre-build event for multiple app.configs

Location:

branches/HeuristicLab.Hive.Azure

Files:

• . (modified) (2 props)
• HeuristicLab.Clients.Hive.JobManager/3.3/MenuItems/JobManagerMenuItem.cs (modified) (1 diff)
• HeuristicLab.Clients.Hive.JobManager/3.3/Views/HiveJobManagerView.Designer.cs (modified) (1 diff)
• HeuristicLab.Clients.Hive.JobManager/3.3/Views/HiveJobPermissionListView.cs (modified) (2 diffs)
• HeuristicLab.Clients.Hive.JobManager/3.3/Views/RefreshableHiveJobListView.cs (modified) (3 diffs)
• HeuristicLab.Clients.Hive.JobManager/3.3/Views/RefreshableHiveJobView.Designer.cs (modified) (9 diffs)
• HeuristicLab.Clients.Hive.JobManager/3.3/Views/RefreshableHiveJobView.cs (modified) (10 diffs)

branches/HeuristicLab.Hive.Azure

@@ -4 +4 @@
 *.suo
 *.vsp
+Doxygen
 Google.ProtocolBuffers-0.9.1.dll
 HeuristicLab 3.3.5.1.ReSharper.user
 HeuristicLab 3.3.6.0.ReSharper.user
 HeuristicLab.4.5.resharper.user
+HeuristicLab.ExtLibs.6.0.ReSharper.user
 HeuristicLab.resharper.user
 ProtoGen.exe
@@ -16 +18 @@
 bin
 protoc.exe
-HeuristicLab.ExtLibs.6.0.ReSharper.user
-Doxygen

@@ -4 +4 @@
 *.suo
 *.vsp
+Doxygen
 Google.ProtocolBuffers-0.9.1.dll
 HeuristicLab 3.3.5.1.ReSharper.user
 HeuristicLab 3.3.6.0.ReSharper.user
 HeuristicLab.4.5.resharper.user
+HeuristicLab.ExtLibs.6.0.ReSharper.user
 HeuristicLab.resharper.user
 ProtoGen.exe
@@ -16 +18 @@
 bin
 protoc.exe
-HeuristicLab.ExtLibs.6.0.ReSharper.user
-Doxygen

branches/HeuristicLab.Hive.Azure/HeuristicLab.Clients.Hive.JobManager/3.3/MenuItems/JobManagerMenuItem.cs

@@ -25 +25 @@
 
 namespace HeuristicLab.Optimizer.MenuItems {
-  public class ExperimentManagerMenuItem : HeuristicLab.MainForm.WindowsForms.MenuItem, IOptimizerUserInterfaceItemProvider {
+  public class JobManagerMenuItem : HeuristicLab.MainForm.WindowsForms.MenuItem, IOptimizerUserInterfaceItemProvider {
     public override string Name {
       get { return "&Job Manager"; }

branches/HeuristicLab.Hive.Azure/HeuristicLab.Clients.Hive.JobManager/3.3/Views/HiveJobManagerView.Designer.cs

@@ -79 +79 @@
       this.Controls.Add(this.refreshButton);
       this.Controls.Add(this.hiveExperimentListView);
-      this.Name = "HiveExperimentManagerView";
+      this.Name = "JobManagerView";
       this.Size = new System.Drawing.Size(735, 524);
       this.ResumeLayout(false);

branches/HeuristicLab.Hive.Azure/HeuristicLab.Clients.Hive.JobManager/3.3/Views/HiveJobPermissionListView.cs

@@ -22 +22 @@
 using System;
 using System.Windows.Forms;
+using HeuristicLab.Collections;
 using HeuristicLab.Core.Views;
 using HeuristicLab.MainForm;
@@ -44 +45 @@
       return new JobPermission() { JobId = this.hiveExperimentId };
     }
+
+    protected override void Content_ItemsRemoved(object sender, CollectionItemsChangedEventArgs<JobPermission> e) {
+      base.Content_ItemsRemoved(sender, e);
+      foreach (var item in e.Items) {
+        if (item.GrantedUserId != Guid.Empty) {
+          HiveClient.Delete(item);
+        }
+      }
+    }
   }
 }

branches/HeuristicLab.Hive.Azure/HeuristicLab.Clients.Hive.JobManager/3.3/Views/RefreshableHiveJobListView.cs

@@ -48 +48 @@
 
     protected override RefreshableJob CreateItem() {
-      return new RefreshableJob() { IsAllowedPrivileged = HiveClient.Instance.IsAllowedPrivileged };
+      var refreshableJob = new RefreshableJob() { IsAllowedPrivileged = HiveClient.Instance.IsAllowedPrivileged };
+      refreshableJob.Job.Name = "New Hive Job";
+      return refreshableJob;
     }
 
     protected override void removeButton_Click(object sender, EventArgs e) {
-      DialogResult result = MessageBox.Show("This action will permanently delete this job (also on the hive server). Continue?", "Delete Job", MessageBoxButtons.OKCancel, MessageBoxIcon.Question);
+      DialogResult result = MessageBox.Show("This action will permanently delete this job (also on the hive server). Continue?", "HeuristicLab Hive Job Manager", MessageBoxButtons.OKCancel, MessageBoxIcon.Question);
       if (result == DialogResult.OK) {
         base.removeButton_Click(sender, e);
@@ -59 +61 @@
 
     protected override void Content_ItemsAdded(object sender, Collections.CollectionItemsChangedEventArgs<RefreshableJob> e) {
-      base.Content_ItemsAdded(sender, e);
-      foreach (ColumnHeader c in this.itemsListView.Columns) {
-        c.AutoResize(ColumnHeaderAutoResizeStyle.ColumnContent);
+      if (InvokeRequired) {
+        Invoke(new CollectionItemsChangedEventHandler<RefreshableJob>(Content_ItemsAdded), sender, e);
+      } else {
+        base.Content_ItemsAdded(sender, e);
+        foreach (ColumnHeader c in this.itemsListView.Columns) {
+          c.AutoResize(ColumnHeaderAutoResizeStyle.ColumnContent);
+        }
+        foreach (var item in e.Items) {
+          item.ItemImageChanged += new EventHandler(item_ItemImageChanged);
+        }
+      }
+    }
+
+    void item_ItemImageChanged(object sender, EventArgs e) {
+      if (this.itemsListView.InvokeRequired) {
+        Invoke(new EventHandler(item_ItemImageChanged), sender, e);
+      } else {
+        RefreshableJob job = sender as RefreshableJob;
+        if (job != null) {
+          foreach (ListViewItem item in this.itemsListView.Items) {
+            if (item.Tag != null) {
+              RefreshableJob cur = item.Tag as RefreshableJob;
+              if (cur != null && cur == job) {
+                this.UpdateListViewItemImage(item);
+              }
+            }
+          }
+        }
       }
     }
 
     protected override void Content_ItemsRemoved(object sender, CollectionItemsChangedEventArgs<RefreshableJob> e) {
-      base.Content_ItemsRemoved(sender, e);
-      if (Content != null && Content.Count == 0) {
-        foreach (ColumnHeader c in this.itemsListView.Columns) {
-          c.AutoResize(ColumnHeaderAutoResizeStyle.HeaderSize);
+      if (InvokeRequired) {
+        Invoke(new CollectionItemsChangedEventHandler<RefreshableJob>(Content_ItemsRemoved), sender, e);
+      } else {
+        base.Content_ItemsRemoved(sender, e);
+        foreach (var item in e.Items) {
+          item.ItemImageChanged -= new EventHandler(item_ItemImageChanged);
+        }
+        if (Content != null && Content.Count == 0) {
+          foreach (ColumnHeader c in this.itemsListView.Columns) {
+            c.AutoResize(ColumnHeaderAutoResizeStyle.HeaderSize);
+          }
         }
       }
@@ -92 +126 @@
     }
 
+    //drag'n'drop is not supported
+    protected override void itemsListView_ItemDrag(object sender, ItemDragEventArgs e) { }
+    protected override void itemsListView_DragEnter(object sender, DragEventArgs e) { }
+    protected override void itemsListView_DragOver(object sender, DragEventArgs e) { }
+    protected override void itemsListView_DragDrop(object sender, DragEventArgs e) { }
+
     private ListViewGroup GetListViewGroup(string groupName) {
       foreach (ListViewGroup group in itemsListView.Groups) {

branches/HeuristicLab.Hive.Azure/HeuristicLab.Clients.Hive.JobManager/3.3/Views/RefreshableHiveJobView.Designer.cs

@@ -28 +28 @@
       this.tabControl = new System.Windows.Forms.TabControl();
       this.tasksTabPage = new System.Windows.Forms.TabPage();
-      this.jobsTreeView = new HeuristicLab.Clients.Hive.Views.ExperimentManager.HiveTaskItemTreeView();
+      this.jobsTreeView = new HeuristicLab.Clients.Hive.Views.HiveTaskItemTreeView();
       this.permissionTabPage = new System.Windows.Forms.TabPage();
       this.refreshPermissionsButton = new System.Windows.Forms.Button();
       this.hiveExperimentPermissionListView = new HeuristicLab.Clients.Hive.JobManager.Views.HiveJobPermissionListView();
       this.runsTabPage = new System.Windows.Forms.TabPage();
+      this.runCollectionViewHost = new HeuristicLab.MainForm.WindowsForms.ViewHost();
       this.stateTabPage = new System.Windows.Forms.TabPage();
       this.stateLogViewHost = new HeuristicLab.MainForm.WindowsForms.ViewHost();
@@ -58 +59 @@
       this.calculatingLabel = new System.Windows.Forms.Label();
       this.jobsLabel = new System.Windows.Forms.Label();
-      this.runCollectionViewHost = new HeuristicLab.MainForm.WindowsForms.ViewHost();
       this.tabControl.SuspendLayout();
       this.tasksTabPage.SuspendLayout();
@@ -107 +107 @@
       this.jobsTreeView.ReadOnly = false;
       this.jobsTreeView.Size = new System.Drawing.Size(704, 420);
-      this.jobsTreeView.TabIndex = 0;
+      this.jobsTreeView.TabIndex = 4;
       this.jobsTreeView.DragDrop += new System.Windows.Forms.DragEventHandler(this.jobsTreeView_DragDrop);
       this.jobsTreeView.DragEnter += new System.Windows.Forms.DragEventHandler(this.jobsTreeView_DragEnter);
@@ -159 +159 @@
       this.runsTabPage.Text = "Runs";
       this.runsTabPage.UseVisualStyleBackColor = true;
+      // 
+      // runCollectionViewHost
+      // 
+      this.runCollectionViewHost.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+                  | System.Windows.Forms.AnchorStyles.Left)
+                  | System.Windows.Forms.AnchorStyles.Right)));
+      this.runCollectionViewHost.Caption = "View";
+      this.runCollectionViewHost.Content = null;
+      this.runCollectionViewHost.Enabled = false;
+      this.runCollectionViewHost.Location = new System.Drawing.Point(3, 3);
+      this.runCollectionViewHost.Name = "runCollectionViewHost";
+      this.runCollectionViewHost.ReadOnly = false;
+      this.runCollectionViewHost.Size = new System.Drawing.Size(703, 420);
+      this.runCollectionViewHost.TabIndex = 2;
+      this.runCollectionViewHost.ViewsLabelVisible = true;
+      this.runCollectionViewHost.ViewType = null;
       // 
       // stateTabPage
@@ -294 +310 @@
       this.resourceNamesTextBox.Name = "resourceNamesTextBox";
       this.resourceNamesTextBox.Size = new System.Drawing.Size(415, 20);
-      this.resourceNamesTextBox.TabIndex = 14;
+      this.resourceNamesTextBox.TabIndex = 2;
       this.resourceNamesTextBox.Validated += new System.EventHandler(this.resourceNamesTextBox_Validated);
       // 
@@ -313 +329 @@
       this.nameTextBox.Name = "nameTextBox";
       this.nameTextBox.Size = new System.Drawing.Size(501, 20);
-      this.nameTextBox.TabIndex = 21;
+      this.nameTextBox.TabIndex = 1;
       this.nameTextBox.Validated += new System.EventHandler(this.nameTextBox_Validated);
       // 
@@ -334 +350 @@
       this.isPrivilegedCheckBox.Name = "isPrivilegedCheckBox";
       this.isPrivilegedCheckBox.Size = new System.Drawing.Size(72, 17);
-      this.isPrivilegedCheckBox.TabIndex = 26;
+      this.isPrivilegedCheckBox.TabIndex = 3;
       this.isPrivilegedCheckBox.Text = "Privileged";
       this.toolTip.SetToolTip(this.isPrivilegedCheckBox, "If checked, the task will be executed in a privileged sandbox on the slave.");
@@ -420 +436 @@
       this.jobsLabel.TabIndex = 0;
       this.jobsLabel.Text = "Waiting:";
-      // 
-      // runCollectionViewHost
-      // 
-      this.runCollectionViewHost.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
-                  | System.Windows.Forms.AnchorStyles.Left)
-                  | System.Windows.Forms.AnchorStyles.Right)));
-      this.runCollectionViewHost.Caption = "View";
-      this.runCollectionViewHost.Content = null;
-      this.runCollectionViewHost.Enabled = false;
-      this.runCollectionViewHost.Location = new System.Drawing.Point(3, 3);
-      this.runCollectionViewHost.Name = "runCollectionViewHost";
-      this.runCollectionViewHost.ReadOnly = false;
-      this.runCollectionViewHost.Size = new System.Drawing.Size(703, 420);
-      this.runCollectionViewHost.TabIndex = 2;
-      this.runCollectionViewHost.ViewsLabelVisible = true;
-      this.runCollectionViewHost.ViewType = null;
       // 
       // RefreshableHiveJobView
@@ -484 +484 @@
     private Core.Views.LogView logView;
     private System.Windows.Forms.TabPage tasksTabPage;
-    private HeuristicLab.Clients.Hive.Views.ExperimentManager.HiveTaskItemTreeView jobsTreeView;
+    private HeuristicLab.Clients.Hive.Views.HiveTaskItemTreeView jobsTreeView;
     private System.Windows.Forms.Label nameLabel;
     private System.Windows.Forms.TextBox nameTextBox;

branches/HeuristicLab.Hive.Azure/HeuristicLab.Clients.Hive.JobManager/3.3/Views/RefreshableHiveJobView.cs

@@ -24 +24 @@
 using System.Linq;
 using System.Threading;
+using System.Threading.Tasks;
 using System.Windows.Forms;
 using HeuristicLab.Clients.Hive.Views;
@@ -301 +302 @@
     }
     private void Content_ExceptionOccured(object sender, EventArgs<Exception> e) {
-      // don't show exception, it is logged anyway
+      throw e.Value;
     }
     private void Content_StateLogListChanged(object sender, EventArgs e) {
@@ -317 +318 @@
       }
     }
-
 
     private void UpdateStateLogList() {
@@ -334 +334 @@
     #region Control events
     private void startButton_Click(object sender, EventArgs e) {
-      HiveClient.StartJob((Exception ex) => ErrorHandling.ShowErrorDialog(this, "Start failed.", ex), Content, new CancellationToken());
-    }
+      if (nameTextBox.Text.Trim() == string.Empty) {
+        MessageBox.Show("Please enter a name for the job before uploading it!", "HeuristicLab Hive Job Manager", MessageBoxButtons.OK, MessageBoxIcon.Information);
+      } else if (Content.ExecutionState == ExecutionState.Paused) {
+        var task = System.Threading.Tasks.Task.Factory.StartNew(ResumeJobAsync, Content);
+        task.ContinueWith((t) => {
+          FinishProgressView();
+          MessageBox.Show("An error occured resuming the job. See the log for more information.", "HeuristicLab Hive Job Manager", MessageBoxButtons.OK, MessageBoxIcon.Error);
+          Content.Log.LogException(t.Exception);
+        }, TaskContinuationOptions.OnlyOnFaulted);
+      } else {
+        HiveClient.StartJob((Exception ex) => ErrorHandling.ShowErrorDialog(this, "Start failed.", ex), Content, new CancellationToken());
+      }
+    }
+
     private void pauseButton_Click(object sender, EventArgs e) {
-      HiveClient.PauseJob(Content);
-    }
+      var task = System.Threading.Tasks.Task.Factory.StartNew(PauseJobAsync, Content);
+      task.ContinueWith((t) => {
+        FinishProgressView();
+        MessageBox.Show("An error occured pausing the job. See the log for more information.", "HeuristicLab Hive Job Manager", MessageBoxButtons.OK, MessageBoxIcon.Error);
+        Content.Log.LogException(t.Exception);
+      }, TaskContinuationOptions.OnlyOnFaulted);
+    }
+
     private void stopButton_Click(object sender, EventArgs e) {
-      HiveClient.StopJob(Content);
+      var task = System.Threading.Tasks.Task.Factory.StartNew(StopJobAsync, Content);
+      task.ContinueWith((t) => {
+        FinishProgressView();
+        MessageBox.Show("An error occured stopping the job. See the log for more information.", "HeuristicLab Hive Job Manager", MessageBoxButtons.OK, MessageBoxIcon.Error);
+        Content.Log.LogException(t.Exception);
+      }, TaskContinuationOptions.OnlyOnFaulted);
     }
     private void resetButton_Click(object sender, EventArgs e) { }
+
+    private void PauseJobAsync(object job) {
+      IProgress prog = new Progress();
+      prog.Status = "Pausing job...";
+      SetProgressView(prog);
+      HiveClient.PauseJob((RefreshableJob)job);
+      FinishProgressView();
+    }
+
+    private void StopJobAsync(object job) {
+      IProgress prog = new Progress();
+      prog.Status = "Stopping job...";
+      SetProgressView(prog);
+      HiveClient.StopJob((RefreshableJob)job);
+      FinishProgressView();
+    }
+
+    private void ResumeJobAsync(object job) {
+      IProgress prog = new Progress();
+      prog.Status = "Resuming job...";
+      SetProgressView(prog);
+      HiveClient.ResumeJob((RefreshableJob)job);
+      FinishProgressView();
+    }
 
     private void nameTextBox_Validated(object sender, EventArgs e) {
@@ -375 +422 @@
 
     private void refreshPermissionsButton_Click(object sender, EventArgs e) {
-      hiveExperimentPermissionListView.Content = HiveClient.GetJobPermissions(this.Content.Job.Id);
-    }
-
-
+      if (this.Content.Job.Id == Guid.Empty) {
+        MessageBox.Show("You have to upload the Job first before you can share it.", "HeuristicLab Hive Job Manager", MessageBoxButtons.OK, MessageBoxIcon.Information);
+      } else {
+        hiveExperimentPermissionListView.Content = HiveClient.GetJobPermissions(this.Content.Job.Id);
+      }
+    }
     #endregion
 
@@ -386 +435 @@
         startButton.Enabled = pauseButton.Enabled = stopButton.Enabled = resetButton.Enabled = false;
       } else {
-        startButton.Enabled = Content.IsControllable && Content.HiveTasks != null && Content.HiveTasks.Count > 0 && Content.ExecutionState == ExecutionState.Prepared;
+        startButton.Enabled = Content.IsControllable && Content.HiveTasks != null && Content.HiveTasks.Count > 0 && (Content.ExecutionState == ExecutionState.Prepared || Content.ExecutionState == ExecutionState.Paused);
         pauseButton.Enabled = Content.IsControllable && Content.ExecutionState == ExecutionState.Started;
         stopButton.Enabled = Content.IsControllable && Content.ExecutionState == ExecutionState.Started;
@@ -408 +457 @@
 
     private void SetProgressView() {
-      if (progressView == null) {
-        progressView = new ProgressView(this, Content.Progress);
-      }
-      progressView.Progress = Content.Progress;
+      if (InvokeRequired) {
+        Invoke(new Action(SetProgressView));
+      } else {
+        if (progressView == null) {
+          progressView = new ProgressView(this, Content.Progress);
+        } else {
+          progressView.Progress = Content.Progress;
+        }
+      }
+    }
+
+    private void SetProgressView(IProgress progress) {
+      if (InvokeRequired) {
+        Invoke(new Action<IProgress>(SetProgressView), progress);
+      } else {
+        if (progressView == null) {
+          progressView = new ProgressView(this, progress);
+        } else {
+          progressView.Progress = progress;
+        }
+      }
     }
 
     private void FinishProgressView() {
-      if (progressView != null) {
-        progressView.Finish();
-        progressView = null;
-        SetEnabledStateOfControls();
+      if (InvokeRequired) {
+        Invoke(new Action(FinishProgressView));
+      } else {
+        if (progressView != null) {
+          progressView.Finish();
+          progressView = null;
+          SetEnabledStateOfControls();
+        }
       }
     }
@@ -432 +502 @@
       var obj = e.Data.GetData(Constants.DragDropDataFormat);
       if (obj is IOptimizer) {
-        if ((e.KeyState & 32) == 32) e.Effect = DragDropEffects.Link;  // ALT key
+        if (Content.Id != Guid.Empty) e.Effect = DragDropEffects.None;
+        else if ((e.KeyState & 32) == 32) e.Effect = DragDropEffects.Link;  // ALT key
         else if (e.AllowedEffect.HasFlag(DragDropEffects.Copy)) e.Effect = DragDropEffects.Copy;
       }
@@ -443 +514 @@
         var optimizer = obj as IOptimizer;
         if (optimizer != null) {
-          Content.HiveTasks.Add(new OptimizerHiveTask(e.Effect.HasFlag(DragDropEffects.Copy) ? (IOptimizer)optimizer.Clone() : optimizer));
+          IOptimizer newOptimizer = null;
+          if (e.Effect.HasFlag(DragDropEffects.Copy)) {
+            newOptimizer = (IOptimizer)optimizer.Clone();
+          } else {
+            newOptimizer = optimizer;
+          }
+          if (newOptimizer.ExecutionState != ExecutionState.Prepared) {
+            newOptimizer.Prepare();
+          }
+
+          Content.HiveTasks.Add(new OptimizerHiveTask(newOptimizer));
         }
       }
@@ -452 +533 @@
       if (tabControl.SelectedTab == permissionTabPage) {
         if (!Content.IsSharable) {
-          MessageBox.Show("Unable to load tab. You have insufficient access privileges.");
+          MessageBox.Show("Unable to load permissions. You have insufficient access privileges.", "HeuristicLab Hive Job Manager", MessageBoxButtons.OK, MessageBoxIcon.Information);
           tabControl.SelectedTab = tasksTabPage;
         }

@@ -4 +4 @@
 *.suo
 *.vsp
+Doxygen
 Google.ProtocolBuffers-0.9.1.dll
 HeuristicLab 3.3.5.1.ReSharper.user
 HeuristicLab 3.3.6.0.ReSharper.user
 HeuristicLab.4.5.resharper.user
+HeuristicLab.ExtLibs.6.0.ReSharper.user
 HeuristicLab.resharper.user
 ProtoGen.exe
@@ -16 +18 @@
 bin
 protoc.exe
-HeuristicLab.ExtLibs.6.0.ReSharper.user
-Doxygen