Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
01/02/12 11:40:31 (12 years ago)
Author:
sforsten
Message:

#1708: merged r7209 from trunk

  • adjusted GUI
  • added toggle for the different series
  • X Axis labels are rounded to useful values
  • added ToolTip
Location:
branches/RegressionBenchmarks
Files:
11 edited

Legend:

Unmodified
Added
Removed

  • branches/RegressionBenchmarks

  • branches/RegressionBenchmarks/HeuristicLab.Clients.Hive.Views/3.3/GanttChart/GanttChart.Designer.cs

    r6976 r7255  
    6969    #endregion
    7070
    71     private Visualization.ChartControlsExtensions.EnhancedChart chart;
     71    public Visualization.ChartControlsExtensions.EnhancedChart chart;
     72
     73
    7274  }
    7375}

  • branches/RegressionBenchmarks/HeuristicLab.Clients.Hive.Views/3.3/HiveTasks/HiveTaskView.cs

    r6976 r7255  
    9393          this.jobIdTextBox.Text = Content.Task.Id.ToString();
    9494          this.dateCreatedTextBox.Text = Content.Task.DateCreated.HasValue ? Content.Task.DateCreated.ToString() : string.Empty;
    95           this.priorityComboBox.Text = Content.Task.Priority.ToString();
     95          if (Content.Task.Priority >= 0 && Content.Task.Priority < priorityComboBox.Items.Count) {
     96            this.priorityComboBox.SelectedIndex = Content.Task.Priority;
     97          } else {
     98            this.priorityComboBox.SelectedIndex = 0;
     99          }
    96100          this.coresNeededComboBox.Text = Content.Task.CoresNeeded.ToString();
    97101          this.memoryNeededComboBox.Text = Content.Task.MemoryNeeded.ToString();
    … …  
    99103          this.jobIdTextBox.Text = string.Empty;
    100104          this.dateCreatedTextBox.Text = string.Empty;
    101           this.priorityComboBox.Text = "3";
     105          this.priorityComboBox.SelectedIndex = 0;
    102106          this.coresNeededComboBox.Text = "1";
    103           this.memoryNeededComboBox.Text = "256";
     107          this.memoryNeededComboBox.Text = "128";
    104108        }
    105109      }
    … …  
    201205      this.modifyItemButton.Enabled = (Content != null && Content.ItemTask.Item != null && (Content.Task.State == TaskState.Paused || Content.Task.State == TaskState.Offline || Content.Task.State == TaskState.Finished || Content.Task.State == TaskState.Failed || Content.Task.State == TaskState.Aborted));
    202206    }
     207
     208    private void priorityComboBox_SelectedIndexChanged(object sender, EventArgs e) {
     209      if (Content.Task.Priority != priorityComboBox.SelectedIndex) {
     210        Content.Task.Priority = priorityComboBox.SelectedIndex;
     211      }
     212    }
    203213  }
    204214}

  • branches/RegressionBenchmarks/HeuristicLab.Clients.Hive.Views/3.3/HiveTasks/HiveTaskView.designer.cs

    r6976 r7255  
    3030      this.splitContainer2 = new System.Windows.Forms.SplitContainer();
    3131      this.groupBoxGenerel = new System.Windows.Forms.GroupBox();
     32      this.priorityComboBox = new System.Windows.Forms.ComboBox();
    3233      this.jobIdLabel = new System.Windows.Forms.Label();
    3334      this.jobIdTextBox = new System.Windows.Forms.TextBox();
    … …  
    3637      this.priorityLabel = new System.Windows.Forms.Label();
    3738      this.configurationGroupBox = new System.Windows.Forms.GroupBox();
     39      this.memoryNeededComboBox = new System.Windows.Forms.ComboBox();
     40      this.coresNeededComboBox = new System.Windows.Forms.ComboBox();
    3841      this.memoryNeededLabel = new System.Windows.Forms.Label();
    3942      this.coresNeededLabel = new System.Windows.Forms.Label();
    … …  
    5760      this.modifyItemButton = new System.Windows.Forms.Button();
    5861      this.tabControl = new System.Windows.Forms.TabControl();
    59       this.priorityComboBox = new System.Windows.Forms.ComboBox();
    60       this.coresNeededComboBox = new System.Windows.Forms.ComboBox();
    61       this.memoryNeededComboBox = new System.Windows.Forms.ComboBox();
    6262      this.stateLogTabPage.SuspendLayout();
    6363      this.detailsTabPage.SuspendLayout();
    … …  
    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      //
    … …  
    164164      this.groupBoxGenerel.TabIndex = 43;
    165165      this.groupBoxGenerel.TabStop = false;
    166       this.groupBoxGenerel.Text = "Generel";
     166      this.groupBoxGenerel.Text = "General";
     167      //
     168      // priorityComboBox
     169      //
     170      this.priorityComboBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
     171                  | System.Windows.Forms.AnchorStyles.Right)));
     172      this.priorityComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
     173      this.priorityComboBox.FormattingEnabled = true;
     174      this.priorityComboBox.Items.AddRange(new object[] {
     175            "Normal",
     176            "Urgent",
     177            "Critical"});
     178      this.priorityComboBox.Location = new System.Drawing.Point(87, 39);
     179      this.priorityComboBox.Name = "priorityComboBox";
     180      this.priorityComboBox.Size = new System.Drawing.Size(182, 21);
     181      this.priorityComboBox.TabIndex = 43;
     182      this.priorityComboBox.SelectedIndexChanged += new System.EventHandler(this.priorityComboBox_SelectedIndexChanged);
    167183      //
    168184      // jobIdLabel
    … …  
    187203      //
    188204      this.lastUpdatedLabel.AutoSize = true;
    189       this.lastUpdatedLabel.Location = new System.Drawing.Point(6, 60);
     205      this.lastUpdatedLabel.Location = new System.Drawing.Point(6, 68);
    190206      this.lastUpdatedLabel.Name = "lastUpdatedLabel";
    191207      this.lastUpdatedLabel.Size = new System.Drawing.Size(75, 13);
    … …  
    197213      this.lastUpdatedTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    198214                  | System.Windows.Forms.AnchorStyles.Right)));
    199       this.lastUpdatedTextBox.Location = new System.Drawing.Point(87, 57);
     215      this.lastUpdatedTextBox.Location = new System.Drawing.Point(87, 66);
    200216      this.lastUpdatedTextBox.Name = "lastUpdatedTextBox";
    201217      this.lastUpdatedTextBox.Size = new System.Drawing.Size(182, 20);
    … …  
    205221      //
    206222      this.priorityLabel.AutoSize = true;
    207       this.priorityLabel.Location = new System.Drawing.Point(6, 38);
     223      this.priorityLabel.Location = new System.Drawing.Point(6, 42);
    208224      this.priorityLabel.Name = "priorityLabel";
    209225      this.priorityLabel.Size = new System.Drawing.Size(41, 13);
    … …  
    227243      this.configurationGroupBox.Text = "Resource demands";
    228244      //
     245      // memoryNeededComboBox
     246      //
     247      this.memoryNeededComboBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
     248                  | System.Windows.Forms.AnchorStyles.Right)));
     249      this.memoryNeededComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
     250      this.memoryNeededComboBox.FormattingEnabled = true;
     251      this.memoryNeededComboBox.Items.AddRange(new object[] {
     252            "128",
     253            "256",
     254            "512",
     255            "1024",
     256            "2048"});
     257      this.memoryNeededComboBox.Location = new System.Drawing.Point(134, 40);
     258      this.memoryNeededComboBox.Name = "memoryNeededComboBox";
     259      this.memoryNeededComboBox.Size = new System.Drawing.Size(134, 21);
     260      this.memoryNeededComboBox.TabIndex = 42;
     261      //
     262      // coresNeededComboBox
     263      //
     264      this.coresNeededComboBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
     265                  | System.Windows.Forms.AnchorStyles.Right)));
     266      this.coresNeededComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
     267      this.coresNeededComboBox.FormattingEnabled = true;
     268      this.coresNeededComboBox.Items.AddRange(new object[] {
     269            "1",
     270            "2",
     271            "3",
     272            "4"});
     273      this.coresNeededComboBox.Location = new System.Drawing.Point(134, 13);
     274      this.coresNeededComboBox.Name = "coresNeededComboBox";
     275      this.coresNeededComboBox.Size = new System.Drawing.Size(134, 21);
     276      this.coresNeededComboBox.TabIndex = 41;
     277      //
    229278      // memoryNeededLabel
    230279      //
    231280      this.memoryNeededLabel.AutoSize = true;
    232       this.memoryNeededLabel.Location = new System.Drawing.Point(6, 38);
     281      this.memoryNeededLabel.Location = new System.Drawing.Point(6, 43);
    233282      this.memoryNeededLabel.Name = "memoryNeededLabel";
    234283      this.memoryNeededLabel.Size = new System.Drawing.Size(122, 13);
    … …  
    241290      this.coresNeededLabel.Location = new System.Drawing.Point(6, 16);
    242291      this.coresNeededLabel.Name = "coresNeededLabel";
    243       this.coresNeededLabel.Size = new System.Drawing.Size(101, 13);
     292      this.coresNeededLabel.Size = new System.Drawing.Size(104, 13);
    244293      this.coresNeededLabel.TabIndex = 39;
    245       this.coresNeededLabel.Text = "Nr. of cores needed";
     294      this.coresNeededLabel.Text = "Nr. of needed cores:";
    246295      //
    247296      // computeInParallelLabel
    248297      //
    249298      this.computeInParallelLabel.AutoSize = true;
    250       this.computeInParallelLabel.Location = new System.Drawing.Point(6, 60);
     299      this.computeInParallelLabel.Location = new System.Drawing.Point(6, 67);
    251300      this.computeInParallelLabel.Name = "computeInParallelLabel";
    252       this.computeInParallelLabel.Size = new System.Drawing.Size(122, 13);
     301      this.computeInParallelLabel.Size = new System.Drawing.Size(107, 13);
    253302      this.computeInParallelLabel.TabIndex = 36;
    254       this.computeInParallelLabel.Text = "Compute task in parallel:";
     303      this.computeInParallelLabel.Text = "Distribute child tasks:";
    255304      //
    256305      // computeInParallelCheckBox
    257306      //
    258307      this.computeInParallelCheckBox.AutoSize = true;
    259       this.computeInParallelCheckBox.Location = new System.Drawing.Point(135, 61);
     308      this.computeInParallelCheckBox.Location = new System.Drawing.Point(135, 67);
    260309      this.computeInParallelCheckBox.Name = "computeInParallelCheckBox";
    261310      this.computeInParallelCheckBox.Size = new System.Drawing.Size(15, 14);
    … …  
    292341      this.commandTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    293342                  | System.Windows.Forms.AnchorStyles.Right)));
    294       this.commandTextBox.Location = new System.Drawing.Point(95, 41);
     343      this.commandTextBox.Location = new System.Drawing.Point(95, 39);
    295344      this.commandTextBox.Name = "commandTextBox";
    296345      this.commandTextBox.Size = new System.Drawing.Size(171, 20);
    … …  
    300349      //
    301350      this.commandLabel.AutoSize = true;
    302       this.commandLabel.Location = new System.Drawing.Point(7, 41);
     351      this.commandLabel.Location = new System.Drawing.Point(7, 42);
    303352      this.commandLabel.Name = "commandLabel";
    304353      this.commandLabel.Size = new System.Drawing.Size(57, 13);
    … …  
    310359      this.stateTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    311360                  | System.Windows.Forms.AnchorStyles.Right)));
    312       this.stateTextBox.Location = new System.Drawing.Point(95, 19);
     361      this.stateTextBox.Location = new System.Drawing.Point(95, 13);
    313362      this.stateTextBox.Name = "stateTextBox";
    314363      this.stateTextBox.Size = new System.Drawing.Size(171, 20);
    … …  
    318367      //
    319368      this.dateCalculatedLabel.AutoSize = true;
    320       this.dateCalculatedLabel.Location = new System.Drawing.Point(7, 108);
     369      this.dateCalculatedLabel.Location = new System.Drawing.Point(7, 120);
    321370      this.dateCalculatedLabel.Name = "dateCalculatedLabel";
    322371      this.dateCalculatedLabel.Size = new System.Drawing.Size(85, 13);
    … …  
    327376      //
    328377      this.stateLabel.AutoSize = true;
    329       this.stateLabel.Location = new System.Drawing.Point(7, 19);
     378      this.stateLabel.Location = new System.Drawing.Point(7, 16);
    330379      this.stateLabel.Name = "stateLabel";
    331380      this.stateLabel.Size = new System.Drawing.Size(35, 13);
    … …  
    337386      this.dateCalculatedText.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    338387                  | System.Windows.Forms.AnchorStyles.Right)));
    339       this.dateCalculatedText.Location = new System.Drawing.Point(95, 108);
     388      this.dateCalculatedText.Location = new System.Drawing.Point(95, 117);
    340389      this.dateCalculatedText.Name = "dateCalculatedText";
    341390      this.dateCalculatedText.Size = new System.Drawing.Size(171, 20);
    … …  
    346395      this.dateFinishedTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    347396                  | System.Windows.Forms.AnchorStyles.Right)));
    348       this.dateFinishedTextBox.Location = new System.Drawing.Point(95, 130);
     397      this.dateFinishedTextBox.Location = new System.Drawing.Point(95, 143);
    349398      this.dateFinishedTextBox.Name = "dateFinishedTextBox";
    350399      this.dateFinishedTextBox.Size = new System.Drawing.Size(171, 20);
    … …  
    355404      this.executionTimeTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    356405                  | System.Windows.Forms.AnchorStyles.Right)));
    357       this.executionTimeTextBox.Location = new System.Drawing.Point(95, 64);
     406      this.executionTimeTextBox.Location = new System.Drawing.Point(95, 65);
    358407      this.executionTimeTextBox.Name = "executionTimeTextBox";
    359408      this.executionTimeTextBox.Size = new System.Drawing.Size(171, 20);
    … …  
    364413      this.dateCreatedTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    365414                  | System.Windows.Forms.AnchorStyles.Right)));
    366       this.dateCreatedTextBox.Location = new System.Drawing.Point(95, 86);
     415      this.dateCreatedTextBox.Location = new System.Drawing.Point(95, 91);
    367416      this.dateCreatedTextBox.Name = "dateCreatedTextBox";
    368417      this.dateCreatedTextBox.Size = new System.Drawing.Size(171, 20);
    … …  
    372421      //
    373422      this.executionTimeLabel.AutoSize = true;
    374       this.executionTimeLabel.Location = new System.Drawing.Point(7, 64);
     423      this.executionTimeLabel.Location = new System.Drawing.Point(7, 68);
    375424      this.executionTimeLabel.Name = "executionTimeLabel";
    376425      this.executionTimeLabel.Size = new System.Drawing.Size(79, 13);
    … …  
    381430      //
    382431      this.exceptionLabel.AutoSize = true;
    383       this.exceptionLabel.Location = new System.Drawing.Point(7, 152);
     432      this.exceptionLabel.Location = new System.Drawing.Point(7, 172);
    384433      this.exceptionLabel.Name = "exceptionLabel";
    385434      this.exceptionLabel.Size = new System.Drawing.Size(57, 13);
    … …  
    390439      //
    391440      this.dateCreatedLabel.AutoSize = true;
    392       this.dateCreatedLabel.Location = new System.Drawing.Point(7, 86);
     441      this.dateCreatedLabel.Location = new System.Drawing.Point(7, 94);
    393442      this.dateCreatedLabel.Name = "dateCreatedLabel";
    394443      this.dateCreatedLabel.Size = new System.Drawing.Size(72, 13);
    … …  
    399448      //
    400449      this.dateFinishedLabel.AutoSize = true;
    401       this.dateFinishedLabel.Location = new System.Drawing.Point(7, 130);
     450      this.dateFinishedLabel.Location = new System.Drawing.Point(7, 146);
    402451      this.dateFinishedLabel.Name = "dateFinishedLabel";
    403452      this.dateFinishedLabel.Size = new System.Drawing.Size(72, 13);
    … …  
    409458      this.exceptionTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    410459                  | System.Windows.Forms.AnchorStyles.Right)));
    411       this.exceptionTextBox.Location = new System.Drawing.Point(95, 152);
     460      this.exceptionTextBox.Location = new System.Drawing.Point(95, 169);
    412461      this.exceptionTextBox.Name = "exceptionTextBox";
    413462      this.exceptionTextBox.Size = new System.Drawing.Size(171, 20);
    … …  
    439488      this.tabControl.Size = new System.Drawing.Size(571, 401);
    440489      this.tabControl.TabIndex = 25;
    441       //
    442       // priorityComboBox
    443       //
    444       this.priorityComboBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    445                   | System.Windows.Forms.AnchorStyles.Right)));
    446       this.priorityComboBox.FormattingEnabled = true;
    447       this.priorityComboBox.Items.AddRange(new object[] {
    448             "1",
    449             "2",
    450             "3",
    451             "4",
    452             "5"});
    453       this.priorityComboBox.Location = new System.Drawing.Point(87, 35);
    454       this.priorityComboBox.Name = "priorityComboBox";
    455       this.priorityComboBox.Size = new System.Drawing.Size(182, 21);
    456       this.priorityComboBox.TabIndex = 43;
    457       //
    458       // coresNeededComboBox
    459       //
    460       this.coresNeededComboBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    461                   | System.Windows.Forms.AnchorStyles.Right)));
    462       this.coresNeededComboBox.FormattingEnabled = true;
    463       this.coresNeededComboBox.Items.AddRange(new object[] {
    464             "1",
    465             "2",
    466             "3",
    467             "4",
    468             "5",
    469             "6",
    470             "7",
    471             "8"});
    472       this.coresNeededComboBox.Location = new System.Drawing.Point(134, 13);
    473       this.coresNeededComboBox.Name = "coresNeededComboBox";
    474       this.coresNeededComboBox.Size = new System.Drawing.Size(134, 21);
    475       this.coresNeededComboBox.TabIndex = 41;
    476       //
    477       // memoryNeededComboBox
    478       //
    479       this.memoryNeededComboBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    480                   | System.Windows.Forms.AnchorStyles.Right)));
    481       this.memoryNeededComboBox.FormattingEnabled = true;
    482       this.memoryNeededComboBox.Items.AddRange(new object[] {
    483             "128",
    484             "256",
    485             "512",
    486             "1024",
    487             "2048"});
    488       this.memoryNeededComboBox.Location = new System.Drawing.Point(134, 35);
    489       this.memoryNeededComboBox.Name = "memoryNeededComboBox";
    490       this.memoryNeededComboBox.Size = new System.Drawing.Size(135, 21);
    491       this.memoryNeededComboBox.TabIndex = 42;
    492490      //
    493491      // HiveTaskView

  • branches/RegressionBenchmarks/HeuristicLab.Clients.Hive.Views/3.3/HiveTasks/OptimizerHiveTaskView.cs

    r6976 r7255  
    2323using System.Windows.Forms;
    2424using HeuristicLab.MainForm;
     25using System.Threading.Tasks;
     26using HeuristicLab.PluginInfrastructure;
    2527
    2628namespace HeuristicLab.Clients.Hive.Views {
    … …  
    2830  [Content(typeof(OptimizerHiveTask), true)]
    2931  public partial class OptimizerHiveTaskView : HiveTaskView {
     32    private ProgressView progressView;
     33
    3034    public new OptimizerHiveTask Content {
    3135      get { return (OptimizerHiveTask)base.Content; }
    … …  
    6771    #region Child Control Events
    6872    private void restartButton_Click(object sender, EventArgs e) {
    69       Content.Restart();
     73      var task = System.Threading.Tasks.Task.Factory.StartNew(ResumeTaskAsync);
     74      task.ContinueWith((t) => {
     75        FinishProgressView();
     76        ErrorHandling.ShowErrorDialog(this, "An error occured while resuming the task.", t.Exception);
     77      }, TaskContinuationOptions.OnlyOnFaulted);
    7078    }
    7179
    7280    private void pauseButton_Click(object sender, EventArgs e) {
    73       Content.Pause();
     81      var task = System.Threading.Tasks.Task.Factory.StartNew(PauseTaskAsync);
     82      task.ContinueWith((t) => {
     83        FinishProgressView();
     84        ErrorHandling.ShowErrorDialog(this, "An error occured while pausing the task.", t.Exception);
     85      }, TaskContinuationOptions.OnlyOnFaulted);
    7486    }
    7587
    7688    private void stopButton_Click(object sender, EventArgs e) {
    77       Content.Stop();
     89      var task = System.Threading.Tasks.Task.Factory.StartNew(StopTaskAsync);
     90      task.ContinueWith((t) => {
     91        FinishProgressView();
     92        ErrorHandling.ShowErrorDialog(this, "An error occured while stopping the task.", t.Exception);
     93      }, TaskContinuationOptions.OnlyOnFaulted);
    7894    }
    7995    #endregion
     96
     97    private void PauseTaskAsync() {
     98      IProgress prog = new Progress();
     99      prog.Status = "Pausing task. Please be patient for the command to take effect.";
     100      SetProgressView(prog);
     101      Content.Pause();
     102      FinishProgressView();
     103    }
     104
     105    private void StopTaskAsync() {
     106      IProgress prog = new Progress();
     107      prog.Status = "Stopping task. Please be patient for the command to take effect.";
     108      SetProgressView(prog);
     109      Content.Stop();
     110      FinishProgressView();
     111    }
     112
     113    private void ResumeTaskAsync() {
     114      IProgress prog = new Progress();
     115      prog.Status = "Resuming task. Please be patient for the command to take effect.";
     116      SetProgressView(prog);
     117      Content.Restart();
     118      FinishProgressView();
     119    }
     120
     121    private void SetProgressView(IProgress progress) {
     122      if (InvokeRequired) {
     123        Invoke(new Action<IProgress>(SetProgressView), progress);
     124      } else {
     125        if (progressView == null) {
     126          progressView = new ProgressView(this, progress);
     127        } else {
     128          progressView.Progress = progress;
     129        }
     130      }
     131    }
     132
     133    private void FinishProgressView() {
     134      if (InvokeRequired) {
     135        Invoke(new Action(FinishProgressView));
     136      } else {
     137        if (progressView != null) {
     138          progressView.Finish();
     139          progressView = null;
     140          SetEnabledStateOfControls();
     141        }
     142      }
     143    }
    80144
    81145    protected override void SetEnabledStateOfControls() {

  • branches/RegressionBenchmarks/HeuristicLab.Clients.Hive.Views/3.3/HiveTasks/OptimizerHiveTaskView.designer.cs

    r6976 r7255  
    3232      this.stateLogTabPage.SuspendLayout();
    3333      this.detailsTabPage.SuspendLayout();
    34       this.configurationGroupBox.SuspendLayout();
    3534      this.jobStatusGroupBox.SuspendLayout();
    3635      this.tabControl.SuspendLayout();
     36      this.configurationGroupBox.SuspendLayout();
    3737      this.runsTabPage.SuspendLayout();
    3838      this.SuspendLayout();
    … …  
    4343      this.detailsTabPage.Controls.Add(this.pauseButton);
    4444      this.detailsTabPage.Controls.Add(this.stopButton);
     45      this.detailsTabPage.Controls.SetChildIndex(this.modifyItemButton, 0);
    4546      this.detailsTabPage.Controls.SetChildIndex(this.stopButton, 0);
    4647      this.detailsTabPage.Controls.SetChildIndex(this.pauseButton, 0);
    … …  
    5455      this.tabControl.Controls.SetChildIndex(this.detailsTabPage, 0);
    5556      //
    56       // showItemButton
     57      // modifyItemButton
    5758      //
    58       this.modifyItemButton.Text = "Modify Optimizer";
     59      this.modifyItemButton.Text = "Show/Modify Optimizer";
    5960      //
    6061      // restartButton
    … …  
    123124      this.stateLogTabPage.ResumeLayout(false);
    124125      this.detailsTabPage.ResumeLayout(false);
    125       this.detailsTabPage.PerformLayout();
    126       this.configurationGroupBox.ResumeLayout(false);
    127       this.configurationGroupBox.PerformLayout();
    128126      this.jobStatusGroupBox.ResumeLayout(false);
    129127      this.jobStatusGroupBox.PerformLayout();
    130128      this.tabControl.ResumeLayout(false);
     129      this.configurationGroupBox.ResumeLayout(false);
     130      this.configurationGroupBox.PerformLayout();
    131131      this.runsTabPage.ResumeLayout(false);
    132132      this.ResumeLayout(false);

  • branches/RegressionBenchmarks/HeuristicLab.Clients.Hive.Views/3.3/HiveTasks/OptimizerHiveTaskView.resx

    r6976 r7255  
    119119  </resheader>
    120120  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
     121  <data name="restartButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     122    <value>
     123        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
     124        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAK/wAA
     125        Cv8BNGKaggAAALBJREFUOE9j+P//PwMlGKvmsv3ZbsQaitWAhBkR/4k1BKcBlmX6RBmC1YCoKUH/N9xa
     126        /J8YQ7AaEDzBG2Q7UYZgNcCnyxlsAAhHLQrA6xKsBjg2W/zP2BAL1mzbrP9fp1jhv0QaN4hWQ48drAaY
     127        1+ihaOZPYMGqGWQYVgP0SpXhNuPTjNMAlXwpsLMJacZpgHSGIFGacRogksyJ089EBSK20MaVNyjKiTi9
     128        QGxOBKkDACT9xOni1RbMAAAAAElFTkSuQmCC
     129</value>
     130  </data>
     131  <data name="pauseButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     132    <value>
     133        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
     134        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAK/wAA
     135        Cv8BNGKaggAAAL5JREFUOE9j+P//PwMlmCLNIIsHoQG9m//+79rw63/e1EefQE5E56OHF4YXQJqvPvzz
     136        Xzd0FVDtfwZ0PkED2tZ++3/r6e//qn6LwAag8wka0Lji8//LD3//l3ObBTYAnU/QgNrF7/+fuP77v5jd
     137        JLAB6HyCBlTMe/V/94Wf//nNusEGoPMJGlAy+/n/9Sd//uc0aAUbgM4naEDB9Mf/F+z5/J9VpxFsADqf
     138        oAGg+GfTbYIbgM4naACpGWvg8wIAkX3yJyVePz4AAAAASUVORK5CYII=
     139</value>
     140  </data>
    121141  <data name="stopButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    122142    <value>
    … …  
    132152</value>
    133153  </data>
    134   <data name="pauseButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    135     <value>
    136         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
    137         YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAK/wAA
    138         Cv8BNGKaggAAAL5JREFUOE9j+P//PwMlmCLNIIsHoQG9m//+79rw63/e1EefQE5E56OHF4YXQJqvPvzz
    139         Xzd0FVDtfwZ0PkED2tZ++3/r6e//qn6LwAag8wka0Lji8//LD3//l3ObBTYAnU/QgNrF7/+fuP77v5jd
    140         JLAB6HyCBlTMe/V/94Wf//nNusEGoPMJGlAy+/n/9Sd//uc0aAUbgM4naEDB9Mf/F+z5/J9VpxFsADqf
    141         oAGg+GfTbYIbgM4naACpGWvg8wIAkX3yJyVePz4AAAAASUVORK5CYII=
    142 </value>
    143   </data>
    144   <data name="restartButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    145     <value>
    146         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
    147         YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAK/wAA
    148         Cv8BNGKaggAAALBJREFUOE9j+P//PwMlGKvmsv3ZbsQaitWAhBkR/4k1BKcBlmX6RBmC1YCoKUH/N9xa
    149         /J8YQ7AaEDzBG2Q7UYZgNcCnyxlsAAhHLQrA6xKsBjg2W/zP2BAL1mzbrP9fp1jhv0QaN4hWQ48drAaY
    150         1+ihaOZPYMGqGWQYVgP0SpXhNuPTjNMAlXwpsLMJacZpgHSGIFGacRogksyJ089EBSK20MaVNyjKiTi9
    151         QGxOBKkDACT9xOni1RbMAAAAAElFTkSuQmCC
    152 </value>
    153   </data>
    154154</root>

  • branches/RegressionBenchmarks/HeuristicLab.Clients.Hive.Views/3.3/StateLog/StateLogGanttChartListView.cs

    r6976 r7255  
    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;

  • branches/RegressionBenchmarks/HeuristicLab.Clients.Hive.Views/3.3/TreeView/DeleteTaskTreeNodeAction.cs

    r6976 r7255  
    2525using HeuristicLab.Optimization;
    2626
    27 namespace HeuristicLab.Clients.Hive.Views.ExperimentManager.TreeView {
     27namespace HeuristicLab.Clients.Hive.Views.TreeView {
    2828  public class DeleteTaskTreeNodeAction : IItemTreeNodeAction<HiveTask> {
    2929    private ItemCollection<HiveTask> hiveTasks;

  • branches/RegressionBenchmarks/HeuristicLab.Clients.Hive.Views/3.3/TreeView/HiveTaskItemTreeView.Designer.cs

    r6976 r7255  
    2020#endregion
    2121
    22 namespace HeuristicLab.Clients.Hive.Views.ExperimentManager {
     22namespace HeuristicLab.Clients.Hive.Views {
    2323  partial class HiveTaskItemTreeView {
    2424    /// <summary>

  • branches/RegressionBenchmarks/HeuristicLab.Clients.Hive.Views/3.3/TreeView/HiveTaskItemTreeView.cs

    r7056 r7255  
    2929using HeuristicLab.Optimization;
    3030
    31 namespace HeuristicLab.Clients.Hive.Views.ExperimentManager {
     31namespace HeuristicLab.Clients.Hive.Views {
    3232  [View("HiveTask ItemTreeView")]
    3333  [Content(typeof(ItemCollection<HiveTask>), IsDefaultView = false)]
Note: See TracChangeset for help on using the changeset viewer.