Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
03/22/11 15:54:58 (14 years ago)
Author:
cneumuel
Message:

#1233

  • implemented correct downloading of paused jobs. its now also possible to change parameters and resume a algorithm
  • removed Prepare() calls in ExperimentManager and in slave, as it prevents corrent resuming of paused jobs
  • made events in ItemTreeView be invoked in the correct thread
  • reduced log output in ExperimentManager
Location:
branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Views/3.4
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Views/3.4/Administration/MenuItems/AdministrationMenuItem.cs

    r5469 r5793  
    2727  public class AdministrationMenuItem : HeuristicLab.MainForm.WindowsForms.MenuItem, IOptimizerUserInterfaceItemProvider {
    2828    public override string Name {
    29       get { return "& Administration"; }
     29      get { return "&Administration (dev)"; }
    3030    }
    3131    public override IEnumerable<string> Structure {

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

    r5779 r5793  
    7171    }
    7272
    73     void Content_OptimizerJobChanged(object sender, EventArgs e) {
     73    protected void Content_OptimizerJobChanged(object sender, EventArgs e) {
    7474      RegisterJobEvents();
    7575      Job_OptimizerChanged(this, e);
    7676    }
    7777
    78     void Job_OptimizerChanged(object sender, EventArgs e) {
     78    protected void Job_OptimizerChanged(object sender, EventArgs e) {
    7979      if (Content != null && Content.Job != null && Content.OptimizerJob.Optimizer != null) {
    8080        optimizerNamedItemView.Content = Content.OptimizerJob.Optimizer;
    … …  
    130130          this.dateFinishedTextBox.Text = Content.Job.DateFinished.ToString();
    131131          this.exceptionTextBox.Text = Content.Job.CurrentStateLog != null ? Content.Job.CurrentStateLog.Exception : string.Empty;
     132          this.lastUpdatedTextBox.Text = Content.Job.LastJobDataUpdate.ToString();
    132133          if (Content.OptimizerJob.ComputeInParallel) {
    133134            this.stateLogViewHost.Content = new StateLogListList(
    … …  
    144145          this.exceptionTextBox.Text = string.Empty;
    145146          this.stateLogViewHost.Content = null;
     147          this.lastUpdatedTextBox.Text = string.Empty;
    146148        }
    147149        SetEnabledStateOfControls();
    … …  
    158160      this.dateFinishedTextBox.ReadOnly = true;
    159161      this.exceptionTextBox.ReadOnly = true;
     162      this.lastUpdatedTextBox.ReadOnly = true;
    160163
    161164      this.priorityTextBox.ReadOnly = this.ReadOnly;
    … …  
    167170      this.pauseButton.Enabled = Content != null && Content.Job.State == JobState.Calculating;
    168171      this.stopButton.Enabled = Content != null && (Content.Job.State == JobState.Calculating || Content.Job.State == JobState.Waiting || Content.Job.State == JobState.Paused);
     172      this.showOptimizerButton.Enabled = Content != null && Content.Job.State == JobState.Paused && Content.OptimizerJob != null && Content.OptimizerJob.Optimizer != null;
    169173
    170174      optimizerNamedItemView.ReadOnly = true;
    … …  
    204208      Content.Stop();
    205209    }
     210    private void showOptimizerButton_Click(object sender, EventArgs e) {
     211      MainFormManager.MainForm.ShowContent(Content.OptimizerJob.Optimizer);
     212    }
    206213  }
    207214}

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

    r5779 r5793  
    3232      this.runCollectionViewHost = new HeuristicLab.MainForm.WindowsForms.ViewHost();
    3333      this.detailsTabPage = new System.Windows.Forms.TabPage();
     34      this.restartButton = new System.Windows.Forms.Button();
     35      this.pauseButton = new System.Windows.Forms.Button();
     36      this.stopButton = new System.Windows.Forms.Button();
    3437      this.optimizerGroupBox = new System.Windows.Forms.GroupBox();
     38      this.showOptimizerButton = new System.Windows.Forms.Button();
     39      this.lastUpdatedTextBox = new System.Windows.Forms.TextBox();
     40      this.lastUpdatedLabel = new System.Windows.Forms.Label();
    3541      this.optimizerNamedItemView = new HeuristicLab.Core.Views.NamedItemView();
    3642      this.configurationGroupBox = new System.Windows.Forms.GroupBox();
    … …  
    5965      this.exceptionTextBox = new System.Windows.Forms.TextBox();
    6066      this.tabControl = new System.Windows.Forms.TabControl();
    61       this.restartButton = new System.Windows.Forms.Button();
    62       this.pauseButton = new System.Windows.Forms.Button();
    63       this.stopButton = new System.Windows.Forms.Button();
    6467      this.logTabPage.SuspendLayout();
    6568      this.stateLogTabPage.SuspendLayout();
    … …  
    7881      this.logTabPage.Name = "logTabPage";
    7982      this.logTabPage.Padding = new System.Windows.Forms.Padding(3);
    80       this.logTabPage.Size = new System.Drawing.Size(406, 492);
     83      this.logTabPage.Size = new System.Drawing.Size(611, 492);
    8184      this.logTabPage.TabIndex = 1;
    8285      this.logTabPage.Text = "Log";
    … …  
    125128      this.runsTabPage.Location = new System.Drawing.Point(4, 22);
    126129      this.runsTabPage.Name = "runsTabPage";
    127       this.runsTabPage.Size = new System.Drawing.Size(406, 492);
     130      this.runsTabPage.Size = new System.Drawing.Size(611, 492);
    128131      this.runsTabPage.TabIndex = 4;
    129132      this.runsTabPage.Text = "Runs";
    … …  
    164167      this.detailsTabPage.UseVisualStyleBackColor = true;
    165168      //
     169      // restartButton
     170      //
     171      this.restartButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
     172      this.restartButton.Image = ((System.Drawing.Image)(resources.GetObject("restartButton.Image")));
     173      this.restartButton.Location = new System.Drawing.Point(3, 465);
     174      this.restartButton.Name = "restartButton";
     175      this.restartButton.Size = new System.Drawing.Size(24, 24);
     176      this.restartButton.TabIndex = 30;
     177      this.restartButton.UseVisualStyleBackColor = true;
     178      this.restartButton.Click += new System.EventHandler(this.restartButton_Click);
     179      //
     180      // pauseButton
     181      //
     182      this.pauseButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
     183      this.pauseButton.Enabled = false;
     184      this.pauseButton.Image = ((System.Drawing.Image)(resources.GetObject("pauseButton.Image")));
     185      this.pauseButton.Location = new System.Drawing.Point(33, 465);
     186      this.pauseButton.Name = "pauseButton";
     187      this.pauseButton.Size = new System.Drawing.Size(24, 24);
     188      this.pauseButton.TabIndex = 31;
     189      this.pauseButton.UseVisualStyleBackColor = true;
     190      this.pauseButton.Click += new System.EventHandler(this.pauseButton_Click);
     191      //
     192      // stopButton
     193      //
     194      this.stopButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
     195      this.stopButton.Image = ((System.Drawing.Image)(resources.GetObject("stopButton.Image")));
     196      this.stopButton.Location = new System.Drawing.Point(63, 465);
     197      this.stopButton.Name = "stopButton";
     198      this.stopButton.Size = new System.Drawing.Size(24, 24);
     199      this.stopButton.TabIndex = 32;
     200      this.stopButton.UseVisualStyleBackColor = true;
     201      this.stopButton.Click += new System.EventHandler(this.stopButton_Click);
     202      //
    166203      // optimizerGroupBox
    167204      //
    168205      this.optimizerGroupBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    169206                  | System.Windows.Forms.AnchorStyles.Right)));
     207      this.optimizerGroupBox.Controls.Add(this.showOptimizerButton);
     208      this.optimizerGroupBox.Controls.Add(this.lastUpdatedTextBox);
     209      this.optimizerGroupBox.Controls.Add(this.lastUpdatedLabel);
    170210      this.optimizerGroupBox.Controls.Add(this.optimizerNamedItemView);
    171211      this.optimizerGroupBox.Location = new System.Drawing.Point(6, 29);
    172212      this.optimizerGroupBox.Name = "optimizerGroupBox";
    173       this.optimizerGroupBox.Size = new System.Drawing.Size(599, 74);
     213      this.optimizerGroupBox.Size = new System.Drawing.Size(599, 129);
    174214      this.optimizerGroupBox.TabIndex = 28;
    175215      this.optimizerGroupBox.TabStop = false;
    176216      this.optimizerGroupBox.Text = "Optimizer";
     217      //
     218      // showOptimizerButton
     219      //
     220      this.showOptimizerButton.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
     221                  | System.Windows.Forms.AnchorStyles.Right)));
     222      this.showOptimizerButton.Location = new System.Drawing.Point(12, 99);
     223      this.showOptimizerButton.Name = "showOptimizerButton";
     224      this.showOptimizerButton.Size = new System.Drawing.Size(581, 23);
     225      this.showOptimizerButton.TabIndex = 3;
     226      this.showOptimizerButton.Text = "Show Optimizer";
     227      this.showOptimizerButton.UseVisualStyleBackColor = true;
     228      this.showOptimizerButton.Click += new System.EventHandler(this.showOptimizerButton_Click);
     229      //
     230      // lastUpdatedTextBox
     231      //
     232      this.lastUpdatedTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
     233                  | System.Windows.Forms.AnchorStyles.Right)));
     234      this.lastUpdatedTextBox.Location = new System.Drawing.Point(78, 73);
     235      this.lastUpdatedTextBox.Name = "lastUpdatedTextBox";
     236      this.lastUpdatedTextBox.Size = new System.Drawing.Size(515, 20);
     237      this.lastUpdatedTextBox.TabIndex = 2;
     238      //
     239      // lastUpdatedLabel
     240      //
     241      this.lastUpdatedLabel.AutoSize = true;
     242      this.lastUpdatedLabel.Location = new System.Drawing.Point(9, 76);
     243      this.lastUpdatedLabel.Name = "lastUpdatedLabel";
     244      this.lastUpdatedLabel.Size = new System.Drawing.Size(71, 13);
     245      this.lastUpdatedLabel.TabIndex = 1;
     246      this.lastUpdatedLabel.Text = "LastUpdated:";
    177247      //
    178248      // optimizerNamedItemView
    … …  
    200270      this.configurationGroupBox.Controls.Add(this.computeInParallelLabel);
    201271      this.configurationGroupBox.Controls.Add(this.computeInParallelCheckBox);
    202       this.configurationGroupBox.Location = new System.Drawing.Point(6, 106);
     272      this.configurationGroupBox.Location = new System.Drawing.Point(6, 164);
    203273      this.configurationGroupBox.Name = "configurationGroupBox";
    204274      this.configurationGroupBox.Size = new System.Drawing.Size(599, 119);
    … …  
    314384      this.jobStatusGroupBox.Controls.Add(this.dateFinishedLabel);
    315385      this.jobStatusGroupBox.Controls.Add(this.exceptionTextBox);
    316       this.jobStatusGroupBox.Location = new System.Drawing.Point(6, 226);
     386      this.jobStatusGroupBox.Location = new System.Drawing.Point(6, 289);
    317387      this.jobStatusGroupBox.Name = "jobStatusGroupBox";
    318388      this.jobStatusGroupBox.Size = new System.Drawing.Size(599, 162);
    … …  
    444514      this.tabControl.Size = new System.Drawing.Size(619, 518);
    445515      this.tabControl.TabIndex = 25;
    446       //
    447       // restartButton
    448       //
    449       this.restartButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
    450       this.restartButton.Image = ((System.Drawing.Image)(resources.GetObject("restartButton.Image")));
    451       this.restartButton.Location = new System.Drawing.Point(3, 465);
    452       this.restartButton.Name = "restartButton";
    453       this.restartButton.Size = new System.Drawing.Size(24, 24);
    454       this.restartButton.TabIndex = 30;
    455       this.restartButton.UseVisualStyleBackColor = true;
    456       this.restartButton.Click += new System.EventHandler(this.restartButton_Click);
    457       //
    458       // pauseButton
    459       //
    460       this.pauseButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
    461       this.pauseButton.Enabled = false;
    462       this.pauseButton.Image = ((System.Drawing.Image)(resources.GetObject("pauseButton.Image")));
    463       this.pauseButton.Location = new System.Drawing.Point(33, 465);
    464       this.pauseButton.Name = "pauseButton";
    465       this.pauseButton.Size = new System.Drawing.Size(24, 24);
    466       this.pauseButton.TabIndex = 31;
    467       this.pauseButton.UseVisualStyleBackColor = true;
    468       this.pauseButton.Click += new System.EventHandler(this.pauseButton_Click);
    469       //
    470       // stopButton
    471       //
    472       this.stopButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
    473       this.stopButton.Image = ((System.Drawing.Image)(resources.GetObject("stopButton.Image")));
    474       this.stopButton.Location = new System.Drawing.Point(63, 465);
    475       this.stopButton.Name = "stopButton";
    476       this.stopButton.Size = new System.Drawing.Size(24, 24);
    477       this.stopButton.TabIndex = 32;
    478       this.stopButton.UseVisualStyleBackColor = true;
    479       this.stopButton.Click += new System.EventHandler(this.stopButton_Click);
    480516      //
    481517      // HiveJobView
    … …  
    492528      this.detailsTabPage.PerformLayout();
    493529      this.optimizerGroupBox.ResumeLayout(false);
     530      this.optimizerGroupBox.PerformLayout();
    494531      this.configurationGroupBox.ResumeLayout(false);
    495532      this.configurationGroupBox.PerformLayout();
    … …  
    525562    private System.Windows.Forms.GroupBox jobStatusGroupBox;
    526563    private System.Windows.Forms.TextBox stateTextBox;
    527     private System.Windows.Forms.Label dateCalculatedLabel;
    528564    private System.Windows.Forms.Label stateLabel;
    529     private System.Windows.Forms.TextBox dateCalculatedText;
    530565    private System.Windows.Forms.TextBox dateFinishedTextBox;
    531566    private System.Windows.Forms.TextBox executionTimeTextBox;
    532     private System.Windows.Forms.TextBox dateCreatedTextBox;
    533567    private System.Windows.Forms.Label executionTimeLabel;
    534568    private System.Windows.Forms.Label exceptionLabel;
    535     private System.Windows.Forms.Label dateCreatedLabel;
    536569    private System.Windows.Forms.Label dateFinishedLabel;
    537570    private System.Windows.Forms.TextBox exceptionTextBox;
    … …  
    540573    private System.Windows.Forms.Button pauseButton;
    541574    private System.Windows.Forms.Button stopButton;
     575    private System.Windows.Forms.Button showOptimizerButton;
     576    private System.Windows.Forms.TextBox lastUpdatedTextBox;
     577    private System.Windows.Forms.Label lastUpdatedLabel;
     578    private System.Windows.Forms.Label dateCalculatedLabel;
     579    private System.Windows.Forms.TextBox dateCalculatedText;
     580    private System.Windows.Forms.TextBox dateCreatedTextBox;
     581    private System.Windows.Forms.Label dateCreatedLabel;
    542582
    543583  }

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

    r5779 r5793  
    5252      item.ItemsRemoved -= new CollectionItemsChangedEventHandler<IItemTree>(item_ItemsRemoved);
    5353      item.CollectionReset -= new CollectionItemsChangedEventHandler<IItemTree>(item_CollectionReset);
    54       item.ToStringChanged -= new System.EventHandler(item_ToStringChanged);
     54      item.ToStringChanged -= new EventHandler(item_ToStringChanged);
    5555      item.ItemImageChanged -= new EventHandler(item_ItemImageChanged);
    5656      foreach (TreeNode childNode in node.Nodes) {
    … …  
    7070      item.ItemsRemoved += new CollectionItemsChangedEventHandler<IItemTree>(item_ItemsRemoved);
    7171      item.CollectionReset += new CollectionItemsChangedEventHandler<IItemTree>(item_CollectionReset);
    72       item.ToStringChanged += new System.EventHandler(item_ToStringChanged);
     72      item.ToStringChanged += new EventHandler(item_ToStringChanged);
    7373      item.ItemImageChanged += new EventHandler(item_ItemImageChanged);
    7474      foreach (TreeNode childNode in node.Nodes) {
    … …  
    7878
    7979    #region Event Handlers (Content)
    80     // Put event handlers of the content here
     80    private void item_ItemsAdded(object sender, CollectionItemsChangedEventArgs<IItemTree> e) {
     81      if (InvokeRequired) {
     82        Invoke(new CollectionItemsChangedEventHandler<IItemTree>(item_ItemsAdded), sender, e);
     83      } else {
     84        TreeNode node = GetNodeByItem(sender as IItemTree);
     85        foreach (IItemTree item in e.Items) {
     86          AddChildNodes(item, node.Nodes, true);
     87          node.ExpandAll();
     88          UpdateNodeItemImage(node);
     89        }
     90      }
     91    }
     92
     93    private void item_ItemsRemoved(object sender, CollectionItemsChangedEventArgs<IItemTree> e) {
     94      if (InvokeRequired) {
     95        Invoke(new CollectionItemsChangedEventHandler<IItemTree>(item_ItemsRemoved), sender, e);
     96      } else {
     97        TreeNode node = GetNodeByItem(sender as IItemTree);
     98        foreach (IItemTree item in e.Items) {
     99          RemoveChildNodes(item, node.Nodes);
     100        }
     101        RebuildImageList();
     102      }
     103    }
     104
     105    private void item_CollectionReset(object sender, CollectionItemsChangedEventArgs<IItemTree> e) {
     106      if (InvokeRequired) {
     107        Invoke(new CollectionItemsChangedEventHandler<IItemTree>(item_CollectionReset), sender, e);
     108      } else {
     109        TreeNode node = GetNodeByItem(sender as IItemTree);
     110        foreach (IItemTree item in e.OldItems) {
     111          RemoveChildNodes(item, node.Nodes);
     112        }
     113        RebuildImageList();
     114        foreach (IItemTree item in e.Items) {
     115          AddChildNodes(item, node.Nodes, true);
     116        }
     117      }
     118    }
     119
     120    private void item_ToStringChanged(object sender, EventArgs e) {
     121      if (InvokeRequired) {
     122        Invoke(new EventHandler(item_ToStringChanged), sender, e);
     123      } else {
     124        var item = sender as IItemTree;
     125        TreeNode node = GetNodeByItem(item);
     126        node.Text = item.ToString();
     127      }
     128    }
     129
     130    private void item_ItemImageChanged(object sender, EventArgs e) {
     131      if (InvokeRequired) {
     132        Invoke(new EventHandler(item_ItemImageChanged), sender, e);
     133      } else {
     134        var item = sender as IItemTree;
     135        TreeNode node = GetNodeByItem(item);
     136        UpdateNodeItemImage(node);
     137      }
     138    }
     139
     140    private void treeView_DoubleClick(object sender, EventArgs e) {
     141      if (InvokeRequired) {
     142        Invoke(new EventHandler(treeView_DoubleClick), sender, e);
     143      } else {
     144        if (treeView.SelectedNode != null) {
     145          var item = treeView.SelectedNode.Tag as IItemTree;
     146          if (item != null) {
     147            IContentView view = MainFormManager.MainForm.ShowContent(item);
     148            if (view != null) {
     149              view.ReadOnly = ReadOnly;
     150              view.Locked = Locked;
     151            }
     152          }
     153        }
     154      }
     155    }
    81156    #endregion
    82157
    … …  
    86161        // Add code when content has been changed and is null
    87162        ClearNodes();
     163        detailsViewHost.Content = null;
    88164      } else {
    89165        // Add code when content has been changed and is not null
    … …  
    122198      treeNodeCollection.RemoveAt(idx);
    123199    }
    124 
    125     private void item_ItemsAdded(object sender, CollectionItemsChangedEventArgs<IItemTree> e) {
    126       TreeNode node = GetNodeByItem(sender as IItemTree);
    127       foreach (IItemTree item in e.Items) {
    128         AddChildNodes(item, node.Nodes, true);
    129         node.ExpandAll();
    130         UpdateNodeItemImage(node);
    131       }
    132     }
    133 
    134     private void item_ItemsRemoved(object sender, CollectionItemsChangedEventArgs<IItemTree> e) {
    135       TreeNode node = GetNodeByItem(sender as IItemTree);
    136       foreach (IItemTree item in e.Items) {
    137         RemoveChildNodes(item, node.Nodes);
    138       }
    139       RebuildImageList();
    140     }
    141 
    142     private void item_CollectionReset(object sender, CollectionItemsChangedEventArgs<IItemTree> e) {
    143       TreeNode node = GetNodeByItem(sender as IItemTree);
    144       foreach (IItemTree item in e.OldItems) {
    145         RemoveChildNodes(item, node.Nodes);
    146       }
    147       RebuildImageList();
    148       foreach (IItemTree item in e.Items) {
    149         AddChildNodes(item, node.Nodes, true);
    150       }
    151     }
    152 
    153     private void item_ToStringChanged(object sender, EventArgs e) {
    154       var item = sender as IItemTree;
    155       TreeNode node = GetNodeByItem(item);
    156       node.Text = item.ToString();
    157     }
    158 
    159     private void item_ItemImageChanged(object sender, EventArgs e) {
    160       var item = sender as IItemTree;
    161       TreeNode node = GetNodeByItem(item);
    162       UpdateNodeItemImage(node);
    163     }
    164 
     200   
    165201    private TreeNode GetNodeByItem(IItemTree item) {
    166202      TreeNode found = null;
    … …  
    212248    // Put event handlers of child controls here.
    213249    private void treeView_AfterSelect(object sender, TreeViewEventArgs e) {
    214       viewHost.Content = (IContent)treeView.SelectedNode.Tag;
     250      detailsViewHost.Content = (IContent)treeView.SelectedNode.Tag;
    215251    }
    216252    #endregion
    … …  
    232268      }
    233269    }
    234 
    235     private void treeView_DoubleClick(object sender, EventArgs e) {
    236       if (treeView.SelectedNode != null) {
    237         var item = treeView.SelectedNode.Tag as IItemTree;
    238         if (item != null) {
    239           IContentView view = MainFormManager.MainForm.ShowContent(item);
    240           if (view != null) {
    241             view.ReadOnly = ReadOnly;
    242             view.Locked = Locked;
    243           }
    244         }
    245       }
    246     }
    247270  }
    248271}

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

    r5779 r5793  
    2929      this.imageList = new System.Windows.Forms.ImageList(this.components);
    3030      this.detailsGroupBox = new System.Windows.Forms.GroupBox();
    31       this.viewHost = new HeuristicLab.MainForm.WindowsForms.ViewHost();
     31      this.detailsViewHost = new HeuristicLab.MainForm.WindowsForms.ViewHost();
    3232      ((System.ComponentModel.ISupportInitialize)(this.splitContainer)).BeginInit();
    3333      this.splitContainer.Panel1.SuspendLayout();
    … …  
    7777      // detailsGroupBox
    7878      //
    79       this.detailsGroupBox.Controls.Add(this.viewHost);
     79      this.detailsGroupBox.Controls.Add(this.detailsViewHost);
    8080      this.detailsGroupBox.Dock = System.Windows.Forms.DockStyle.Fill;
    8181      this.detailsGroupBox.Location = new System.Drawing.Point(0, 0);
    … …  
    8686      this.detailsGroupBox.Text = "Details";
    8787      //
    88       // viewHost
     88      // detailsViewHost
    8989      //
    90       this.viewHost.Caption = "View";
    91       this.viewHost.Content = null;
    92       this.viewHost.Dock = System.Windows.Forms.DockStyle.Fill;
    93       this.viewHost.Enabled = false;
    94       this.viewHost.Location = new System.Drawing.Point(3, 16);
    95       this.viewHost.Name = "viewHost";
    96       this.viewHost.ReadOnly = false;
    97       this.viewHost.Size = new System.Drawing.Size(414, 444);
    98       this.viewHost.TabIndex = 0;
    99       this.viewHost.ViewsLabelVisible = true;
    100       this.viewHost.ViewType = null;
     90      this.detailsViewHost.Caption = "View";
     91      this.detailsViewHost.Content = null;
     92      this.detailsViewHost.Dock = System.Windows.Forms.DockStyle.Fill;
     93      this.detailsViewHost.Enabled = false;
     94      this.detailsViewHost.Location = new System.Drawing.Point(3, 16);
     95      this.detailsViewHost.Name = "detailsViewHost";
     96      this.detailsViewHost.ReadOnly = false;
     97      this.detailsViewHost.Size = new System.Drawing.Size(414, 444);
     98      this.detailsViewHost.TabIndex = 0;
     99      this.detailsViewHost.ViewsLabelVisible = true;
     100      this.detailsViewHost.ViewType = null;
    101101      //
    102102      // ItemTreeView
    … …  
    119119    private System.Windows.Forms.SplitContainer splitContainer;
    120120    private System.Windows.Forms.TreeView treeView;
    121     private MainForm.WindowsForms.ViewHost viewHost;
     121    private MainForm.WindowsForms.ViewHost detailsViewHost;
    122122    private System.Windows.Forms.ImageList imageList;
    123123    private System.Windows.Forms.GroupBox detailsGroupBox;

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

    r5512 r5793  
    2727  public class ExperimentManagerMenuItem : HeuristicLab.MainForm.WindowsForms.MenuItem, IOptimizerUserInterfaceItemProvider {
    2828    public override string Name {
    29       get { return "&Experiment Manager 3.4"; }
     29      get { return "&Experiment Manager (dev)"; }
    3030    }
    3131    public override IEnumerable<string> Structure {
Note: See TracChangeset for help on using the changeset viewer.