Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
09/26/11 18:26:02 (13 years ago)
Author:
ascheibe
Message:

#1233

  • implemented last couple of slave ui review comments
  • added global runs view to the job manager
  • some minor ui improvements
File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.Views/3.3/SlaveStats.cs

    r6823 r6834  
    101101        Invoke(new Action<StatusCommons>(RenderJobChart), status);
    102102      } else {
    103         jobChart.Series[0].Points.Clear();
    104         jobChart.Series[1].Points.Clear();
    105         jobChart.Series[2].Points.Clear();
    106         jobChart.Series[3].Points.Clear();
    107         jobChart.Series[4].Points.Clear();
     103        taskChart.Series[0].Points.Clear();
     104        taskChart.Series[1].Points.Clear();
     105        taskChart.Series[2].Points.Clear();
     106        taskChart.Series[3].Points.Clear();
     107        taskChart.Series[4].Points.Clear();
    108108
    109109
     
    114114        DataPoint pJobsFailed = new DataPoint(5, status.JobsFailed);
    115115
    116         pJobs.LegendText = "Current jobs: " + status.Jobs.Count;
     116        pJobs.LegendText = "Current tasks: " + status.Jobs.Count;
    117117        pJobs.Color = System.Drawing.Color.Yellow;
    118118        pJobs.ToolTip = pJobs.LegendText;
    119         jobChart.Series[0].Color = System.Drawing.Color.Yellow;
    120         jobChart.Series[0].LegendText = pJobs.LegendText;
    121         jobChart.Series[0].Points.Add(pJobs);
     119        taskChart.Series[0].Color = System.Drawing.Color.Yellow;
     120        taskChart.Series[0].LegendText = pJobs.LegendText;
     121        taskChart.Series[0].Points.Add(pJobs);
    122122
    123         pJobsAborted.LegendText = "Aborted jobs: " + status.JobsAborted;
     123        pJobsAborted.LegendText = "Aborted tasks: " + status.JobsAborted;
    124124        pJobsAborted.Color = System.Drawing.Color.Orange;
    125125        pJobsAborted.ToolTip = pJobsAborted.LegendText;
    126         jobChart.Series[1].Color = System.Drawing.Color.Orange;
    127         jobChart.Series[1].LegendText = pJobsAborted.LegendText;
    128         jobChart.Series[1].Points.Add(pJobsAborted);
     126        taskChart.Series[1].Color = System.Drawing.Color.Orange;
     127        taskChart.Series[1].LegendText = pJobsAborted.LegendText;
     128        taskChart.Series[1].Points.Add(pJobsAborted);
    129129
    130         pJobsDone.LegendText = "Finished jobs: " + status.JobsFinished;
     130        pJobsDone.LegendText = "Finished tasks: " + status.JobsFinished;
    131131        pJobsDone.Color = System.Drawing.Color.Green;
    132132        pJobsDone.ToolTip = pJobsDone.LegendText;
    133         jobChart.Series[2].Color = System.Drawing.Color.Green;
    134         jobChart.Series[2].LegendText = pJobsDone.LegendText;
    135         jobChart.Series[2].Points.Add(pJobsDone);
     133        taskChart.Series[2].Color = System.Drawing.Color.Green;
     134        taskChart.Series[2].LegendText = pJobsDone.LegendText;
     135        taskChart.Series[2].Points.Add(pJobsDone);
    136136
    137         pJobsFetched.LegendText = "Fetched jobs: " + status.JobsFetched;
     137        pJobsFetched.LegendText = "Fetched tasks: " + status.JobsFetched;
    138138        pJobsFetched.ToolTip = pJobsFetched.LegendText;
    139139        pJobsFetched.Color = System.Drawing.Color.Blue;
    140         jobChart.Series[3].Color = System.Drawing.Color.Blue;
    141         jobChart.Series[3].LegendText = pJobsFetched.LegendText;
    142         jobChart.Series[3].Points.Add(pJobsFetched);
     140        taskChart.Series[3].Color = System.Drawing.Color.Blue;
     141        taskChart.Series[3].LegendText = pJobsFetched.LegendText;
     142        taskChart.Series[3].Points.Add(pJobsFetched);
    143143
    144         pJobsFailed.LegendText = "Failed jobs: " + status.JobsFailed;
     144        pJobsFailed.LegendText = "Failed tasks: " + status.JobsFailed;
    145145        pJobsFailed.ToolTip = pJobsFailed.LegendText;
    146146        pJobsFailed.Color = System.Drawing.Color.Red;
    147         jobChart.Series[4].Color = System.Drawing.Color.Red;
    148         jobChart.Series[4].LegendText = pJobsFailed.LegendText;
    149         jobChart.Series[4].Points.Add(pJobsFailed);
     147        taskChart.Series[4].Color = System.Drawing.Color.Red;
     148        taskChart.Series[4].LegendText = pJobsFailed.LegendText;
     149        taskChart.Series[4].Points.Add(pJobsFailed);
    150150      }
    151151    }
     
    161161        coresChart.Series[0].Points.Clear();
    162162
    163         pFreeCores.LegendText = "Free cores: " + statusCommons.FreeCores;
     163        pFreeCores.LegendText = "Free: " + statusCommons.FreeCores;
    164164        pFreeCores.Color = System.Drawing.Color.Green;
    165         pUsedCores.LegendText = "Used cores: " + usedCores;
     165        pUsedCores.LegendText = "Used: " + usedCores;
    166166        pUsedCores.Color = System.Drawing.Color.Red;
    167167
Note: See TracChangeset for help on using the changeset viewer.