Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
12/02/16 17:35:05 (7 years ago)
Author:
gkronber
Message:

#2650: merged r14422:14443 from trunk to branches resolving conflicts

File:
1 edited

Legend:

Unmodified
Added
Removed

  • branches/symbreg-factors-2650/HeuristicLab.Analysis.Views/3.3/DataRowVisualPropertiesControl.Designer.cs

    r14185 r14449  
    5454      this.label3 = new System.Windows.Forms.Label();
    5555      this.commonGroupBox = new System.Windows.Forms.GroupBox();
     56      this.isVisibleInLegendCheckBox = new System.Windows.Forms.CheckBox();
     57      this.label10 = new System.Windows.Forms.Label();
    5658      this.displayNameTextBox = new System.Windows.Forms.TextBox();
    5759      this.axisGroupBox = new System.Windows.Forms.GroupBox();
     60      this.panel2 = new System.Windows.Forms.Panel();
    5861      this.yAxisSecondaryRadioButton = new System.Windows.Forms.RadioButton();
     62      this.yAxisPrimaryRadioButton = new System.Windows.Forms.RadioButton();
     63      this.panel1 = new System.Windows.Forms.Panel();
    5964      this.xAxisPrimaryRadioButton = new System.Windows.Forms.RadioButton();
    60       this.yAxisPrimaryRadioButton = new System.Windows.Forms.RadioButton();
     65      this.xAxisSecondaryRadioButton = new System.Windows.Forms.RadioButton();
    6166      this.label5 = new System.Windows.Forms.Label();
    62       this.xAxisSecondaryRadioButton = new System.Windows.Forms.RadioButton();
    6367      this.label6 = new System.Windows.Forms.Label();
    6468      this.label9 = new System.Windows.Forms.Label();
    … …  
    7276      this.lineStyleComboBox = new System.Windows.Forms.ComboBox();
    7377      this.label8 = new System.Windows.Forms.Label();
    74       this.panel1 = new System.Windows.Forms.Panel();
    75       this.panel2 = new System.Windows.Forms.Panel();
    7678      ((System.ComponentModel.ISupportInitialize)(this.binsNumericUpDown)).BeginInit();
    7779      this.commonGroupBox.SuspendLayout();
    7880      this.axisGroupBox.SuspendLayout();
     81      this.panel2.SuspendLayout();
     82      this.panel1.SuspendLayout();
    7983      this.histoGramGroupBox.SuspendLayout();
    8084      this.lineChartGroupBox.SuspendLayout();
    8185      ((System.ComponentModel.ISupportInitialize)(this.lineWidthNumericUpDown)).BeginInit();
    82       this.panel1.SuspendLayout();
    83       this.panel2.SuspendLayout();
    8486      this.SuspendLayout();
    8587      //
    … …  
    9092      this.chartTypeComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
    9193      this.chartTypeComboBox.FormattingEnabled = true;
    92       this.chartTypeComboBox.Location = new System.Drawing.Point(57, 45);
     94      this.chartTypeComboBox.Location = new System.Drawing.Point(102, 45);
    9395      this.chartTypeComboBox.Name = "chartTypeComboBox";
    94       this.chartTypeComboBox.Size = new System.Drawing.Size(264, 21);
     96      this.chartTypeComboBox.Size = new System.Drawing.Size(219, 21);
    9597      this.chartTypeComboBox.TabIndex = 3;
    9698      this.chartTypeComboBox.SelectedValueChanged += new System.EventHandler(this.chartTypeComboBox_SelectedValueChanged);
    … …  
    103105      //
    104106      this.colorButton.BackColor = System.Drawing.SystemColors.Control;
    105       this.colorButton.Location = new System.Drawing.Point(56, 72);
     107      this.colorButton.Location = new System.Drawing.Point(102, 72);
    106108      this.colorButton.Name = "colorButton";
    107109      this.colorButton.Size = new System.Drawing.Size(23, 23);
    … …  
    172174      this.commonGroupBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    173175            | System.Windows.Forms.AnchorStyles.Right)));
     176      this.commonGroupBox.Controls.Add(this.isVisibleInLegendCheckBox);
     177      this.commonGroupBox.Controls.Add(this.label10);
    174178      this.commonGroupBox.Controls.Add(this.displayNameTextBox);
    175179      this.commonGroupBox.Controls.Add(this.axisGroupBox);
    … …  
    181185      this.commonGroupBox.Location = new System.Drawing.Point(0, 0);
    182186      this.commonGroupBox.Name = "commonGroupBox";
    183       this.commonGroupBox.Size = new System.Drawing.Size(327, 174);
     187      this.commonGroupBox.Size = new System.Drawing.Size(327, 199);
    184188      this.commonGroupBox.TabIndex = 0;
    185189      this.commonGroupBox.TabStop = false;
    186190      this.commonGroupBox.Text = "Common";
    187191      //
     192      // isVisibleInLegendCheckBox
     193      //
     194      this.isVisibleInLegendCheckBox.AutoSize = true;
     195      this.isVisibleInLegendCheckBox.CheckAlign = System.Drawing.ContentAlignment.MiddleRight;
     196      this.isVisibleInLegendCheckBox.Location = new System.Drawing.Point(102, 104);
     197      this.isVisibleInLegendCheckBox.Name = "isVisibleInLegendCheckBox";
     198      this.isVisibleInLegendCheckBox.Size = new System.Drawing.Size(15, 14);
     199      this.isVisibleInLegendCheckBox.TabIndex = 8;
     200      this.isVisibleInLegendCheckBox.UseVisualStyleBackColor = true;
     201      this.isVisibleInLegendCheckBox.CheckedChanged += new System.EventHandler(this.isVisibleInLegendCheckBox_CheckedChanged);
     202      //
     203      // label10
     204      //
     205      this.label10.AutoSize = true;
     206      this.label10.Location = new System.Drawing.Point(6, 104);
     207      this.label10.Name = "label10";
     208      this.label10.Size = new System.Drawing.Size(90, 13);
     209      this.label10.TabIndex = 7;
     210      this.label10.Text = "&Visible in Legend:";
     211      //
    188212      // displayNameTextBox
    189213      //
    190214      this.displayNameTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    191215            | System.Windows.Forms.AnchorStyles.Right)));
    192       this.displayNameTextBox.Location = new System.Drawing.Point(57, 19);
     216      this.displayNameTextBox.Location = new System.Drawing.Point(102, 19);
    193217      this.displayNameTextBox.Name = "displayNameTextBox";
    194       this.displayNameTextBox.Size = new System.Drawing.Size(264, 20);
     218      this.displayNameTextBox.Size = new System.Drawing.Size(219, 20);
    195219      this.displayNameTextBox.TabIndex = 1;
    196220      this.displayNameTextBox.Validated += new System.EventHandler(this.displayNameTextBox_Validated);
    … …  
    205229      this.axisGroupBox.Controls.Add(this.label5);
    206230      this.axisGroupBox.Controls.Add(this.label6);
    207       this.axisGroupBox.Location = new System.Drawing.Point(6, 101);
     231      this.axisGroupBox.Location = new System.Drawing.Point(6, 126);
    208232      this.axisGroupBox.Name = "axisGroupBox";
    209233      this.axisGroupBox.Size = new System.Drawing.Size(315, 67);
    … …  
    211235      this.axisGroupBox.TabStop = false;
    212236      this.axisGroupBox.Text = "Axes";
     237      //
     238      // panel2
     239      //
     240      this.panel2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
     241            | System.Windows.Forms.AnchorStyles.Right)));
     242      this.panel2.Controls.Add(this.yAxisSecondaryRadioButton);
     243      this.panel2.Controls.Add(this.yAxisPrimaryRadioButton);
     244      this.panel2.Location = new System.Drawing.Point(51, 42);
     245      this.panel2.Name = "panel2";
     246      this.panel2.Size = new System.Drawing.Size(258, 17);
     247      this.panel2.TabIndex = 7;
    213248      //
    214249      // yAxisSecondaryRadioButton
    … …  
    224259      this.yAxisSecondaryRadioButton.CheckedChanged += new System.EventHandler(this.yAxisRadioButton_CheckedChanged);
    225260      //
     261      // yAxisPrimaryRadioButton
     262      //
     263      this.yAxisPrimaryRadioButton.AutoSize = true;
     264      this.yAxisPrimaryRadioButton.Location = new System.Drawing.Point(0, 0);
     265      this.yAxisPrimaryRadioButton.Name = "yAxisPrimaryRadioButton";
     266      this.yAxisPrimaryRadioButton.Size = new System.Drawing.Size(59, 17);
     267      this.yAxisPrimaryRadioButton.TabIndex = 4;
     268      this.yAxisPrimaryRadioButton.TabStop = true;
     269      this.yAxisPrimaryRadioButton.Text = "&Primary";
     270      this.yAxisPrimaryRadioButton.UseVisualStyleBackColor = true;
     271      this.yAxisPrimaryRadioButton.CheckedChanged += new System.EventHandler(this.yAxisRadioButton_CheckedChanged);
     272      //
     273      // panel1
     274      //
     275      this.panel1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
     276            | System.Windows.Forms.AnchorStyles.Right)));
     277      this.panel1.Controls.Add(this.xAxisPrimaryRadioButton);
     278      this.panel1.Controls.Add(this.xAxisSecondaryRadioButton);
     279      this.panel1.Location = new System.Drawing.Point(51, 19);
     280      this.panel1.Name = "panel1";
     281      this.panel1.Size = new System.Drawing.Size(258, 17);
     282      this.panel1.TabIndex = 6;
     283      //
    226284      // xAxisPrimaryRadioButton
    227285      //
    … …  
    236294      this.xAxisPrimaryRadioButton.CheckedChanged += new System.EventHandler(this.xAxisRadioButton_CheckedChanged);
    237295      //
    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       //
    259296      // xAxisSecondaryRadioButton
    260297      //
    … …  
    269306      this.xAxisSecondaryRadioButton.CheckedChanged += new System.EventHandler(this.xAxisRadioButton_CheckedChanged);
    270307      //
     308      // label5
     309      //
     310      this.label5.AutoSize = true;
     311      this.label5.Location = new System.Drawing.Point(6, 44);
     312      this.label5.Name = "label5";
     313      this.label5.Size = new System.Drawing.Size(39, 13);
     314      this.label5.TabIndex = 3;
     315      this.label5.Text = "&Y-Axis:";
     316      //
    271317      // label6
    272318      //
    … …  
    295341      this.histoGramGroupBox.Controls.Add(this.binsNumericUpDown);
    296342      this.histoGramGroupBox.Controls.Add(this.label3);
    297       this.histoGramGroupBox.Location = new System.Drawing.Point(0, 280);
     343      this.histoGramGroupBox.Location = new System.Drawing.Point(0, 305);
    298344      this.histoGramGroupBox.Name = "histoGramGroupBox";
    299345      this.histoGramGroupBox.Size = new System.Drawing.Size(327, 47);
    … …  
    338384      this.lineChartGroupBox.Controls.Add(this.lineStyleComboBox);
    339385      this.lineChartGroupBox.Controls.Add(this.label8);
    340       this.lineChartGroupBox.Location = new System.Drawing.Point(0, 180);
     386      this.lineChartGroupBox.Location = new System.Drawing.Point(0, 205);
    341387      this.lineChartGroupBox.Name = "lineChartGroupBox";
    342388      this.lineChartGroupBox.Size = new System.Drawing.Size(327, 94);
    … …  
    404450      this.label8.Text = "&Style:";
    405451      //
    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       //
    428452      // DataRowVisualPropertiesControl
    429453      //
    430       this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
    431454      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
    432455      this.Controls.Add(this.lineChartGroupBox);
    … …  
    434457      this.Controls.Add(this.commonGroupBox);
    435458      this.Name = "DataRowVisualPropertiesControl";
    436       this.Size = new System.Drawing.Size(327, 331);
     459      this.Size = new System.Drawing.Size(327, 356);
    437460      ((System.ComponentModel.ISupportInitialize)(this.binsNumericUpDown)).EndInit();
    438461      this.commonGroupBox.ResumeLayout(false);
    … …  
    440463      this.axisGroupBox.ResumeLayout(false);
    441464      this.axisGroupBox.PerformLayout();
     465      this.panel2.ResumeLayout(false);
     466      this.panel2.PerformLayout();
     467      this.panel1.ResumeLayout(false);
     468      this.panel1.PerformLayout();
    442469      this.histoGramGroupBox.ResumeLayout(false);
    443470      this.histoGramGroupBox.PerformLayout();
    … …  
    445472      this.lineChartGroupBox.PerformLayout();
    446473      ((System.ComponentModel.ISupportInitialize)(this.lineWidthNumericUpDown)).EndInit();
    447       this.panel1.ResumeLayout(false);
    448       this.panel1.PerformLayout();
    449       this.panel2.ResumeLayout(false);
    450       this.panel2.PerformLayout();
    451474      this.ResumeLayout(false);
    452475
    … …  
    484507    private System.Windows.Forms.Panel panel2;
    485508    private System.Windows.Forms.Panel panel1;
     509    private System.Windows.Forms.Label label10;
     510    private System.Windows.Forms.CheckBox isVisibleInLegendCheckBox;
    486511  }
    487512}
Note: See TracChangeset for help on using the changeset viewer.