Free cookie consent management tool by TermsFeed Policy Generator

Changeset 5597


Ignore:
Timestamp:
03/02/11 18:26:45 (13 years ago)
Author:
cneumuel
Message:

#1233

  • extended jobview to show statelog as list with details or as ganttview
  • also a ganttview of all statelogs of all childjobs was implemented
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  
    2121
    2222using System;
     23using System.Linq;
    2324using System.Windows.Forms;
     25using HeuristicLab.Core;
    2426using HeuristicLab.Core.Views;
    2527using HeuristicLab.MainForm;
    … …  
    132134          this.dateFinishedTextBox.Text = Content.Job.DateFinished.ToString();
    133135          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          }
    134143        } else {
    135144          this.stateTextBox.Text = string.Empty;
    … …  
    138147          this.dateFinishedTextBox.Text = string.Empty;
    139148          this.exceptionTextBox.Text = string.Empty;
     149          this.stateLogViewHost.Content = null;
    140150        }
    141151      }

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

    r4905 r5597  
    5353      this.jobIdTextBox = new System.Windows.Forms.TextBox();
    5454      this.childJobsTabPage = new System.Windows.Forms.TabPage();
    55       this.childHiveJobView = new HiveJobListView();
    5655      this.runsTabPage = new System.Windows.Forms.TabPage();
     56      this.runCollectionViewHost = new HeuristicLab.MainForm.WindowsForms.ViewHost();
     57      this.stateLogTabPage = new System.Windows.Forms.TabPage();
    5758      this.logTabPage = new System.Windows.Forms.TabPage();
    5859      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();
    6062      this.jobStatusGroupBox.SuspendLayout();
    6163      this.tabControl.SuspendLayout();
    … …  
    6567      this.childJobsTabPage.SuspendLayout();
    6668      this.runsTabPage.SuspendLayout();
     69      this.stateLogTabPage.SuspendLayout();
    6770      this.logTabPage.SuspendLayout();
    6871      this.SuspendLayout();
    … …  
    205208      this.tabControl.Controls.Add(this.childJobsTabPage);
    206209      this.tabControl.Controls.Add(this.runsTabPage);
     210      this.tabControl.Controls.Add(this.stateLogTabPage);
    207211      this.tabControl.Controls.Add(this.logTabPage);
    208212      this.tabControl.Location = new System.Drawing.Point(3, 3);
    … …  
    371375      this.childJobsTabPage.UseVisualStyleBackColor = true;
    372376      //
    373       // childHiveJobView
    374       //
    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       //
    386377      // runsTabPage
    387378      //
    … …  
    393384      this.runsTabPage.Text = "Runs";
    394385      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;
    395412      //
    396413      // logTabPage
    … …  
    418435      this.logView.TabIndex = 0;
    419436      //
    420       // runCollectionViewHost
    421       //
    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)
    423440                  | System.Windows.Forms.AnchorStyles.Left)
    424441                  | 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;
    434465      //
    435466      // HiveJobView
    … …  
    450481      this.childJobsTabPage.ResumeLayout(false);
    451482      this.runsTabPage.ResumeLayout(false);
     483      this.stateLogTabPage.ResumeLayout(false);
    452484      this.logTabPage.ResumeLayout(false);
    453485      this.ResumeLayout(false);
    … …  
    491523    private System.Windows.Forms.TabPage runsTabPage;
    492524    private MainForm.WindowsForms.ViewHost runCollectionViewHost;
     525    private System.Windows.Forms.TabPage stateLogTabPage;
     526    private MainForm.WindowsForms.ViewHost stateLogViewHost;
    493527  }
    494528}

  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Views/3.4/ExperimentManager/HiveJobView.resx

    r4905 r5597  
    113113  </resheader>
    114114  <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>
    116116  </resheader>
    117117  <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>
    119119  </resheader>
    120120</root>

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

    r5538 r5597  
    110110      <HintPath>..\..\..\..\..\..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
    111111    </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>
    112115    <Reference Include="System" />
    113116    <Reference Include="System.Core" />
    114117    <Reference Include="System.Drawing" />
    115118    <Reference Include="System.Windows.Forms" />
     119    <Reference Include="System.Windows.Forms.DataVisualization" />
    116120    <Reference Include="System.Xml.Linq" />
    117121    <Reference Include="System.Data.DataSetExtensions" />
    … …  
    127131      <DependentUpon>UpdateControl.cs</DependentUpon>
    128132    </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>
    129164    <Compile Include="ExperimentManager\UpdateableHiveExperimentManagerView.cs">
    130165      <SubType>UserControl</SubType>
    … …  
    210245    <EmbeddedResource Include="Common\UpdateControl.resx">
    211246      <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>
    212259    </EmbeddedResource>
    213260    <EmbeddedResource Include="ExperimentManager\HiveExperimentManagerView.resx">

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

    r5591 r5597  
    124124    <Compile Include="ExperimentManager\PluginClient.cs" />
    125125    <Compile Include="Exceptions\ResourceNotFoundException.cs" />
     126    <Compile Include="ExperimentManager\StateLogItem.cs" />
    126127    <Compile Include="IServiceLocator.cs" />
    127128    <Compile Include="Jobs\OptimizerJob.cs" />
Note: See TracChangeset for help on using the changeset viewer.