Ignore:
Timestamp:
06/30/17 16:41:06 (2 years ago)
Author:
pfleck
Message:

#2713 #2715 #2765
Merged to stable

  • 14435-14439,14493,14516,14519,14982,14987,14992,15042 (from #2713)
  • 14457-14458,14508,14582,14740,14984,15068,15095 (from #2715)
  • 14860-14861 (from #2765)
Location:
stable
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • stable

  • stable/HeuristicLab.Analysis.Views

  • stable/HeuristicLab.Analysis.Views/3.3/DataRowVisualPropertiesControl.Designer.cs

    r14186 r15097  
    4949      this.colorButton = new System.Windows.Forms.Button();
    5050      this.startIndexZeroCheckBox = new System.Windows.Forms.CheckBox();
    51       this.binsNumericUpDown = new System.Windows.Forms.NumericUpDown();
    5251      this.label1 = new System.Windows.Forms.Label();
    5352      this.label2 = new System.Windows.Forms.Label();
    54       this.label3 = new System.Windows.Forms.Label();
    5553      this.commonGroupBox = new System.Windows.Forms.GroupBox();
     54      this.clearColorButton = new System.Windows.Forms.Button();
     55      this.isVisibleInLegendCheckBox = new System.Windows.Forms.CheckBox();
     56      this.label10 = new System.Windows.Forms.Label();
    5657      this.displayNameTextBox = new System.Windows.Forms.TextBox();
    5758      this.axisGroupBox = new System.Windows.Forms.GroupBox();
     59      this.panel2 = new System.Windows.Forms.Panel();
    5860      this.yAxisSecondaryRadioButton = new System.Windows.Forms.RadioButton();
     61      this.yAxisPrimaryRadioButton = new System.Windows.Forms.RadioButton();
     62      this.panel1 = new System.Windows.Forms.Panel();
    5963      this.xAxisPrimaryRadioButton = new System.Windows.Forms.RadioButton();
    60       this.yAxisPrimaryRadioButton = new System.Windows.Forms.RadioButton();
     64      this.xAxisSecondaryRadioButton = new System.Windows.Forms.RadioButton();
    6165      this.label5 = new System.Windows.Forms.Label();
    62       this.xAxisSecondaryRadioButton = new System.Windows.Forms.RadioButton();
    6366      this.label6 = new System.Windows.Forms.Label();
    6467      this.label9 = new System.Windows.Forms.Label();
    65       this.histoGramGroupBox = new System.Windows.Forms.GroupBox();
    66       this.binsExactRadioButton = new System.Windows.Forms.RadioButton();
    67       this.binsApproximatelyRadioButton = new System.Windows.Forms.RadioButton();
    6868      this.lineChartGroupBox = new System.Windows.Forms.GroupBox();
    6969      this.lineWidthNumericUpDown = new System.Windows.Forms.NumericUpDown();
     
    7272      this.lineStyleComboBox = new System.Windows.Forms.ComboBox();
    7373      this.label8 = new System.Windows.Forms.Label();
    74       this.panel1 = new System.Windows.Forms.Panel();
    75       this.panel2 = new System.Windows.Forms.Panel();
    76       ((System.ComponentModel.ISupportInitialize)(this.binsNumericUpDown)).BeginInit();
    7774      this.commonGroupBox.SuspendLayout();
    7875      this.axisGroupBox.SuspendLayout();
    79       this.histoGramGroupBox.SuspendLayout();
     76      this.panel2.SuspendLayout();
     77      this.panel1.SuspendLayout();
    8078      this.lineChartGroupBox.SuspendLayout();
    8179      ((System.ComponentModel.ISupportInitialize)(this.lineWidthNumericUpDown)).BeginInit();
    82       this.panel1.SuspendLayout();
    83       this.panel2.SuspendLayout();
    8480      this.SuspendLayout();
    8581      //
     
    9086      this.chartTypeComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
    9187      this.chartTypeComboBox.FormattingEnabled = true;
    92       this.chartTypeComboBox.Location = new System.Drawing.Point(57, 45);
     88      this.chartTypeComboBox.Location = new System.Drawing.Point(102, 45);
    9389      this.chartTypeComboBox.Name = "chartTypeComboBox";
    94       this.chartTypeComboBox.Size = new System.Drawing.Size(264, 21);
     90      this.chartTypeComboBox.Size = new System.Drawing.Size(219, 21);
    9591      this.chartTypeComboBox.TabIndex = 3;
    9692      this.chartTypeComboBox.SelectedValueChanged += new System.EventHandler(this.chartTypeComboBox_SelectedValueChanged);
     
    10399      //
    104100      this.colorButton.BackColor = System.Drawing.SystemColors.Control;
    105       this.colorButton.Location = new System.Drawing.Point(56, 72);
     101      this.colorButton.Location = new System.Drawing.Point(102, 72);
    106102      this.colorButton.Name = "colorButton";
    107103      this.colorButton.Size = new System.Drawing.Size(23, 23);
     
    121117      this.startIndexZeroCheckBox.CheckedChanged += new System.EventHandler(this.startIndexZeroCheckBox_CheckedChanged);
    122118      //
    123       // binsNumericUpDown
    124       //
    125       this.binsNumericUpDown.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    126             | System.Windows.Forms.AnchorStyles.Right)));
    127       this.binsNumericUpDown.Location = new System.Drawing.Point(57, 19);
    128       this.binsNumericUpDown.Minimum = new decimal(new int[] {
    129             1,
    130             0,
    131             0,
    132             0});
    133       this.binsNumericUpDown.Name = "binsNumericUpDown";
    134       this.binsNumericUpDown.Size = new System.Drawing.Size(97, 20);
    135       this.binsNumericUpDown.TabIndex = 1;
    136       this.binsNumericUpDown.Value = new decimal(new int[] {
    137             1,
    138             0,
    139             0,
    140             0});
    141       this.binsNumericUpDown.ValueChanged += new System.EventHandler(this.binsNumericUpDown_ValueChanged);
    142       //
    143119      // label1
    144120      //
     
    159135      this.label2.Text = "&Color:";
    160136      //
    161       // label3
    162       //
    163       this.label3.AutoSize = true;
    164       this.label3.Location = new System.Drawing.Point(6, 21);
    165       this.label3.Name = "label3";
    166       this.label3.Size = new System.Drawing.Size(30, 13);
    167       this.label3.TabIndex = 0;
    168       this.label3.Text = "&Bins:";
    169       //
    170137      // commonGroupBox
    171138      //
    172139      this.commonGroupBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    173140            | System.Windows.Forms.AnchorStyles.Right)));
     141      this.commonGroupBox.Controls.Add(this.clearColorButton);
     142      this.commonGroupBox.Controls.Add(this.isVisibleInLegendCheckBox);
     143      this.commonGroupBox.Controls.Add(this.label10);
    174144      this.commonGroupBox.Controls.Add(this.displayNameTextBox);
    175145      this.commonGroupBox.Controls.Add(this.axisGroupBox);
     
    181151      this.commonGroupBox.Location = new System.Drawing.Point(0, 0);
    182152      this.commonGroupBox.Name = "commonGroupBox";
    183       this.commonGroupBox.Size = new System.Drawing.Size(327, 174);
     153      this.commonGroupBox.Size = new System.Drawing.Size(327, 199);
    184154      this.commonGroupBox.TabIndex = 0;
    185155      this.commonGroupBox.TabStop = false;
    186156      this.commonGroupBox.Text = "Common";
    187157      //
     158      // clearColorButton
     159      //
     160      this.clearColorButton.BackColor = System.Drawing.SystemColors.ActiveCaption;
     161      this.clearColorButton.Cursor = System.Windows.Forms.Cursors.Default;
     162      this.clearColorButton.FlatAppearance.BorderSize = 0;
     163      this.clearColorButton.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
     164      this.clearColorButton.ForeColor = System.Drawing.Color.Transparent;
     165      this.clearColorButton.Location = new System.Drawing.Point(128, 76);
     166      this.clearColorButton.Margin = new System.Windows.Forms.Padding(0);
     167      this.clearColorButton.Name = "clearColorButton";
     168      this.clearColorButton.Size = new System.Drawing.Size(15, 16);
     169      this.clearColorButton.TabIndex = 10;
     170      this.clearColorButton.TabStop = false;
     171      this.clearColorButton.UseVisualStyleBackColor = false;
     172      this.clearColorButton.Click += new System.EventHandler(this.clearColorButton_Click);
     173      //
     174      // isVisibleInLegendCheckBox
     175      //
     176      this.isVisibleInLegendCheckBox.AutoSize = true;
     177      this.isVisibleInLegendCheckBox.CheckAlign = System.Drawing.ContentAlignment.MiddleRight;
     178      this.isVisibleInLegendCheckBox.Location = new System.Drawing.Point(102, 104);
     179      this.isVisibleInLegendCheckBox.Name = "isVisibleInLegendCheckBox";
     180      this.isVisibleInLegendCheckBox.Size = new System.Drawing.Size(15, 14);
     181      this.isVisibleInLegendCheckBox.TabIndex = 8;
     182      this.isVisibleInLegendCheckBox.UseVisualStyleBackColor = true;
     183      this.isVisibleInLegendCheckBox.CheckedChanged += new System.EventHandler(this.isVisibleInLegendCheckBox_CheckedChanged);
     184      //
     185      // label10
     186      //
     187      this.label10.AutoSize = true;
     188      this.label10.Location = new System.Drawing.Point(6, 104);
     189      this.label10.Name = "label10";
     190      this.label10.Size = new System.Drawing.Size(90, 13);
     191      this.label10.TabIndex = 7;
     192      this.label10.Text = "&Visible in Legend:";
     193      //
    188194      // displayNameTextBox
    189195      //
    190196      this.displayNameTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    191197            | System.Windows.Forms.AnchorStyles.Right)));
    192       this.displayNameTextBox.Location = new System.Drawing.Point(57, 19);
     198      this.displayNameTextBox.Location = new System.Drawing.Point(102, 19);
    193199      this.displayNameTextBox.Name = "displayNameTextBox";
    194       this.displayNameTextBox.Size = new System.Drawing.Size(264, 20);
     200      this.displayNameTextBox.Size = new System.Drawing.Size(219, 20);
    195201      this.displayNameTextBox.TabIndex = 1;
    196202      this.displayNameTextBox.Validated += new System.EventHandler(this.displayNameTextBox_Validated);
     
    205211      this.axisGroupBox.Controls.Add(this.label5);
    206212      this.axisGroupBox.Controls.Add(this.label6);
    207       this.axisGroupBox.Location = new System.Drawing.Point(6, 101);
     213      this.axisGroupBox.Location = new System.Drawing.Point(6, 126);
    208214      this.axisGroupBox.Name = "axisGroupBox";
    209215      this.axisGroupBox.Size = new System.Drawing.Size(315, 67);
     
    211217      this.axisGroupBox.TabStop = false;
    212218      this.axisGroupBox.Text = "Axes";
     219      //
     220      // panel2
     221      //
     222      this.panel2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
     223            | System.Windows.Forms.AnchorStyles.Right)));
     224      this.panel2.Controls.Add(this.yAxisSecondaryRadioButton);
     225      this.panel2.Controls.Add(this.yAxisPrimaryRadioButton);
     226      this.panel2.Location = new System.Drawing.Point(51, 42);
     227      this.panel2.Name = "panel2";
     228      this.panel2.Size = new System.Drawing.Size(258, 17);
     229      this.panel2.TabIndex = 7;
    213230      //
    214231      // yAxisSecondaryRadioButton
     
    224241      this.yAxisSecondaryRadioButton.CheckedChanged += new System.EventHandler(this.yAxisRadioButton_CheckedChanged);
    225242      //
     243      // yAxisPrimaryRadioButton
     244      //
     245      this.yAxisPrimaryRadioButton.AutoSize = true;
     246      this.yAxisPrimaryRadioButton.Location = new System.Drawing.Point(0, 0);
     247      this.yAxisPrimaryRadioButton.Name = "yAxisPrimaryRadioButton";
     248      this.yAxisPrimaryRadioButton.Size = new System.Drawing.Size(59, 17);
     249      this.yAxisPrimaryRadioButton.TabIndex = 4;
     250      this.yAxisPrimaryRadioButton.TabStop = true;
     251      this.yAxisPrimaryRadioButton.Text = "&Primary";
     252      this.yAxisPrimaryRadioButton.UseVisualStyleBackColor = true;
     253      this.yAxisPrimaryRadioButton.CheckedChanged += new System.EventHandler(this.yAxisRadioButton_CheckedChanged);
     254      //
     255      // panel1
     256      //
     257      this.panel1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
     258            | System.Windows.Forms.AnchorStyles.Right)));
     259      this.panel1.Controls.Add(this.xAxisPrimaryRadioButton);
     260      this.panel1.Controls.Add(this.xAxisSecondaryRadioButton);
     261      this.panel1.Location = new System.Drawing.Point(51, 19);
     262      this.panel1.Name = "panel1";
     263      this.panel1.Size = new System.Drawing.Size(258, 17);
     264      this.panel1.TabIndex = 6;
     265      //
    226266      // xAxisPrimaryRadioButton
    227267      //
     
    236276      this.xAxisPrimaryRadioButton.CheckedChanged += new System.EventHandler(this.xAxisRadioButton_CheckedChanged);
    237277      //
    238       // yAxisPrimaryRadioButton
    239       //
    240       this.yAxisPrimaryRadioButton.AutoSize = true;
    241       this.yAxisPrimaryRadioButton.Location = new System.Drawing.Point(0, 0);
    242       this.yAxisPrimaryRadioButton.Name = "yAxisPrimaryRadioButton";
    243       this.yAxisPrimaryRadioButton.Size = new System.Drawing.Size(59, 17);
    244       this.yAxisPrimaryRadioButton.TabIndex = 4;
    245       this.yAxisPrimaryRadioButton.TabStop = true;
    246       this.yAxisPrimaryRadioButton.Text = "&Primary";
    247       this.yAxisPrimaryRadioButton.UseVisualStyleBackColor = true;
    248       this.yAxisPrimaryRadioButton.CheckedChanged += new System.EventHandler(this.yAxisRadioButton_CheckedChanged);
    249       //
    250       // label5
    251       //
    252       this.label5.AutoSize = true;
    253       this.label5.Location = new System.Drawing.Point(6, 44);
    254       this.label5.Name = "label5";
    255       this.label5.Size = new System.Drawing.Size(39, 13);
    256       this.label5.TabIndex = 3;
    257       this.label5.Text = "&Y-Axis:";
    258       //
    259278      // xAxisSecondaryRadioButton
    260279      //
     
    269288      this.xAxisSecondaryRadioButton.CheckedChanged += new System.EventHandler(this.xAxisRadioButton_CheckedChanged);
    270289      //
     290      // label5
     291      //
     292      this.label5.AutoSize = true;
     293      this.label5.Location = new System.Drawing.Point(6, 44);
     294      this.label5.Name = "label5";
     295      this.label5.Size = new System.Drawing.Size(39, 13);
     296      this.label5.TabIndex = 3;
     297      this.label5.Text = "&Y-Axis:";
     298      //
    271299      // label6
    272300      //
     
    287315      this.label9.Text = "&Name:";
    288316      //
    289       // histoGramGroupBox
    290       //
    291       this.histoGramGroupBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    292             | System.Windows.Forms.AnchorStyles.Right)));
    293       this.histoGramGroupBox.Controls.Add(this.binsExactRadioButton);
    294       this.histoGramGroupBox.Controls.Add(this.binsApproximatelyRadioButton);
    295       this.histoGramGroupBox.Controls.Add(this.binsNumericUpDown);
    296       this.histoGramGroupBox.Controls.Add(this.label3);
    297       this.histoGramGroupBox.Location = new System.Drawing.Point(0, 280);
    298       this.histoGramGroupBox.Name = "histoGramGroupBox";
    299       this.histoGramGroupBox.Size = new System.Drawing.Size(327, 47);
    300       this.histoGramGroupBox.TabIndex = 2;
    301       this.histoGramGroupBox.TabStop = false;
    302       this.histoGramGroupBox.Text = "Histogram Properties";
    303       //
    304       // binsExactRadioButton
    305       //
    306       this.binsExactRadioButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
    307       this.binsExactRadioButton.AutoSize = true;
    308       this.binsExactRadioButton.Location = new System.Drawing.Point(269, 19);
    309       this.binsExactRadioButton.Name = "binsExactRadioButton";
    310       this.binsExactRadioButton.Size = new System.Drawing.Size(52, 17);
    311       this.binsExactRadioButton.TabIndex = 3;
    312       this.binsExactRadioButton.TabStop = true;
    313       this.binsExactRadioButton.Text = "&Exact";
    314       this.binsExactRadioButton.UseVisualStyleBackColor = true;
    315       this.binsExactRadioButton.CheckedChanged += new System.EventHandler(this.binNumberRadioButton_CheckedChanged);
    316       //
    317       // binsApproximatelyRadioButton
    318       //
    319       this.binsApproximatelyRadioButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
    320       this.binsApproximatelyRadioButton.AutoSize = true;
    321       this.binsApproximatelyRadioButton.Location = new System.Drawing.Point(173, 19);
    322       this.binsApproximatelyRadioButton.Name = "binsApproximatelyRadioButton";
    323       this.binsApproximatelyRadioButton.Size = new System.Drawing.Size(90, 17);
    324       this.binsApproximatelyRadioButton.TabIndex = 2;
    325       this.binsApproximatelyRadioButton.TabStop = true;
    326       this.binsApproximatelyRadioButton.Text = "&Approximately";
    327       this.binsApproximatelyRadioButton.UseVisualStyleBackColor = true;
    328       this.binsApproximatelyRadioButton.CheckedChanged += new System.EventHandler(this.binNumberRadioButton_CheckedChanged);
    329       //
    330317      // lineChartGroupBox
    331318      //
     
    338325      this.lineChartGroupBox.Controls.Add(this.lineStyleComboBox);
    339326      this.lineChartGroupBox.Controls.Add(this.label8);
    340       this.lineChartGroupBox.Location = new System.Drawing.Point(0, 180);
     327      this.lineChartGroupBox.Location = new System.Drawing.Point(0, 205);
    341328      this.lineChartGroupBox.Name = "lineChartGroupBox";
    342329      this.lineChartGroupBox.Size = new System.Drawing.Size(327, 94);
     
    404391      this.label8.Text = "&Style:";
    405392      //
    406       // panel1
    407       //
    408       this.panel1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    409             | System.Windows.Forms.AnchorStyles.Right)));
    410       this.panel1.Controls.Add(this.xAxisPrimaryRadioButton);
    411       this.panel1.Controls.Add(this.xAxisSecondaryRadioButton);
    412       this.panel1.Location = new System.Drawing.Point(51, 19);
    413       this.panel1.Name = "panel1";
    414       this.panel1.Size = new System.Drawing.Size(258, 17);
    415       this.panel1.TabIndex = 6;
    416       //
    417       // panel2
    418       //
    419       this.panel2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    420             | System.Windows.Forms.AnchorStyles.Right)));
    421       this.panel2.Controls.Add(this.yAxisSecondaryRadioButton);
    422       this.panel2.Controls.Add(this.yAxisPrimaryRadioButton);
    423       this.panel2.Location = new System.Drawing.Point(51, 42);
    424       this.panel2.Name = "panel2";
    425       this.panel2.Size = new System.Drawing.Size(258, 17);
    426       this.panel2.TabIndex = 7;
    427       //
    428393      // DataRowVisualPropertiesControl
    429394      //
    430       this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
    431395      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
    432396      this.Controls.Add(this.lineChartGroupBox);
    433       this.Controls.Add(this.histoGramGroupBox);
    434397      this.Controls.Add(this.commonGroupBox);
    435398      this.Name = "DataRowVisualPropertiesControl";
    436       this.Size = new System.Drawing.Size(327, 331);
    437       ((System.ComponentModel.ISupportInitialize)(this.binsNumericUpDown)).EndInit();
     399      this.Size = new System.Drawing.Size(327, 300);
    438400      this.commonGroupBox.ResumeLayout(false);
    439401      this.commonGroupBox.PerformLayout();
    440402      this.axisGroupBox.ResumeLayout(false);
    441403      this.axisGroupBox.PerformLayout();
    442       this.histoGramGroupBox.ResumeLayout(false);
    443       this.histoGramGroupBox.PerformLayout();
     404      this.panel2.ResumeLayout(false);
     405      this.panel2.PerformLayout();
     406      this.panel1.ResumeLayout(false);
     407      this.panel1.PerformLayout();
    444408      this.lineChartGroupBox.ResumeLayout(false);
    445409      this.lineChartGroupBox.PerformLayout();
    446410      ((System.ComponentModel.ISupportInitialize)(this.lineWidthNumericUpDown)).EndInit();
    447       this.panel1.ResumeLayout(false);
    448       this.panel1.PerformLayout();
    449       this.panel2.ResumeLayout(false);
    450       this.panel2.PerformLayout();
    451411      this.ResumeLayout(false);
    452412
     
    459419    private System.Windows.Forms.Button colorButton;
    460420    private System.Windows.Forms.CheckBox startIndexZeroCheckBox;
    461     private System.Windows.Forms.NumericUpDown binsNumericUpDown;
    462421    private System.Windows.Forms.Label label1;
    463422    private System.Windows.Forms.Label label2;
    464     private System.Windows.Forms.Label label3;
    465423    private System.Windows.Forms.GroupBox commonGroupBox;
    466     private System.Windows.Forms.GroupBox histoGramGroupBox;
    467424    private System.Windows.Forms.RadioButton xAxisSecondaryRadioButton;
    468425    private System.Windows.Forms.RadioButton yAxisSecondaryRadioButton;
     
    474431    private System.Windows.Forms.Label label4;
    475432    private System.Windows.Forms.Label label7;
    476     private System.Windows.Forms.RadioButton binsExactRadioButton;
    477     private System.Windows.Forms.RadioButton binsApproximatelyRadioButton;
    478433    private System.Windows.Forms.ComboBox lineStyleComboBox;
    479434    private System.Windows.Forms.Label label8;
     
    484439    private System.Windows.Forms.Panel panel2;
    485440    private System.Windows.Forms.Panel panel1;
     441    private System.Windows.Forms.Label label10;
     442    private System.Windows.Forms.CheckBox isVisibleInLegendCheckBox;
     443    private System.Windows.Forms.Button clearColorButton;
    486444  }
    487445}
Note: See TracChangeset for help on using the changeset viewer.