Changeset 9188

Timestamp:

01/24/13 17:20:07 (12 years ago)

Author:

ascheibe

Message:

#2005 implemented unloading of jobs

Location:

branches/UnloadJobs

Files:

• HeuristicLab.Clients.Hive.JobManager/3.3/Views/RefreshableHiveJobView.Designer.cs (modified) (6 diffs)
• HeuristicLab.Clients.Hive.JobManager/3.3/Views/RefreshableHiveJobView.cs (modified) (2 diffs)
• HeuristicLab.Clients.Hive.Views/3.3/TreeView/HiveTaskItemTreeView.cs (modified) (1 diff)
• HeuristicLab.Clients.Hive/3.3/RefreshableJob.cs (modified) (1 diff)

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

@@ -71 +71 @@
       this.refreshButton = new System.Windows.Forms.Button();
       this.isPrivilegedCheckBox = new System.Windows.Forms.CheckBox();
+      this.UnloadButton = new System.Windows.Forms.Button();
       this.refreshAutomaticallyCheckBox = new System.Windows.Forms.CheckBox();
       this.infoGroupBox = new System.Windows.Forms.GroupBox();
@@ -91 +92 @@
       // tabControl
       // 
+      this.tabControl.AllowDrop = true;
       this.tabControl.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
             | System.Windows.Forms.AnchorStyles.Left)
@@ -377 +379 @@
       this.isPrivilegedCheckBox.CheckedChanged += new System.EventHandler(this.isPrivilegedCheckBox_CheckChanged);
       // 
+      // UnloadButton
+      // 
+      this.UnloadButton.Image = HeuristicLab.Common.Resources.VSImageLibrary.Disconnect;
+      this.UnloadButton.Location = new System.Drawing.Point(30, 0);
+      this.UnloadButton.Name = "UnloadButton";
+      this.UnloadButton.Size = new System.Drawing.Size(24, 24);
+      this.UnloadButton.TabIndex = 27;
+      this.toolTip.SetToolTip(this.UnloadButton, "Unload Job");
+      this.UnloadButton.UseVisualStyleBackColor = true;
+      this.UnloadButton.Click += new System.EventHandler(this.UnloadButton_Click);
+      // 
       // refreshAutomaticallyCheckBox
       // 
       this.refreshAutomaticallyCheckBox.AutoSize = true;
-      this.refreshAutomaticallyCheckBox.Location = new System.Drawing.Point(30, 5);
+      this.refreshAutomaticallyCheckBox.Location = new System.Drawing.Point(70, 3);
       this.refreshAutomaticallyCheckBox.Name = "refreshAutomaticallyCheckBox";
       this.refreshAutomaticallyCheckBox.Size = new System.Drawing.Size(127, 17);
@@ -471 +484 @@
       // RefreshableHiveJobView
       // 
-      this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
+      this.Controls.Add(this.UnloadButton);
       this.Controls.Add(this.searchButton);
       this.Controls.Add(this.isPrivilegedCheckBox);
@@ -505 +518 @@
     #endregion
 
-    private System.Windows.Forms.TabControl tabControl;
     private System.Windows.Forms.Button startButton;
     private System.Windows.Forms.Button stopButton;
@@ -539 +551 @@
     private MainForm.WindowsForms.ViewHost runCollectionViewHost;
     private System.Windows.Forms.Button searchButton;
+    private MainForm.WindowsForms.DragOverTabControl tabControl;
+    private System.Windows.Forms.Button UnloadButton;
 
   }

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

@@ -187 +187 @@
         this.refreshButton.Enabled = Content.IsDownloadable && alreadyUploaded && !Content.IsProgressing;
         this.Locked = !Content.IsControllable || Content.ExecutionState == ExecutionState.Started || Content.IsProgressing;
+
+        this.UnloadButton.Enabled = Content.HiveTasks != null && Content.HiveTasks.Count > 0 && alreadyUploaded && !Content.IsProgressing;
       }
       SetEnabledStateOfExecutableButtons();
@@ -569 +571 @@
       }
     }
+
+    private void UnloadButton_Click(object sender, EventArgs e) {
+      Content.Unload();
+      runCollectionViewHost.Content = null;
+      stateLogViewHost.Content = null;
+      hiveExperimentPermissionListView.Content = null;
+      jobsTreeView.Content = null;
+
+      SetEnabledStateOfControls();
+    }
   }
 }

branches/UnloadJobs/HeuristicLab.Clients.Hive.Views/3.3/TreeView/HiveTaskItemTreeView.cs

@@ -35 +35 @@
       get { return (ItemCollection<HiveTask>)base.Content; }
       set { base.Content = value; }
-    }
-
-    protected override void OnContentChanged() {
-      if (Content == null) {
-        foreach (var t in Content) {
-          t.Dispose();
-        }
-      }
-      base.OnContentChanged();
     }
 

branches/UnloadJobs/HeuristicLab.Clients.Hive/3.3/RefreshableJob.cs

@@ -610 +610 @@
     }
 
+    public void Unload() {
+      // stop result polling
+      if (refreshAutomatically)
+        RefreshAutomatically = false;
+      DisposeTasks();
+      hiveTasks = new ItemCollection<HiveTask>();
+    }
+
     #region IDisposable Members
     public void Dispose() {