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
Location:
branches/HeuristicLab.Hive-3.4/sources
Files:
11 edited
3 moved

Legend:

Unmodified
Added
Removed

  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.JobManager/3.3/Views/RefreshableHiveJobListView.cs

    r6792 r6834  
    5252
    5353    protected override void removeButton_Click(object sender, EventArgs e) {
    54       DialogResult result = MessageBox.Show("This action will permanently delete this experiment (also on the hive server). Continue?", "Delete Experiment", MessageBoxButtons.OKCancel);
     54      DialogResult result = MessageBox.Show("This action will permanently delete this job (also on the hive server). Continue?", "Delete Job", MessageBoxButtons.OKCancel, MessageBoxIcon.Question);
    5555      if (result == DialogResult.OK) {
    5656        base.removeButton_Click(sender, e);

  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.JobManager/3.3/Views/RefreshableHiveJobView.Designer.cs

    r6792 r6834  
    5858      this.calculatingLabel = new System.Windows.Forms.Label();
    5959      this.jobsLabel = new System.Windows.Forms.Label();
     60      this.runCollectionViewHost = new HeuristicLab.MainForm.WindowsForms.ViewHost();
    6061      this.tabControl.SuspendLayout();
    6162      this.tasksTabPage.SuspendLayout();
    6263      this.permissionTabPage.SuspendLayout();
     64      this.runsTabPage.SuspendLayout();
    6365      this.stateTabPage.SuspendLayout();
    6466      this.logTabPage.SuspendLayout();
    … …  
    149151      // runsTabPage
    150152      //
     153      this.runsTabPage.Controls.Add(this.runCollectionViewHost);
    151154      this.runsTabPage.Location = new System.Drawing.Point(4, 22);
    152155      this.runsTabPage.Name = "runsTabPage";
    … …  
    418421      this.jobsLabel.Text = "Waiting:";
    419422      //
    420       // RefreshableHiveExperimentView
     423      // runCollectionViewHost
     424      //
     425      this.runCollectionViewHost.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
     426                  | System.Windows.Forms.AnchorStyles.Left)
     427                  | System.Windows.Forms.AnchorStyles.Right)));
     428      this.runCollectionViewHost.Caption = "View";
     429      this.runCollectionViewHost.Content = null;
     430      this.runCollectionViewHost.Enabled = false;
     431      this.runCollectionViewHost.Location = new System.Drawing.Point(3, 3);
     432      this.runCollectionViewHost.Name = "runCollectionViewHost";
     433      this.runCollectionViewHost.ReadOnly = false;
     434      this.runCollectionViewHost.Size = new System.Drawing.Size(703, 420);
     435      this.runCollectionViewHost.TabIndex = 2;
     436      this.runCollectionViewHost.ViewsLabelVisible = true;
     437      this.runCollectionViewHost.ViewType = null;
     438      //
     439      // RefreshableHiveJobView
    421440      //
    422441      this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
    … …  
    437456      this.Controls.Add(this.stopButton);
    438457      this.Controls.Add(this.resetButton);
    439       this.Name = "RefreshableHiveExperimentView";
     458      this.Name = "RefreshableHiveJobView";
    440459      this.Size = new System.Drawing.Size(717, 560);
    441460      this.tabControl.ResumeLayout(false);
    442461      this.tasksTabPage.ResumeLayout(false);
    443462      this.permissionTabPage.ResumeLayout(false);
     463      this.runsTabPage.ResumeLayout(false);
    444464      this.stateTabPage.ResumeLayout(false);
    445465      this.logTabPage.ResumeLayout(false);
    … …  
    484504    private System.Windows.Forms.Button refreshPermissionsButton;
    485505    private System.Windows.Forms.TabPage runsTabPage;
     506    private MainForm.WindowsForms.ViewHost runCollectionViewHost;
    486507
    487508  }

  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.JobManager/3.3/Views/RefreshableHiveJobView.cs

    r6792 r6834  
    6363      Content.StateLogListChanged += new EventHandler(Content_StateLogListChanged);
    6464      Content.IsProgressingChanged += new EventHandler(Content_IsProgressingChanged);
    65       Content.HiveJobsChanged += new EventHandler(Content_HiveJobChanged);
     65      Content.HiveTasksChanged += new EventHandler(Content_HiveTasksChanged);
    6666      Content.ExecutionStateChanged += new EventHandler(Content_ExecutionStateChanged);
    6767      Content.ExecutionTimeChanged += new EventHandler(Content_ExecutionTimeChanged);
    6868      Content.IsAllowedPrivilegedChanged += new EventHandler(Content_IsAllowedPrivilegedChanged);
     69      Content.Loaded += new EventHandler(Content_Loaded);
    6970    }
    7071
    … …  
    7778      Content.StateLogListChanged -= new EventHandler(Content_StateLogListChanged);
    7879      Content.IsProgressingChanged -= new EventHandler(Content_IsProgressingChanged);
    79       Content.HiveJobsChanged -= new EventHandler(Content_HiveJobChanged);
     80      Content.HiveTasksChanged -= new EventHandler(Content_HiveTasksChanged);
    8081      Content.ExecutionStateChanged -= new EventHandler(Content_ExecutionStateChanged);
    8182      Content.ExecutionTimeChanged -= new EventHandler(Content_ExecutionTimeChanged);
     83      Content.Loaded -= new EventHandler(Content_Loaded);
    8284      base.DeregisterContentEvents();
    8385    }
    … …  
    9294
    9395    private void RegisterHiveJobEvents() {
    94       Content.HiveTasks.ItemsAdded += new CollectionItemsChangedEventHandler<HiveTask>(HiveJobs_ItemsAdded_Removed_Reset);
    95       Content.HiveTasks.ItemsRemoved += new CollectionItemsChangedEventHandler<HiveTask>(HiveJobs_ItemsAdded_Removed_Reset);
    96       Content.HiveTasks.CollectionReset += new CollectionItemsChangedEventHandler<HiveTask>(HiveJobs_ItemsAdded_Removed_Reset);
     96      Content.HiveTasks.ItemsAdded += new CollectionItemsChangedEventHandler<HiveTask>(HiveTasks_ItemsAdded);
     97      Content.HiveTasks.ItemsRemoved += new CollectionItemsChangedEventHandler<HiveTask>(HiveTasks_ItemsRemoved);
     98      Content.HiveTasks.CollectionReset += new CollectionItemsChangedEventHandler<HiveTask>(HiveTasks_CollectionReset);
    9799    }
    98100    private void DeregisterHiveJobEvents() {
    99       Content.HiveTasks.ItemsAdded -= new CollectionItemsChangedEventHandler<HiveTask>(HiveJobs_ItemsAdded_Removed_Reset);
    100       Content.HiveTasks.ItemsRemoved -= new CollectionItemsChangedEventHandler<HiveTask>(HiveJobs_ItemsAdded_Removed_Reset);
    101       Content.HiveTasks.CollectionReset -= new CollectionItemsChangedEventHandler<HiveTask>(HiveJobs_ItemsAdded_Removed_Reset);
     101      Content.HiveTasks.ItemsAdded -= new CollectionItemsChangedEventHandler<HiveTask>(HiveTasks_ItemsAdded);
     102      Content.HiveTasks.ItemsRemoved -= new CollectionItemsChangedEventHandler<HiveTask>(HiveTasks_ItemsRemoved);
     103      Content.HiveTasks.CollectionReset -= new CollectionItemsChangedEventHandler<HiveTask>(HiveTasks_CollectionReset);
    102104    }
    103105
    … …  
    112114        refreshAutomaticallyCheckBox.Checked = false;
    113115        logView.Content = null;
     116        runCollectionViewHost.Content = null;
    114117      } else {
    115118        nameTextBox.Text = Content.Job.Name;
    … …  
    119122        refreshAutomaticallyCheckBox.Checked = Content.RefreshAutomatically;
    120123        logView.Content = Content.Log;
     124        runCollectionViewHost.Content = GetAllRunsFromJob(Content);
    121125      }
    122126      hiveExperimentPermissionListView.Content = null; // has to be filled by refresh button
    123127      Content_JobStatisticsChanged(this, EventArgs.Empty);
    124128      Content_HiveExperimentChanged(this, EventArgs.Empty);
    125       Content_HiveJobChanged(this, EventArgs.Empty);
     129      Content_HiveTasksChanged(this, EventArgs.Empty);
    126130      Content_IsProgressingChanged(this, EventArgs.Empty);
    127131      Content_StateLogListChanged(this, EventArgs.Empty);
    … …  
    163167
    164168    #region Content Events
    165     private void HiveJobs_ItemsAdded_Removed_Reset(object sender, CollectionItemsChangedEventArgs<HiveTask> e) {
    166       if (InvokeRequired)
    167         Invoke(new CollectionItemsChangedEventHandler<HiveTask>(HiveJobs_ItemsAdded_Removed_Reset), sender, e);
    168       else {
    169         SetEnabledStateOfControls();
    170       }
    171     }
     169    private void HiveTasks_ItemsAdded(object sender, CollectionItemsChangedEventArgs<HiveTask> e) {
     170      if (InvokeRequired)
     171        Invoke(new CollectionItemsChangedEventHandler<HiveTask>(HiveTasks_ItemsAdded), sender, e);
     172      else {
     173        foreach (HiveTask t in e.Items) {
     174          t.TaskStateChanged += new EventHandler(HiveTask_TaskStateChanged);
     175        }
     176        SetEnabledStateOfControls();
     177      }
     178    }
     179
     180    private void HiveTasks_ItemsRemoved(object sender, CollectionItemsChangedEventArgs<HiveTask> e) {
     181      if (InvokeRequired)
     182        Invoke(new CollectionItemsChangedEventHandler<HiveTask>(HiveTasks_ItemsRemoved), sender, e);
     183      else {
     184        foreach (HiveTask t in e.Items) {
     185          t.TaskStateChanged -= new EventHandler(HiveTask_TaskStateChanged);
     186        }
     187        SetEnabledStateOfControls();
     188      }
     189    }
     190
     191    private void HiveTasks_CollectionReset(object sender, CollectionItemsChangedEventArgs<HiveTask> e) {
     192      if (InvokeRequired)
     193        Invoke(new CollectionItemsChangedEventHandler<HiveTask>(HiveTasks_CollectionReset), sender, e);
     194      else {
     195        foreach (HiveTask t in e.Items) {
     196          t.TaskStateChanged -= new EventHandler(HiveTask_TaskStateChanged);
     197        }
     198        SetEnabledStateOfControls();
     199      }
     200    }
     201
     202    void HiveTask_TaskStateChanged(object sender, EventArgs e) {
     203      runCollectionViewHost.Content = GetAllRunsFromJob(Content);
     204    }
     205
    172206    private void Content_ExecutionStateChanged(object sender, EventArgs e) {
    173207      if (InvokeRequired)
    … …  
    224258      }
    225259    }
    226     private void Content_HiveJobChanged(object sender, EventArgs e) {
    227       if (InvokeRequired)
    228         Invoke(new EventHandler(Content_HiveJobChanged), sender, e);
     260    private void Content_HiveTasksChanged(object sender, EventArgs e) {
     261      if (InvokeRequired)
     262        Invoke(new EventHandler(Content_HiveTasksChanged), sender, e);
    229263      else {
    230264        if (Content != null && Content.HiveTasks != null) {
    … …  
    236270        SetEnabledStateOfControls();
    237271      }
     272    }
     273
     274    void Content_Loaded(object sender, EventArgs e) {
     275      runCollectionViewHost.Content = GetAllRunsFromJob(Content);
    238276    }
    239277
    … …  
    419457      }
    420458    }
     459
     460    private RunCollection GetAllRunsFromJob(RefreshableJob job) {
     461      if (job != null) {
     462        RunCollection runs = new RunCollection();
     463
     464        foreach (HiveTask subTask in job.HiveTasks) {
     465          if (subTask is OptimizerHiveTask) {
     466            OptimizerHiveTask ohTask = subTask as OptimizerHiveTask;
     467            runs.AddRange(ohTask.ItemTask.Item.Runs);
     468          }
     469        }
     470        return runs;
     471      } else {
     472        return null;
     473      }
     474    }
    421475  }
    422476}

  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.App/3.3/MainWindow.Designer.cs

    r6823 r6834  
    5050      this.Name = "MainWindow";
    5151      this.Text = "Hive Slave";
     52      this.SizeChanged += new System.EventHandler(this.MainWindow_SizeChanged);
    5253      this.ResumeLayout(false);
    5354

  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.App/3.3/MainWindow.cs

    r6823 r6834  
    3636      } else {
    3737        Show();
     38        if (WindowState == FormWindowState.Minimized) {
     39          WindowState = FormWindowState.Normal;
     40        }
    3841      }
    3942    }
    … …  
    4548      }
    4649    }
     50
     51    private void MainWindow_SizeChanged(object sender, EventArgs e) {
     52      if (WindowState == FormWindowState.Minimized) {
     53        Hide();
     54      } /*else if (Visible == false) {
     55        Show();
     56      }   */
     57    }
    4758  }
    4859}

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

    r6823 r6834  
    177177      <DependentUpon>SlaveStats.cs</DependentUpon>
    178178    </Compile>
    179     <Compile Include="JobsView.cs">
    180       <SubType>UserControl</SubType>
    181     </Compile>
    182     <Compile Include="JobsView.Designer.cs">
    183       <DependentUpon>JobsView.cs</DependentUpon>
     179    <Compile Include="TaskView.cs">
     180      <SubType>UserControl</SubType>
     181    </Compile>
     182    <Compile Include="TaskView.Designer.cs">
     183      <DependentUpon>TaskView.cs</DependentUpon>
    184184    </Compile>
    185185    <Compile Include="LogView.cs">
    … …  
    248248      <SubType>Designer</SubType>
    249249    </EmbeddedResource>
    250     <EmbeddedResource Include="JobsView.resx">
    251       <DependentUpon>JobsView.cs</DependentUpon>
     250    <EmbeddedResource Include="TaskView.resx">
     251      <DependentUpon>TaskView.cs</DependentUpon>
    252252    </EmbeddedResource>
    253253    <EmbeddedResource Include="LogView.resx">

  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.Views/3.3/SlaveStats.Designer.cs

    r6823 r6834  
    4545    /// </summary>
    4646    private void InitializeComponent() {
    47       System.Windows.Forms.DataVisualization.Charting.ChartArea chartArea7 = new System.Windows.Forms.DataVisualization.Charting.ChartArea();
    48       System.Windows.Forms.DataVisualization.Charting.CustomLabel customLabel13 = new System.Windows.Forms.DataVisualization.Charting.CustomLabel();
    49       System.Windows.Forms.DataVisualization.Charting.CustomLabel customLabel14 = new System.Windows.Forms.DataVisualization.Charting.CustomLabel();
    50       System.Windows.Forms.DataVisualization.Charting.CustomLabel customLabel15 = new System.Windows.Forms.DataVisualization.Charting.CustomLabel();
    51       System.Windows.Forms.DataVisualization.Charting.CustomLabel customLabel16 = new System.Windows.Forms.DataVisualization.Charting.CustomLabel();
    52       System.Windows.Forms.DataVisualization.Charting.Legend legend7 = new System.Windows.Forms.DataVisualization.Charting.Legend();
    53       System.Windows.Forms.DataVisualization.Charting.Series series19 = new System.Windows.Forms.DataVisualization.Charting.Series();
    54       System.Windows.Forms.DataVisualization.Charting.Series series20 = new System.Windows.Forms.DataVisualization.Charting.Series();
    55       System.Windows.Forms.DataVisualization.Charting.Series series21 = new System.Windows.Forms.DataVisualization.Charting.Series();
    56       System.Windows.Forms.DataVisualization.Charting.Series series22 = new System.Windows.Forms.DataVisualization.Charting.Series();
    57       System.Windows.Forms.DataVisualization.Charting.Series series23 = new System.Windows.Forms.DataVisualization.Charting.Series();
    58       System.Windows.Forms.DataVisualization.Charting.ChartArea chartArea8 = new System.Windows.Forms.DataVisualization.Charting.ChartArea();
    59       System.Windows.Forms.DataVisualization.Charting.Legend legend8 = new System.Windows.Forms.DataVisualization.Charting.Legend();
    60       System.Windows.Forms.DataVisualization.Charting.Series series24 = new System.Windows.Forms.DataVisualization.Charting.Series();
    61       this.jobChart = new System.Windows.Forms.DataVisualization.Charting.Chart();
     47      System.Windows.Forms.DataVisualization.Charting.ChartArea chartArea1 = new System.Windows.Forms.DataVisualization.Charting.ChartArea();
     48      System.Windows.Forms.DataVisualization.Charting.CustomLabel customLabel1 = new System.Windows.Forms.DataVisualization.Charting.CustomLabel();
     49      System.Windows.Forms.DataVisualization.Charting.CustomLabel customLabel2 = new System.Windows.Forms.DataVisualization.Charting.CustomLabel();
     50      System.Windows.Forms.DataVisualization.Charting.CustomLabel customLabel3 = new System.Windows.Forms.DataVisualization.Charting.CustomLabel();
     51      System.Windows.Forms.DataVisualization.Charting.CustomLabel customLabel4 = new System.Windows.Forms.DataVisualization.Charting.CustomLabel();
     52      System.Windows.Forms.DataVisualization.Charting.Legend legend1 = new System.Windows.Forms.DataVisualization.Charting.Legend();
     53      System.Windows.Forms.DataVisualization.Charting.Series series1 = new System.Windows.Forms.DataVisualization.Charting.Series();
     54      System.Windows.Forms.DataVisualization.Charting.Series series2 = new System.Windows.Forms.DataVisualization.Charting.Series();
     55      System.Windows.Forms.DataVisualization.Charting.Series series3 = new System.Windows.Forms.DataVisualization.Charting.Series();
     56      System.Windows.Forms.DataVisualization.Charting.Series series4 = new System.Windows.Forms.DataVisualization.Charting.Series();
     57      System.Windows.Forms.DataVisualization.Charting.Series series5 = new System.Windows.Forms.DataVisualization.Charting.Series();
     58      System.Windows.Forms.DataVisualization.Charting.ChartArea chartArea2 = new System.Windows.Forms.DataVisualization.Charting.ChartArea();
     59      System.Windows.Forms.DataVisualization.Charting.Legend legend2 = new System.Windows.Forms.DataVisualization.Charting.Legend();
     60      System.Windows.Forms.DataVisualization.Charting.Series series6 = new System.Windows.Forms.DataVisualization.Charting.Series();
     61      this.taskChart = new System.Windows.Forms.DataVisualization.Charting.Chart();
    6262      this.coresChart = new System.Windows.Forms.DataVisualization.Charting.Chart();
    6363      this.label1 = new System.Windows.Forms.Label();
    6464      this.txtSlaveState = new System.Windows.Forms.TextBox();
    65       ((System.ComponentModel.ISupportInitialize)(this.jobChart)).BeginInit();
     65      this.mainSplitContainer = new System.Windows.Forms.SplitContainer();
     66      this.coresGroupBox = new System.Windows.Forms.GroupBox();
     67      this.groupBoxTaskChart = new System.Windows.Forms.GroupBox();
     68      ((System.ComponentModel.ISupportInitialize)(this.taskChart)).BeginInit();
    6669      ((System.ComponentModel.ISupportInitialize)(this.coresChart)).BeginInit();
     70      ((System.ComponentModel.ISupportInitialize)(this.mainSplitContainer)).BeginInit();
     71      this.mainSplitContainer.Panel1.SuspendLayout();
     72      this.mainSplitContainer.Panel2.SuspendLayout();
     73      this.mainSplitContainer.SuspendLayout();
     74      this.coresGroupBox.SuspendLayout();
     75      this.groupBoxTaskChart.SuspendLayout();
    6776      this.SuspendLayout();
    6877      //
    69       // jobChart
    70       //
    71       this.jobChart.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
    72                   | System.Windows.Forms.AnchorStyles.Left)
    73                   | System.Windows.Forms.AnchorStyles.Right)));
    74       this.jobChart.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None;
    75       customLabel13.Text = "Jobs";
    76       customLabel14.Text = "Aborted Jobs";
    77       customLabel15.Text = "Finished Jobs";
    78       customLabel16.Text = "Fetched Jobs";
    79       chartArea7.AxisX.CustomLabels.Add(customLabel13);
    80       chartArea7.AxisX.CustomLabels.Add(customLabel14);
    81       chartArea7.AxisX.CustomLabels.Add(customLabel15);
    82       chartArea7.AxisX.CustomLabels.Add(customLabel16);
    83       chartArea7.AxisX.Enabled = System.Windows.Forms.DataVisualization.Charting.AxisEnabled.True;
    84       chartArea7.AxisX.MajorGrid.Enabled = false;
    85       chartArea7.AxisX.MajorTickMark.Enabled = false;
    86       chartArea7.Name = "ChartArea1";
    87       this.jobChart.ChartAreas.Add(chartArea7);
    88       legend7.Name = "Legend1";
    89       this.jobChart.Legends.Add(legend7);
    90       this.jobChart.Location = new System.Drawing.Point(3, 121);
    91       this.jobChart.Name = "jobChart";
    92       series19.ChartArea = "ChartArea1";
    93       series19.Legend = "Legend1";
    94       series19.Name = "Series1";
    95       series20.ChartArea = "ChartArea1";
    96       series20.Legend = "Legend1";
    97       series20.Name = "Series2";
    98       series21.ChartArea = "ChartArea1";
    99       series21.Legend = "Legend1";
    100       series21.Name = "Series3";
    101       series22.ChartArea = "ChartArea1";
    102       series22.Legend = "Legend1";
    103       series22.Name = "Series4";
    104       series23.ChartArea = "ChartArea1";
    105       series23.Legend = "Legend1";
    106       series23.Name = "Series5";
    107       this.jobChart.Series.Add(series19);
    108       this.jobChart.Series.Add(series20);
    109       this.jobChart.Series.Add(series21);
    110       this.jobChart.Series.Add(series22);
    111       this.jobChart.Series.Add(series23);
    112       this.jobChart.Size = new System.Drawing.Size(412, 189);
    113       this.jobChart.TabIndex = 7;
     78      // taskChart
     79      //
     80      this.taskChart.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
     81                  | System.Windows.Forms.AnchorStyles.Left)
     82                  | System.Windows.Forms.AnchorStyles.Right)));
     83      customLabel1.Text = "Jobs";
     84      customLabel2.Text = "Aborted Jobs";
     85      customLabel3.Text = "Finished Jobs";
     86      customLabel4.Text = "Fetched Jobs";
     87      chartArea1.AxisX.CustomLabels.Add(customLabel1);
     88      chartArea1.AxisX.CustomLabels.Add(customLabel2);
     89      chartArea1.AxisX.CustomLabels.Add(customLabel3);
     90      chartArea1.AxisX.CustomLabels.Add(customLabel4);
     91      chartArea1.AxisX.Enabled = System.Windows.Forms.DataVisualization.Charting.AxisEnabled.True;
     92      chartArea1.AxisX.MajorGrid.Enabled = false;
     93      chartArea1.AxisX.MajorTickMark.Enabled = false;
     94      chartArea1.AxisY.Enabled = System.Windows.Forms.DataVisualization.Charting.AxisEnabled.True;
     95      chartArea1.AxisY.Title = "Number of...";
     96      chartArea1.InnerPlotPosition.Auto = false;
     97      chartArea1.InnerPlotPosition.Height = 97F;
     98      chartArea1.InnerPlotPosition.Width = 97F;
     99      chartArea1.InnerPlotPosition.X = 3F;
     100      chartArea1.InnerPlotPosition.Y = 3F;
     101      chartArea1.Name = "ChartArea1";
     102      this.taskChart.ChartAreas.Add(chartArea1);
     103      legend1.Name = "Legend1";
     104      this.taskChart.Legends.Add(legend1);
     105      this.taskChart.Location = new System.Drawing.Point(6, 19);
     106      this.taskChart.Name = "taskChart";
     107      series1.ChartArea = "ChartArea1";
     108      series1.Legend = "Legend1";
     109      series1.Name = "Series1";
     110      series2.ChartArea = "ChartArea1";
     111      series2.Legend = "Legend1";
     112      series2.Name = "Series2";
     113      series3.ChartArea = "ChartArea1";
     114      series3.Legend = "Legend1";
     115      series3.Name = "Series3";
     116      series4.ChartArea = "ChartArea1";
     117      series4.Legend = "Legend1";
     118      series4.Name = "Series4";
     119      series5.ChartArea = "ChartArea1";
     120      series5.Legend = "Legend1";
     121      series5.Name = "Series5";
     122      this.taskChart.Series.Add(series1);
     123      this.taskChart.Series.Add(series2);
     124      this.taskChart.Series.Add(series3);
     125      this.taskChart.Series.Add(series4);
     126      this.taskChart.Series.Add(series5);
     127      this.taskChart.Size = new System.Drawing.Size(406, 178);
     128      this.taskChart.TabIndex = 7;
    114129      //
    115130      // coresChart
    116131      //
    117       this.coresChart.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
    118       chartArea8.Name = "ChartArea1";
    119       this.coresChart.ChartAreas.Add(chartArea8);
    120       legend8.Name = "Legend1";
    121       this.coresChart.Legends.Add(legend8);
    122       this.coresChart.Location = new System.Drawing.Point(186, 3);
     132      this.coresChart.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
     133                  | System.Windows.Forms.AnchorStyles.Left)
     134                  | System.Windows.Forms.AnchorStyles.Right)));
     135      chartArea2.Name = "ChartArea1";
     136      this.coresChart.ChartAreas.Add(chartArea2);
     137      legend2.Name = "Legend1";
     138      this.coresChart.Legends.Add(legend2);
     139      this.coresChart.Location = new System.Drawing.Point(6, 19);
    123140      this.coresChart.Name = "coresChart";
    124       series24.ChartArea = "ChartArea1";
    125       series24.ChartType = System.Windows.Forms.DataVisualization.Charting.SeriesChartType.Pie;
    126       series24.Legend = "Legend1";
    127       series24.Name = "Series1";
    128       this.coresChart.Series.Add(series24);
    129       this.coresChart.Size = new System.Drawing.Size(229, 80);
     141      series6.ChartArea = "ChartArea1";
     142      series6.ChartType = System.Windows.Forms.DataVisualization.Charting.SeriesChartType.Pie;
     143      series6.Legend = "Legend1";
     144      series6.Name = "Series1";
     145      this.coresChart.Series.Add(series6);
     146      this.coresChart.Size = new System.Drawing.Size(187, 72);
    130147      this.coresChart.TabIndex = 9;
    131148      //
    … …  
    133150      //
    134151      this.label1.AutoSize = true;
    135       this.label1.Location = new System.Drawing.Point(7, 5);
     152      this.label1.Location = new System.Drawing.Point(5, 6);
    136153      this.label1.Name = "label1";
    137154      this.label1.Size = new System.Drawing.Size(65, 13);
    … …  
    142159      //
    143160      this.txtSlaveState.Enabled = false;
    144       this.txtSlaveState.Location = new System.Drawing.Point(78, 2);
     161      this.txtSlaveState.Location = new System.Drawing.Point(76, 3);
    145162      this.txtSlaveState.Name = "txtSlaveState";
    146163      this.txtSlaveState.Size = new System.Drawing.Size(100, 20);
    147164      this.txtSlaveState.TabIndex = 15;
    148165      //
     166      // mainSplitContainer
     167      //
     168      this.mainSplitContainer.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
     169                  | System.Windows.Forms.AnchorStyles.Left)
     170                  | System.Windows.Forms.AnchorStyles.Right)));
     171      this.mainSplitContainer.Location = new System.Drawing.Point(3, 3);
     172      this.mainSplitContainer.Name = "mainSplitContainer";
     173      this.mainSplitContainer.Orientation = System.Windows.Forms.Orientation.Horizontal;
     174      //
     175      // mainSplitContainer.Panel1
     176      //
     177      this.mainSplitContainer.Panel1.Controls.Add(this.coresGroupBox);
     178      this.mainSplitContainer.Panel1.Controls.Add(this.txtSlaveState);
     179      this.mainSplitContainer.Panel1.Controls.Add(this.label1);
     180      //
     181      // mainSplitContainer.Panel2
     182      //
     183      this.mainSplitContainer.Panel2.Controls.Add(this.groupBoxTaskChart);
     184      this.mainSplitContainer.Size = new System.Drawing.Size(424, 319);
     185      this.mainSplitContainer.SplitterDistance = 106;
     186      this.mainSplitContainer.TabIndex = 16;
     187      //
     188      // coresGroupBox
     189      //
     190      this.coresGroupBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
     191                  | System.Windows.Forms.AnchorStyles.Right)));
     192      this.coresGroupBox.Controls.Add(this.coresChart);
     193      this.coresGroupBox.Location = new System.Drawing.Point(216, 6);
     194      this.coresGroupBox.Name = "coresGroupBox";
     195      this.coresGroupBox.Size = new System.Drawing.Size(199, 97);
     196      this.coresGroupBox.TabIndex = 0;
     197      this.coresGroupBox.TabStop = false;
     198      this.coresGroupBox.Text = "Cores";
     199      //
     200      // groupBoxTaskChart
     201      //
     202      this.groupBoxTaskChart.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
     203                  | System.Windows.Forms.AnchorStyles.Left)
     204                  | System.Windows.Forms.AnchorStyles.Right)));
     205      this.groupBoxTaskChart.Controls.Add(this.taskChart);
     206      this.groupBoxTaskChart.Location = new System.Drawing.Point(3, 3);
     207      this.groupBoxTaskChart.Name = "groupBoxTaskChart";
     208      this.groupBoxTaskChart.Size = new System.Drawing.Size(418, 203);
     209      this.groupBoxTaskChart.TabIndex = 0;
     210      this.groupBoxTaskChart.TabStop = false;
     211      this.groupBoxTaskChart.Text = "Tasks";
     212      //
    149213      // SlaveStats
    150214      //
    151215      this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
    152216      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
    153       this.Controls.Add(this.txtSlaveState);
    154       this.Controls.Add(this.label1);
    155       this.Controls.Add(this.coresChart);
    156       this.Controls.Add(this.jobChart);
     217      this.Controls.Add(this.mainSplitContainer);
    157218      this.Name = "SlaveStats";
    158       this.Size = new System.Drawing.Size(418, 313);
    159       ((System.ComponentModel.ISupportInitialize)(this.jobChart)).EndInit();
     219      this.Size = new System.Drawing.Size(430, 325);
     220      ((System.ComponentModel.ISupportInitialize)(this.taskChart)).EndInit();
    160221      ((System.ComponentModel.ISupportInitialize)(this.coresChart)).EndInit();
     222      this.mainSplitContainer.Panel1.ResumeLayout(false);
     223      this.mainSplitContainer.Panel1.PerformLayout();
     224      this.mainSplitContainer.Panel2.ResumeLayout(false);
     225      ((System.ComponentModel.ISupportInitialize)(this.mainSplitContainer)).EndInit();
     226      this.mainSplitContainer.ResumeLayout(false);
     227      this.coresGroupBox.ResumeLayout(false);
     228      this.groupBoxTaskChart.ResumeLayout(false);
    161229      this.ResumeLayout(false);
    162       this.PerformLayout();
    163230
    164231    }
    … …  
    166233    #endregion
    167234
    168     private System.Windows.Forms.DataVisualization.Charting.Chart jobChart;
     235    private System.Windows.Forms.DataVisualization.Charting.Chart taskChart;
    169236    private System.Windows.Forms.DataVisualization.Charting.Chart coresChart;
    170237    private System.Windows.Forms.Label label1;
    171238    private System.Windows.Forms.TextBox txtSlaveState;
     239    private System.Windows.Forms.SplitContainer mainSplitContainer;
     240    private System.Windows.Forms.GroupBox groupBoxTaskChart;
     241    private System.Windows.Forms.GroupBox coresGroupBox;
    172242  }
    173243}

  • 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

  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.Views/3.3/SlaveView.Designer.cs

    r6823 r6834  
    4545    /// </summary>
    4646    private void InitializeComponent() {
     47      this.splitContainer = new System.Windows.Forms.SplitContainer();
    4748      this.slaveStats = new HeuristicLab.Clients.Hive.SlaveCore.Views.SlaveStats();
    48       this.splitContainer = new System.Windows.Forms.SplitContainer();
    49       this.jobsView = new HeuristicLab.Clients.Hive.SlaveCore.Views.JobsView();
     49      this.jobsView = new HeuristicLab.Clients.Hive.SlaveCore.Views.TaskView();
    5050      ((System.ComponentModel.ISupportInitialize)(this.splitContainer)).BeginInit();
    5151      this.splitContainer.Panel1.SuspendLayout();
    … …  
    5353      this.splitContainer.SuspendLayout();
    5454      this.SuspendLayout();
    55       //
    56       // slaveStats
    57       //
    58       this.slaveStats.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
    59                   | System.Windows.Forms.AnchorStyles.Left)
    60                   | System.Windows.Forms.AnchorStyles.Right)));
    61       this.slaveStats.Caption = "HeuristicLab Slave View";
    62       this.slaveStats.Content = null;
    63       this.slaveStats.Location = new System.Drawing.Point(3, 3);
    64       this.slaveStats.Name = "slaveStats";
    65       this.slaveStats.ReadOnly = false;
    66       this.slaveStats.Size = new System.Drawing.Size(508, 194);
    67       this.slaveStats.TabIndex = 0;
    6855      //
    6956      // splitContainer
    … …  
    8673      this.splitContainer.SplitterDistance = 200;
    8774      this.splitContainer.TabIndex = 2;
     75      //
     76      // slaveStats
     77      //
     78      this.slaveStats.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
     79                  | System.Windows.Forms.AnchorStyles.Left)
     80                  | System.Windows.Forms.AnchorStyles.Right)));
     81      this.slaveStats.Caption = "HeuristicLab Slave View";
     82      this.slaveStats.Content = null;
     83      this.slaveStats.Location = new System.Drawing.Point(3, 3);
     84      this.slaveStats.Name = "slaveStats";
     85      this.slaveStats.ReadOnly = false;
     86      this.slaveStats.Size = new System.Drawing.Size(508, 194);
     87      this.slaveStats.TabIndex = 0;
    8888      //
    8989      // jobsView
    … …  
    119119    private SlaveStats slaveStats;
    120120    private System.Windows.Forms.SplitContainer splitContainer;
    121     private JobsView jobsView;
     121    private TaskView jobsView;
    122122
    123123  }

  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.Views/3.3/TaskView.Designer.cs

    r6823 r6834  
    2121
    2222namespace HeuristicLab.Clients.Hive.SlaveCore.Views {
    23   partial class JobsView {
     23  partial class TaskView {
    2424    /// <summary>
    2525    /// Required designer variable.
    … …  
    4646    private void InitializeComponent() {
    4747      this.lstJobs = new System.Windows.Forms.ListView();
    48       this.columnJobId = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
     48      this.columnTaskId = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
    4949      this.columnExecutionTime = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
    5050      this.SuspendLayout();
    … …  
    5656                  | System.Windows.Forms.AnchorStyles.Right)));
    5757      this.lstJobs.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
    58             this.columnJobId,
     58            this.columnTaskId,
    5959            this.columnExecutionTime});
    6060      this.lstJobs.Location = new System.Drawing.Point(3, 3);
    … …  
    6565      this.lstJobs.View = System.Windows.Forms.View.Details;
    6666      //
    67       // columnJobId
     67      // columnTaskId
    6868      //
    69       this.columnJobId.Text = "Job Id";
    70       this.columnJobId.Width = 120;
     69      this.columnTaskId.Text = "Task Id";
     70      this.columnTaskId.Width = 120;
    7171      //
    7272      // columnExecutionTime
    … …  
    8989
    9090    private System.Windows.Forms.ListView lstJobs;
    91     private System.Windows.Forms.ColumnHeader columnJobId;
     91    private System.Windows.Forms.ColumnHeader columnTaskId;
    9292    private System.Windows.Forms.ColumnHeader columnExecutionTime;
    9393  }

  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.Views/3.3/TaskView.cs

    r6822 r6834  
    2828  [View("Jobs View")]
    2929  [Content(typeof(SlaveItem), IsDefaultView = false)]
    30   public partial class JobsView : ItemView {
     30  public partial class TaskView : ItemView {
    3131    public new SlaveItem Content {
    3232      get { return (SlaveItem)base.Content; }
    … …  
    3434    }
    3535
    36     public JobsView() {
     36    public TaskView() {
    3737      InitializeComponent();
    3838    }

  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Views/3.3/TreeView/ItemTreeView.cs

    r6382 r6834  
    219219      if (e.Button == System.Windows.Forms.MouseButtons.Left) {
    220220        // enables deselection of treeNodes
    221         if (treeView.SelectedNode == null)
     221        if (treeView.SelectedNode == null) {
    222222          return;
     223        }
     224        detailsViewHost.Content = null;
    223225        treeView.SelectedNode = null;
    224226        SetEnabledStateOfControls();

  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.3/RefreshableJob.cs

    r6743 r6834  
    6363          hiveTasks = value;
    6464          if (hiveTasks != null) RegisterHiveJobsEvents();
    65           OnHiveJobsChanged();
     65          OnHiveTasksChanged();
    6666        }
    6767      }
    … …  
    324324      return null;
    325325    }
     326
    326327    private void UpdateStatistics() {
    327328      var jobs = this.GetAllHiveTasks();
    … …  
    350351    #endregion
    351352
    352     #region Task Events
     353    #region Job Events
    353354    private void RegisterJobEvents() {
    354355      job.ToStringChanged += new EventHandler(OnToStringChanged);
    … …  
    470471    #region HiveTasks Events
    471472    private void RegisterHiveJobsEvents() {
    472       this.hiveTasks.ItemsAdded += new CollectionItemsChangedEventHandler<HiveTask>(hiveJobs_ItemsAdded);
    473       this.hiveTasks.ItemsRemoved += new CollectionItemsChangedEventHandler<HiveTask>(hiveJobs_ItemsRemoved);
    474       this.hiveTasks.CollectionReset += new CollectionItemsChangedEventHandler<HiveTask>(hiveJobs_CollectionReset);
     473      this.hiveTasks.ItemsAdded += new CollectionItemsChangedEventHandler<HiveTask>(hivetasks_ItemsAdded);
     474      this.hiveTasks.ItemsRemoved += new CollectionItemsChangedEventHandler<HiveTask>(hiveTasks_ItemsRemoved);
     475      this.hiveTasks.CollectionReset += new CollectionItemsChangedEventHandler<HiveTask>(hiveTasks_CollectionReset);
    475476    }
    476477
    477478    private void DeregisterHiveJobsEvents() {
    478       this.hiveTasks.ItemsAdded -= new CollectionItemsChangedEventHandler<HiveTask>(hiveJobs_ItemsAdded);
    479       this.hiveTasks.ItemsRemoved -= new CollectionItemsChangedEventHandler<HiveTask>(hiveJobs_ItemsRemoved);
    480       this.hiveTasks.CollectionReset -= new CollectionItemsChangedEventHandler<HiveTask>(hiveJobs_CollectionReset);
    481     }
    482 
    483     private void hiveJobs_CollectionReset(object sender, CollectionItemsChangedEventArgs<HiveTask> e) {
     479      this.hiveTasks.ItemsAdded -= new CollectionItemsChangedEventHandler<HiveTask>(hivetasks_ItemsAdded);
     480      this.hiveTasks.ItemsRemoved -= new CollectionItemsChangedEventHandler<HiveTask>(hiveTasks_ItemsRemoved);
     481      this.hiveTasks.CollectionReset -= new CollectionItemsChangedEventHandler<HiveTask>(hiveTasks_CollectionReset);
     482    }
     483
     484    private void hiveTasks_CollectionReset(object sender, CollectionItemsChangedEventArgs<HiveTask> e) {
    484485      foreach (var item in e.Items) {
    485486        item.StateLogChanged -= new EventHandler(item_StateLogChanged);
    486487      }
    487       OnHiveJobsReset(e);
    488     }
    489 
    490     private void hiveJobs_ItemsRemoved(object sender, CollectionItemsChangedEventArgs<HiveTask> e) {
     488      OnHiveTasksReset(e);
     489    }
     490
     491    private void hiveTasks_ItemsRemoved(object sender, CollectionItemsChangedEventArgs<HiveTask> e) {
    491492      foreach (var item in e.Items) {
    492493        item.StateLogChanged -= new EventHandler(item_StateLogChanged);
    493494      }
    494       OnHiveJobsRemoved(e);
    495     }
    496 
    497     private void hiveJobs_ItemsAdded(object sender, CollectionItemsChangedEventArgs<HiveTask> e) {
     495      OnHiveTasksRemoved(e);
     496    }
     497
     498    private void hivetasks_ItemsAdded(object sender, CollectionItemsChangedEventArgs<HiveTask> e) {
    498499      foreach (var item in e.Items) {
    499500        item.StateLogChanged += new EventHandler(item_StateLogChanged);
    500501        item.IsControllable = this.IsControllable;
    501502      }
    502       OnHiveJobsAdded(e);
     503      OnHiveTasksAdded(e);
    503504    }
    504505
    … …  
    508509    #endregion
    509510
    510     public event EventHandler HiveJobsChanged;
    511     protected virtual void OnHiveJobsChanged() {
     511    public event EventHandler HiveTasksChanged;
     512    protected virtual void OnHiveTasksChanged() {
    512513      if (jobResultPoller != null && jobResultPoller.IsPolling) {
    513514        jobResultPoller.Stop();
    … …  
    519520      }
    520521
    521       var handler = HiveJobsChanged;
     522      var handler = HiveTasksChanged;
    522523      if (handler != null) handler(this, EventArgs.Empty);
    523524    }
    … …  
    535536    }
    536537
    537     public event EventHandler<CollectionItemsChangedEventArgs<HiveTask>> HiveJobsAdded;
    538     private void OnHiveJobsAdded(CollectionItemsChangedEventArgs<HiveTask> e) {
    539       var handler = HiveJobsAdded;
     538    public event EventHandler<CollectionItemsChangedEventArgs<HiveTask>> HiveTasksAdded;
     539    private void OnHiveTasksAdded(CollectionItemsChangedEventArgs<HiveTask> e) {
     540      var handler = HiveTasksAdded;
    540541      if (handler != null) handler(this, e);
    541542    }
    542543
    543     public event EventHandler<CollectionItemsChangedEventArgs<HiveTask>> HiveJobsRemoved;
    544     private void OnHiveJobsRemoved(CollectionItemsChangedEventArgs<HiveTask> e) {
    545       var handler = HiveJobsRemoved;
     544    public event EventHandler<CollectionItemsChangedEventArgs<HiveTask>> HiveTasksRemoved;
     545    private void OnHiveTasksRemoved(CollectionItemsChangedEventArgs<HiveTask> e) {
     546      var handler = HiveTasksRemoved;
    546547      if (handler != null) handler(this, e);
    547548    }
    548549
    549     public event EventHandler<CollectionItemsChangedEventArgs<HiveTask>> HiveJobsReset;
    550     private void OnHiveJobsReset(CollectionItemsChangedEventArgs<HiveTask> e) {
    551       var handler = HiveJobsReset;
     550    public event EventHandler<CollectionItemsChangedEventArgs<HiveTask>> HiveTasksReset;
     551    private void OnHiveTasksReset(CollectionItemsChangedEventArgs<HiveTask> e) {
     552      var handler = HiveTasksReset;
    552553      if (handler != null) handler(this, e);
    553554    }
Note: See TracChangeset for help on using the changeset viewer.