Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
04/05/11 15:37:04 (13 years ago)
Author:
cneumuel
Message:

#1233

  • seperated ExperimentMangerClient (OKB-Style, contains business logic) and HiveExperiment (mainly only contains information)
  • fixed redundant cloning methods in dtos
  • added simple statistics in HiveExperiment which the user can see before downloading an experiment
  • added db-delete cascade for slaves and statelogs - now slaves can be safely deleted
Location:
branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Views/3.4
Files:
2 added
9 edited

Legend:

Unmodified
Added
Removed

  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Views/3.4/ExperimentManager/HiveExperimentListView.cs

    r4905 r5955  
    2020#endregion
    2121
    22 using System;
    2322using System.Windows.Forms;
    2423using HeuristicLab.Core;
    … …  
    2827namespace HeuristicLab.Clients.Hive.Views {
    2928  [View("HiveExperimentList View")]
    30   [Content(typeof(IItemList<HiveExperimentClient>), false)]
    31   public partial class HiveExperimentListView : ItemListView<HiveExperimentClient> {
     29  [Content(typeof(ItemCollection<HiveExperiment>), false)]
     30  public partial class HiveExperimentListView : ItemCollectionView<HiveExperiment> {
    3231
    3332    public HiveExperimentListView() {
    3433      InitializeComponent();
    35       itemsGroupBox.Text = "Hive Experiments";
    3634    }
    3735
    38     protected override HiveExperimentClient CreateItem() {
    39       return new HiveExperimentClient();
    40     }
    41 
    42     protected override void SetEnabledStateOfControls() {
    43       base.SetEnabledStateOfControls();
    44       if (Content != null) {
    45         if (itemsListView.SelectedItems.Count > 0) {
    46           // only allow delete-operation if all selected items are stored in hive (they have HiveExperimentId)
    47           bool canRemove = true;
    48           foreach (ListViewItem item in itemsListView.SelectedItems) {
    49             canRemove = canRemove && Content[item.Index].HiveExperimentId != Guid.Empty;
    50           }
    51           this.removeButton.Enabled = canRemove;
    52         }
    53       }
    54     }
    55 
    56     protected override void removeButton_Click(object sender, EventArgs e) {
    57       DialogResult result = MessageBox.Show("This action will permanently delete this experiment (also on the hive server). Continue?", "Delete Experiment", MessageBoxButtons.OKCancel);
    58       if (result == DialogResult.OK) {
    59         base.removeButton_Click(sender, e);
    60       }
     36    protected override HiveExperiment CreateItem() {
     37      return new HiveExperiment();
    6138    }
    6239  }

  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Views/3.4/ExperimentManager/HiveExperimentManagerView.Designer.cs

    r5512 r5955  
    4545    /// </summary>
    4646    private void InitializeComponent() {
     47      System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(HiveExperimentManagerView));
    4748      this.hiveExperimentListView = new HeuristicLab.Clients.Hive.Views.HiveExperimentListView();
     49      this.refreshButton = new System.Windows.Forms.Button();
    4850      this.SuspendLayout();
    4951      //
    … …  
    5557      this.hiveExperimentListView.Caption = "HiveExperimentList View";
    5658      this.hiveExperimentListView.Content = null;
    57       this.hiveExperimentListView.Location = new System.Drawing.Point(3, 3);
     59      this.hiveExperimentListView.Location = new System.Drawing.Point(3, 33);
    5860      this.hiveExperimentListView.Name = "hiveExperimentListView";
    5961      this.hiveExperimentListView.ReadOnly = false;
    60       this.hiveExperimentListView.Size = new System.Drawing.Size(729, 518);
     62      this.hiveExperimentListView.Size = new System.Drawing.Size(729, 488);
    6163      this.hiveExperimentListView.TabIndex = 0;
    6264      //
    63       // HiveExperimentManagerBaseView
     65      // refreshButton
     66      //
     67      this.refreshButton.Image = ((System.Drawing.Image)(resources.GetObject("refreshButton.Image")));
     68      this.refreshButton.Location = new System.Drawing.Point(3, 3);
     69      this.refreshButton.Name = "refreshButton";
     70      this.refreshButton.Size = new System.Drawing.Size(24, 24);
     71      this.refreshButton.TabIndex = 1;
     72      this.refreshButton.UseVisualStyleBackColor = true;
     73      this.refreshButton.Click += new System.EventHandler(this.refreshButton_Click);
     74      //
     75      // HiveExperimentManagerView
    6476      //
    6577      this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
    6678      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
     79      this.Controls.Add(this.refreshButton);
    6780      this.Controls.Add(this.hiveExperimentListView);
    68       this.Name = "HiveExperimentManagerBaseView";
     81      this.Name = "HiveExperimentManagerView";
    6982      this.Size = new System.Drawing.Size(735, 524);
    7083      this.ResumeLayout(false);
    … …  
    7487
    7588    private HiveExperimentListView hiveExperimentListView;
     89    private System.Windows.Forms.Button refreshButton;
    7690
    7791

  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Views/3.4/ExperimentManager/HiveExperimentManagerView.cs

    r5512 r5955  
    2222using System;
    2323using System.Windows.Forms;
    24 using HeuristicLab.Core.Views;
    2524using HeuristicLab.MainForm;
     25using HeuristicLab.MainForm.WindowsForms;
     26using HeuristicLab.PluginInfrastructure;
    2627
    2728namespace HeuristicLab.Clients.Hive.Views {
    … …  
    3031  /// </summary>
    3132  [View("Hive Experiment Manager View")]
    32   [Content(typeof(HiveExperimentManagerClient), false)]
    33   public partial class HiveExperimentManagerView : ItemView {
     33  [Content(typeof(ExperimentManagerClient), true)]
     34  public partial class HiveExperimentManagerView : AsynchronousContentView {
    3435
    35     public new HiveExperimentManagerClient Content {
    36       get { return (HiveExperimentManagerClient)base.Content; }
     36    public new ExperimentManagerClient Content {
     37      get { return (ExperimentManagerClient)base.Content; }
    3738      set { base.Content = value; }
    3839    }
    … …  
    4546    }
    4647
     48    protected override void RegisterContentEvents() {
     49      base.RegisterContentEvents();
     50      Content.Refreshing += new EventHandler(Content_Refreshing);
     51      Content.Refreshed += new EventHandler(Content_Refreshed);
     52    }
     53
     54    protected override void DeregisterContentEvents() {
     55      Content.Refreshing -= new EventHandler(Content_Refreshing);
     56      Content.Refreshed -= new EventHandler(Content_Refreshed);
     57      base.DeregisterContentEvents();
     58    }
     59
    4760    protected override void OnContentChanged() {
    4861      base.OnContentChanged();
    49       Content_HiveExperimentsChanged(this, EventArgs.Empty);
     62      if (Content == null) {
     63        hiveExperimentListView.Content = null;
     64      } else {
     65        hiveExperimentListView.Content = Content.HiveExperiments;
     66        if(Content != null)
     67          Content.RefreshAsync(new Action<Exception>((Exception ex) => ErrorHandling.ShowErrorDialog(this, "Refresh failed.", ex)));
     68      }
    5069    }
    5170
    5271    protected override void SetEnabledStateOfControls() {
    5372      base.SetEnabledStateOfControls();
     73      refreshButton.Enabled = Content != null;
     74      hiveExperimentListView.Enabled = Content != null;
    5475    }
    5576
    56     protected override void RegisterContentEvents() {
    57       this.Content.HiveExperimentsChanged += new EventHandler(Content_HiveExperimentsChanged);
     77    private void Content_Refreshing(object sender, EventArgs e) {
     78      if (InvokeRequired) {
     79        Invoke(new EventHandler(Content_Refreshing), sender, e);
     80      } else {
     81        Cursor = Cursors.AppStarting;
     82        refreshButton.Enabled = false;
     83        hiveExperimentListView.Enabled = false;
     84      }
     85    }
     86    private void Content_Refreshed(object sender, EventArgs e) {
     87      if (InvokeRequired) {
     88        Invoke(new EventHandler(Content_Refreshed), sender, e);
     89      } else {
     90        hiveExperimentListView.Content = Content.HiveExperiments;
     91        refreshButton.Enabled = true;
     92        hiveExperimentListView.Enabled = true;
     93        Cursor = Cursors.Default;
     94      }
    5895    }
    5996
    60     protected override void DeregisterContentEvents() {
    61       this.Content.HiveExperimentsChanged -= new EventHandler(Content_HiveExperimentsChanged);
     97    private void refreshButton_Click(object sender, EventArgs e) {
     98      Content.RefreshAsync(new Action<Exception>((Exception ex) => ErrorHandling.ShowErrorDialog(this, "Refresh failed.", ex)));
    6299    }
    63100
    64     private void Content_HiveExperimentsChanged(object sender, EventArgs e) {
     101    protected override void OnClosing(FormClosingEventArgs e) {
     102      base.OnClosing(e);
    65103      if (Content != null) {
    66         this.hiveExperimentListView.Content = Content.HiveExperiments;
     104        foreach (var exp in Content.HiveExperiments) {
     105          if (exp.RefreshAutomatically) {
     106            exp.RefreshAutomatically = false; // stop result polling
     107          }
     108        }
    67109      }
    68110    }

  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Views/3.4/ExperimentManager/HiveExperimentManagerView.resx

    r5512 r5955  
    118118    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
    119119  </resheader>
     120  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
     121  <data name="refreshButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     122    <value>
     123        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGOfPtRkwAAACBjSFJNAACH
     124        DwAAjA8AAP1SAACBQAAAfXkAAOmLAAA85QAAGcxzPIV3AAAKOWlDQ1BQaG90b3Nob3AgSUNDIHByb2Zp
     125        bGUAAEjHnZZ3VFTXFofPvXd6oc0wAlKG3rvAANJ7k15FYZgZYCgDDjM0sSGiAhFFRJoiSFDEgNFQJFZE
     126        sRAUVLAHJAgoMRhFVCxvRtaLrqy89/Ly++Osb+2z97n77L3PWhcAkqcvl5cGSwGQyhPwgzyc6RGRUXTs
     127        AIABHmCAKQBMVka6X7B7CBDJy82FniFyAl8EAfB6WLwCcNPQM4BOB/+fpFnpfIHomAARm7M5GSwRF4g4
     128        JUuQLrbPipgalyxmGCVmvihBEcuJOWGRDT77LLKjmNmpPLaIxTmns1PZYu4V8bZMIUfEiK+ICzO5nCwR
     129        3xKxRoowlSviN+LYVA4zAwAUSWwXcFiJIjYRMYkfEuQi4uUA4EgJX3HcVyzgZAvEl3JJS8/hcxMSBXQd
     130        li7d1NqaQffkZKVwBALDACYrmcln013SUtOZvBwAFu/8WTLi2tJFRbY0tba0NDQzMv2qUP91829K3NtF
     131        ehn4uWcQrf+L7a/80hoAYMyJarPziy2uCoDOLQDI3fti0zgAgKSobx3Xv7oPTTwviQJBuo2xcVZWlhGX
     132        wzISF/QP/U+Hv6GvvmckPu6P8tBdOfFMYYqALq4bKy0lTcinZ6QzWRy64Z+H+B8H/nUeBkGceA6fwxNF
     133        hImmjMtLELWbx+YKuGk8Opf3n5r4D8P+pMW5FonS+BFQY4yA1HUqQH7tBygKESDR+8Vd/6NvvvgwIH55
     134        4SqTi3P/7zf9Z8Gl4iWDm/A5ziUohM4S8jMX98TPEqABAUgCKpAHykAd6ABDYAasgC1wBG7AG/iDEBAJ
     135        VgMWSASpgA+yQB7YBApBMdgJ9oBqUAcaQTNoBcdBJzgFzoNL4Bq4AW6D+2AUTIBnYBa8BgsQBGEhMkSB
     136        5CEVSBPSh8wgBmQPuUG+UBAUCcVCCRAPEkJ50GaoGCqDqqF6qBn6HjoJnYeuQIPQXWgMmoZ+h97BCEyC
     137        qbASrAUbwwzYCfaBQ+BVcAK8Bs6FC+AdcCXcAB+FO+Dz8DX4NjwKP4PnEIAQERqiihgiDMQF8UeikHiE
     138        j6xHipAKpAFpRbqRPuQmMorMIG9RGBQFRUcZomxRnqhQFAu1BrUeVYKqRh1GdaB6UTdRY6hZ1Ec0Ga2I
     139        1kfboL3QEegEdBa6EF2BbkK3oy+ib6Mn0K8xGAwNo42xwnhiIjFJmLWYEsw+TBvmHGYQM46Zw2Kx8lh9
     140        rB3WH8vECrCF2CrsUexZ7BB2AvsGR8Sp4Mxw7rgoHA+Xj6vAHcGdwQ3hJnELeCm8Jt4G749n43PwpfhG
     141        fDf+On4Cv0CQJmgT7AghhCTCJkIloZVwkfCA8JJIJKoRrYmBRC5xI7GSeIx4mThGfEuSIemRXEjRJCFp
     142        B+kQ6RzpLuklmUzWIjuSo8gC8g5yM/kC+RH5jQRFwkjCS4ItsUGiRqJDYkjiuSReUlPSSXK1ZK5kheQJ
     143        yeuSM1J4KS0pFymm1HqpGqmTUiNSc9IUaVNpf+lU6RLpI9JXpKdksDJaMm4ybJkCmYMyF2TGKQhFneJC
     144        YVE2UxopFykTVAxVm+pFTaIWU7+jDlBnZWVkl8mGyWbL1sielh2lITQtmhcthVZKO04bpr1borTEaQln
     145        yfYlrUuGlszLLZVzlOPIFcm1yd2WeydPl3eTT5bfJd8p/1ABpaCnEKiQpbBf4aLCzFLqUtulrKVFS48v
     146        vacIK+opBimuVTyo2K84p6Ss5KGUrlSldEFpRpmm7KicpFyufEZ5WoWiYq/CVSlXOavylC5Ld6Kn0Cvp
     147        vfRZVUVVT1Whar3qgOqCmrZaqFq+WpvaQ3WCOkM9Xr1cvUd9VkNFw08jT6NF454mXpOhmai5V7NPc15L
     148        Wytca6tWp9aUtpy2l3audov2Ax2yjoPOGp0GnVu6GF2GbrLuPt0berCehV6iXo3edX1Y31Kfq79Pf9AA
     149        bWBtwDNoMBgxJBk6GWYathiOGdGMfI3yjTqNnhtrGEcZ7zLuM/5oYmGSYtJoct9UxtTbNN+02/R3Mz0z
     150        llmN2S1zsrm7+QbzLvMXy/SXcZbtX3bHgmLhZ7HVosfig6WVJd+y1XLaSsMq1qrWaoRBZQQwShiXrdHW
     151        ztYbrE9Zv7WxtBHYHLf5zdbQNtn2iO3Ucu3lnOWNy8ft1OyYdvV2o/Z0+1j7A/ajDqoOTIcGh8eO6o5s
     152        xybHSSddpySno07PnU2c+c7tzvMuNi7rXM65Iq4erkWuA24ybqFu1W6P3NXcE9xb3Gc9LDzWepzzRHv6
     153        eO7yHPFS8mJ5NXvNelt5r/Pu9SH5BPtU+zz21fPl+3b7wX7efrv9HqzQXMFb0ekP/L38d/s/DNAOWBPw
     154        YyAmMCCwJvBJkGlQXlBfMCU4JvhI8OsQ55DSkPuhOqHC0J4wybDosOaw+XDX8LLw0QjjiHUR1yIVIrmR
     155        XVHYqLCopqi5lW4r96yciLaILoweXqW9KnvVldUKq1NWn46RjGHGnIhFx4bHHol9z/RnNjDn4rziauNm
     156        WS6svaxnbEd2OXuaY8cp40zG28WXxU8l2CXsTphOdEisSJzhunCruS+SPJPqkuaT/ZMPJX9KCU9pS8Wl
     157        xqae5Mnwknm9acpp2WmD6frphemja2zW7Fkzy/fhN2VAGasyugRU0c9Uv1BHuEU4lmmfWZP5Jiss60S2
     158        dDYvuz9HL2d7zmSue+63a1FrWWt78lTzNuWNrXNaV78eWh+3vmeD+oaCDRMbPTYe3kTYlLzpp3yT/LL8
     159        V5vDN3cXKBVsLBjf4rGlpVCikF84stV2a9021DbutoHt5turtn8sYhddLTYprih+X8IqufqN6TeV33za
     160        Eb9joNSydP9OzE7ezuFdDrsOl0mX5ZaN7/bb3VFOLy8qf7UnZs+VimUVdXsJe4V7Ryt9K7uqNKp2Vr2v
     161        Tqy+XeNc01arWLu9dn4fe9/Qfsf9rXVKdcV17w5wD9yp96jvaNBqqDiIOZh58EljWGPft4xvm5sUmoqb
     162        PhziHRo9HHS4t9mqufmI4pHSFrhF2DJ9NProje9cv+tqNWytb6O1FR8Dx4THnn4f+/3wcZ/jPScYJ1p/
     163        0Pyhtp3SXtQBdeR0zHYmdo52RXYNnvQ+2dNt293+o9GPh06pnqo5LXu69AzhTMGZT2dzz86dSz83cz7h
     164        /HhPTM/9CxEXbvUG9g5c9Ll4+ZL7pQt9Tn1nL9tdPnXF5srJq4yrndcsr3X0W/S3/2TxU/uA5UDHdavr
     165        XTesb3QPLh88M+QwdP6m681Lt7xuXbu94vbgcOjwnZHokdE77DtTd1PuvriXeW/h/sYH6AdFD6UeVjxS
     166        fNTws+7PbaOWo6fHXMf6Hwc/vj/OGn/2S8Yv7ycKnpCfVEyqTDZPmU2dmnafvvF05dOJZ+nPFmYKf5X+
     167        tfa5zvMffnP8rX82YnbiBf/Fp99LXsq/PPRq2aueuYC5R69TXy/MF72Rf3P4LeNt37vwd5MLWe+x7ys/
     168        6H7o/ujz8cGn1E+f/gUDmPP8usTo0wAAAAlwSFlzAAALDwAACw8BkvkDpQAAABl0RVh0U29mdHdhcmUA
     169        UGFpbnQuTkVUIHYzLjUuNUmK/OAAAAJiSURBVDhPnZNtSFNRHMbdzAgV/DC0bL4R5rSNEjOjiJkhUfpB
     170        Aikog74ERV+iIipymgvXbFZrW1NrFoQhQUr2phQxcK0XGWx+2JhGdrfWNmduM1N3r9vTPcNF0vVLFx4O
     171        h3Of33nO+f9PUtLSRwcHkunQEJ8OGzOZGXMq8/NjJqsMZuZ9NhMyrqKnX/HIr/Peu5KE55+RmR3JM419
     172        QLtRg/rHR1HVVQvprX243C+HjXKE6LD5iMqoBycg4usR9I++RN3zBsgmFFC4NLjiUKHJ0YYTn86h8k4N
     173        rBN2lNzcxg1weMaDxHx14gZq+w4hq2kD1sk34pjxVBzU7LgehxQoxdyAC0+b0WA6ie3qPWgf1GLU5cSY
     174        l0JOiyieKqFseSE34IDhMKSd+9FneQFmMSamF2Np/sA0bG7nMoigMZ8bUNFZhfNPZMRcyopHMzFer2UA
     175        +QoJchXFIDsTc8ZFITdgi3YnRr7Y4Jv8kUJu2eMN5Li/+1O+eSfXeHyB1eycT7l9a52fKW4AuyOWtJcd
     176        kyN0bJfb4+fNR6L8uYUo7xer2blommxYyQ0oM1Ris34Him+XBwvaJGFhqwgd5odYoKMCkoiFVHcM30eJ
     177        doUybjVIoXTp4iUrVJXCQtnJccAmyCUprNQYah7VY31jEXeCTbqKPwACEanLYflqZztwHF2mnnhXklIe
     178        f3CaG8DGRtG1smU1J6aEkZiFMhHuve3lBuS1ivHM+hpCtnH+NiUaiJgVQxoEQsxuzregf9MN9qLwzmHB
     179        pd4W1OoOIv1sFtLPZKFaXQftYDemwkyqZ4rmr/ga/2fhN/0cpIchJAs6AAAAAElFTkSuQmCC
     180</value>
     181  </data>
    120182  <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
    121183    <value>57</value>

  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Views/3.4/ExperimentManager/HiveExperimentView.Designer.cs

    r5852 r5955  
    4545    /// </summary>
    4646    private void InitializeComponent() {
     47      this.components = new System.ComponentModel.Container();
    4748      System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(HiveExperimentView));
    4849      this.tabControl = new System.Windows.Forms.TabControl();
    … …  
    5657      this.logTabPage = new System.Windows.Forms.TabPage();
    5758      this.logView = new HeuristicLab.Core.Views.LogView();
    58       this.downloadExperimentButton = new System.Windows.Forms.Button();
    5959      this.startButton = new System.Windows.Forms.Button();
    6060      this.stopButton = new System.Windows.Forms.Button();
    … …  
    6565      this.resourceIdsLabel = new System.Windows.Forms.Label();
    6666      this.resourceNamesTextBox = new System.Windows.Forms.TextBox();
    67       this.disconnectButton = new System.Windows.Forms.Button();
    68       this.reconnectButton = new System.Windows.Forms.Button();
    69       this.downloadExperimentPanel = new System.Windows.Forms.Panel();
    7067      this.useLocalPluginsCheckBox = new System.Windows.Forms.CheckBox();
    71       ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).BeginInit();
     68      this.nameLabel = new System.Windows.Forms.Label();
     69      this.nameTextBox = new System.Windows.Forms.TextBox();
     70      this.toolTip = new System.Windows.Forms.ToolTip(this.components);
     71      this.refreshButton = new System.Windows.Forms.Button();
     72      this.refreshAutomaticallyCheckBox = new System.Windows.Forms.CheckBox();
     73      this.infoGroupBox = new System.Windows.Forms.GroupBox();
     74      this.finishedTextBox = new System.Windows.Forms.TextBox();
     75      this.calculatingTextBox = new System.Windows.Forms.TextBox();
     76      this.jobsTextBox = new System.Windows.Forms.TextBox();
     77      this.finishedLabel = new System.Windows.Forms.Label();
     78      this.calculatingLabel = new System.Windows.Forms.Label();
     79      this.jobsLabel = new System.Windows.Forms.Label();
    7280      this.tabControl.SuspendLayout();
    7381      this.experimentTabPage.SuspendLayout();
    7482      this.jobsTabPage.SuspendLayout();
    7583      this.logTabPage.SuspendLayout();
    76       this.downloadExperimentPanel.SuspendLayout();
     84      this.infoGroupBox.SuspendLayout();
    7785      this.SuspendLayout();
    78       //
    79       // nameTextBox
    80       //
    81       this.errorProvider.SetIconAlignment(this.nameTextBox, System.Windows.Forms.ErrorIconAlignment.MiddleLeft);
    82       this.errorProvider.SetIconPadding(this.nameTextBox, 2);
    83       this.nameTextBox.Size = new System.Drawing.Size(727, 20);
    8486      //
    8587      // tabControl
    … …  
    9496      this.tabControl.Name = "tabControl";
    9597      this.tabControl.SelectedIndex = 0;
    96       this.tabControl.Size = new System.Drawing.Size(799, 520);
     98      this.tabControl.Size = new System.Drawing.Size(821, 520);
    9799      this.tabControl.TabIndex = 4;
    98100      //
    … …  
    106108      this.experimentTabPage.Name = "experimentTabPage";
    107109      this.experimentTabPage.Padding = new System.Windows.Forms.Padding(3);
    108       this.experimentTabPage.Size = new System.Drawing.Size(791, 494);
     110      this.experimentTabPage.Size = new System.Drawing.Size(813, 494);
    109111      this.experimentTabPage.TabIndex = 1;
    110112      this.experimentTabPage.Text = "Experiment";
    … …  
    139141      this.experimentNamedItemView.Caption = "NamedItem View";
    140142      this.experimentNamedItemView.Content = null;
    141       this.experimentNamedItemView.Location = new System.Drawing.Point(3, 36);
     143      this.experimentNamedItemView.Location = new System.Drawing.Point(2, 36);
    142144      this.experimentNamedItemView.Name = "experimentNamedItemView";
    143145      this.experimentNamedItemView.ReadOnly = false;
    144       this.experimentNamedItemView.Size = new System.Drawing.Size(728, 52);
     146      this.experimentNamedItemView.Size = new System.Drawing.Size(808, 26);
    145147      this.experimentNamedItemView.TabIndex = 3;
    146148      //
    … …  
    149151      this.viewExperimentButton.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    150152                  | System.Windows.Forms.AnchorStyles.Right)));
    151       this.viewExperimentButton.Location = new System.Drawing.Point(0, 94);
     153      this.viewExperimentButton.Location = new System.Drawing.Point(3, 64);
    152154      this.viewExperimentButton.Name = "viewExperimentButton";
    153       this.viewExperimentButton.Size = new System.Drawing.Size(734, 23);
     155      this.viewExperimentButton.Size = new System.Drawing.Size(804, 23);
    154156      this.viewExperimentButton.TabIndex = 1;
    155157      this.viewExperimentButton.Text = "&Show Experiment";
    156158      this.viewExperimentButton.UseVisualStyleBackColor = true;
    157       this.viewExperimentButton.Click += new System.EventHandler(this.showExperimentButton_Click);
     159      this.viewExperimentButton.Click += new System.EventHandler(this.viewExperimentButton_Click);
    158160      //
    159161      // jobsTabPage
    … …  
    162164      this.jobsTabPage.Location = new System.Drawing.Point(4, 22);
    163165      this.jobsTabPage.Name = "jobsTabPage";
    164       this.jobsTabPage.Size = new System.Drawing.Size(791, 494);
     166      this.jobsTabPage.Size = new System.Drawing.Size(813, 494);
    165167      this.jobsTabPage.TabIndex = 5;
    166168      this.jobsTabPage.Text = "Jobs";
    … …  
    177179      this.jobsTreeView.Name = "jobsTreeView";
    178180      this.jobsTreeView.ReadOnly = false;
    179       this.jobsTreeView.Size = new System.Drawing.Size(786, 488);
     181      this.jobsTreeView.Size = new System.Drawing.Size(808, 488);
    180182      this.jobsTreeView.TabIndex = 0;
    181183      //
    … …  
    185187      this.logTabPage.Location = new System.Drawing.Point(4, 22);
    186188      this.logTabPage.Name = "logTabPage";
    187       this.logTabPage.Size = new System.Drawing.Size(791, 494);
     189      this.logTabPage.Size = new System.Drawing.Size(813, 494);
    188190      this.logTabPage.TabIndex = 3;
    189191      this.logTabPage.Text = "Log";
    … …  
    198200      this.logView.Name = "logView";
    199201      this.logView.ReadOnly = false;
    200       this.logView.Size = new System.Drawing.Size(791, 494);
     202      this.logView.Size = new System.Drawing.Size(801, 494);
    201203      this.logView.TabIndex = 0;
    202       //
    203       // downloadExperimentButton
    204       //
    205       this.downloadExperimentButton.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    206                   | System.Windows.Forms.AnchorStyles.Right)));
    207       this.downloadExperimentButton.Image = ((System.Drawing.Image)(resources.GetObject("downloadExperimentButton.Image")));
    208       this.downloadExperimentButton.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
    209       this.downloadExperimentButton.Location = new System.Drawing.Point(44, 22);
    210       this.downloadExperimentButton.Name = "downloadExperimentButton";
    211       this.downloadExperimentButton.Size = new System.Drawing.Size(164, 54);
    212       this.downloadExperimentButton.TabIndex = 17;
    213       this.downloadExperimentButton.Text = "Download Experiment";
    214       this.toolTip.SetToolTip(this.downloadExperimentButton, "Reconnect to Hive");
    215       this.downloadExperimentButton.UseVisualStyleBackColor = true;
    216       this.downloadExperimentButton.Click += new System.EventHandler(this.downloadExperimentButton_Click);
    217204      //
    218205      // startButton
    … …  
    257244      this.executionTimeLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
    258245      this.executionTimeLabel.AutoSize = true;
    259       this.executionTimeLabel.Location = new System.Drawing.Point(573, 611);
     246      this.executionTimeLabel.Location = new System.Drawing.Point(595, 611);
    260247      this.executionTimeLabel.Name = "executionTimeLabel";
    261248      this.executionTimeLabel.Size = new System.Drawing.Size(83, 13);
    … …  
    266253      //
    267254      this.executionTimeTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
    268       this.executionTimeTextBox.Location = new System.Drawing.Point(662, 608);
     255      this.executionTimeTextBox.Location = new System.Drawing.Point(684, 608);
    269256      this.executionTimeTextBox.Name = "executionTimeTextBox";
    270257      this.executionTimeTextBox.ReadOnly = true;
    … …  
    288275      //
    289276      this.resourceIdsLabel.AutoSize = true;
    290       this.resourceIdsLabel.Location = new System.Drawing.Point(3, 55);
     277      this.resourceIdsLabel.Location = new System.Drawing.Point(4, 56);
    291278      this.resourceIdsLabel.Name = "resourceIdsLabel";
    292       this.resourceIdsLabel.Size = new System.Drawing.Size(67, 13);
     279      this.resourceIdsLabel.Size = new System.Drawing.Size(70, 13);
    293280      this.resourceIdsLabel.TabIndex = 12;
    294       this.resourceIdsLabel.Text = "ResourceIds";
     281      this.resourceIdsLabel.Text = "ResourceIds:";
    295282      //
    296283      // resourceNamesTextBox
    … …  
    298285      this.resourceNamesTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    299286                  | System.Windows.Forms.AnchorStyles.Right)));
    300       this.resourceNamesTextBox.Location = new System.Drawing.Point(72, 52);
     287      this.resourceNamesTextBox.Location = new System.Drawing.Point(73, 53);
    301288      this.resourceNamesTextBox.Name = "resourceNamesTextBox";
    302       this.resourceNamesTextBox.Size = new System.Drawing.Size(616, 20);
     289      this.resourceNamesTextBox.Size = new System.Drawing.Size(494, 20);
    303290      this.resourceNamesTextBox.TabIndex = 14;
    304291      this.resourceNamesTextBox.Validated += new System.EventHandler(this.resourceNamesTextBox_Validated);
    305292      //
    306       // disconnectButton
    307       //
    308       this.disconnectButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
    309       this.disconnectButton.Enabled = false;
    310       this.disconnectButton.Location = new System.Drawing.Point(234, 604);
    311       this.disconnectButton.Name = "disconnectButton";
    312       this.disconnectButton.Size = new System.Drawing.Size(120, 24);
    313       this.disconnectButton.TabIndex = 15;
    314       this.disconnectButton.Text = "Stop Result Polling";
    315       this.toolTip.SetToolTip(this.disconnectButton, "Disconnect from Hive (Jobs will be continue to be calculated)");
    316       this.disconnectButton.UseVisualStyleBackColor = true;
    317       this.disconnectButton.Click += new System.EventHandler(this.disconnectButton_Click);
    318       //
    319       // reconnectButton
    320       //
    321       this.reconnectButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
    322       this.reconnectButton.Enabled = false;
    323       this.reconnectButton.Location = new System.Drawing.Point(120, 604);
    324       this.reconnectButton.Name = "reconnectButton";
    325       this.reconnectButton.Size = new System.Drawing.Size(108, 24);
    326       this.reconnectButton.TabIndex = 16;
    327       this.reconnectButton.Text = "Start Result Polling";
    328       this.toolTip.SetToolTip(this.reconnectButton, "Reconnect to Hive");
    329       this.reconnectButton.UseVisualStyleBackColor = true;
    330       this.reconnectButton.Click += new System.EventHandler(this.reconnectButton_Click);
    331       //
    332       // downloadExperimentPanel
    333       //
    334       this.downloadExperimentPanel.Controls.Add(this.downloadExperimentButton);
    335       this.downloadExperimentPanel.Location = new System.Drawing.Point(331, 3);
    336       this.downloadExperimentPanel.Name = "downloadExperimentPanel";
    337       this.downloadExperimentPanel.Size = new System.Drawing.Size(250, 80);
    338       this.downloadExperimentPanel.TabIndex = 18;
    339       //
    340293      // useLocalPluginsCheckBox
    341294      //
    342295      this.useLocalPluginsCheckBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
    343296      this.useLocalPluginsCheckBox.AutoSize = true;
    344       this.useLocalPluginsCheckBox.Location = new System.Drawing.Point(694, 54);
     297      this.useLocalPluginsCheckBox.Location = new System.Drawing.Point(573, 56);
    345298      this.useLocalPluginsCheckBox.Name = "useLocalPluginsCheckBox";
    346299      this.useLocalPluginsCheckBox.Size = new System.Drawing.Size(105, 17);
    … …  
    350303      this.useLocalPluginsCheckBox.CheckedChanged += new System.EventHandler(this.useLocalPluginsCheckBox_CheckedChanged);
    351304      //
     305      // nameLabel
     306      //
     307      this.nameLabel.AutoSize = true;
     308      this.nameLabel.Location = new System.Drawing.Point(1, 27);
     309      this.nameLabel.Name = "nameLabel";
     310      this.nameLabel.Size = new System.Drawing.Size(38, 13);
     311      this.nameLabel.TabIndex = 20;
     312      this.nameLabel.Text = "Name:";
     313      //
     314      // nameTextBox
     315      //
     316      this.nameTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
     317                  | System.Windows.Forms.AnchorStyles.Right)));
     318      this.nameTextBox.Location = new System.Drawing.Point(73, 27);
     319      this.nameTextBox.Name = "nameTextBox";
     320      this.nameTextBox.Size = new System.Drawing.Size(605, 20);
     321      this.nameTextBox.TabIndex = 21;
     322      this.nameTextBox.Validated += new System.EventHandler(this.nameTextBox_Validated);
     323      //
     324      // refreshButton
     325      //
     326      this.refreshButton.Image = ((System.Drawing.Image)(resources.GetObject("refreshButton.Image")));
     327      this.refreshButton.Location = new System.Drawing.Point(3, 0);
     328      this.refreshButton.Name = "refreshButton";
     329      this.refreshButton.Size = new System.Drawing.Size(24, 24);
     330      this.refreshButton.TabIndex = 22;
     331      this.toolTip.SetToolTip(this.refreshButton, "Refresh Data");
     332      this.refreshButton.UseVisualStyleBackColor = true;
     333      this.refreshButton.Click += new System.EventHandler(this.refreshButton_Click);
     334      //
     335      // refreshAutomaticallyCheckBox
     336      //
     337      this.refreshAutomaticallyCheckBox.AutoSize = true;
     338      this.refreshAutomaticallyCheckBox.Location = new System.Drawing.Point(30, 5);
     339      this.refreshAutomaticallyCheckBox.Name = "refreshAutomaticallyCheckBox";
     340      this.refreshAutomaticallyCheckBox.Size = new System.Drawing.Size(128, 17);
     341      this.refreshAutomaticallyCheckBox.TabIndex = 24;
     342      this.refreshAutomaticallyCheckBox.Text = "&Refresh Automatically";
     343      this.refreshAutomaticallyCheckBox.UseVisualStyleBackColor = true;
     344      this.refreshAutomaticallyCheckBox.CheckedChanged += new System.EventHandler(this.refreshAutomaticallyCheckBox_CheckedChanged);
     345      //
     346      // infoGroupBox
     347      //
     348      this.infoGroupBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
     349      this.infoGroupBox.Controls.Add(this.finishedTextBox);
     350      this.infoGroupBox.Controls.Add(this.calculatingTextBox);
     351      this.infoGroupBox.Controls.Add(this.jobsTextBox);
     352      this.infoGroupBox.Controls.Add(this.finishedLabel);
     353      this.infoGroupBox.Controls.Add(this.calculatingLabel);
     354      this.infoGroupBox.Controls.Add(this.jobsLabel);
     355      this.infoGroupBox.Location = new System.Drawing.Point(684, 5);
     356      this.infoGroupBox.Name = "infoGroupBox";
     357      this.infoGroupBox.Size = new System.Drawing.Size(133, 89);
     358      this.infoGroupBox.TabIndex = 25;
     359      this.infoGroupBox.TabStop = false;
     360      this.infoGroupBox.Text = "Info";
     361      //
     362      // finishedTextBox
     363      //
     364      this.finishedTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
     365                  | System.Windows.Forms.AnchorStyles.Right)));
     366      this.finishedTextBox.Location = new System.Drawing.Point(74, 64);
     367      this.finishedTextBox.Name = "finishedTextBox";
     368      this.finishedTextBox.Size = new System.Drawing.Size(53, 20);
     369      this.finishedTextBox.TabIndex = 5;
     370      //
     371      // calculatingTextBox
     372      //
     373      this.calculatingTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
     374                  | System.Windows.Forms.AnchorStyles.Right)));
     375      this.calculatingTextBox.Location = new System.Drawing.Point(74, 40);
     376      this.calculatingTextBox.Name = "calculatingTextBox";
     377      this.calculatingTextBox.Size = new System.Drawing.Size(53, 20);
     378      this.calculatingTextBox.TabIndex = 4;
     379      //
     380      // jobsTextBox
     381      //
     382      this.jobsTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
     383                  | System.Windows.Forms.AnchorStyles.Right)));
     384      this.jobsTextBox.Location = new System.Drawing.Point(74, 16);
     385      this.jobsTextBox.Name = "jobsTextBox";
     386      this.jobsTextBox.Size = new System.Drawing.Size(53, 20);
     387      this.jobsTextBox.TabIndex = 3;
     388      //
     389      // finishedLabel
     390      //
     391      this.finishedLabel.AutoSize = true;
     392      this.finishedLabel.Location = new System.Drawing.Point(6, 67);
     393      this.finishedLabel.Name = "finishedLabel";
     394      this.finishedLabel.Size = new System.Drawing.Size(49, 13);
     395      this.finishedLabel.TabIndex = 2;
     396      this.finishedLabel.Text = "Finished:";
     397      //
     398      // calculatingLabel
     399      //
     400      this.calculatingLabel.AutoSize = true;
     401      this.calculatingLabel.Location = new System.Drawing.Point(6, 43);
     402      this.calculatingLabel.Name = "calculatingLabel";
     403      this.calculatingLabel.Size = new System.Drawing.Size(62, 13);
     404      this.calculatingLabel.TabIndex = 1;
     405      this.calculatingLabel.Text = "Calculating:";
     406      //
     407      // jobsLabel
     408      //
     409      this.jobsLabel.AutoSize = true;
     410      this.jobsLabel.Location = new System.Drawing.Point(6, 19);
     411      this.jobsLabel.Name = "jobsLabel";
     412      this.jobsLabel.Size = new System.Drawing.Size(32, 13);
     413      this.jobsLabel.TabIndex = 0;
     414      this.jobsLabel.Text = "Jobs:";
     415      //
    352416      // HiveExperimentView
    353417      //
    354418      this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
    355419      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
    356       this.Controls.Add(this.downloadExperimentPanel);
     420      this.Controls.Add(this.infoGroupBox);
     421      this.Controls.Add(this.refreshAutomaticallyCheckBox);
     422      this.Controls.Add(this.refreshButton);
     423      this.Controls.Add(this.nameTextBox);
     424      this.Controls.Add(this.nameLabel);
    357425      this.Controls.Add(this.tabControl);
    358       this.Controls.Add(this.disconnectButton);
    359426      this.Controls.Add(this.startButton);
     427      this.Controls.Add(this.executionTimeTextBox);
     428      this.Controls.Add(this.executionTimeLabel);
    360429      this.Controls.Add(this.resourceNamesTextBox);
    361       this.Controls.Add(this.executionTimeTextBox);
     430      this.Controls.Add(this.pauseButton);
    362431      this.Controls.Add(this.resourceIdsLabel);
    363       this.Controls.Add(this.executionTimeLabel);
     432      this.Controls.Add(this.stopButton);
    364433      this.Controls.Add(this.useLocalPluginsCheckBox);
    365       this.Controls.Add(this.pauseButton);
    366       this.Controls.Add(this.stopButton);
    367434      this.Controls.Add(this.resetButton);
    368       this.Controls.Add(this.reconnectButton);
    369435      this.Name = "HiveExperimentView";
    370       this.Size = new System.Drawing.Size(799, 628);
    371       this.Controls.SetChildIndex(this.nameTextBox, 0);
    372       this.Controls.SetChildIndex(this.reconnectButton, 0);
    373       this.Controls.SetChildIndex(this.resetButton, 0);
    374       this.Controls.SetChildIndex(this.stopButton, 0);
    375       this.Controls.SetChildIndex(this.pauseButton, 0);
    376       this.Controls.SetChildIndex(this.useLocalPluginsCheckBox, 0);
    377       this.Controls.SetChildIndex(this.executionTimeLabel, 0);
    378       this.Controls.SetChildIndex(this.resourceIdsLabel, 0);
    379       this.Controls.SetChildIndex(this.executionTimeTextBox, 0);
    380       this.Controls.SetChildIndex(this.resourceNamesTextBox, 0);
    381       this.Controls.SetChildIndex(this.startButton, 0);
    382       this.Controls.SetChildIndex(this.disconnectButton, 0);
    383       this.Controls.SetChildIndex(this.tabControl, 0);
    384       this.Controls.SetChildIndex(this.nameLabel, 0);
    385       this.Controls.SetChildIndex(this.downloadExperimentPanel, 0);
    386       ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).EndInit();
     436      this.Size = new System.Drawing.Size(821, 628);
    387437      this.tabControl.ResumeLayout(false);
    388438      this.experimentTabPage.ResumeLayout(false);
    389439      this.jobsTabPage.ResumeLayout(false);
    390440      this.logTabPage.ResumeLayout(false);
    391       this.downloadExperimentPanel.ResumeLayout(false);
     441      this.infoGroupBox.ResumeLayout(false);
     442      this.infoGroupBox.PerformLayout();
    392443      this.ResumeLayout(false);
    393444      this.PerformLayout();
    … …  
    410461    private System.Windows.Forms.TabPage logTabPage;
    411462    private Core.Views.LogView logView;
    412     private System.Windows.Forms.Button disconnectButton;
    413     private System.Windows.Forms.Button reconnectButton;
    414463    private System.Windows.Forms.Button openExperimentButton;
    415464    private System.Windows.Forms.Button newExperimentButton;
    416     private System.Windows.Forms.Button downloadExperimentButton;
    417     private System.Windows.Forms.Panel downloadExperimentPanel;
    418465    private System.Windows.Forms.CheckBox useLocalPluginsCheckBox;
    419466    private System.Windows.Forms.TabPage jobsTabPage;
    420467    private ItemTreeView jobsTreeView;
     468    private System.Windows.Forms.Label nameLabel;
     469    private System.Windows.Forms.TextBox nameTextBox;
     470    private System.Windows.Forms.ToolTip toolTip;
     471    private System.Windows.Forms.Button refreshButton;
     472    private System.Windows.Forms.CheckBox refreshAutomaticallyCheckBox;
     473    private System.Windows.Forms.GroupBox infoGroupBox;
     474    private System.Windows.Forms.TextBox finishedTextBox;
     475    private System.Windows.Forms.TextBox calculatingTextBox;
     476    private System.Windows.Forms.TextBox jobsTextBox;
     477    private System.Windows.Forms.Label finishedLabel;
     478    private System.Windows.Forms.Label calculatingLabel;
     479    private System.Windows.Forms.Label jobsLabel;
    421480
    422481  }

  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Views/3.4/ExperimentManager/HiveExperimentView.cs

    r5852 r5955  
    2121
    2222using System;
     23using System.ComponentModel;
    2324using System.Threading;
    2425using System.Windows.Forms;
    … …  
    3435  /// </summary>
    3536  [View("Experiment View")]
    36   [Content(typeof(HiveExperimentClient), true)]
    37   public sealed partial class HiveExperimentView : NamedItemView {
     37  [Content(typeof(HiveExperiment), true)]
     38  public sealed partial class HiveExperimentView : ItemView {
    3839    private ProgressView progressView;
    3940
    40     public new HiveExperimentClient Content {
    41       get { return (HiveExperimentClient)base.Content; }
     41    public new HiveExperiment Content {
     42      get { return (HiveExperiment)base.Content; }
    4243      set { base.Content = value; }
    4344    }
    … …  
    4849    public HiveExperimentView() {
    4950      InitializeComponent();
    50       downloadExperimentPanel.Dock = DockStyle.Fill;
    5151    }
    5252
    5353    protected override void DeregisterContentEvents() {
    54       Content.ExceptionOccurred -= new EventHandler<EventArgs<Exception>>(Content_ExceptionOccurred);
     54      //Content.ExceptionOccurred -= new EventHandler<EventArgs<Exception>>(Content_ExceptionOccurred);
    5555      Content.ExecutionStateChanged -= new EventHandler(Content_ExecutionStateChanged);
    5656      Content.ExecutionTimeChanged -= new EventHandler(Content_ExecutionTimeChanged);
    57       Content.Prepared -= new EventHandler(Content_Prepared);
    58       Content.Started -= new EventHandler(Content_Started);
    59       Content.Paused -= new EventHandler(Content_Paused);
    60       Content.Stopped -= new EventHandler(Content_Stopped);
    61       Content.IsResultsPollingChanged -= new EventHandler(Content_IsResultsPollingChanged);
     57      //Content.Prepared -= new EventHandler(Content_Prepared);
     58      //Content.Started -= new EventHandler(Content_Started);
     59      //Content.Paused -= new EventHandler(Content_Paused);
     60      //Content.Stopped -= new EventHandler(Content_Stopped);
     61      Content.RefreshAutomaticallyChanged -= new EventHandler(Content_RefreshAutomaticallyChanged);
    6262      Content.HiveJobChanged -= new EventHandler(Content_HiveJobChanged);
    6363      Content.IsProgressingChanged -= new EventHandler(Content_IsProgressingChanged);
     64      Content.PropertyChanged -= new System.ComponentModel.PropertyChangedEventHandler(Content_PropertyChanged);
    6465      base.DeregisterContentEvents();
    6566    }
    … …  
    6768    protected override void RegisterContentEvents() {
    6869      base.RegisterContentEvents();
    69       Content.ExceptionOccurred += new EventHandler<EventArgs<Exception>>(Content_ExceptionOccurred);
     70      //Content.ExceptionOccurred += new EventHandler<EventArgs<Exception>>(Content_ExceptionOccurred);
    7071      Content.ExecutionStateChanged += new EventHandler(Content_ExecutionStateChanged);
    7172      Content.ExecutionTimeChanged += new EventHandler(Content_ExecutionTimeChanged);
    72       Content.Prepared += new EventHandler(Content_Prepared);
    73       Content.Started += new EventHandler(Content_Started);
    74       Content.Paused += new EventHandler(Content_Paused);
    75       Content.Stopped += new EventHandler(Content_Stopped);
    76       Content.IsResultsPollingChanged += new EventHandler(Content_IsResultsPollingChanged);
     73      //Content.Prepared += new EventHandler(Content_Prepared);
     74      //Content.Started += new EventHandler(Content_Started);
     75      //Content.Paused += new EventHandler(Content_Paused);
     76      //Content.Stopped += new EventHandler(Content_Stopped);
     77      Content.RefreshAutomaticallyChanged += new EventHandler(Content_RefreshAutomaticallyChanged);
    7778      Content.HiveJobChanged += new EventHandler(Content_HiveJobChanged);
    7879      Content.IsProgressingChanged += new EventHandler(Content_IsProgressingChanged);
     80      Content.PropertyChanged += new System.ComponentModel.PropertyChangedEventHandler(Content_PropertyChanged);
    7981    }
    8082
    … …  
    8284      base.OnContentChanged();
    8385      if (Content == null) {
     86        nameTextBox.Text = string.Empty;
    8487        executionTimeTextBox.Text = string.Empty;
    8588        resourceNamesTextBox.Text = string.Empty;
    8689        useLocalPluginsCheckBox.Checked = false;
    8790        logView.Content = null;
     91        //includeJobsCheckBox.Checked = false;
     92        refreshAutomaticallyCheckBox.Checked = false;
     93        jobsTextBox.Text = "0";
     94        calculatingTextBox.Text = "0";
     95        finishedTextBox.Text = "0";
    8896      } else {
     97        nameTextBox.Text = Content.Name;
    8998        executionTimeTextBox.Text = Content.ExecutionTime.ToString();
    9099        resourceNamesTextBox.Text = Content.ResourceNames;
    91100        useLocalPluginsCheckBox.Checked = Content.UseLocalPlugins;
    92         logView.Content = Content.Log;
     101        //includeJobsCheckBox.Checked = Content.IncludeJobs;
     102        refreshAutomaticallyCheckBox.Checked = Content.RefreshAutomatically;
     103        jobsTextBox.Text = Content.JobCount.ToString();
     104        calculatingTextBox.Text = Content.CalculatingCount.ToString();
     105        finishedTextBox.Text = Content.FinishedCount.ToString();
    93106      }
    94107      Content_HiveJobChanged(this, EventArgs.Empty);
    … …  
    101114      executionTimeTextBox.Enabled = Content != null;
    102115      experimentNamedItemView.ReadOnly = true;
     116      jobsTextBox.ReadOnly = true;
     117      calculatingTextBox.ReadOnly = true;
     118      finishedTextBox.ReadOnly = true;
     119
    103120      if (Content != null) {
    104         this.nameTextBox.ReadOnly = Content.ExecutionState != ExecutionState.Prepared;
    105         this.resourceNamesTextBox.ReadOnly = Content.ExecutionState != ExecutionState.Prepared;
    106         this.jobsTreeView.ReadOnly = Content.ExecutionState != ExecutionState.Prepared;
    107         this.useLocalPluginsCheckBox.Enabled = Content.ExecutionState == ExecutionState.Prepared;
    108 
    109         viewExperimentButton.Enabled = Content.GetExperiment() != null;
    110 
    111         this.Locked = Content.ExecutionState == ExecutionState.Started && Content.IsPollingResults;
    112         downloadExperimentPanel.Visible = Content.HiveExperimentId != Guid.Empty && Content.GetExperiment() == null;
     121        bool alreadyUploaded = Content.RootJobId != null && Content.Id != Guid.Empty;
     122        bool jobsLoaded = Content.HiveJob != null && Content.HiveJob.Job.Id != Guid.Empty;
     123
     124        this.nameTextBox.ReadOnly = Content.ExecutionState != ExecutionState.Prepared || alreadyUploaded;
     125        this.resourceNamesTextBox.ReadOnly = Content.ExecutionState != ExecutionState.Prepared || alreadyUploaded;
     126        this.jobsTreeView.ReadOnly = Content.ExecutionState != ExecutionState.Prepared || alreadyUploaded;
     127        this.useLocalPluginsCheckBox.Enabled = !(Content.ExecutionState != ExecutionState.Prepared || alreadyUploaded);
     128        this.refreshAutomaticallyCheckBox.Enabled = alreadyUploaded && jobsLoaded && Content.ExecutionState == ExecutionState.Started;
     129        this.viewExperimentButton.Enabled = Content.GetExperiment() != null;
     130        this.openExperimentButton.Enabled = !alreadyUploaded && Content.ExecutionState == ExecutionState.Prepared;
     131        this.newExperimentButton.Enabled = !alreadyUploaded && Content.ExecutionState == ExecutionState.Prepared;
     132        this.refreshButton.Enabled = alreadyUploaded;
     133
     134        this.Locked = Content.ExecutionState == ExecutionState.Started;
    113135      }
    114136      SetEnabledStateOfExecutableButtons();
    … …  
    117139    protected override void OnClosed(FormClosedEventArgs e) {
    118140      if (Content != null) {
    119         if (Content.IsPollingResults)
     141        if (Content.RefreshAutomatically)
    120142          Content.StopResultPolling();
    121143      }
    … …  
    176198        ErrorHandling.ShowErrorDialog(this, e.Value);
    177199    }
    178     private void Content_IsResultsPollingChanged(object sender, EventArgs e) {
    179       if (InvokeRequired)
    180         Invoke(new EventHandler(Content_IsResultsPollingChanged), sender, e);
    181       else {
    182         SetEnabledStateOfControls();
    183       }
    184     }
    185     void Content_HiveJobChanged(object sender, EventArgs e) {
     200    private void Content_RefreshAutomaticallyChanged(object sender, EventArgs e) {
     201      if (InvokeRequired)
     202        Invoke(new EventHandler(Content_RefreshAutomaticallyChanged), sender, e);
     203      else {
     204        refreshAutomaticallyCheckBox.Checked = Content.RefreshAutomatically;
     205        SetEnabledStateOfControls();
     206      }
     207    }
     208    private void Content_HiveJobChanged(object sender, EventArgs e) {
    186209      if (InvokeRequired)
    187210        Invoke(new EventHandler(Content_HiveJobChanged), sender, e);
    … …  
    197220      }
    198221    }
     222    private void Content_PropertyChanged(object sender, PropertyChangedEventArgs e) {
     223      if (InvokeRequired)
     224        Invoke(new PropertyChangedEventHandler(Content_PropertyChanged), sender, e);
     225      else {
     226        jobsTextBox.Text = Content.JobCount.ToString();
     227        calculatingTextBox.Text = Content.CalculatingCount.ToString();
     228        finishedTextBox.Text = Content.FinishedCount.ToString();
     229      }
     230    }
    199231    #endregion
    200232
    201233    #region Control events
    202234    private void startButton_Click(object sender, EventArgs e) {
    203       Content.Start();
     235      ExperimentManagerClient.StartExperiment(new Action<Exception>((Exception ex) => ErrorHandling.ShowErrorDialog(this, "Start failed.", ex)), Content);
    204236    }
    205237    private void pauseButton_Click(object sender, EventArgs e) {
    206       Content.Pause();
     238      ExperimentManagerClient.PauseExperiment(Content);
    207239    }
    208240    private void stopButton_Click(object sender, EventArgs e) {
    209       Content.Stop();
    210     }
    211     private void resetButton_Click(object sender, EventArgs e) {
    212       Content.Prepare();
     241      ExperimentManagerClient.StopExperiment(Content);
     242    }
     243    private void resetButton_Click(object sender, EventArgs e) {  }
     244
     245    private void nameTextBox_Validated(object sender, EventArgs e) {
     246      if (Content.Name != nameTextBox.Text)
     247        Content.Name = nameTextBox.Text;
    213248    }
    214249
    215250    private void resourceNamesTextBox_Validated(object sender, EventArgs e) {
    216       Content.ResourceNames = resourceNamesTextBox.Text;
     251      if (Content.ResourceNames != resourceNamesTextBox.Text)
     252        Content.ResourceNames = resourceNamesTextBox.Text;
    217253    }
    218254
    … …  
    238274    }
    239275
    240     private void disconnectButton_Click(object sender, EventArgs e) {
     276    private void viewExperimentButton_Click(object sender, EventArgs e) {
     277      MainFormManager.MainForm.ShowContent(Content.GetExperiment());
     278    }
     279
     280    private void includeJobsCheckBox_CheckedChanged(object sender, EventArgs e) {
     281      //if (Content != null) Content.IncludeJobs = includeJobsCheckBox.Checked;
     282    }
     283
     284    private void refreshAutomaticallyCheckBox_CheckedChanged(object sender, EventArgs e) {
    241285      if (Content != null) {
    242         Content.StopResultPolling();
    243         SetEnabledStateOfControls();
    244       }
    245     }
    246 
    247     private void reconnectButton_Click(object sender, EventArgs e) {
    248       if (Content != null) {
    249         Content.StartResultPolling();
    250         SetEnabledStateOfControls();
     286        Content.RefreshAutomatically = refreshAutomaticallyCheckBox.Checked;
    251287      }
    252288    }
    253289
    254290    private void useLocalPluginsCheckBox_CheckedChanged(object sender, EventArgs e) {
    255       if (Content != null) {
    256         Content.UseLocalPlugins = useLocalPluginsCheckBox.Checked;
    257       }
    258     }
    259     #endregion
    260 
    261     #region Helpers
    262     private void SetEnabledStateOfExecutableButtons() {
    263       if (Content == null) {
    264         startButton.Enabled = pauseButton.Enabled = stopButton.Enabled = resetButton.Enabled = reconnectButton.Enabled = disconnectButton.Enabled = false;
    265       } else {
    266         startButton.Enabled = Content.GetExperiment() != null && Content.ExecutionState == ExecutionState.Prepared;
    267         pauseButton.Enabled = false;
    268         stopButton.Enabled = Content.ExecutionState == ExecutionState.Started && Content.IsPollingResults;
    269         resetButton.Enabled = false;
    270         reconnectButton.Enabled = (Content.ExecutionState == ExecutionState.Started) && !Content.IsPollingResults;
    271         disconnectButton.Enabled = (Content.ExecutionState == ExecutionState.Started) && Content.IsPollingResults;
    272       }
    273     }
    274     #endregion
    275 
    276     private void downloadExperimentButton_Click(object sender, EventArgs e) {
    277       var invoker = new MethodInvoker(Content.LoadHiveJob);
    278       invoker.BeginInvoke((ar) => {
     291      if (Content != null) Content.UseLocalPlugins = useLocalPluginsCheckBox.Checked;
     292    }
     293
     294    private void refreshButton_Click(object sender, EventArgs e) {
     295      var invoker = new Action<HiveExperiment>(ExperimentManagerClient.LoadExperiment);
     296      invoker.BeginInvoke(Content, (ar) => {
    279297        try {
    280298          invoker.EndInvoke(ar);
    … …  
    285303      }, null);
    286304    }
    287 
     305    #endregion
     306
     307    #region Helpers
     308    private void SetEnabledStateOfExecutableButtons() {
     309      if (Content == null) {
     310        startButton.Enabled = pauseButton.Enabled = stopButton.Enabled = resetButton.Enabled = false;
     311      } else {
     312        startButton.Enabled = Content.GetExperiment() != null && Content.ExecutionState == ExecutionState.Prepared;
     313        pauseButton.Enabled = Content.ExecutionState == ExecutionState.Started;
     314        stopButton.Enabled = Content.ExecutionState == ExecutionState.Started;
     315        resetButton.Enabled = false;
     316      }
     317    }
     318    #endregion
     319
     320    #region Progress reporting
    288321    private void Content_IsProgressingChanged(object sender, EventArgs e) {
    289322      if (this.InvokeRequired) {
    … …  
    312345      }
    313346    }
     347    #endregion
     348 
    314349  }
    315350}

  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Views/3.4/ExperimentManager/HiveExperimentView.resx

    r5402 r5955  
    118118    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
    119119  </resheader>
    120   <metadata name="errorProvider.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    121     <value>107, 17</value>
    122   </metadata>
    123   <metadata name="toolTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    124     <value>17, 17</value>
    125   </metadata>
    126120  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
    127121  <data name="openExperimentButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    … …  
    143137</value>
    144138  </data>
     139  <metadata name="toolTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     140    <value>17, 17</value>
     141  </metadata>
    145142  <data name="newExperimentButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    146143    <value>
    … …  
    157154</value>
    158155  </data>
    159   <data name="downloadExperimentButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     156  <data name="startButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     157    <value>
     158        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
     159        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAK/wAA
     160        Cv8BNGKaggAAALBJREFUOE9j+P//PwMlGKvmsv3ZbsQaitWAhBkR/4k1BKcBlmX6RBmC1YCoKUH/N9xa
     161        /J8YQ7AaEDzBG2Q7UYZgNcCnyxlsAAhHLQrA6xKsBjg2W/zP2BAL1mzbrP9fp1jhv0QaN4hWQ48drAaY
     162        1+ihaOZPYMGqGWQYVgP0SpXhNuPTjNMAlXwpsLMJacZpgHSGIFGacRogksyJ089EBSK20MaVNyjKiTi9
     163        QGxOBKkDACT9xOni1RbMAAAAAElFTkSuQmCC
     164</value>
     165  </data>
     166  <data name="stopButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     167    <value>
     168        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
     169        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAK/wAA
     170        Cv8BNGKaggAAAWtJREFUOE/Nkz9IAmEYxl0KGqKtMVpaIiEoipYIgnByCSGhSQiCNBqCMiqwsr8clChF
     171        YmYSSikeWEbZH2qwEhKhwhAXjQwKEbw0zyue7nO7hgtyqOEbf7/ne5+XVwJAUsorCSbB/0xAeT+xSBcw
     172        685B52QwYU9jdOMFw+ZnDK0+YtCUyHzvSzACge/jH7hLcAg8FHB4w8IbZOEKsLD4s5AqdnheWLpAQJKj
     173        TxyCUa4IOi/yWPPlsOJlMGePoU6+JS4g376NczgKsdg+y8PIg3pnBmPWV6ipMGq61sUFZOarCAf3JZ98
     174        8I75XQKnoDEmoRg5RXW7QVxACvOHWdhO8lim36C1ptFvSEI5E4NsYA9VLUviAtK255qFcT+LSXsKahMP
     175        66OQa0Po7HOholEvLiCr2jxmMG2LQEOFoBw/55M96FA50NpjRlmDTlxA9tym8qGpl0Z9twO1Mktx7srm
     176        BZRLp34W/Oao/v4WvgBcI/R+TmAaZAAAAABJRU5ErkJggg==
     177</value>
     178  </data>
     179  <data name="resetButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     180    <value>
     181        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
     182        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAK/wAA
     183        Cv8BNGKaggAAAX9JREFUOE9j+P//PwMlmCLNIIupa0Dv5r//Ybht7bf/jSs+/69d/P5/xbxX/0tmP/9f
     184        MP3x/9JZj4EWI7yN4oKuDb/+bzr57f/KQ1/+L9jz6f/lBz//965997956RuwIXnTX/zXDV2F2wCQrSsO
     185        fvk/b9en/7ee/AIp/N+w5M3/0rkv/+dMff4/qffZf1W/RbgNADl5zo5P/x++/AHWDAIls1/+z5ry/H9C
     186        79P/Ya2P/8u5zcJtAMi/Nx99hmtGZhy7/Oa/V+3D/2J2k3AbAPJn87I3/09deQnXG9355H9g0yMw36H0
     187        /n9+s27cBoBCuhxoSM605/93HrkL1hTQ8Oi/W9UDMNss7+5/ToNW3AaAoikb6N9EoH/D2x7/n7Puwn/X
     188        ivv/bYrvgQ3Qy7j1n1WnEbcBoDiO63n6P7Tl0X+fuof/ncrv/7cuvPffJPsO2AD1JCIMsEza9h+EjWM2
     189        /NcKXv5fwWMuOOB4TTr/s+k24XcB0BKSkzbJGtAtodgAAJMl+qgyDSjjAAAAAElFTkSuQmCC
     190</value>
     191  </data>
     192  <data name="pauseButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     193    <value>
     194        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
     195        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAK/wAA
     196        Cv8BNGKaggAAAL5JREFUOE9j+P//PwMlmCLNIIsHoQG9m//+79rw63/e1EefQE5E56OHF4YXQJqvPvzz
     197        Xzd0FVDtfwZ0PkED2tZ++3/r6e//qn6LwAag8wka0Lji8//LD3//l3ObBTYAnU/QgNrF7/+fuP77v5jd
     198        JLAB6HyCBlTMe/V/94Wf//nNusEGoPMJGlAy+/n/9Sd//uc0aAUbgM4naEDB9Mf/F+z5/J9VpxFsADqf
     199        oAGg+GfTbYIbgM4naACpGWvg8wIAkX3yJyVePz4AAAAASUVORK5CYII=
     200</value>
     201  </data>
     202  <data name="refreshButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    160203    <value>
    161204        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGOfPtRkwAAACBjSFJNAACH
    … …  
    204247        fNTws+7PbaOWo6fHXMf6Hwc/vj/OGn/2S8Yv7ycKnpCfVEyqTDZPmU2dmnafvvF05dOJZ+nPFmYKf5X+
    205248        tfa5zvMffnP8rX82YnbiBf/Fp99LXsq/PPRq2aueuYC5R69TXy/MF72Rf3P4LeNt37vwd5MLWe+x7ys/
    206         6H7o/ujz8cGn1E+f/gUDmPP8usTo0wAAAAlwSFlzAAAOvAAADrwBlbxySQAAA2JJREFUOE9lk31MFHQY
    207         x59JZIU62/QPF1gauDJXjkpyZLxVMEEubgpKU0NePKS6yp168qaJ4OIlMhUH6hRWChyuuuTaQjqFk8j0
    208         MEhlURdMRgp0XERccfjpx7G1Vn8822+/fb/fz/f54xFA/jtDf03S4fyTloE/6PhlFNfvY0xMTCjZ/7X/
    209         mCfv3qXH7ab6lp387i/Y2VWE9mIhcdZk1phrybXeofvWIG6l+XeQN8CtzJ/fucHb10rZ013N0f5zHOyr
    210         Ytf3kWhb5hJQnciMfb+y9HA/J1u6cTqdTE5OeoPEo8y1A00kWFcr8jZqBk185f6Bc6MOCntySLItYuGZ
    211         /UiRE9lhZ05RGdWNNoaHh6cDrricrLI8yfpLj5B/U0vlgJVPRppoc1/l1O1O1rZ08NDpC8wo7kP25iE5
    212         QmD2IWw2G2NjY0hi/TB+Zbm83BxA6uVgjNdTybuZzIEfjRT/BDHn4b5jClVWiOwPRoyCzxvPkFtSRW9v
    213         L/Jwwc/Irhs83hBI5Jf+JFxcoKjBpLS3o7kA/meU+QMP8l4m8q4vsn0mPrp5xGYV0q40MkvfgbzlYNah
    214         LSxuEB6tiyfIdJSFtTD7pDIfnFDkAaRgij4XyVjB7JTnCd2YQ2NjI+KX2ops/U616OTe97fje3gH91em
    215         Ih+q/2IVUPAbkl+qRhRduEfnS0DaS4SsM1JfX4/MT7ciSc2I7ppq0o/s7lR1w5Q5SJmOI4YeRG9CtkXh
    216         k76EBVuXsTwtixfWGqirq0OW7/4aiVRJiU3Ia5dUxS5k5yvTxGw1GZXIhstIrA0/TSnP6jaxcnM5mg2Z
    217         mM1mBbD047OqBok4jcR9hiScR9afQt5U5i3hSLwFiT6LhNbwYNQRNLojPLG6jKys12lra0Ou991mWd63
    218         PBCi6k5NaC0z47OZszEUCTuBrKzB57kTzI/4mJCkJp7WmoiI3UxJSQkOhwMZHx+ntrWLoGw7gWvM+Ieb
    219         WKItYrGmnHlhDSyKOcsKtV5M2jc8laDeL6ZgMBiwWq2Mjo5OX9fIyAifNrcRvcfMY5ntRGW0EpveSlzG
    220         FeJ1Vwl5tZml0fuI0WzCaDRisVgYHBz03oM3YOrhcrmw2+2UV33EunfKiUo5QHjyXiISDWiTdej1eioq
    221         Krx7Dw0N4fF4vLfwN80WjZRSOVvaAAAAAElFTkSuQmCC
    222 </value>
    223   </data>
    224   <data name="startButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    225     <value>
    226         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
    227         YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAK/wAA
    228         Cv8BNGKaggAAALBJREFUOE9j+P//PwMlGKvmsv3ZbsQaitWAhBkR/4k1BKcBlmX6RBmC1YCoKUH/N9xa
    229         /J8YQ7AaEDzBG2Q7UYZgNcCnyxlsAAhHLQrA6xKsBjg2W/zP2BAL1mzbrP9fp1jhv0QaN4hWQ48drAaY
    230         1+ihaOZPYMGqGWQYVgP0SpXhNuPTjNMAlXwpsLMJacZpgHSGIFGacRogksyJ089EBSK20MaVNyjKiTi9
    231         QGxOBKkDACT9xOni1RbMAAAAAElFTkSuQmCC
    232 </value>
    233   </data>
    234   <data name="stopButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    235     <value>
    236         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
    237         YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAK/wAA
    238         Cv8BNGKaggAAAWtJREFUOE/Nkz9IAmEYxl0KGqKtMVpaIiEoipYIgnByCSGhSQiCNBqCMiqwsr8clChF
    239         YmYSSikeWEbZH2qwEhKhwhAXjQwKEbw0zyue7nO7hgtyqOEbf7/ne5+XVwJAUsorCSbB/0xAeT+xSBcw
    240         685B52QwYU9jdOMFw+ZnDK0+YtCUyHzvSzACge/jH7hLcAg8FHB4w8IbZOEKsLD4s5AqdnheWLpAQJKj
    241         TxyCUa4IOi/yWPPlsOJlMGePoU6+JS4g376NczgKsdg+y8PIg3pnBmPWV6ipMGq61sUFZOarCAf3JZ98
    242         8I75XQKnoDEmoRg5RXW7QVxACvOHWdhO8lim36C1ptFvSEI5E4NsYA9VLUviAtK255qFcT+LSXsKahMP
    243         66OQa0Po7HOholEvLiCr2jxmMG2LQEOFoBw/55M96FA50NpjRlmDTlxA9tym8qGpl0Z9twO1Mktx7srm
    244         BZRLp34W/Oao/v4WvgBcI/R+TmAaZAAAAABJRU5ErkJggg==
    245 </value>
    246   </data>
    247   <data name="resetButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    248     <value>
    249         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
    250         YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAK/wAA
    251         Cv8BNGKaggAAAX9JREFUOE9j+P//PwMlmCLNIIupa0Dv5r//Ybht7bf/jSs+/69d/P5/xbxX/0tmP/9f
    252         MP3x/9JZj4EWI7yN4oKuDb/+bzr57f/KQ1/+L9jz6f/lBz//965997956RuwIXnTX/zXDV2F2wCQrSsO
    253         fvk/b9en/7ee/AIp/N+w5M3/0rkv/+dMff4/qffZf1W/RbgNADl5zo5P/x++/AHWDAIls1/+z5ry/H9C
    254         79P/Ya2P/8u5zcJtAMi/Nx99hmtGZhy7/Oa/V+3D/2J2k3AbAPJn87I3/09deQnXG9355H9g0yMw36H0
    255         /n9+s27cBoBCuhxoSM605/93HrkL1hTQ8Oi/W9UDMNss7+5/ToNW3AaAoikb6N9EoH/D2x7/n7Puwn/X
    256         ivv/bYrvgQ3Qy7j1n1WnEbcBoDiO63n6P7Tl0X+fuof/ncrv/7cuvPffJPsO2AD1JCIMsEza9h+EjWM2
    257         /NcKXv5fwWMuOOB4TTr/s+k24XcB0BKSkzbJGtAtodgAAJMl+qgyDSjjAAAAAElFTkSuQmCC
    258 </value>
    259   </data>
    260   <data name="pauseButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    261     <value>
    262         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
    263         YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAK/wAA
    264         Cv8BNGKaggAAAL5JREFUOE9j+P//PwMlmCLNIIsHoQG9m//+79rw63/e1EefQE5E56OHF4YXQJqvPvzz
    265         Xzd0FVDtfwZ0PkED2tZ++3/r6e//qn6LwAag8wka0Lji8//LD3//l3ObBTYAnU/QgNrF7/+fuP77v5jd
    266         JLAB6HyCBlTMe/V/94Wf//nNusEGoPMJGlAy+/n/9Sd//uc0aAUbgM4naEDB9Mf/F+z5/J9VpxFsADqf
    267         oAGg+GfTbYIbgM4naACpGWvg8wIAkX3yJyVePz4AAAAASUVORK5CYII=
     249        6H7o/ujz8cGn1E+f/gUDmPP8usTo0wAAAAlwSFlzAAALDAAACwwBP0AiyAAAABl0RVh0U29mdHdhcmUA
     250        UGFpbnQuTkVUIHYzLjUuNUmK/OAAAAJiSURBVDhPnZNtSFNRHMbdzAgV/DC0bL4R5rSNEjOjiJkhUfpB
     251        Aikog74ERV+iIipymgvXbFZrW1NrFoQhQUr2phQxcK0XGWx+2JhGdrfWNmduM1N3r9vTPcNF0vVLFx4O
     252        h3Of33nO+f9PUtLSRwcHkunQEJ8OGzOZGXMq8/NjJqsMZuZ9NhMyrqKnX/HIr/Peu5KE55+RmR3JM419
     253        QLtRg/rHR1HVVQvprX243C+HjXKE6LD5iMqoBycg4usR9I++RN3zBsgmFFC4NLjiUKHJ0YYTn86h8k4N
     254        rBN2lNzcxg1weMaDxHx14gZq+w4hq2kD1sk34pjxVBzU7LgehxQoxdyAC0+b0WA6ie3qPWgf1GLU5cSY
     255        l0JOiyieKqFseSE34IDhMKSd+9FneQFmMSamF2Np/sA0bG7nMoigMZ8bUNFZhfNPZMRcyopHMzFer2UA
     256        +QoJchXFIDsTc8ZFITdgi3YnRr7Y4Jv8kUJu2eMN5Li/+1O+eSfXeHyB1eycT7l9a52fKW4AuyOWtJcd
     257        kyN0bJfb4+fNR6L8uYUo7xer2blommxYyQ0oM1Ris34Him+XBwvaJGFhqwgd5odYoKMCkoiFVHcM30eJ
     258        doUybjVIoXTp4iUrVJXCQtnJccAmyCUprNQYah7VY31jEXeCTbqKPwACEanLYflqZztwHF2mnnhXklIe
     259        f3CaG8DGRtG1smU1J6aEkZiFMhHuve3lBuS1ivHM+hpCtnH+NiUaiJgVQxoEQsxuzregf9MN9qLwzmHB
     260        pd4W1OoOIv1sFtLPZKFaXQftYDemwkyqZ4rmr/ga/2fhN/0cpIchJAs6AAAAAElFTkSuQmCC
    268261</value>
    269262  </data>

  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Views/3.4/ExperimentManager/MenuItems/ExperimentManagerMenuItem.cs

    r5793 r5955  
    3333    }
    3434    public override void Execute() {
    35       MainFormManager.MainForm.ShowContent(new HiveExperimentManagerClient());
     35      MainFormManager.MainForm.ShowContent(ExperimentManagerClient.Instance);
    3636    }
    3737    public override int Position {

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

    r5852 r5955  
    157157      <DependentUpon>UpdateControl.cs</DependentUpon>
    158158    </Compile>
     159    <Compile Include="ExperimentManager\HiveExperimentView.cs">
     160      <SubType>UserControl</SubType>
     161    </Compile>
     162    <Compile Include="ExperimentManager\HiveExperimentView.Designer.cs">
     163      <DependentUpon>HiveExperimentView.cs</DependentUpon>
     164    </Compile>
     165    <Compile Include="ExperimentManager\HiveItemView.cs">
     166      <SubType>UserControl</SubType>
     167    </Compile>
     168    <Compile Include="ExperimentManager\HiveItemView.Designer.cs">
     169      <DependentUpon>HiveItemView.cs</DependentUpon>
     170    </Compile>
    159171    <Compile Include="ExperimentManager\StateLogListList.cs" />
    160172    <Compile Include="ExperimentManager\ItemTreeView.cs">
    … …  
    194206    <Compile Include="ExperimentManager\StateLogView.designer.cs">
    195207      <DependentUpon>StateLogView.cs</DependentUpon>
    196     </Compile>
    197     <Compile Include="ExperimentManager\UpdateableHiveExperimentManagerView.cs">
    198       <SubType>UserControl</SubType>
    199     </Compile>
    200     <Compile Include="ExperimentManager\UpdateableHiveExperimentManagerView.designer.cs">
    201       <DependentUpon>UpdateableHiveExperimentManagerView.cs</DependentUpon>
    202208    </Compile>
    203209    <Compile Include="ExperimentManager\HiveExperimentManagerView.cs">
    … …  
    231237      <DependentUpon>HiveExperimentListView.cs</DependentUpon>
    232238    </Compile>
    233     <Compile Include="ExperimentManager\HiveExperimentView.cs">
    234       <SubType>UserControl</SubType>
    235     </Compile>
    236     <Compile Include="ExperimentManager\HiveExperimentView.Designer.cs">
    237       <DependentUpon>HiveExperimentView.cs</DependentUpon>
    238     </Compile>
    239239    <Compile Include="ExperimentManager\HiveJobListView.cs">
    240240      <SubType>UserControl</SubType>
    … …  
    282282      <DependentUpon>UpdateControl.cs</DependentUpon>
    283283    </EmbeddedResource>
     284    <EmbeddedResource Include="ExperimentManager\HiveExperimentView.resx">
     285      <DependentUpon>HiveExperimentView.cs</DependentUpon>
     286    </EmbeddedResource>
    284287    <EmbeddedResource Include="ExperimentManager\ItemTreeView.resx">
    285288      <DependentUpon>ItemTreeView.cs</DependentUpon>
    … …  
    300303      <DependentUpon>HiveExperimentManagerView.cs</DependentUpon>
    301304      <SubType>Designer</SubType>
    302     </EmbeddedResource>
    303     <EmbeddedResource Include="ExperimentManager\UpdateableHiveExperimentManagerView.resx">
    304       <DependentUpon>UpdateableHiveExperimentManagerView.cs</DependentUpon>
    305     </EmbeddedResource>
    306     <EmbeddedResource Include="ExperimentManager\HiveExperimentView.resx">
    307       <DependentUpon>HiveExperimentView.cs</DependentUpon>
    308305    </EmbeddedResource>
    309306    <EmbeddedResource Include="ExperimentManager\HiveJobView.resx">
Note: See TracChangeset for help on using the changeset viewer.