Changeset 5797


Ignore:
Timestamp:
03/22/11 16:57:44 (11 years ago)
Author:
cneumuel
Message:

#1233

  • ItemTreeView robustifications
  • compactified the layout in HiveJobView
Location:
branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Views/3.4/ExperimentManager
Files:
2 edited

Legend:

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

    r5793 r5797  
    6565      this.exceptionTextBox = new System.Windows.Forms.TextBox();
    6666      this.tabControl = new System.Windows.Forms.TabControl();
     67      this.splitContainer1 = new System.Windows.Forms.SplitContainer();
    6768      this.logTabPage.SuspendLayout();
    6869      this.stateLogTabPage.SuspendLayout();
     
    7374      this.jobStatusGroupBox.SuspendLayout();
    7475      this.tabControl.SuspendLayout();
     76      ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
     77      this.splitContainer1.Panel1.SuspendLayout();
     78      this.splitContainer1.Panel2.SuspendLayout();
     79      this.splitContainer1.SuspendLayout();
    7580      this.SuspendLayout();
    7681      //
     
    151156      // detailsTabPage
    152157      //
     158      this.detailsTabPage.Controls.Add(this.splitContainer1);
    153159      this.detailsTabPage.Controls.Add(this.restartButton);
    154160      this.detailsTabPage.Controls.Add(this.pauseButton);
    155161      this.detailsTabPage.Controls.Add(this.stopButton);
    156162      this.detailsTabPage.Controls.Add(this.optimizerGroupBox);
    157       this.detailsTabPage.Controls.Add(this.configurationGroupBox);
    158163      this.detailsTabPage.Controls.Add(this.jobIdLabel);
    159164      this.detailsTabPage.Controls.Add(this.jobIdTextBox);
    160       this.detailsTabPage.Controls.Add(this.jobStatusGroupBox);
    161165      this.detailsTabPage.Location = new System.Drawing.Point(4, 22);
    162166      this.detailsTabPage.Name = "detailsTabPage";
    163167      this.detailsTabPage.Padding = new System.Windows.Forms.Padding(3);
    164       this.detailsTabPage.Size = new System.Drawing.Size(611, 492);
     168      this.detailsTabPage.Size = new System.Drawing.Size(563, 375);
    165169      this.detailsTabPage.TabIndex = 0;
    166170      this.detailsTabPage.Text = "Details";
     
    171175      this.restartButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
    172176      this.restartButton.Image = ((System.Drawing.Image)(resources.GetObject("restartButton.Image")));
    173       this.restartButton.Location = new System.Drawing.Point(3, 465);
     177      this.restartButton.Location = new System.Drawing.Point(3, 348);
    174178      this.restartButton.Name = "restartButton";
    175179      this.restartButton.Size = new System.Drawing.Size(24, 24);
     
    183187      this.pauseButton.Enabled = false;
    184188      this.pauseButton.Image = ((System.Drawing.Image)(resources.GetObject("pauseButton.Image")));
    185       this.pauseButton.Location = new System.Drawing.Point(33, 465);
     189      this.pauseButton.Location = new System.Drawing.Point(33, 348);
    186190      this.pauseButton.Name = "pauseButton";
    187191      this.pauseButton.Size = new System.Drawing.Size(24, 24);
     
    194198      this.stopButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
    195199      this.stopButton.Image = ((System.Drawing.Image)(resources.GetObject("stopButton.Image")));
    196       this.stopButton.Location = new System.Drawing.Point(63, 465);
     200      this.stopButton.Location = new System.Drawing.Point(63, 348);
    197201      this.stopButton.Name = "stopButton";
    198202      this.stopButton.Size = new System.Drawing.Size(24, 24);
     
    211215      this.optimizerGroupBox.Location = new System.Drawing.Point(6, 29);
    212216      this.optimizerGroupBox.Name = "optimizerGroupBox";
    213       this.optimizerGroupBox.Size = new System.Drawing.Size(599, 129);
     217      this.optimizerGroupBox.Size = new System.Drawing.Size(551, 129);
    214218      this.optimizerGroupBox.TabIndex = 28;
    215219      this.optimizerGroupBox.TabStop = false;
     
    220224      this.showOptimizerButton.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    221225                  | System.Windows.Forms.AnchorStyles.Right)));
    222       this.showOptimizerButton.Location = new System.Drawing.Point(12, 99);
     226      this.showOptimizerButton.Location = new System.Drawing.Point(78, 99);
    223227      this.showOptimizerButton.Name = "showOptimizerButton";
    224       this.showOptimizerButton.Size = new System.Drawing.Size(581, 23);
     228      this.showOptimizerButton.Size = new System.Drawing.Size(467, 23);
    225229      this.showOptimizerButton.TabIndex = 3;
    226230      this.showOptimizerButton.Text = "Show Optimizer";
     
    234238      this.lastUpdatedTextBox.Location = new System.Drawing.Point(78, 73);
    235239      this.lastUpdatedTextBox.Name = "lastUpdatedTextBox";
    236       this.lastUpdatedTextBox.Size = new System.Drawing.Size(515, 20);
     240      this.lastUpdatedTextBox.Size = new System.Drawing.Size(467, 20);
    237241      this.lastUpdatedTextBox.TabIndex = 2;
    238242      //
     
    255259      this.optimizerNamedItemView.Name = "optimizerNamedItemView";
    256260      this.optimizerNamedItemView.ReadOnly = false;
    257       this.optimizerNamedItemView.Size = new System.Drawing.Size(587, 51);
     261      this.optimizerNamedItemView.Size = new System.Drawing.Size(539, 51);
    258262      this.optimizerNamedItemView.TabIndex = 0;
    259263      //
    260264      // configurationGroupBox
    261265      //
    262       this.configurationGroupBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    263                   | System.Windows.Forms.AnchorStyles.Right)));
    264266      this.configurationGroupBox.Controls.Add(this.priorityTextBox);
    265267      this.configurationGroupBox.Controls.Add(this.priorityLabel);
     
    270272      this.configurationGroupBox.Controls.Add(this.computeInParallelLabel);
    271273      this.configurationGroupBox.Controls.Add(this.computeInParallelCheckBox);
    272       this.configurationGroupBox.Location = new System.Drawing.Point(6, 164);
     274      this.configurationGroupBox.Dock = System.Windows.Forms.DockStyle.Fill;
     275      this.configurationGroupBox.Location = new System.Drawing.Point(0, 0);
    273276      this.configurationGroupBox.Name = "configurationGroupBox";
    274       this.configurationGroupBox.Size = new System.Drawing.Size(599, 119);
     277      this.configurationGroupBox.Size = new System.Drawing.Size(275, 155);
    275278      this.configurationGroupBox.TabIndex = 27;
    276279      this.configurationGroupBox.TabStop = false;
     
    283286      this.priorityTextBox.Location = new System.Drawing.Point(108, 66);
    284287      this.priorityTextBox.Name = "priorityTextBox";
    285       this.priorityTextBox.Size = new System.Drawing.Size(485, 20);
     288      this.priorityTextBox.Size = new System.Drawing.Size(161, 20);
    286289      this.priorityTextBox.TabIndex = 41;
    287290      //
     
    301304      this.coresNeededTextBox.Location = new System.Drawing.Point(108, 20);
    302305      this.coresNeededTextBox.Name = "coresNeededTextBox";
    303       this.coresNeededTextBox.Size = new System.Drawing.Size(485, 20);
     306      this.coresNeededTextBox.Size = new System.Drawing.Size(161, 20);
    304307      this.coresNeededTextBox.TabIndex = 37;
    305308      //
     
    310313      this.memoryNeededTextBox.Location = new System.Drawing.Point(108, 42);
    311314      this.memoryNeededTextBox.Name = "memoryNeededTextBox";
    312       this.memoryNeededTextBox.Size = new System.Drawing.Size(485, 20);
     315      this.memoryNeededTextBox.Size = new System.Drawing.Size(161, 20);
    313316      this.memoryNeededTextBox.TabIndex = 38;
    314317      //
     
    365368      this.jobIdTextBox.Location = new System.Drawing.Point(91, 6);
    366369      this.jobIdTextBox.Name = "jobIdTextBox";
    367       this.jobIdTextBox.Size = new System.Drawing.Size(514, 20);
     370      this.jobIdTextBox.Size = new System.Drawing.Size(466, 20);
    368371      this.jobIdTextBox.TabIndex = 26;
    369372      //
    370373      // jobStatusGroupBox
    371374      //
    372       this.jobStatusGroupBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    373                   | System.Windows.Forms.AnchorStyles.Right)));
    374375      this.jobStatusGroupBox.Controls.Add(this.stateTextBox);
    375376      this.jobStatusGroupBox.Controls.Add(this.dateCalculatedLabel);
     
    384385      this.jobStatusGroupBox.Controls.Add(this.dateFinishedLabel);
    385386      this.jobStatusGroupBox.Controls.Add(this.exceptionTextBox);
    386       this.jobStatusGroupBox.Location = new System.Drawing.Point(6, 289);
     387      this.jobStatusGroupBox.Dock = System.Windows.Forms.DockStyle.Fill;
     388      this.jobStatusGroupBox.Location = new System.Drawing.Point(0, 0);
    387389      this.jobStatusGroupBox.Name = "jobStatusGroupBox";
    388       this.jobStatusGroupBox.Size = new System.Drawing.Size(599, 162);
     390      this.jobStatusGroupBox.Size = new System.Drawing.Size(272, 155);
    389391      this.jobStatusGroupBox.TabIndex = 24;
    390392      this.jobStatusGroupBox.TabStop = false;
     
    397399      this.stateTextBox.Location = new System.Drawing.Point(95, 19);
    398400      this.stateTextBox.Name = "stateTextBox";
    399       this.stateTextBox.Size = new System.Drawing.Size(498, 20);
     401      this.stateTextBox.Size = new System.Drawing.Size(171, 20);
    400402      this.stateTextBox.TabIndex = 2;
    401403      //
     
    424426      this.dateCalculatedText.Location = new System.Drawing.Point(95, 85);
    425427      this.dateCalculatedText.Name = "dateCalculatedText";
    426       this.dateCalculatedText.Size = new System.Drawing.Size(498, 20);
     428      this.dateCalculatedText.Size = new System.Drawing.Size(171, 20);
    427429      this.dateCalculatedText.TabIndex = 22;
    428430      //
     
    433435      this.dateFinishedTextBox.Location = new System.Drawing.Point(95, 107);
    434436      this.dateFinishedTextBox.Name = "dateFinishedTextBox";
    435       this.dateFinishedTextBox.Size = new System.Drawing.Size(498, 20);
     437      this.dateFinishedTextBox.Size = new System.Drawing.Size(171, 20);
    436438      this.dateFinishedTextBox.TabIndex = 6;
    437439      //
     
    442444      this.executionTimeTextBox.Location = new System.Drawing.Point(95, 41);
    443445      this.executionTimeTextBox.Name = "executionTimeTextBox";
    444       this.executionTimeTextBox.Size = new System.Drawing.Size(498, 20);
     446      this.executionTimeTextBox.Size = new System.Drawing.Size(171, 20);
    445447      this.executionTimeTextBox.TabIndex = 4;
    446448      //
     
    451453      this.dateCreatedTextBox.Location = new System.Drawing.Point(95, 63);
    452454      this.dateCreatedTextBox.Name = "dateCreatedTextBox";
    453       this.dateCreatedTextBox.Size = new System.Drawing.Size(498, 20);
     455      this.dateCreatedTextBox.Size = new System.Drawing.Size(171, 20);
    454456      this.dateCreatedTextBox.TabIndex = 5;
    455457      //
     
    496498      this.exceptionTextBox.Location = new System.Drawing.Point(95, 129);
    497499      this.exceptionTextBox.Name = "exceptionTextBox";
    498       this.exceptionTextBox.Size = new System.Drawing.Size(498, 20);
     500      this.exceptionTextBox.Size = new System.Drawing.Size(171, 20);
    499501      this.exceptionTextBox.TabIndex = 10;
    500502      this.exceptionTextBox.DoubleClick += new System.EventHandler(this.exceptionTextBox_DoubleClick);
     
    512514      this.tabControl.Name = "tabControl";
    513515      this.tabControl.SelectedIndex = 0;
    514       this.tabControl.Size = new System.Drawing.Size(619, 518);
     516      this.tabControl.Size = new System.Drawing.Size(571, 401);
    515517      this.tabControl.TabIndex = 25;
     518      //
     519      // splitContainer1
     520      //
     521      this.splitContainer1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
     522                  | System.Windows.Forms.AnchorStyles.Right)));
     523      this.splitContainer1.Location = new System.Drawing.Point(6, 164);
     524      this.splitContainer1.Name = "splitContainer1";
     525      //
     526      // splitContainer1.Panel1
     527      //
     528      this.splitContainer1.Panel1.Controls.Add(this.configurationGroupBox);
     529      //
     530      // splitContainer1.Panel2
     531      //
     532      this.splitContainer1.Panel2.Controls.Add(this.jobStatusGroupBox);
     533      this.splitContainer1.Size = new System.Drawing.Size(551, 155);
     534      this.splitContainer1.SplitterDistance = 275;
     535      this.splitContainer1.TabIndex = 33;
    516536      //
    517537      // HiveJobView
     
    521541      this.Controls.Add(this.tabControl);
    522542      this.Name = "HiveJobView";
    523       this.Size = new System.Drawing.Size(625, 524);
     543      this.Size = new System.Drawing.Size(577, 407);
    524544      this.logTabPage.ResumeLayout(false);
    525545      this.stateLogTabPage.ResumeLayout(false);
     
    534554      this.jobStatusGroupBox.PerformLayout();
    535555      this.tabControl.ResumeLayout(false);
     556      this.splitContainer1.Panel1.ResumeLayout(false);
     557      this.splitContainer1.Panel2.ResumeLayout(false);
     558      ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit();
     559      this.splitContainer1.ResumeLayout(false);
    536560      this.ResumeLayout(false);
    537561
     
    580604    private System.Windows.Forms.TextBox dateCreatedTextBox;
    581605    private System.Windows.Forms.Label dateCreatedLabel;
     606    private System.Windows.Forms.SplitContainer splitContainer1;
    582607
    583608  }
  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Views/3.4/ExperimentManager/ItemTreeView.cs

    r5793 r5797  
    8383      } else {
    8484        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);
     85        if (node != null) {
     86          foreach (IItemTree item in e.Items) {
     87            AddChildNodes(item, node.Nodes, true);
     88            node.ExpandAll();
     89            UpdateNodeItemImage(node);
     90          }
    8991        }
    9092      }
     
    9698      } else {
    9799        TreeNode node = GetNodeByItem(sender as IItemTree);
    98         foreach (IItemTree item in e.Items) {
    99           RemoveChildNodes(item, node.Nodes);
    100         }
    101         RebuildImageList();
     100        if (node != null) {
     101          foreach (IItemTree item in e.Items) {
     102            RemoveChildNodes(item, node.Nodes);
     103          }
     104          RebuildImageList();
     105        }
    102106      }
    103107    }
     
    108112      } else {
    109113        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);
     114        if (node != null) {
     115          foreach (IItemTree item in e.OldItems) {
     116            RemoveChildNodes(item, node.Nodes);
     117          }
     118          RebuildImageList();
     119          foreach (IItemTree item in e.Items) {
     120            AddChildNodes(item, node.Nodes, true);
     121          }
    116122        }
    117123      }
     
    124130        var item = sender as IItemTree;
    125131        TreeNode node = GetNodeByItem(item);
    126         node.Text = item.ToString();
     132        if(node != null)
     133          node.Text = item.ToString();
    127134      }
    128135    }
     
    134141        var item = sender as IItemTree;
    135142        TreeNode node = GetNodeByItem(item);
    136         UpdateNodeItemImage(node);
     143        if(node != null)
     144          UpdateNodeItemImage(node);
    137145      }
    138146    }
Note: See TracChangeset for help on using the changeset viewer.