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

Timestamp:

03/08/11 16:37:03 (13 years ago)

Author:

cneumuel

Message:

#1233

• added treeview for hive jobs in experiment manager

Location:

branches/HeuristicLab.Hive-3.4/sources

Files:

• . (modified) (1 prop)
• HeuristicLab.Clients.Hive.Views/3.4 (modified) (1 prop)
• HeuristicLab.Clients.Hive.Views/3.4/ExperimentManager/HiveExperimentView.Designer.cs (modified) (19 diffs)
• HeuristicLab.Clients.Hive.Views/3.4/ExperimentManager/HiveExperimentView.cs (modified) (2 diffs)
• HeuristicLab.Clients.Hive.Views/3.4/ExperimentManager/HiveJobView.designer.cs (modified) (6 diffs)
• HeuristicLab.Clients.Hive.Views/3.4/ExperimentManager/ItemTreeView.cs (added)
• HeuristicLab.Clients.Hive.Views/3.4/ExperimentManager/ItemTreeView.designer.cs (added)
• HeuristicLab.Clients.Hive.Views/3.4/ExperimentManager/ItemTreeView.resx (added)

branches/HeuristicLab.Hive-3.4/sources

@@ -3 +3 @@
 TestResults
 PrecompiledWeb
+CreateEventLogSources

@@ -3 +3 @@
 TestResults
 PrecompiledWeb
+CreateEventLogSources

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

@@ -3 +3 @@
 *.user
 HeuristicLabClientsHiveViewsPlugin.cs
+*.vs10x

@@ -3 +3 @@
 *.user
 HeuristicLabClientsHiveViewsPlugin.cs
+*.vs10x

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

@@ -68 +68 @@
       this.downloadExperimentPanel = new System.Windows.Forms.Panel();
       this.useLocalPluginsCheckBox = new System.Windows.Forms.CheckBox();
-      this.hiveJobView = new HeuristicLab.Clients.Hive.Views.HiveJobView();
+      this.jobViewHost = new HeuristicLab.MainForm.WindowsForms.ViewHost();
       ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).BeginInit();
       this.tabControl.SuspendLayout();
@@ -81 +81 @@
       this.errorProvider.SetIconAlignment(this.nameTextBox, System.Windows.Forms.ErrorIconAlignment.MiddleLeft);
       this.errorProvider.SetIconPadding(this.nameTextBox, 2);
-      this.nameTextBox.Size = new System.Drawing.Size(670, 20);
+      this.nameTextBox.Size = new System.Drawing.Size(727, 20);
       // 
       // descriptionTextBox
       // 
-      this.descriptionTextBox.Size = new System.Drawing.Size(670, 20);
+      this.descriptionTextBox.Size = new System.Drawing.Size(727, 20);
       // 
       // tabControl
@@ -98 +98 @@
       this.tabControl.Name = "tabControl";
       this.tabControl.SelectedIndex = 0;
-      this.tabControl.Size = new System.Drawing.Size(742, 416);
+      this.tabControl.Size = new System.Drawing.Size(799, 520);
       this.tabControl.TabIndex = 4;
       // 
@@ -110 +110 @@
       this.experimentTabPage.Name = "experimentTabPage";
       this.experimentTabPage.Padding = new System.Windows.Forms.Padding(3);
-      this.experimentTabPage.Size = new System.Drawing.Size(734, 390);
+      this.experimentTabPage.Size = new System.Drawing.Size(791, 494);
       this.experimentTabPage.TabIndex = 1;
       this.experimentTabPage.Text = "Experiment";
@@ -163 +163 @@
       // jobsTabPage
       // 
-      this.jobsTabPage.Controls.Add(this.hiveJobView);
+      this.jobsTabPage.Controls.Add(this.jobViewHost);
       this.jobsTabPage.Location = new System.Drawing.Point(4, 22);
       this.jobsTabPage.Name = "jobsTabPage";
-      this.jobsTabPage.Size = new System.Drawing.Size(734, 390);
+      this.jobsTabPage.Size = new System.Drawing.Size(791, 494);
       this.jobsTabPage.TabIndex = 5;
       this.jobsTabPage.Text = "Jobs";
@@ -176 +176 @@
       this.logTabPage.Location = new System.Drawing.Point(4, 22);
       this.logTabPage.Name = "logTabPage";
-      this.logTabPage.Size = new System.Drawing.Size(734, 390);
+      this.logTabPage.Size = new System.Drawing.Size(791, 494);
       this.logTabPage.TabIndex = 3;
       this.logTabPage.Text = "Log";
@@ -213 +213 @@
       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, 500);
+      this.startButton.Location = new System.Drawing.Point(0, 604);
       this.startButton.Name = "startButton";
       this.startButton.Size = new System.Drawing.Size(24, 24);
@@ -225 +225 @@
       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, 500);
+      this.stopButton.Location = new System.Drawing.Point(60, 604);
       this.stopButton.Name = "stopButton";
       this.stopButton.Size = new System.Drawing.Size(24, 24);
@@ -238 +238 @@
       this.resetButton.Enabled = false;
       this.resetButton.Image = ((System.Drawing.Image)(resources.GetObject("resetButton.Image")));
-      this.resetButton.Location = new System.Drawing.Point(90, 500);
+      this.resetButton.Location = new System.Drawing.Point(90, 604);
       this.resetButton.Name = "resetButton";
       this.resetButton.Size = new System.Drawing.Size(24, 24);
@@ -250 +250 @@
       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(516, 507);
+      this.executionTimeLabel.Location = new System.Drawing.Point(573, 611);
       this.executionTimeLabel.Name = "executionTimeLabel";
       this.executionTimeLabel.Size = new System.Drawing.Size(83, 13);
@@ -259 +259 @@
       // 
       this.executionTimeTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-      this.executionTimeTextBox.Location = new System.Drawing.Point(605, 504);
+      this.executionTimeTextBox.Location = new System.Drawing.Point(662, 608);
       this.executionTimeTextBox.Name = "executionTimeTextBox";
       this.executionTimeTextBox.ReadOnly = true;
@@ -270 +270 @@
       this.pauseButton.Enabled = false;
       this.pauseButton.Image = ((System.Drawing.Image)(resources.GetObject("pauseButton.Image")));
-      this.pauseButton.Location = new System.Drawing.Point(30, 500);
+      this.pauseButton.Location = new System.Drawing.Point(30, 604);
       this.pauseButton.Name = "pauseButton";
       this.pauseButton.Size = new System.Drawing.Size(24, 24);
@@ -287 +287 @@
       this.resourceIdsLabel.Text = "ResourceIds";
       // 
-      // resourceIdsTextBox
+      // resourceNamesTextBox
       // 
       this.resourceNamesTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
                   | System.Windows.Forms.AnchorStyles.Right)));
       this.resourceNamesTextBox.Location = new System.Drawing.Point(72, 52);
-      this.resourceNamesTextBox.Name = "resourceIdsTextBox";
-      this.resourceNamesTextBox.Size = new System.Drawing.Size(559, 20);
+      this.resourceNamesTextBox.Name = "resourceNamesTextBox";
+      this.resourceNamesTextBox.Size = new System.Drawing.Size(616, 20);
       this.resourceNamesTextBox.TabIndex = 14;
       this.resourceNamesTextBox.Validated += new System.EventHandler(this.resourceNamesTextBox_Validated);
@@ -301 +301 @@
       this.disconnectButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
       this.disconnectButton.Enabled = false;
-      this.disconnectButton.Location = new System.Drawing.Point(234, 500);
+      this.disconnectButton.Location = new System.Drawing.Point(234, 604);
       this.disconnectButton.Name = "disconnectButton";
       this.disconnectButton.Size = new System.Drawing.Size(120, 24);
@@ -314 +314 @@
       this.reconnectButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
       this.reconnectButton.Enabled = false;
-      this.reconnectButton.Location = new System.Drawing.Point(120, 500);
+      this.reconnectButton.Location = new System.Drawing.Point(120, 604);
       this.reconnectButton.Name = "reconnectButton";
       this.reconnectButton.Size = new System.Drawing.Size(108, 24);
@@ -335 +335 @@
       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(637, 54);
+      this.useLocalPluginsCheckBox.Location = new System.Drawing.Point(694, 54);
       this.useLocalPluginsCheckBox.Name = "useLocalPluginsCheckBox";
       this.useLocalPluginsCheckBox.Size = new System.Drawing.Size(105, 17);
@@ -343 +343 @@
       this.useLocalPluginsCheckBox.CheckedChanged += new System.EventHandler(this.useLocalPluginsCheckBox_CheckedChanged);
       // 
-      // hiveJobView
-      // 
-      this.hiveJobView.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.hiveJobView.Caption = "HiveJob View";
-      this.hiveJobView.Content = null;
-      this.hiveJobView.Location = new System.Drawing.Point(2, 3);
-      this.hiveJobView.Name = "hiveJobView";
-      this.hiveJobView.ReadOnly = true;
-      this.hiveJobView.Size = new System.Drawing.Size(722, 384);
-      this.hiveJobView.TabIndex = 0;
+      // jobViewHost
+      // 
+      this.jobViewHost.Caption = "View";
+      this.jobViewHost.Content = null;
+      this.jobViewHost.Dock = System.Windows.Forms.DockStyle.Fill;
+      this.jobViewHost.Enabled = false;
+      this.jobViewHost.Location = new System.Drawing.Point(0, 0);
+      this.jobViewHost.Name = "jobViewHost";
+      this.jobViewHost.ReadOnly = false;
+      this.jobViewHost.Size = new System.Drawing.Size(791, 494);
+      this.jobViewHost.TabIndex = 0;
+      this.jobViewHost.ViewsLabelVisible = true;
+      this.jobViewHost.ViewType = null;
       // 
       // HiveExperimentView
@@ -374 +375 @@
       this.Controls.Add(this.reconnectButton);
       this.Name = "HiveExperimentView";
-      this.Size = new System.Drawing.Size(742, 524);
+      this.Size = new System.Drawing.Size(799, 628);
       this.Controls.SetChildIndex(this.nameTextBox, 0);
       this.Controls.SetChildIndex(this.descriptionTextBox, 0);
@@ -425 +426 @@
     private System.Windows.Forms.Button downloadExperimentButton;
     private System.Windows.Forms.Panel downloadExperimentPanel;
-    private HiveJobView hiveJobView;
     private System.Windows.Forms.CheckBox useLocalPluginsCheckBox;
+    private MainForm.WindowsForms.ViewHost jobViewHost;
 
   }

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

@@ -105 +105 @@
         this.descriptionTextBox.ReadOnly = Content.ExecutionState != ExecutionState.Prepared;
         this.resourceNamesTextBox.ReadOnly = Content.ExecutionState != ExecutionState.Prepared;
-        this.hiveJobView.ReadOnly = Content.ExecutionState != ExecutionState.Prepared;
+        this.jobViewHost.ReadOnly = Content.ExecutionState != ExecutionState.Prepared;
         this.useLocalPluginsCheckBox.Enabled = Content.ExecutionState == ExecutionState.Prepared;
 
@@ -189 +189 @@
       else {
         if (Content != null) {
-          hiveJobView.Content = Content.HiveJob;
+          jobViewHost.Content = Content.HiveJob;
           experimentNamedItemView.Content = Content.GetExperiment();
         } else {
-          hiveJobView.Content = null;
+          jobViewHost.Content = null;
           experimentNamedItemView.Content = null;
         }

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

@@ -56 +56 @@
       this.runCollectionViewHost = new HeuristicLab.MainForm.WindowsForms.ViewHost();
       this.stateLogTabPage = new System.Windows.Forms.TabPage();
+      this.stateLogViewHost = new HeuristicLab.MainForm.WindowsForms.ViewHost();
       this.logTabPage = new System.Windows.Forms.TabPage();
       this.logView = new HeuristicLab.Core.Views.LogView();
-      this.stateLogViewHost = new HeuristicLab.MainForm.WindowsForms.ViewHost();
       this.childHiveJobView = new HeuristicLab.Clients.Hive.Views.HiveJobListView();
       this.jobStatusGroupBox.SuspendLayout();
@@ -249 +249 @@
       this.optimizerNamedItemView.Caption = "NamedItem View";
       this.optimizerNamedItemView.Content = null;
-      this.optimizerNamedItemView.Location = new System.Drawing.Point(0, 20);
+      this.optimizerNamedItemView.Location = new System.Drawing.Point(6, 20);
       this.optimizerNamedItemView.Name = "optimizerNamedItemView";
       this.optimizerNamedItemView.ReadOnly = false;
-      this.optimizerNamedItemView.Size = new System.Drawing.Size(604, 51);
+      this.optimizerNamedItemView.Size = new System.Drawing.Size(598, 51);
       this.optimizerNamedItemView.TabIndex = 0;
       // 
@@ -411 +411 @@
       this.stateLogTabPage.UseVisualStyleBackColor = true;
       // 
-      // logTabPage
-      // 
-      this.logTabPage.Controls.Add(this.logView);
-      this.logTabPage.Location = new System.Drawing.Point(4, 22);
-      this.logTabPage.Name = "logTabPage";
-      this.logTabPage.Padding = new System.Windows.Forms.Padding(3);
-      this.logTabPage.Size = new System.Drawing.Size(619, 492);
-      this.logTabPage.TabIndex = 1;
-      this.logTabPage.Text = "Log";
-      this.logTabPage.UseVisualStyleBackColor = true;
-      // 
-      // logView
-      // 
-      this.logView.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.logView.Caption = "Log View";
-      this.logView.Content = null;
-      this.logView.Location = new System.Drawing.Point(3, 3);
-      this.logView.Name = "logView";
-      this.logView.ReadOnly = false;
-      this.logView.Size = new System.Drawing.Size(613, 486);
-      this.logView.TabIndex = 0;
-      // 
       // stateLogViewHost
       // 
@@ -450 +426 @@
       this.stateLogViewHost.ViewsLabelVisible = true;
       this.stateLogViewHost.ViewType = null;
+      // 
+      // logTabPage
+      // 
+      this.logTabPage.Controls.Add(this.logView);
+      this.logTabPage.Location = new System.Drawing.Point(4, 22);
+      this.logTabPage.Name = "logTabPage";
+      this.logTabPage.Padding = new System.Windows.Forms.Padding(3);
+      this.logTabPage.Size = new System.Drawing.Size(619, 492);
+      this.logTabPage.TabIndex = 1;
+      this.logTabPage.Text = "Log";
+      this.logTabPage.UseVisualStyleBackColor = true;
+      // 
+      // logView
+      // 
+      this.logView.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.logView.Caption = "Log View";
+      this.logView.Content = null;
+      this.logView.Location = new System.Drawing.Point(3, 3);
+      this.logView.Name = "logView";
+      this.logView.ReadOnly = false;
+      this.logView.Size = new System.Drawing.Size(613, 486);
+      this.logView.TabIndex = 0;
       // 
       // childHiveJobView
@@ -509 +509 @@
     private System.Windows.Forms.TextBox jobIdTextBox;
     private System.Windows.Forms.TabPage childJobsTabPage;
-    private HiveJobListView childHiveJobView;
     private System.Windows.Forms.GroupBox configurationGroupBox;
     private System.Windows.Forms.TextBox priorityTextBox;
@@ -525 +524 @@
     private System.Windows.Forms.TabPage stateLogTabPage;
     private MainForm.WindowsForms.ViewHost stateLogViewHost;
+    private HiveJobListView childHiveJobView;
   }
 }

@@ -3 +3 @@
 TestResults
 PrecompiledWeb
+CreateEventLogSources

@@ -3 +3 @@
 *.user
 HeuristicLabClientsHiveViewsPlugin.cs
+*.vs10x