Free cookie consent management tool by TermsFeed Policy Generator

Changeset 7191 for trunk/sources


Ignore:
Timestamp:
12/15/11 16:01:58 (13 years ago)
Author:
ascheibe
Message:

#1709

  • tooltip now shows the name and the id of a task
  • the date is now shown on the x-axis for runs spanning multiple days
Location:
trunk/sources
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/sources/HeuristicLab.Clients.Hive.Views/3.3/GanttChart/GanttChart.Designer.cs

    r6976 r7191  
    6969    #endregion
    7070
    71     private Visualization.ChartControlsExtensions.EnhancedChart chart;
     71    public Visualization.ChartControlsExtensions.EnhancedChart chart;
     72
     73
    7274  }
    7375}
  • trunk/sources/HeuristicLab.Clients.Hive.Views/3.3/HiveTasks/HiveTaskView.designer.cs

    r7190 r7191  
    8383      this.stateLogTabPage.Size = new System.Drawing.Size(563, 375);
    8484      this.stateLogTabPage.TabIndex = 5;
    85       this.stateLogTabPage.Text = "State";
     85      this.stateLogTabPage.Text = "Execution History";
    8686      this.stateLogTabPage.UseVisualStyleBackColor = true;
    8787      //
     
    301301      this.computeInParallelLabel.Location = new System.Drawing.Point(6, 67);
    302302      this.computeInParallelLabel.Name = "computeInParallelLabel";
    303       this.computeInParallelLabel.Size = new System.Drawing.Size(122, 13);
     303      this.computeInParallelLabel.Size = new System.Drawing.Size(107, 13);
    304304      this.computeInParallelLabel.TabIndex = 36;
    305       this.computeInParallelLabel.Text = "Compute task in parallel:";
     305      this.computeInParallelLabel.Text = "Distribute child tasks:";
    306306      //
    307307      // computeInParallelCheckBox
  • trunk/sources/HeuristicLab.Clients.Hive.Views/3.3/StateLog/StateLogGanttChartListView.cs

    r6976 r7191  
    5656      base.OnContentChanged();
    5757      if (Content == null) {
    58         // Add code when content has been changed and is null
    5958        ganttChart.Reset();
    6059      } else {
    61         // Add code when content has been changed and is not null
    6260        ganttChart.Reset();
    6361        SetupCategories(ganttChart);
    6462        if (Content.Count > 0) {
    6563          DateTime maxValue = Content.Max(x => x.Count > 0 ? x.Max(y => y.DateTime) : DateTime.MinValue);
     64          DateTime minValue = Content.Min(x => x.Count > 0 ? x.Min(y => y.DateTime) : DateTime.MinValue);
    6665          DateTime upperLimit;
    6766          if (Content.All(x => x.Count > 0 ? (x.Last().State == TaskState.Finished || x.Last().State == TaskState.Failed || x.Last().State == TaskState.Aborted) : true)) {
     
    6968          } else {
    7069            upperLimit = DateTime.Now;
     70          }
     71
     72          if ((upperLimit - minValue) > TimeSpan.FromDays(1)) {
     73            this.ganttChart.chart.Series[0].YValueType = System.Windows.Forms.DataVisualization.Charting.ChartValueType.Date;
     74          } else {
     75            this.ganttChart.chart.Series[0].YValueType = System.Windows.Forms.DataVisualization.Charting.ChartValueType.Time;
    7176          }
    7277
     
    98103      DateTime until = to != null ? to.DateTime : upperLimit;
    99104      TimeSpan duration = until - from.DateTime;
    100       string tooltip = string.Format("State: {0} " + Environment.NewLine + " Duration: {1} " + Environment.NewLine + " {2} - {3}", from.State, duration, from.DateTime, until);
     105      string tooltip = string.Format("Task: {0} " + Environment.NewLine + "Task Id: {1}" + Environment.NewLine + "State: {2} " + Environment.NewLine + "Duration: {3} " + Environment.NewLine + "{4} - {5}", from.TaskName, from.TaskId, from.State, duration, from.DateTime, until);
    101106      if (!string.IsNullOrEmpty(from.Exception))
    102107        tooltip += Environment.NewLine + from.Exception;
  • trunk/sources/HeuristicLab.Clients.Hive/3.3/HiveJobs/HiveTask.cs

    r7177 r7191  
    143143
    144144    public StateLogList StateLog {
    145       get { return new StateLogList(this.task.StateLog); }
     145      get {
     146        var list = new StateLogList(this.task.StateLog);
     147        list.ForEach(s => { s.TaskName = itemTask.Name; });
     148        return list;
     149      }
    146150    }
    147151
  • trunk/sources/HeuristicLab.Clients.Hive/3.3/ServiceClients/StateLog.cs

    r6976 r7191  
    3838    }
    3939
     40    public string TaskName { get; set; }
     41
    4042    public override IDeepCloneable Clone(Cloner cloner) {
    4143      return new StateLog(this, cloner);
Note: See TracChangeset for help on using the changeset viewer.