Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
07/07/14 14:42:44 (10 years ago)
Author:
bburlacu
Message:

#1763: Improved alignment of node edit dialogs. Removed GroupSymbols from the list of available symbols when inserting new nodes. Added additional condition disallowing paste operations when it exceeds a symbols max arity. Moved tree status indicator to lower left and changed visibility to appear only when the tree is invalid.

Location:
trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/TreeEditDialogs
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/TreeEditDialogs/SymbolicExpressionTreeConstantNodeEditDialog.Designer.cs

    r9456 r11111  
    6767      // oldValueTextBox
    6868      //
    69       this.oldValueTextBox.Location = new System.Drawing.Point(123, 6);
     69      this.oldValueTextBox.Location = new System.Drawing.Point(106, 6);
    7070      this.oldValueTextBox.Name = "oldValueTextBox";
    7171      this.oldValueTextBox.ReadOnly = true;
    … …  
    7575      // newValueTextBox
    7676      //
    77       this.newValueTextBox.Location = new System.Drawing.Point(123, 42);
     77      this.newValueTextBox.Location = new System.Drawing.Point(106, 32);
    7878      this.newValueTextBox.Name = "newValueTextBox";
    7979      this.newValueTextBox.Size = new System.Drawing.Size(131, 20);
    … …  
    8686      //
    8787      this.newValueLabel.AutoSize = true;
    88       this.newValueLabel.Location = new System.Drawing.Point(12, 45);
     88      this.newValueLabel.Location = new System.Drawing.Point(12, 35);
    8989      this.newValueLabel.Name = "newValueLabel";
    9090      this.newValueLabel.Size = new System.Drawing.Size(59, 13);
    … …  
    101101      //
    102102      this.okButton.DialogResult = System.Windows.Forms.DialogResult.OK;
    103       this.okButton.Location = new System.Drawing.Point(15, 79);
     103      this.okButton.Location = new System.Drawing.Point(81, 66);
    104104      this.okButton.Name = "okButton";
    105105      this.okButton.Size = new System.Drawing.Size(75, 23);
    … …  
    113113      this.cancelButton.CausesValidation = false;
    114114      this.cancelButton.DialogResult = System.Windows.Forms.DialogResult.Cancel;
    115       this.cancelButton.Location = new System.Drawing.Point(179, 79);
     115      this.cancelButton.Location = new System.Drawing.Point(162, 66);
    116116      this.cancelButton.Name = "cancelButton";
    117117      this.cancelButton.Size = new System.Drawing.Size(75, 23);
    … …  
    127127      this.AutoSize = true;
    128128      this.CancelButton = this.cancelButton;
    129       this.ClientSize = new System.Drawing.Size(269, 116);
     129      this.ClientSize = new System.Drawing.Size(248, 101);
    130130      this.ControlBox = false;
    131131      this.Controls.Add(this.cancelButton);

  • trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/TreeEditDialogs/SymbolicExpressionTreeNodeInsertDialog.Designer.cs

    r9456 r11111  
    6363      //
    6464      this.nodeSymbolLabel.AutoSize = true;
    65       this.nodeSymbolLabel.Location = new System.Drawing.Point(13, 13);
     65      this.nodeSymbolLabel.Location = new System.Drawing.Point(19, 13);
    6666      this.nodeSymbolLabel.Name = "nodeSymbolLabel";
    6767      this.nodeSymbolLabel.Size = new System.Drawing.Size(41, 13);
    … …  
    7373      this.allowedSymbolsCombo.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
    7474      this.allowedSymbolsCombo.FormattingEnabled = true;
    75       this.allowedSymbolsCombo.Location = new System.Drawing.Point(120, 10);
     75      this.allowedSymbolsCombo.Location = new System.Drawing.Point(101, 10);
    7676      this.allowedSymbolsCombo.Name = "allowedSymbolsCombo";
    77       this.allowedSymbolsCombo.Size = new System.Drawing.Size(108, 21);
     77      this.allowedSymbolsCombo.Size = new System.Drawing.Size(127, 21);
    7878      this.allowedSymbolsCombo.TabIndex = 1;
    7979      this.allowedSymbolsCombo.SelectedIndexChanged += new System.EventHandler(this.allowedSymbolsCombo_SelectedIndexChanged);
    … …  
    8383      //
    8484      this.variableWeightLabel.AutoSize = true;
    85       this.variableWeightLabel.Location = new System.Drawing.Point(13, 44);
     85      this.variableWeightLabel.Location = new System.Drawing.Point(19, 40);
    8686      this.variableWeightLabel.Name = "variableWeightLabel";
    8787      this.variableWeightLabel.Size = new System.Drawing.Size(41, 13);
    … …  
    9393      //
    9494      this.variableNameLabel.AutoSize = true;
    95       this.variableNameLabel.Location = new System.Drawing.Point(13, 74);
     95      this.variableNameLabel.Location = new System.Drawing.Point(19, 66);
    9696      this.variableNameLabel.Name = "variableNameLabel";
    9797      this.variableNameLabel.Size = new System.Drawing.Size(35, 13);
    … …  
    104104      this.variableNamesCombo.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
    105105      this.variableNamesCombo.FormattingEnabled = true;
    106       this.variableNamesCombo.Location = new System.Drawing.Point(120, 71);
     106      this.variableNamesCombo.Location = new System.Drawing.Point(101, 63);
    107107      this.variableNamesCombo.Name = "variableNamesCombo";
    108       this.variableNamesCombo.Size = new System.Drawing.Size(108, 21);
     108      this.variableNamesCombo.Size = new System.Drawing.Size(127, 21);
    109109      this.variableNamesCombo.TabIndex = 5;
    110110      this.variableNamesCombo.Visible = false;
    … …  
    112112      // variableWeightTextBox
    113113      //
    114       this.variableWeightTextBox.Location = new System.Drawing.Point(120, 41);
     114      this.variableWeightTextBox.Location = new System.Drawing.Point(120, 37);
    115115      this.variableWeightTextBox.Name = "variableWeightTextBox";
    116116      this.variableWeightTextBox.Size = new System.Drawing.Size(108, 20);
    … …  
    122122      // constantValueTextBox
    123123      //
    124       this.constantValueTextBox.Location = new System.Drawing.Point(120, 41);
     124      this.constantValueTextBox.Location = new System.Drawing.Point(101, 37);
    125125      this.constantValueTextBox.Name = "constantValueTextBox";
    126       this.constantValueTextBox.Size = new System.Drawing.Size(108, 20);
     126      this.constantValueTextBox.Size = new System.Drawing.Size(127, 20);
    127127      this.constantValueTextBox.TabIndex = 7;
    128128      this.constantValueTextBox.Text = "0.0";
    … …  
    133133      //
    134134      this.constantValueLabel.AutoSize = true;
    135       this.constantValueLabel.Location = new System.Drawing.Point(13, 44);
     135      this.constantValueLabel.Location = new System.Drawing.Point(19, 40);
    136136      this.constantValueLabel.Name = "constantValueLabel";
    137137      this.constantValueLabel.Size = new System.Drawing.Size(34, 13);
    … …  
    149149      //
    150150      this.okButton.DialogResult = System.Windows.Forms.DialogResult.OK;
    151       this.okButton.Location = new System.Drawing.Point(12, 112);
     151      this.okButton.Location = new System.Drawing.Point(72, 98);
    152152      this.okButton.Name = "okButton";
    153153      this.okButton.Size = new System.Drawing.Size(75, 23);
    … …  
    160160      //
    161161      this.cancelButton.DialogResult = System.Windows.Forms.DialogResult.Cancel;
    162       this.cancelButton.Location = new System.Drawing.Point(153, 112);
     162      this.cancelButton.Location = new System.Drawing.Point(153, 98);
    163163      this.cancelButton.Name = "cancelButton";
    164164      this.cancelButton.Size = new System.Drawing.Size(75, 23);
    … …  
    173173      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
    174174      this.CancelButton = this.cancelButton;
    175       this.ClientSize = new System.Drawing.Size(240, 147);
     175      this.ClientSize = new System.Drawing.Size(241, 133);
    176176      this.ControlBox = false;
    177177      this.Controls.Add(this.cancelButton);

  • trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/TreeEditDialogs/SymbolicExpressionTreeVariableNodeEditDialog.Designer.cs

    r9456 r11111  
    6161      //
    6262      this.originalValueLabel.AutoSize = true;
    63       this.originalValueLabel.Location = new System.Drawing.Point(12, 48);
     63      this.originalValueLabel.Location = new System.Drawing.Point(6, 42);
    6464      this.originalValueLabel.Name = "originalValueLabel";
    6565      this.originalValueLabel.Size = new System.Drawing.Size(72, 13);
    … …  
    6969      // oldValueTextBox
    7070      //
    71       this.oldValueTextBox.Location = new System.Drawing.Point(123, 45);
     71      this.oldValueTextBox.Location = new System.Drawing.Point(101, 39);
    7272      this.oldValueTextBox.Name = "oldValueTextBox";
    7373      this.oldValueTextBox.ReadOnly = true;
    … …  
    7777      // newValueTextBox
    7878      //
    79       this.newValueTextBox.Location = new System.Drawing.Point(123, 82);
     79      this.newValueTextBox.Location = new System.Drawing.Point(101, 65);
    8080      this.newValueTextBox.Name = "newValueTextBox";
    8181      this.newValueTextBox.Size = new System.Drawing.Size(131, 20);
    … …  
    8888      //
    8989      this.newValueLabel.AutoSize = true;
    90       this.newValueLabel.Location = new System.Drawing.Point(12, 85);
     90      this.newValueLabel.Location = new System.Drawing.Point(6, 68);
    9191      this.newValueLabel.Name = "newValueLabel";
    9292      this.newValueLabel.Size = new System.Drawing.Size(59, 13);
    … …  
    103103      //
    104104      this.variableNameLabel.AutoSize = true;
    105       this.variableNameLabel.Location = new System.Drawing.Point(12, 12);
     105      this.variableNameLabel.Location = new System.Drawing.Point(6, 15);
    106106      this.variableNameLabel.Name = "variableNameLabel";
    107107      this.variableNameLabel.Size = new System.Drawing.Size(76, 13);
    … …  
    114114      this.variableNamesCombo.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
    115115      this.variableNamesCombo.FormattingEnabled = true;
    116       this.variableNamesCombo.Location = new System.Drawing.Point(123, 9);
     116      this.variableNamesCombo.Location = new System.Drawing.Point(101, 12);
    117117      this.variableNamesCombo.Name = "variableNamesCombo";
    118118      this.variableNamesCombo.Size = new System.Drawing.Size(131, 21);
    … …  
    126126      //
    127127      this.okButton.DialogResult = System.Windows.Forms.DialogResult.OK;
    128       this.okButton.Location = new System.Drawing.Point(15, 119);
     128      this.okButton.Location = new System.Drawing.Point(75, 98);
    129129      this.okButton.Name = "okButton";
    130130      this.okButton.Size = new System.Drawing.Size(75, 23);
    … …  
    138138      this.cancelButton.CausesValidation = false;
    139139      this.cancelButton.DialogResult = System.Windows.Forms.DialogResult.Cancel;
    140       this.cancelButton.Location = new System.Drawing.Point(179, 119);
     140      this.cancelButton.Location = new System.Drawing.Point(156, 98);
    141141      this.cancelButton.Name = "cancelButton";
    142142      this.cancelButton.Size = new System.Drawing.Size(75, 23);
    … …  
    152152      this.AutoSize = true;
    153153      this.CancelButton = this.cancelButton;
    154       this.ClientSize = new System.Drawing.Size(269, 154);
     154      this.ClientSize = new System.Drawing.Size(244, 134);
    155155      this.ControlBox = false;
    156156      this.Controls.Add(this.cancelButton);
Note: See TracChangeset for help on using the changeset viewer.