Changeset 5597
- Timestamp:
- 03/02/11 18:26:45 (14 years ago)
- Location:
- branches/HeuristicLab.Hive-3.4/sources
- Files:
-
- 17 added
- 1 deleted
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Views/3.4/ExperimentManager/HiveJobView.cs
r5511 r5597 21 21 22 22 using System; 23 using System.Linq; 23 24 using System.Windows.Forms; 25 using HeuristicLab.Core; 24 26 using HeuristicLab.Core.Views; 25 27 using HeuristicLab.MainForm; … … 132 134 this.dateFinishedTextBox.Text = Content.Job.DateFinished.ToString(); 133 135 this.exceptionTextBox.Text = Content.Job.CurrentStateLog.Exception; 136 if (Content.OptimizerJob.ComputeInParallel) { 137 this.stateLogViewHost.Content = new ItemList<StateLogItemList>( 138 this.Content.ChildHiveJobs.Select(child => new StateLogItemList(child.Job.StateLog.Select(x => new StateLogItem(x))) 139 )); 140 } else { 141 this.stateLogViewHost.Content = new StateLogItemList(Content.Job.StateLog.Select(x => new StateLogItem(x))); 142 } 134 143 } else { 135 144 this.stateTextBox.Text = string.Empty; … … 138 147 this.dateFinishedTextBox.Text = string.Empty; 139 148 this.exceptionTextBox.Text = string.Empty; 149 this.stateLogViewHost.Content = null; 140 150 } 141 151 } -
branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Views/3.4/ExperimentManager/HiveJobView.designer.cs
r4905 r5597 53 53 this.jobIdTextBox = new System.Windows.Forms.TextBox(); 54 54 this.childJobsTabPage = new System.Windows.Forms.TabPage(); 55 this.childHiveJobView = new HiveJobListView();56 55 this.runsTabPage = new System.Windows.Forms.TabPage(); 56 this.runCollectionViewHost = new HeuristicLab.MainForm.WindowsForms.ViewHost(); 57 this.stateLogTabPage = new System.Windows.Forms.TabPage(); 57 58 this.logTabPage = new System.Windows.Forms.TabPage(); 58 59 this.logView = new HeuristicLab.Core.Views.LogView(); 59 this.runCollectionViewHost = new HeuristicLab.MainForm.WindowsForms.ViewHost(); 60 this.stateLogViewHost = new HeuristicLab.MainForm.WindowsForms.ViewHost(); 61 this.childHiveJobView = new HeuristicLab.Clients.Hive.Views.HiveJobListView(); 60 62 this.jobStatusGroupBox.SuspendLayout(); 61 63 this.tabControl.SuspendLayout(); … … 65 67 this.childJobsTabPage.SuspendLayout(); 66 68 this.runsTabPage.SuspendLayout(); 69 this.stateLogTabPage.SuspendLayout(); 67 70 this.logTabPage.SuspendLayout(); 68 71 this.SuspendLayout(); … … 205 208 this.tabControl.Controls.Add(this.childJobsTabPage); 206 209 this.tabControl.Controls.Add(this.runsTabPage); 210 this.tabControl.Controls.Add(this.stateLogTabPage); 207 211 this.tabControl.Controls.Add(this.logTabPage); 208 212 this.tabControl.Location = new System.Drawing.Point(3, 3); … … 371 375 this.childJobsTabPage.UseVisualStyleBackColor = true; 372 376 // 373 // childHiveJobView374 //375 this.childHiveJobView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)376 | System.Windows.Forms.AnchorStyles.Left)377 | System.Windows.Forms.AnchorStyles.Right)));378 this.childHiveJobView.Caption = "JobItemList View";379 this.childHiveJobView.Content = null;380 this.childHiveJobView.Location = new System.Drawing.Point(3, 3);381 this.childHiveJobView.Name = "childHiveJobView";382 this.childHiveJobView.ReadOnly = false;383 this.childHiveJobView.Size = new System.Drawing.Size(613, 486);384 this.childHiveJobView.TabIndex = 0;385 //386 377 // runsTabPage 387 378 // … … 393 384 this.runsTabPage.Text = "Runs"; 394 385 this.runsTabPage.UseVisualStyleBackColor = true; 386 // 387 // runCollectionViewHost 388 // 389 this.runCollectionViewHost.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 390 | System.Windows.Forms.AnchorStyles.Left) 391 | System.Windows.Forms.AnchorStyles.Right))); 392 this.runCollectionViewHost.Caption = "View"; 393 this.runCollectionViewHost.Content = null; 394 this.runCollectionViewHost.Enabled = false; 395 this.runCollectionViewHost.Location = new System.Drawing.Point(3, 3); 396 this.runCollectionViewHost.Name = "runCollectionViewHost"; 397 this.runCollectionViewHost.ReadOnly = false; 398 this.runCollectionViewHost.Size = new System.Drawing.Size(613, 486); 399 this.runCollectionViewHost.TabIndex = 0; 400 this.runCollectionViewHost.ViewsLabelVisible = true; 401 this.runCollectionViewHost.ViewType = null; 402 // 403 // stateLogTabPage 404 // 405 this.stateLogTabPage.Controls.Add(this.stateLogViewHost); 406 this.stateLogTabPage.Location = new System.Drawing.Point(4, 22); 407 this.stateLogTabPage.Name = "stateLogTabPage"; 408 this.stateLogTabPage.Size = new System.Drawing.Size(619, 492); 409 this.stateLogTabPage.TabIndex = 5; 410 this.stateLogTabPage.Text = "StateLog"; 411 this.stateLogTabPage.UseVisualStyleBackColor = true; 395 412 // 396 413 // logTabPage … … 418 435 this.logView.TabIndex = 0; 419 436 // 420 // runCollectionViewHost421 // 422 this. runCollectionViewHost.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)437 // stateLogViewHost 438 // 439 this.stateLogViewHost.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 423 440 | System.Windows.Forms.AnchorStyles.Left) 424 441 | System.Windows.Forms.AnchorStyles.Right))); 425 this.runCollectionViewHost.Caption = "View"; 426 this.runCollectionViewHost.Content = null; 427 this.runCollectionViewHost.Enabled = false; 428 this.runCollectionViewHost.Location = new System.Drawing.Point(3, 3); 429 this.runCollectionViewHost.Name = "runCollectionViewHost"; 430 this.runCollectionViewHost.ReadOnly = false; 431 this.runCollectionViewHost.Size = new System.Drawing.Size(613, 486); 432 this.runCollectionViewHost.TabIndex = 0; 433 this.runCollectionViewHost.ViewType = null; 442 this.stateLogViewHost.Caption = "View"; 443 this.stateLogViewHost.Content = null; 444 this.stateLogViewHost.Enabled = false; 445 this.stateLogViewHost.Location = new System.Drawing.Point(0, 0); 446 this.stateLogViewHost.Name = "stateLogViewHost"; 447 this.stateLogViewHost.ReadOnly = false; 448 this.stateLogViewHost.Size = new System.Drawing.Size(619, 492); 449 this.stateLogViewHost.TabIndex = 0; 450 this.stateLogViewHost.ViewsLabelVisible = true; 451 this.stateLogViewHost.ViewType = null; 452 // 453 // childHiveJobView 454 // 455 this.childHiveJobView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 456 | System.Windows.Forms.AnchorStyles.Left) 457 | System.Windows.Forms.AnchorStyles.Right))); 458 this.childHiveJobView.Caption = "JobItemList View"; 459 this.childHiveJobView.Content = null; 460 this.childHiveJobView.Location = new System.Drawing.Point(3, 3); 461 this.childHiveJobView.Name = "childHiveJobView"; 462 this.childHiveJobView.ReadOnly = false; 463 this.childHiveJobView.Size = new System.Drawing.Size(613, 486); 464 this.childHiveJobView.TabIndex = 0; 434 465 // 435 466 // HiveJobView … … 450 481 this.childJobsTabPage.ResumeLayout(false); 451 482 this.runsTabPage.ResumeLayout(false); 483 this.stateLogTabPage.ResumeLayout(false); 452 484 this.logTabPage.ResumeLayout(false); 453 485 this.ResumeLayout(false); … … 491 523 private System.Windows.Forms.TabPage runsTabPage; 492 524 private MainForm.WindowsForms.ViewHost runCollectionViewHost; 525 private System.Windows.Forms.TabPage stateLogTabPage; 526 private MainForm.WindowsForms.ViewHost stateLogViewHost; 493 527 } 494 528 } -
branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Views/3.4/ExperimentManager/HiveJobView.resx
r4905 r5597 113 113 </resheader> 114 114 <resheader name="reader"> 115 <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version= 2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>115 <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> 116 116 </resheader> 117 117 <resheader name="writer"> 118 <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version= 2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>118 <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> 119 119 </resheader> 120 120 </root> -
branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Views/3.4/HeuristicLab.Clients.Hive.Views-3.4.csproj
r5538 r5597 110 110 <HintPath>..\..\..\..\..\..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath> 111 111 </Reference> 112 <Reference Include="HeuristicLab.Visualization.ChartControlsExtensions-3.3"> 113 <HintPath>..\..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Visualization.ChartControlsExtensions-3.3.dll</HintPath> 114 </Reference> 112 115 <Reference Include="System" /> 113 116 <Reference Include="System.Core" /> 114 117 <Reference Include="System.Drawing" /> 115 118 <Reference Include="System.Windows.Forms" /> 119 <Reference Include="System.Windows.Forms.DataVisualization" /> 116 120 <Reference Include="System.Xml.Linq" /> 117 121 <Reference Include="System.Data.DataSetExtensions" /> … … 127 131 <DependentUpon>UpdateControl.cs</DependentUpon> 128 132 </Compile> 133 <Compile Include="ExperimentManager\StateLogGanttChartListView.cs"> 134 <SubType>UserControl</SubType> 135 </Compile> 136 <Compile Include="ExperimentManager\StateLogGanttChartListView.designer.cs"> 137 <DependentUpon>StateLogGanttChartListView.cs</DependentUpon> 138 </Compile> 139 <Compile Include="ExperimentManager\GanttChart.cs"> 140 <SubType>UserControl</SubType> 141 </Compile> 142 <Compile Include="ExperimentManager\GanttChart.Designer.cs"> 143 <DependentUpon>GanttChart.cs</DependentUpon> 144 </Compile> 145 <Compile Include="ExperimentManager\StateLogGanttChartView.cs"> 146 <SubType>UserControl</SubType> 147 </Compile> 148 <Compile Include="ExperimentManager\StateLogGanttChartView.designer.cs"> 149 <DependentUpon>StateLogGanttChartView.cs</DependentUpon> 150 </Compile> 151 <Compile Include="ExperimentManager\StateLogItemList.cs" /> 152 <Compile Include="ExperimentManager\StateLogListView.cs"> 153 <SubType>UserControl</SubType> 154 </Compile> 155 <Compile Include="ExperimentManager\StateLogListView.designer.cs"> 156 <DependentUpon>StateLogListView.cs</DependentUpon> 157 </Compile> 158 <Compile Include="ExperimentManager\StateLogView.cs"> 159 <SubType>UserControl</SubType> 160 </Compile> 161 <Compile Include="ExperimentManager\StateLogView.designer.cs"> 162 <DependentUpon>StateLogView.cs</DependentUpon> 163 </Compile> 129 164 <Compile Include="ExperimentManager\UpdateableHiveExperimentManagerView.cs"> 130 165 <SubType>UserControl</SubType> … … 210 245 <EmbeddedResource Include="Common\UpdateControl.resx"> 211 246 <DependentUpon>UpdateControl.cs</DependentUpon> 247 </EmbeddedResource> 248 <EmbeddedResource Include="ExperimentManager\StateLogGanttChartListView.resx"> 249 <DependentUpon>StateLogGanttChartListView.cs</DependentUpon> 250 </EmbeddedResource> 251 <EmbeddedResource Include="ExperimentManager\GanttChart.resx"> 252 <DependentUpon>GanttChart.cs</DependentUpon> 253 </EmbeddedResource> 254 <EmbeddedResource Include="ExperimentManager\StateLogGanttChartView.resx"> 255 <DependentUpon>StateLogGanttChartView.cs</DependentUpon> 256 </EmbeddedResource> 257 <EmbeddedResource Include="ExperimentManager\StateLogView.resx"> 258 <DependentUpon>StateLogView.cs</DependentUpon> 212 259 </EmbeddedResource> 213 260 <EmbeddedResource Include="ExperimentManager\HiveExperimentManagerView.resx"> -
branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.4/HeuristicLab.Clients.Hive-3.4.csproj
r5591 r5597 124 124 <Compile Include="ExperimentManager\PluginClient.cs" /> 125 125 <Compile Include="Exceptions\ResourceNotFoundException.cs" /> 126 <Compile Include="ExperimentManager\StateLogItem.cs" /> 126 127 <Compile Include="IServiceLocator.cs" /> 127 128 <Compile Include="Jobs\OptimizerJob.cs" />
Note: See TracChangeset
for help on using the changeset viewer.