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

Timestamp:

06/08/11 00:04:16 (13 years ago)

Author:

cneumuel

Message:

#1233

• locking for childHiveJobs in OptimizerHiveJob avoid multi threaded access issues
• added IsPrivileged to gui
• minor changes

Location:

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

Files:

• . (modified) (1 prop)
• HeuristicLab.Clients.Hive.ExperimentManager-3.4.csproj (modified) (1 diff)
• Views/HiveExperimentListView.Designer.cs (deleted)
• Views/HiveExperimentListView.cs (deleted)
• Views/HiveExperimentManagerView.Designer.cs (modified) (2 diffs)
• Views/RefreshableHiveExperimentListView.Designer.cs (added)
• Views/RefreshableHiveExperimentListView.cs (added)
• Views/RefreshableHiveExperimentView.Designer.cs (modified) (18 diffs)
• Views/RefreshableHiveExperimentView.cs (modified) (4 diffs)

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

@@ -151 +151 @@
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Views\HiveExperimentListView.cs">
+    <Compile Include="Views\RefreshableHiveExperimentListView.cs">
       <SubType>UserControl</SubType>
     </Compile>
-    <Compile Include="Views\HiveExperimentListView.Designer.cs">
-      <DependentUpon>HiveExperimentListView.cs</DependentUpon>
+    <Compile Include="Views\RefreshableHiveExperimentListView.Designer.cs">
+      <DependentUpon>RefreshableHiveExperimentListView.cs</DependentUpon>
     </Compile>
     <Compile Include="Views\HiveExperimentManagerView.cs">

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

@@ -46 +46 @@
     private void InitializeComponent() {
       System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(HiveExperimentManagerView));
-      this.hiveExperimentListView = new HiveExperimentListView();
+      this.hiveExperimentListView = new RefreshableHiveExperimentListView();
       this.refreshButton = new System.Windows.Forms.Button();
       this.SuspendLayout();
@@ -86 +86 @@
     #endregion
 
-    private HiveExperimentListView hiveExperimentListView;
+    private RefreshableHiveExperimentListView hiveExperimentListView;
     private System.Windows.Forms.Button refreshButton;
 

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

@@ -50 +50 @@
       this.tabControl = new System.Windows.Forms.TabControl();
       this.jobsTabPage = new System.Windows.Forms.TabPage();
+      this.jobsTreeView = new HeuristicLab.Clients.Hive.Views.ExperimentManager.HiveJobItemTreeView();
       this.logTabPage = new System.Windows.Forms.TabPage();
       this.logView = new HeuristicLab.Core.Views.LogView();
@@ -73 +74 @@
       this.calculatingLabel = new System.Windows.Forms.Label();
       this.jobsLabel = new System.Windows.Forms.Label();
-      this.jobsTreeView = new HeuristicLab.Clients.Hive.Views.ExperimentManager.HiveJobItemTreeView();
+      this.isPrivilegedCheckBox = new System.Windows.Forms.CheckBox();
       this.tabControl.SuspendLayout();
       this.jobsTabPage.SuspendLayout();
@@ -90 +91 @@
       this.tabControl.Name = "tabControl";
       this.tabControl.SelectedIndex = 0;
-      this.tabControl.Size = new System.Drawing.Size(821, 520);
+      this.tabControl.Size = new System.Drawing.Size(717, 452);
       this.tabControl.TabIndex = 4;
       // 
@@ -98 +99 @@
       this.jobsTabPage.Location = new System.Drawing.Point(4, 22);
       this.jobsTabPage.Name = "jobsTabPage";
-      this.jobsTabPage.Size = new System.Drawing.Size(813, 494);
+      this.jobsTabPage.Size = new System.Drawing.Size(709, 426);
       this.jobsTabPage.TabIndex = 5;
       this.jobsTabPage.Text = "Jobs";
       this.jobsTabPage.UseVisualStyleBackColor = true;
+      // 
+      // jobsTreeView
+      // 
+      this.jobsTreeView.AllowDrop = true;
+      this.jobsTreeView.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.jobsTreeView.Caption = "ItemTree View";
+      this.jobsTreeView.Content = null;
+      this.jobsTreeView.Location = new System.Drawing.Point(2, 3);
+      this.jobsTreeView.Name = "jobsTreeView";
+      this.jobsTreeView.ReadOnly = false;
+      this.jobsTreeView.Size = new System.Drawing.Size(704, 420);
+      this.jobsTreeView.TabIndex = 0;
+      this.jobsTreeView.DragDrop += new System.Windows.Forms.DragEventHandler(this.jobsTreeView_DragDrop);
+      this.jobsTreeView.DragEnter += new System.Windows.Forms.DragEventHandler(this.jobsTreeView_DragEnter);
+      this.jobsTreeView.DragOver += new System.Windows.Forms.DragEventHandler(this.jobsTreeView_DragOver);
       // 
       // logTabPage
@@ -128 +146 @@
       this.startButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
       this.startButton.Image = ((System.Drawing.Image)(resources.GetObject("startButton.Image")));
-      this.startButton.Location = new System.Drawing.Point(0, 604);
+      this.startButton.Location = new System.Drawing.Point(0, 536);
       this.startButton.Name = "startButton";
       this.startButton.Size = new System.Drawing.Size(24, 24);
@@ -140 +158 @@
       this.stopButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
       this.stopButton.Image = ((System.Drawing.Image)(resources.GetObject("stopButton.Image")));
-      this.stopButton.Location = new System.Drawing.Point(60, 604);
+      this.stopButton.Location = new System.Drawing.Point(60, 536);
       this.stopButton.Name = "stopButton";
       this.stopButton.Size = new System.Drawing.Size(24, 24);
@@ -153 +171 @@
       this.resetButton.Enabled = false;
       this.resetButton.Image = ((System.Drawing.Image)(resources.GetObject("resetButton.Image")));
-      this.resetButton.Location = new System.Drawing.Point(90, 604);
+      this.resetButton.Location = new System.Drawing.Point(90, 536);
       this.resetButton.Name = "resetButton";
       this.resetButton.Size = new System.Drawing.Size(24, 24);
@@ -165 +183 @@
       this.executionTimeLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
       this.executionTimeLabel.AutoSize = true;
-      this.executionTimeLabel.Location = new System.Drawing.Point(595, 611);
+      this.executionTimeLabel.Location = new System.Drawing.Point(491, 543);
       this.executionTimeLabel.Name = "executionTimeLabel";
       this.executionTimeLabel.Size = new System.Drawing.Size(83, 13);
@@ -174 +192 @@
       // 
       this.executionTimeTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-      this.executionTimeTextBox.Location = new System.Drawing.Point(684, 608);
+      this.executionTimeTextBox.Location = new System.Drawing.Point(580, 540);
       this.executionTimeTextBox.Name = "executionTimeTextBox";
       this.executionTimeTextBox.ReadOnly = true;
@@ -185 +203 @@
       this.pauseButton.Enabled = false;
       this.pauseButton.Image = ((System.Drawing.Image)(resources.GetObject("pauseButton.Image")));
-      this.pauseButton.Location = new System.Drawing.Point(30, 604);
+      this.pauseButton.Location = new System.Drawing.Point(30, 536);
       this.pauseButton.Name = "pauseButton";
       this.pauseButton.Size = new System.Drawing.Size(24, 24);
@@ -208 +226 @@
       this.resourceNamesTextBox.Location = new System.Drawing.Point(73, 53);
       this.resourceNamesTextBox.Name = "resourceNamesTextBox";
-      this.resourceNamesTextBox.Size = new System.Drawing.Size(494, 20);
+      this.resourceNamesTextBox.Size = new System.Drawing.Size(304, 20);
       this.resourceNamesTextBox.TabIndex = 14;
       this.resourceNamesTextBox.Validated += new System.EventHandler(this.resourceNamesTextBox_Validated);
@@ -216 +234 @@
       this.useLocalPluginsCheckBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
       this.useLocalPluginsCheckBox.AutoSize = true;
-      this.useLocalPluginsCheckBox.Location = new System.Drawing.Point(573, 56);
+      this.useLocalPluginsCheckBox.Location = new System.Drawing.Point(469, 56);
       this.useLocalPluginsCheckBox.Name = "useLocalPluginsCheckBox";
       this.useLocalPluginsCheckBox.Size = new System.Drawing.Size(105, 17);
@@ -239 +257 @@
       this.nameTextBox.Location = new System.Drawing.Point(73, 27);
       this.nameTextBox.Name = "nameTextBox";
-      this.nameTextBox.Size = new System.Drawing.Size(605, 20);
+      this.nameTextBox.Size = new System.Drawing.Size(501, 20);
       this.nameTextBox.TabIndex = 21;
       this.nameTextBox.Validated += new System.EventHandler(this.nameTextBox_Validated);
@@ -274 +292 @@
       this.infoGroupBox.Controls.Add(this.calculatingLabel);
       this.infoGroupBox.Controls.Add(this.jobsLabel);
-      this.infoGroupBox.Location = new System.Drawing.Point(684, 5);
+      this.infoGroupBox.Location = new System.Drawing.Point(580, 5);
       this.infoGroupBox.Name = "infoGroupBox";
       this.infoGroupBox.Size = new System.Drawing.Size(133, 89);
@@ -335 +353 @@
       this.jobsLabel.Text = "Jobs:";
       // 
-      // jobsTreeView
-      // 
-      this.jobsTreeView.AllowDrop = true;
-      this.jobsTreeView.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.jobsTreeView.Caption = "ItemTree View";
-      this.jobsTreeView.Content = null;
-      this.jobsTreeView.Location = new System.Drawing.Point(2, 3);
-      this.jobsTreeView.Name = "jobsTreeView";
-      this.jobsTreeView.ReadOnly = false;
-      this.jobsTreeView.Size = new System.Drawing.Size(808, 488);
-      this.jobsTreeView.TabIndex = 0;
-      this.jobsTreeView.DragDrop += new System.Windows.Forms.DragEventHandler(this.jobsTreeView_DragDrop);
-      this.jobsTreeView.DragEnter += new System.Windows.Forms.DragEventHandler(this.jobsTreeView_DragEnter);
-      this.jobsTreeView.DragOver += new System.Windows.Forms.DragEventHandler(this.jobsTreeView_DragOver);
+      // isPrivilegedCheckBox
+      // 
+      this.isPrivilegedCheckBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+      this.isPrivilegedCheckBox.AutoSize = true;
+      this.isPrivilegedCheckBox.Location = new System.Drawing.Point(383, 55);
+      this.isPrivilegedCheckBox.Name = "isPrivilegedCheckBox";
+      this.isPrivilegedCheckBox.Size = new System.Drawing.Size(80, 17);
+      this.isPrivilegedCheckBox.TabIndex = 26;
+      this.isPrivilegedCheckBox.Text = "IsPrivileged";
+      this.toolTip.SetToolTip(this.isPrivilegedCheckBox, "If checked, the job will be executed in a privileged sandbox on the slave.");
+      this.isPrivilegedCheckBox.UseVisualStyleBackColor = true;
+      this.isPrivilegedCheckBox.CheckedChanged += new System.EventHandler(this.isPrivilegedCheckBox_CheckedChanged);
       // 
       // RefreshableHiveExperimentView
@@ -356 +370 @@
       this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+      this.Controls.Add(this.isPrivilegedCheckBox);
       this.Controls.Add(this.infoGroupBox);
       this.Controls.Add(this.refreshAutomaticallyCheckBox);
@@ -372 +387 @@
       this.Controls.Add(this.resetButton);
       this.Name = "RefreshableHiveExperimentView";
-      this.Size = new System.Drawing.Size(821, 628);
+      this.Size = new System.Drawing.Size(717, 560);
       this.tabControl.ResumeLayout(false);
       this.jobsTabPage.ResumeLayout(false);
@@ -410 +425 @@
     private System.Windows.Forms.Label calculatingLabel;
     private System.Windows.Forms.Label jobsLabel;
+    private System.Windows.Forms.CheckBox isPrivilegedCheckBox;
 
   }

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

@@ -103 +103 @@
         resourceNamesTextBox.Text = string.Empty;
         useLocalPluginsCheckBox.Checked = false;
+        isPrivilegedCheckBox.Checked = false;
         logView.Content = null;
-        //includeJobsCheckBox.Checked = false;
-        refreshAutomaticallyCheckBox.Checked = false;
+        refreshAutomaticallyCheckBox.Checked = false;        
         logView.Content = null;
       } else {
@@ -112 +112 @@
         resourceNamesTextBox.Text = Content.HiveExperiment.ResourceNames;
         useLocalPluginsCheckBox.Checked = Content.HiveExperiment.UseLocalPlugins;
-        //includeJobsCheckBox.Checked = Content.IncludeJobs;
+        isPrivilegedCheckBox.Checked = Content.HiveExperiment.IsPrivileged;
         refreshAutomaticallyCheckBox.Checked = Content.RefreshAutomatically;
         logView.Content = Content.Log;
@@ -138 +138 @@
         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.useLocalPluginsCheckBox.Enabled = Content.IsControllable && !(Content.HiveExperiment.ExecutionState != ExecutionState.Prepared || alreadyUploaded);
         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;
+
       }
       SetEnabledStateOfExecutableButtons();
@@ -296 +298 @@
     private void useLocalPluginsCheckBox_CheckedChanged(object sender, EventArgs e) {
       if (Content != null) Content.HiveExperiment.UseLocalPlugins = useLocalPluginsCheckBox.Checked;
+    }
+
+    private void isPrivilegedCheckBox_CheckedChanged(object sender, EventArgs e) {
+      if (Content != null) Content.HiveExperiment.IsPrivileged = isPrivilegedCheckBox.Checked;
     }