Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
04/12/11 13:43:05 (13 years ago)
Author:
cneumuel
Message:

#1233

  • changed relationship between Job and HiveExperiment. There is no more HiveExperiment.RootJobId, instead there is Job.HiveExperimentId.
  • One HiveExperiment can now have multiple Experiments.
  • TreeView supports multiple root nodes
  • HiveEngine creates a HiveExperiment for each set of jobs, so jobs cannot be without an parent experiment anymore (no more loose jobs)
  • updated ExperimentManager binaries
Location:
branches/HeuristicLab.Hive-3.4/sources
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/HeuristicLab.Hive-3.4/sources

    • Property svn:ignore
      •  

        old new  
        44PrecompiledWeb
        55CreateEventLogSources
         6WindowsFormsTestProject
  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.HiveEngine/3.4

    • Property svn:ignore
      •  

        old new  
        22obj
        33HeuristicLab.HiveEngine-3.4.csproj.vs10x
         4HeuristicLabHiveEnginePlugin.cs
  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.HiveEngine/3.4/Views/HiveEngineView.cs

    r5958 r6006  
    11using System;
    2 using System.Collections.Generic;
    3 using System.ComponentModel;
    4 using System.Drawing;
    5 using System.Data;
    6 using System.Linq;
    7 using System.Text;
     2using HeuristicLab.Core.Views;
    83using HeuristicLab.MainForm;
    9 using HeuristicLab.Optimization.Views;
    10 using HeuristicLab.Core.Views;
    114
    125namespace HeuristicLab.HiveEngine.Views {
    136  [View("Hive Engine View")]
    147  [Content(typeof(HiveEngine), IsDefaultView = true)]
    15   public sealed partial class HiveEngineView : EngineView {
     8  public sealed partial class HiveEngineView : ItemView {
    169    public new HiveEngine Content {
    1710      get { return (HiveEngine)base.Content; }
     
    2417
    2518    protected override void DeregisterContentEvents() {
     19      Content.ExecutionStateChanged -= new EventHandler(Content_ExecutionStateChanged);
    2620      Content.ExecutionTimeOnHiveChanged -= new EventHandler(Content_ExecutionTimeOnHiveChanged);
    2721      base.DeregisterContentEvents();
     
    3024    protected override void RegisterContentEvents() {
    3125      base.RegisterContentEvents();
     26      Content.ExecutionStateChanged += new EventHandler(Content_ExecutionStateChanged);
    3227      Content.ExecutionTimeOnHiveChanged += new EventHandler(Content_ExecutionTimeOnHiveChanged);
    3328    }
    3429
    3530    #region Event Handlers (Content)
     31    private void Content_ExecutionStateChanged(object sender, EventArgs e) {
     32      if (InvokeRequired) {
     33        Invoke(new EventHandler(Content_ExecutionStateChanged), sender, e);
     34      } else {
     35        executionTimeTextBox.Text = Content.ExecutionTime.ToString();
     36      }
     37    }
     38
    3639    private void Content_ExecutionTimeOnHiveChanged(object sender, EventArgs e) {
    3740      if (InvokeRequired) {
     
    4952        priorityTextBox.Text = string.Empty;
    5053        executionTimeOnHiveTextBox.Text = string.Empty;
     54        useLocalPluginsCheckBox.Checked = false;
     55        hiveExperimentListView.Content = null;
     56        logView.Content = null;
    5157      } else {
    52         resourceIdsTextBox.Text = Content.ResourceIds;
     58        resourceIdsTextBox.Text = Content.ResourceNames;
    5359        priorityTextBox.Text = Content.Priority.ToString();
    5460        executionTimeOnHiveTextBox.Text = Content.ExecutionTimeOnHive.ToString();
     61        useLocalPluginsCheckBox.Checked = Content.UseLocalPlugins;
     62        hiveExperimentListView.Content = Content.HiveExperiments;
     63        logView.Content = Content.Log;
    5564      }
    5665    }
     
    6271        resourceIdsTextBox.ReadOnly = this.ReadOnly;
    6372        priorityTextBox.ReadOnly = this.ReadOnly;
     73        useLocalPluginsCheckBox.Enabled = !this.ReadOnly;
    6474      } else {
    6575        resourceIdsTextBox.ReadOnly = false;
    6676        priorityTextBox.ReadOnly = false;
     77        useLocalPluginsCheckBox.Enabled = false;
    6778      }
    6879    }
     
    7081    #region Event Handlers (child controls)
    7182    private void resourceIdsTextBox_TextChanged(object sender, EventArgs e) {
    72       Content.ResourceIds = resourceIdsTextBox.Text;
     83      Content.ResourceNames = resourceIdsTextBox.Text;
    7384    }
    74     #endregion
    7585
    7686    private void priorityTextBox_TextChanged(object sender, EventArgs e) {
    7787      Content.Priority = int.Parse(priorityTextBox.Text);
    7888    }
     89
     90    private void useLocalPluginsCheckBox_CheckedChanged(object sender, EventArgs e) {
     91      Content.UseLocalPlugins = useLocalPluginsCheckBox.Checked;
     92    }
     93    #endregion
     94
     95
    7996  }
    8097}
Note: See TracChangeset for help on using the changeset viewer.