Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
06/30/17 16:41:06 (7 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/ScatterPlotDataRowVisualPropertiesControl.Designer.cs

    r14186 r15097  
    4545    /// </summary>
    4646    private void InitializeComponent() {
     47      this.components = new System.ComponentModel.Container();
    4748      this.pointStyleComboBox = new System.Windows.Forms.ComboBox();
    4849      this.colorDialog = new System.Windows.Forms.ColorDialog();
     
    5657      this.label9 = new System.Windows.Forms.Label();
    5758      this.label7 = new System.Windows.Forms.Label();
     59      this.label4 = new System.Windows.Forms.Label();
     60      this.regressionTypeComboBox = new System.Windows.Forms.ComboBox();
     61      this.regressionGroupBox = new System.Windows.Forms.GroupBox();
     62      this.isRegressionVisibleInLegendCheckBox = new System.Windows.Forms.CheckBox();
     63      this.polynomialRegressionOrderNumericUpDown = new System.Windows.Forms.NumericUpDown();
     64      this.orderLabel = new System.Windows.Forms.Label();
     65      this.regressionLegendTextBox = new System.Windows.Forms.TextBox();
     66      this.toolTip = new System.Windows.Forms.ToolTip(this.components);
     67      this.clearColorButton = new System.Windows.Forms.Button();
    5868      ((System.ComponentModel.ISupportInitialize)(this.pointSizeNumericUpDown)).BeginInit();
     69      this.regressionGroupBox.SuspendLayout();
     70      ((System.ComponentModel.ISupportInitialize)(this.polynomialRegressionOrderNumericUpDown)).BeginInit();
    5971      this.SuspendLayout();
    6072      //
     
    171183      this.label7.Text = "&Visible in Legend:";
    172184      //
     185      // label4
     186      //
     187      this.label4.AutoSize = true;
     188      this.label4.Location = new System.Drawing.Point(6, 22);
     189      this.label4.Name = "label4";
     190      this.label4.Size = new System.Drawing.Size(34, 13);
     191      this.label4.TabIndex = 7;
     192      this.label4.Text = "Type:";
     193      //
     194      // regressionTypeComboBox
     195      //
     196      this.regressionTypeComboBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
     197            | System.Windows.Forms.AnchorStyles.Right)));
     198      this.regressionTypeComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
     199      this.regressionTypeComboBox.FormattingEnabled = true;
     200      this.regressionTypeComboBox.Location = new System.Drawing.Point(93, 19);
     201      this.regressionTypeComboBox.Name = "regressionTypeComboBox";
     202      this.regressionTypeComboBox.Size = new System.Drawing.Size(147, 21);
     203      this.regressionTypeComboBox.TabIndex = 8;
     204      this.regressionTypeComboBox.SelectedValueChanged += new System.EventHandler(this.regressionTypeComboBox_SelectedValueChanged);
     205      //
     206      // regressionGroupBox
     207      //
     208      this.regressionGroupBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
     209            | System.Windows.Forms.AnchorStyles.Right)));
     210      this.regressionGroupBox.Controls.Add(this.isRegressionVisibleInLegendCheckBox);
     211      this.regressionGroupBox.Controls.Add(this.regressionTypeComboBox);
     212      this.regressionGroupBox.Controls.Add(this.polynomialRegressionOrderNumericUpDown);
     213      this.regressionGroupBox.Controls.Add(this.orderLabel);
     214      this.regressionGroupBox.Controls.Add(this.regressionLegendTextBox);
     215      this.regressionGroupBox.Controls.Add(this.label4);
     216      this.regressionGroupBox.Location = new System.Drawing.Point(3, 136);
     217      this.regressionGroupBox.Name = "regressionGroupBox";
     218      this.regressionGroupBox.Size = new System.Drawing.Size(336, 74);
     219      this.regressionGroupBox.TabIndex = 9;
     220      this.regressionGroupBox.TabStop = false;
     221      this.regressionGroupBox.Text = "&Regression";
     222      //
     223      // isRegressionVisibleInLegendCheckBox
     224      //
     225      this.isRegressionVisibleInLegendCheckBox.AutoSize = true;
     226      this.isRegressionVisibleInLegendCheckBox.CheckAlign = System.Drawing.ContentAlignment.MiddleRight;
     227      this.isRegressionVisibleInLegendCheckBox.Location = new System.Drawing.Point(6, 48);
     228      this.isRegressionVisibleInLegendCheckBox.Name = "isRegressionVisibleInLegendCheckBox";
     229      this.isRegressionVisibleInLegendCheckBox.Size = new System.Drawing.Size(68, 17);
     230      this.isRegressionVisibleInLegendCheckBox.TabIndex = 13;
     231      this.isRegressionVisibleInLegendCheckBox.Text = "Legend: ";
     232      this.isRegressionVisibleInLegendCheckBox.UseVisualStyleBackColor = true;
     233      this.isRegressionVisibleInLegendCheckBox.CheckedChanged += new System.EventHandler(this.isRegressionVisibleInLegendCheckBox_CheckedChanged);
     234      //
     235      // polynomialRegressionOrderNumericUpDown
     236      //
     237      this.polynomialRegressionOrderNumericUpDown.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
     238      this.polynomialRegressionOrderNumericUpDown.Location = new System.Drawing.Point(285, 20);
     239      this.polynomialRegressionOrderNumericUpDown.Margin = new System.Windows.Forms.Padding(9, 3, 3, 3);
     240      this.polynomialRegressionOrderNumericUpDown.Maximum = new decimal(new int[] {
     241            6,
     242            0,
     243            0,
     244            0});
     245      this.polynomialRegressionOrderNumericUpDown.Minimum = new decimal(new int[] {
     246            2,
     247            0,
     248            0,
     249            0});
     250      this.polynomialRegressionOrderNumericUpDown.Name = "polynomialRegressionOrderNumericUpDown";
     251      this.polynomialRegressionOrderNumericUpDown.Size = new System.Drawing.Size(45, 20);
     252      this.polynomialRegressionOrderNumericUpDown.TabIndex = 11;
     253      this.toolTip.SetToolTip(this.polynomialRegressionOrderNumericUpDown, "Order only available for Polynomial");
     254      this.polynomialRegressionOrderNumericUpDown.Value = new decimal(new int[] {
     255            2,
     256            0,
     257            0,
     258            0});
     259      this.polynomialRegressionOrderNumericUpDown.ValueChanged += new System.EventHandler(this.polynomialRegressionOrderNumericUpDown_ValueChanged);
     260      //
     261      // orderLabel
     262      //
     263      this.orderLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
     264      this.orderLabel.AutoSize = true;
     265      this.orderLabel.Location = new System.Drawing.Point(246, 22);
     266      this.orderLabel.Name = "orderLabel";
     267      this.orderLabel.Size = new System.Drawing.Size(36, 13);
     268      this.orderLabel.TabIndex = 12;
     269      this.orderLabel.Text = "Order:";
     270      //
     271      // regressionLegendTextBox
     272      //
     273      this.regressionLegendTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
     274            | System.Windows.Forms.AnchorStyles.Right)));
     275      this.regressionLegendTextBox.Location = new System.Drawing.Point(93, 46);
     276      this.regressionLegendTextBox.Name = "regressionLegendTextBox";
     277      this.regressionLegendTextBox.Size = new System.Drawing.Size(237, 20);
     278      this.regressionLegendTextBox.TabIndex = 10;
     279      this.regressionLegendTextBox.Validated += new System.EventHandler(this.regressionLegendTextBox_Validated);
     280      //
     281      // clearColorButton
     282      //
     283      this.clearColorButton.BackColor = System.Drawing.SystemColors.ActiveCaption;
     284      this.clearColorButton.Cursor = System.Windows.Forms.Cursors.Default;
     285      this.clearColorButton.FlatAppearance.BorderSize = 0;
     286      this.clearColorButton.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
     287      this.clearColorButton.ForeColor = System.Drawing.Color.Transparent;
     288      this.clearColorButton.Location = new System.Drawing.Point(125, 65);
     289      this.clearColorButton.Margin = new System.Windows.Forms.Padding(0);
     290      this.clearColorButton.Name = "clearColorButton";
     291      this.clearColorButton.Size = new System.Drawing.Size(15, 16);
     292      this.clearColorButton.TabIndex = 11;
     293      this.clearColorButton.TabStop = false;
     294      this.clearColorButton.UseVisualStyleBackColor = false;
     295      this.clearColorButton.Click += new System.EventHandler(this.clearColorButton_Click);
     296      //
    173297      // ScatterPlotDataRowVisualPropertiesControl
    174298      //
    175299      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
     300      this.Controls.Add(this.clearColorButton);
     301      this.Controls.Add(this.regressionGroupBox);
    176302      this.Controls.Add(this.pointSizeNumericUpDown);
    177303      this.Controls.Add(this.isVisibleInLegendCheckBox);
     
    185311      this.Controls.Add(this.colorButton);
    186312      this.Name = "ScatterPlotDataRowVisualPropertiesControl";
    187       this.Size = new System.Drawing.Size(342, 135);
     313      this.Size = new System.Drawing.Size(342, 215);
    188314      ((System.ComponentModel.ISupportInitialize)(this.pointSizeNumericUpDown)).EndInit();
     315      this.regressionGroupBox.ResumeLayout(false);
     316      this.regressionGroupBox.PerformLayout();
     317      ((System.ComponentModel.ISupportInitialize)(this.polynomialRegressionOrderNumericUpDown)).EndInit();
    189318      this.ResumeLayout(false);
    190319      this.PerformLayout();
     
    205334    private System.Windows.Forms.Label label9;
    206335    private System.Windows.Forms.Label label3;
     336    private System.Windows.Forms.Label label4;
     337    private System.Windows.Forms.ComboBox regressionTypeComboBox;
     338    private System.Windows.Forms.GroupBox regressionGroupBox;
     339    private System.Windows.Forms.TextBox regressionLegendTextBox;
     340    private System.Windows.Forms.NumericUpDown polynomialRegressionOrderNumericUpDown;
     341    private System.Windows.Forms.Label orderLabel;
     342    private System.Windows.Forms.ToolTip toolTip;
     343    private System.Windows.Forms.CheckBox isRegressionVisibleInLegendCheckBox;
     344    private System.Windows.Forms.Button clearColorButton;
    207345  }
    208346}
Note: See TracChangeset for help on using the changeset viewer.