Changeset 6479 for branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.ExperimentManager

Timestamp:

06/27/11 15:20:23 (13 years ago)

Author:

cneumuel

Message:

#1233

• finished experiment sharing
• added role for executing privileged jobs
• refreshing experiments in experimentManager does not delete already downloaded jobs
• moved some properties from HiveExperiment into RefreshableHiveExperiment

Location:

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.ExperimentManager/3.4

Files:

• MenuItems/ExperimentManagerMenuItem.cs (modified) (1 diff)
• Views/HiveExperimentPermissionView.Designer.cs (modified) (3 diffs)
• Views/HiveExperimentPermissionView.cs (modified) (2 diffs)
• Views/RefreshableHiveExperimentListView.cs (modified) (3 diffs)
• Views/RefreshableHiveExperimentView.Designer.cs (modified) (6 diffs)
• Views/RefreshableHiveExperimentView.cs (modified) (15 diffs)

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.ExperimentManager/3.4/MenuItems/ExperimentManagerMenuItem.cs

@@ -27 +27 @@
   public class ExperimentManagerMenuItem : HeuristicLab.MainForm.WindowsForms.MenuItem, IOptimizerUserInterfaceItemProvider {
     public override string Name {
-      get { return "&Experiment Manager (dev)"; }
+      get { return "&Experiment Manager"; }
     }
     public override IEnumerable<string> Structure {

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.ExperimentManager/3.4/Views/HiveExperimentPermissionView.Designer.cs

@@ -61 +61 @@
       this.usernameTextBox.TabIndex = 3;
       this.usernameTextBox.Validated += new System.EventHandler(this.usernameTextBox_Validated);
+      this.usernameTextBox.Validating += new System.ComponentModel.CancelEventHandler(usernameTextBox_Validating);
       // 
       // permissionComboBox
@@ -73 +74 @@
       this.permissionComboBox.TabIndex = 4;
       this.permissionComboBox.Validated += new System.EventHandler(this.permissionComboBox_Validated);
+      this.permissionComboBox.Validating += new System.ComponentModel.CancelEventHandler(permissionComboBox_Validating);
       // 
       // HiveExperimentPermissionView
@@ -92 +94 @@
 
     }
-
     #endregion
 

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.ExperimentManager/3.4/Views/HiveExperimentPermissionView.cs

@@ -20 +20 @@
 #endregion
 
+using System.ComponentModel;
 using HeuristicLab.Clients.Hive.Views;
 using HeuristicLab.MainForm;
@@ -62 +63 @@
 
     #region Child Control Events
-    private void usernameTextBox_Validated(object sender, System.EventArgs e) {
+
+    private void usernameTextBox_Validating(object sender, CancelEventArgs e) {
       Content.GrantedUserName = usernameTextBox.Text;
     }
+    private void usernameTextBox_Validated(object sender, System.EventArgs e) {
+      
+    }
 
+    private void permissionComboBox_Validating(object sender, CancelEventArgs e) {
+      Content.Permission = (Permission)permissionComboBox.SelectedItem;
+    }
     private void permissionComboBox_Validated(object sender, System.EventArgs e) {
-      Content.Permission = (Permission)permissionComboBox.SelectedItem;
+      
     }
     #endregion

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.ExperimentManager/3.4/Views/RefreshableHiveExperimentListView.cs

@@ -39 +39 @@
       this.itemsListView.HeaderStyle = ColumnHeaderStyle.Clickable;
       this.itemsListView.FullRowSelect = true;
+      this.itemsListView.Sorting = SortOrder.Ascending;
+      this.itemsListView.Sort();
     }
 
     protected override RefreshableHiveExperiment CreateItem() {
-      return new RefreshableHiveExperiment();
+      return new RefreshableHiveExperiment() { IsAllowedPrivileged = HiveClient.Instance.IsAllowedPrivileged };
     }
 
@@ -52 +54 @@
     }
 
+    protected override void Content_ItemsAdded(object sender, Collections.CollectionItemsChangedEventArgs<RefreshableHiveExperiment> e) {
+      base.Content_ItemsAdded(sender, e);
+
+    }
+
     protected override ListViewItem CreateListViewItem(RefreshableHiveExperiment item) {
       ListViewItem listViewItem = base.CreateListViewItem(item);
@@ -59 +66 @@
       listViewItem.Group = GetListViewGroup(item.HiveExperiment.OwnerUsername);
       return listViewItem;
+    }
+
+    protected override void UpdateListViewItemText(ListViewItem listViewItem) {
+      if (listViewItem == null) throw new ArgumentNullException();
+      var item = listViewItem.Tag as RefreshableHiveExperiment;
+      listViewItem.SubItems[0].Text = item == null ? "null" : item.HiveExperiment.DateCreated.ToString("dd.MM.yyyy HH:mm");
+      listViewItem.SubItems[1].Text = item == null ? "null" : item.HiveExperiment.Name;
+      listViewItem.Group = GetListViewGroup(item.HiveExperiment.OwnerUsername);
+      listViewItem.ToolTipText = item == null ? string.Empty : item.ItemName + ": " + item.ItemDescription;
     }
 

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.ExperimentManager/3.4/Views/RefreshableHiveExperimentView.Designer.cs

@@ -55 +55 @@
       this.stateLogViewHost = new HeuristicLab.MainForm.WindowsForms.ViewHost();
       this.sharingTabPage = new System.Windows.Forms.TabPage();
+      this.refreshPermissionsButton = new System.Windows.Forms.Button();
       this.hiveExperimentPermissionListView = new HeuristicLab.Clients.Hive.ExperimentManager.Views.HiveExperimentPermissionListView();
       this.logTabPage = new System.Windows.Forms.TabPage();
@@ -79 +80 @@
       this.calculatingLabel = new System.Windows.Forms.Label();
       this.jobsLabel = new System.Windows.Forms.Label();
-      this.refreshPermissionsButton = new System.Windows.Forms.Button();
       this.tabControl.SuspendLayout();
       this.jobsTabPage.SuspendLayout();
@@ -102 +102 @@
       this.tabControl.Size = new System.Drawing.Size(717, 452);
       this.tabControl.TabIndex = 4;
+      this.tabControl.SelectedIndexChanged += new System.EventHandler(this.tabControl_SelectedIndexChanged);
       // 
       // jobsTabPage
@@ -165 +166 @@
       this.sharingTabPage.UseVisualStyleBackColor = true;
       // 
+      // refreshPermissionsButton
+      // 
+      this.refreshPermissionsButton.Image = ((System.Drawing.Image)(resources.GetObject("refreshPermissionsButton.Image")));
+      this.refreshPermissionsButton.Location = new System.Drawing.Point(3, 3);
+      this.refreshPermissionsButton.Name = "refreshPermissionsButton";
+      this.refreshPermissionsButton.Size = new System.Drawing.Size(24, 24);
+      this.refreshPermissionsButton.TabIndex = 23;
+      this.toolTip.SetToolTip(this.refreshPermissionsButton, "Refresh Data");
+      this.refreshPermissionsButton.UseVisualStyleBackColor = true;
+      this.refreshPermissionsButton.Click += new System.EventHandler(this.refreshPermissionsButton_Click);
+      // 
       // hiveExperimentPermissionListView
       // 
@@ -172 +184 @@
       this.hiveExperimentPermissionListView.Caption = "HiveExperimentPermissionList View";
       this.hiveExperimentPermissionListView.Content = null;
+      this.hiveExperimentPermissionListView.HiveExperimentId = new System.Guid("00000000-0000-0000-0000-000000000000");
       this.hiveExperimentPermissionListView.Location = new System.Drawing.Point(3, 33);
       this.hiveExperimentPermissionListView.Name = "hiveExperimentPermissionListView";
@@ -410 +423 @@
       this.jobsLabel.TabIndex = 0;
       this.jobsLabel.Text = "Jobs:";
-      // 
-      // refreshPermissionsButton
-      // 
-      this.refreshPermissionsButton.Image = ((System.Drawing.Image)(resources.GetObject("refreshPermissionsButton.Image")));
-      this.refreshPermissionsButton.Location = new System.Drawing.Point(3, 3);
-      this.refreshPermissionsButton.Name = "refreshPermissionsButton";
-      this.refreshPermissionsButton.Size = new System.Drawing.Size(24, 24);
-      this.refreshPermissionsButton.TabIndex = 23;
-      this.toolTip.SetToolTip(this.refreshPermissionsButton, "Refresh Data");
-      this.refreshPermissionsButton.UseVisualStyleBackColor = true;
-      this.refreshPermissionsButton.Click += new System.EventHandler(this.refreshPermissionsButton_Click);
       // 
       // RefreshableHiveExperimentView

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.ExperimentManager/3.4/Views/RefreshableHiveExperimentView.cs

@@ -63 +63 @@
       Content.ExceptionOccured += new EventHandler<EventArgs<Exception>>(Content_ExceptionOccured);
       Content.StateLogListChanged += new EventHandler(Content_StateLogListChanged);
+      Content.IsProgressingChanged += new EventHandler(Content_IsProgressingChanged);
+      Content.HiveJobsChanged += new EventHandler(Content_HiveJobChanged);
+      Content.ExecutionStateChanged += new EventHandler(Content_ExecutionStateChanged);
+      Content.ExecutionTimeChanged += new EventHandler(Content_ExecutionTimeChanged);
+      Content.IsAllowedPrivilegedChanged += new EventHandler(Content_IsAllowedPrivilegedChanged);
     }
 
@@ -72 +77 @@
       Content.ExceptionOccured -= new EventHandler<EventArgs<Exception>>(Content_ExceptionOccured);
       Content.StateLogListChanged -= new EventHandler(Content_StateLogListChanged);
+      Content.IsProgressingChanged -= new EventHandler(Content_IsProgressingChanged);
+      Content.HiveJobsChanged -= new EventHandler(Content_HiveJobChanged);
+      Content.ExecutionStateChanged -= new EventHandler(Content_ExecutionStateChanged);
+      Content.ExecutionTimeChanged -= new EventHandler(Content_ExecutionTimeChanged);
       base.DeregisterContentEvents();
     }
 
     private void RegisterHiveExperimentEvents() {
-      Content.HiveExperiment.ExecutionStateChanged += new EventHandler(Content_ExecutionStateChanged);
-      Content.HiveExperiment.ExecutionTimeChanged += new EventHandler(Content_ExecutionTimeChanged);
-      Content.HiveExperiment.HiveJobsChanged += new EventHandler(Content_HiveJobChanged);
-      Content.HiveExperiment.IsProgressingChanged += new EventHandler(Content_IsProgressingChanged);
       Content.HiveExperiment.PropertyChanged += new PropertyChangedEventHandler(HiveExperiment_PropertyChanged);
     }
     
     private void DeregisterHiveExperimentEvents() {
-      Content.HiveExperiment.ExecutionStateChanged -= new EventHandler(Content_ExecutionStateChanged);
-      Content.HiveExperiment.ExecutionTimeChanged -= new EventHandler(Content_ExecutionTimeChanged);
-      Content.HiveExperiment.HiveJobsChanged -= new EventHandler(Content_HiveJobChanged);
-      Content.HiveExperiment.IsProgressingChanged -= new EventHandler(Content_IsProgressingChanged);
       Content.HiveExperiment.PropertyChanged -= new PropertyChangedEventHandler(HiveExperiment_PropertyChanged);
     }
 
     private void RegisterHiveJobEvents() {
-      Content.HiveExperiment.HiveJobs.ItemsAdded += new CollectionItemsChangedEventHandler<HiveJob>(HiveJobs_ItemsAdded_Removed_Reset);
-      Content.HiveExperiment.HiveJobs.ItemsRemoved += new CollectionItemsChangedEventHandler<HiveJob>(HiveJobs_ItemsAdded_Removed_Reset);
-      Content.HiveExperiment.HiveJobs.CollectionReset += new CollectionItemsChangedEventHandler<HiveJob>(HiveJobs_ItemsAdded_Removed_Reset);
+      Content.HiveJobs.ItemsAdded += new CollectionItemsChangedEventHandler<HiveJob>(HiveJobs_ItemsAdded_Removed_Reset);
+      Content.HiveJobs.ItemsRemoved += new CollectionItemsChangedEventHandler<HiveJob>(HiveJobs_ItemsAdded_Removed_Reset);
+      Content.HiveJobs.CollectionReset += new CollectionItemsChangedEventHandler<HiveJob>(HiveJobs_ItemsAdded_Removed_Reset);
     }
     private void DeregisterHiveJobEvents() {
-      Content.HiveExperiment.HiveJobs.ItemsAdded -= new CollectionItemsChangedEventHandler<HiveJob>(HiveJobs_ItemsAdded_Removed_Reset);
-      Content.HiveExperiment.HiveJobs.ItemsRemoved -= new CollectionItemsChangedEventHandler<HiveJob>(HiveJobs_ItemsAdded_Removed_Reset);
-      Content.HiveExperiment.HiveJobs.CollectionReset -= new CollectionItemsChangedEventHandler<HiveJob>(HiveJobs_ItemsAdded_Removed_Reset);
+      Content.HiveJobs.ItemsAdded -= new CollectionItemsChangedEventHandler<HiveJob>(HiveJobs_ItemsAdded_Removed_Reset);
+      Content.HiveJobs.ItemsRemoved -= new CollectionItemsChangedEventHandler<HiveJob>(HiveJobs_ItemsAdded_Removed_Reset);
+      Content.HiveJobs.CollectionReset -= new CollectionItemsChangedEventHandler<HiveJob>(HiveJobs_ItemsAdded_Removed_Reset);
     }
 
@@ -114 +115 @@
       } else {
         nameTextBox.Text = Content.HiveExperiment.Name;
-        executionTimeTextBox.Text = Content.HiveExperiment.ExecutionTime.ToString();
+        executionTimeTextBox.Text = Content.ExecutionTime.ToString();
         resourceNamesTextBox.Text = Content.HiveExperiment.ResourceNames;
         isPrivilegedCheckBox.Checked = Content.HiveExperiment.IsPrivileged;
@@ -139 +140 @@
       if (Content != null) {
         bool alreadyUploaded = Content.Id != Guid.Empty;
-        bool jobsLoaded = Content.HiveExperiment.HiveJobs != null && Content.HiveExperiment.HiveJobs.All(x => x.Job.Id != Guid.Empty);
-
-        this.nameTextBox.ReadOnly = !Content.IsControllable || Content.HiveExperiment.ExecutionState != ExecutionState.Prepared || alreadyUploaded;
-        this.resourceNamesTextBox.ReadOnly = !Content.IsControllable || Content.HiveExperiment.ExecutionState != ExecutionState.Prepared || alreadyUploaded;
-        this.jobsTreeView.ReadOnly = !Content.IsControllable || Content.HiveExperiment.ExecutionState != ExecutionState.Prepared || alreadyUploaded;
-
-        this.isPrivilegedCheckBox.Enabled = Content.IsControllable && !(Content.HiveExperiment.ExecutionState != ExecutionState.Prepared || alreadyUploaded); // TODO: check if user has the rights to do this        
-        this.refreshAutomaticallyCheckBox.Enabled = Content.IsControllable && alreadyUploaded && jobsLoaded && Content.HiveExperiment.ExecutionState == ExecutionState.Started;
-        this.refreshButton.Enabled = Content.IsControllable && alreadyUploaded;
-        this.Locked = !Content.IsControllable || Content.HiveExperiment.ExecutionState == ExecutionState.Started;
-
+        bool jobsLoaded = Content.HiveJobs != null && Content.HiveJobs.All(x => x.Job.Id != Guid.Empty);
+
+        this.nameTextBox.ReadOnly = !Content.IsControllable || Content.ExecutionState != ExecutionState.Prepared || alreadyUploaded;
+        this.resourceNamesTextBox.ReadOnly = !Content.IsControllable || Content.ExecutionState != ExecutionState.Prepared || alreadyUploaded;
+        this.jobsTreeView.ReadOnly = !Content.IsControllable || Content.ExecutionState != ExecutionState.Prepared || alreadyUploaded;
+
+        this.isPrivilegedCheckBox.Enabled = Content.IsAllowedPrivileged && Content.IsControllable && !(Content.ExecutionState != ExecutionState.Prepared || alreadyUploaded); // TODO: check if user has the rights to do this        
+        this.refreshAutomaticallyCheckBox.Enabled = Content.IsControllable && alreadyUploaded && jobsLoaded && Content.ExecutionState == ExecutionState.Started;
+        this.refreshButton.Enabled = Content.IsDownloadable && alreadyUploaded;
+        this.Locked = !Content.IsControllable || Content.ExecutionState == ExecutionState.Started;
       }
       SetEnabledStateOfExecutableButtons();
+      tabControl_SelectedIndexChanged(this, EventArgs.Empty); // ensure sharing tabpage is disabled
     }
 
@@ -214 +215 @@
         Invoke(new EventHandler(Content_ExecutionTimeChanged), sender, e);
       else
-        executionTimeTextBox.Text = Content.HiveExperiment.ExecutionTime.ToString();
+        executionTimeTextBox.Text = Content.ExecutionTime.ToString();
     }
     private void Content_RefreshAutomaticallyChanged(object sender, EventArgs e) {
@@ -228 +229 @@
         Invoke(new EventHandler(Content_HiveJobChanged), sender, e);
       else {
-        if (Content != null && Content.HiveExperiment.HiveJobs != null) {
-          jobsTreeView.Content = Content.HiveExperiment.HiveJobs;
+        if (Content != null && Content.HiveJobs != null) {
+          jobsTreeView.Content = Content.HiveJobs;
           RegisterHiveJobEvents();
         } else {
@@ -263 +264 @@
     }
     private void Content_ExceptionOccured(object sender, EventArgs<Exception> e) {
-      if (Content.IsControllable) {
-        // show error dialog only if Controllable (otherwise it should continue trying without an error dialog (e.g. HiveEngine))
-        ErrorHandling.ShowErrorDialog(this, e.Value);
-      }
+      // don't show exception, it is logged anyway
     }
     private void Content_StateLogListChanged(object sender, EventArgs e) {
@@ -275 +273 @@
       }
     }
+    private void Content_IsAllowedPrivilegedChanged(object sender, EventArgs e) {
+      if (InvokeRequired)
+        Invoke(new EventHandler(Content_IsAllowedPrivilegedChanged), sender, e);
+      else {
+        SetEnabledStateOfControls();
+      }
+    }
+
 
     private void UpdateStateLogList() {
       if (Content != null && this.Content.HiveExperiment != null) {
-        stateLogViewHost.Content = this.Content.HiveExperiment.StateLogList;
+        stateLogViewHost.Content = this.Content.StateLogList;
       } else {
         stateLogViewHost.Content = null;
@@ -294 +300 @@
     }
     private void pauseButton_Click(object sender, EventArgs e) {
-      HiveClient.PauseExperiment(Content.HiveExperiment);
+      HiveClient.PauseExperiment(Content);
     }
     private void stopButton_Click(object sender, EventArgs e) {
-      HiveClient.StopExperiment(Content.HiveExperiment);
+      HiveClient.StopExperiment(Content);
     }
     private void resetButton_Click(object sender, EventArgs e) { }
@@ -320 +326 @@
 
     private void refreshButton_Click(object sender, EventArgs e) {
-      var invoker = new Action<HiveExperiment>(HiveClient.LoadExperiment);
-      invoker.BeginInvoke(Content.HiveExperiment, (ar) => {
+      var invoker = new Action<RefreshableHiveExperiment>(HiveClient.LoadExperiment);
+      invoker.BeginInvoke(Content, (ar) => {
         try {
           invoker.EndInvoke(ar);
@@ -343 +349 @@
         startButton.Enabled = pauseButton.Enabled = stopButton.Enabled = resetButton.Enabled = false;
       } else {
-        startButton.Enabled = Content.IsControllable && Content.HiveExperiment.HiveJobs != null && Content.HiveExperiment.HiveJobs.Count > 0 && Content.HiveExperiment.ExecutionState == ExecutionState.Prepared;
-        pauseButton.Enabled = Content.IsControllable && Content.HiveExperiment.ExecutionState == ExecutionState.Started;
-        stopButton.Enabled = Content.IsControllable && Content.HiveExperiment.ExecutionState == ExecutionState.Started;
+        startButton.Enabled = Content.IsControllable && Content.HiveJobs != null && Content.HiveJobs.Count > 0 && Content.ExecutionState == ExecutionState.Prepared;
+        pauseButton.Enabled = Content.IsControllable && Content.ExecutionState == ExecutionState.Started;
+        stopButton.Enabled = Content.IsControllable && Content.ExecutionState == ExecutionState.Started;
         resetButton.Enabled = false;
       }
@@ -356 +362 @@
         Invoke(new EventHandler(Content_IsProgressingChanged), sender, e);
       } else {
-        if (Content != null && Content.HiveExperiment.IsProgressing) {
+        if (Content != null && Content.IsProgressing) {
           SetProgressView();
         } else {
@@ -366 +372 @@
     private void SetProgressView() {
       if (progressView == null) {
-        progressView = new ProgressView(this, Content.HiveExperiment.Progress);
-      }
-      progressView.Progress = Content.HiveExperiment.Progress;
+        progressView = new ProgressView(this, Content.Progress);
+      }
+      progressView.Progress = Content.Progress;
     }
 
@@ -389 +395 @@
       var obj = e.Data.GetData(Constants.DragDropDataFormat);
       if (obj is IOptimizer) {
-        e.Effect = DragDropEffects.Copy;
+        if ((e.KeyState & 32) == 32) e.Effect = DragDropEffects.Link;  // ALT key
+        else if (e.AllowedEffect.HasFlag(DragDropEffects.Copy)) e.Effect = DragDropEffects.Copy;
       }
     }
@@ -399 +406 @@
         var optimizer = obj as IOptimizer;
         if (optimizer != null) {
-          Content.HiveExperiment.HiveJobs.Add(new OptimizerHiveJob(optimizer));
+          Content.HiveJobs.Add(new OptimizerHiveJob(e.Effect.HasFlag(DragDropEffects.Copy) ? (IOptimizer)optimizer.Clone() : optimizer));
         }
       }
     }
     #endregion
+
+    private void tabControl_SelectedIndexChanged(object sender, EventArgs e) {
+      if (tabControl.SelectedTab == sharingTabPage) {
+        if (!Content.IsSharable) {
+          MessageBox.Show("Unable to load tab. You have insufficient access privileges.");
+          tabControl.SelectedTab = jobsTabPage;
+        }
+      }
+    }
   }
 }