Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
06/27/17 10:06:34 (7 years ago)
Author:
pfleck
Message:

#2715 Moved the histogram properties (nr of bins, exact/approximate bins, aggregation) from DataRowVisualProperties to DataTableVisualProperties

  • Adapted DataRow/TableVisualPropertiesControl
  • Backwards compatability is handled in the DataTable (DataTableVisualProperties has no access to the DataRowVisualProperties)
File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/sources/HeuristicLab.Analysis.Views/3.3/DataRowVisualPropertiesControl.Designer.cs

    r14582 r15068  
    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();
    5654      this.clearColorButton = new System.Windows.Forms.Button();
    … …  
    6866      this.label6 = new System.Windows.Forms.Label();
    6967      this.label9 = new System.Windows.Forms.Label();
    70       this.histoGramGroupBox = new System.Windows.Forms.GroupBox();
    71       this.binsExactRadioButton = new System.Windows.Forms.RadioButton();
    72       this.binsApproximatelyRadioButton = new System.Windows.Forms.RadioButton();
    73       this.label11 = new System.Windows.Forms.Label();
    74       this.aggregationComboBox = new System.Windows.Forms.ComboBox();
    7568      this.lineChartGroupBox = new System.Windows.Forms.GroupBox();
    7669      this.lineWidthNumericUpDown = new System.Windows.Forms.NumericUpDown();
    … …  
    7972      this.lineStyleComboBox = new System.Windows.Forms.ComboBox();
    8073      this.label8 = new System.Windows.Forms.Label();
    81       ((System.ComponentModel.ISupportInitialize)(this.binsNumericUpDown)).BeginInit();
    8274      this.commonGroupBox.SuspendLayout();
    8375      this.axisGroupBox.SuspendLayout();
    8476      this.panel2.SuspendLayout();
    8577      this.panel1.SuspendLayout();
    86       this.histoGramGroupBox.SuspendLayout();
    8778      this.lineChartGroupBox.SuspendLayout();
    8879      ((System.ComponentModel.ISupportInitialize)(this.lineWidthNumericUpDown)).BeginInit();
    … …  
    9182      // chartTypeComboBox
    9283      //
    93       this.chartTypeComboBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
     84      this.chartTypeComboBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
    9485            | System.Windows.Forms.AnchorStyles.Right)));
    9586      this.chartTypeComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
    … …  
    126117      this.startIndexZeroCheckBox.CheckedChanged += new System.EventHandler(this.startIndexZeroCheckBox_CheckedChanged);
    127118      //
    128       // binsNumericUpDown
    129       //
    130       this.binsNumericUpDown.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    131             | System.Windows.Forms.AnchorStyles.Right)));
    132       this.binsNumericUpDown.Location = new System.Drawing.Point(82, 19);
    133       this.binsNumericUpDown.Minimum = new decimal(new int[] {
    134             1,
    135             0,
    136             0,
    137             0});
    138       this.binsNumericUpDown.Name = "binsNumericUpDown";
    139       this.binsNumericUpDown.Size = new System.Drawing.Size(72, 20);
    140       this.binsNumericUpDown.TabIndex = 1;
    141       this.binsNumericUpDown.Value = new decimal(new int[] {
    142             1,
    143             0,
    144             0,
    145             0});
    146       this.binsNumericUpDown.ValueChanged += new System.EventHandler(this.binsNumericUpDown_ValueChanged);
    147       //
    148119      // label1
    149120      //
    … …  
    164135      this.label2.Text = "&Color:";
    165136      //
    166       // label3
    167       //
    168       this.label3.AutoSize = true;
    169       this.label3.Location = new System.Drawing.Point(6, 21);
    170       this.label3.Name = "label3";
    171       this.label3.Size = new System.Drawing.Size(30, 13);
    172       this.label3.TabIndex = 0;
    173       this.label3.Text = "&Bins:";
    174       //
    175137      // commonGroupBox
    176138      //
    177       this.commonGroupBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
     139      this.commonGroupBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
    178140            | System.Windows.Forms.AnchorStyles.Right)));
    179141      this.commonGroupBox.Controls.Add(this.clearColorButton);
    … …  
    232194      // displayNameTextBox
    233195      //
    234       this.displayNameTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
     196      this.displayNameTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
    235197            | System.Windows.Forms.AnchorStyles.Right)));
    236198      this.displayNameTextBox.Location = new System.Drawing.Point(102, 19);
    … …  
    242204      // axisGroupBox
    243205      //
    244       this.axisGroupBox.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
    245             | System.Windows.Forms.AnchorStyles.Left)
     206      this.axisGroupBox.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
     207            | System.Windows.Forms.AnchorStyles.Left) 
    246208            | System.Windows.Forms.AnchorStyles.Right)));
    247209      this.axisGroupBox.Controls.Add(this.panel2);
    … …  
    258220      // panel2
    259221      //
    260       this.panel2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
     222      this.panel2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
    261223            | System.Windows.Forms.AnchorStyles.Right)));
    262224      this.panel2.Controls.Add(this.yAxisSecondaryRadioButton);
    … …  
    293255      // panel1
    294256      //
    295       this.panel1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
     257      this.panel1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
    296258            | System.Windows.Forms.AnchorStyles.Right)));
    297259      this.panel1.Controls.Add(this.xAxisPrimaryRadioButton);
    … …  
    353315      this.label9.Text = "&Name:";
    354316      //
    355       // histoGramGroupBox
    356       //
    357       this.histoGramGroupBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    358             | System.Windows.Forms.AnchorStyles.Right)));
    359       this.histoGramGroupBox.Controls.Add(this.binsExactRadioButton);
    360       this.histoGramGroupBox.Controls.Add(this.binsApproximatelyRadioButton);
    361       this.histoGramGroupBox.Controls.Add(this.binsNumericUpDown);
    362       this.histoGramGroupBox.Controls.Add(this.label11);
    363       this.histoGramGroupBox.Controls.Add(this.label3);
    364       this.histoGramGroupBox.Controls.Add(this.aggregationComboBox);
    365       this.histoGramGroupBox.Location = new System.Drawing.Point(0, 305);
    366       this.histoGramGroupBox.Name = "histoGramGroupBox";
    367       this.histoGramGroupBox.Size = new System.Drawing.Size(327, 75);
    368       this.histoGramGroupBox.TabIndex = 2;
    369       this.histoGramGroupBox.TabStop = false;
    370       this.histoGramGroupBox.Text = "Histogram Properties";
    371       //
    372       // binsExactRadioButton
    373       //
    374       this.binsExactRadioButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
    375       this.binsExactRadioButton.AutoSize = true;
    376       this.binsExactRadioButton.Location = new System.Drawing.Point(269, 19);
    377       this.binsExactRadioButton.Name = "binsExactRadioButton";
    378       this.binsExactRadioButton.Size = new System.Drawing.Size(52, 17);
    379       this.binsExactRadioButton.TabIndex = 3;
    380       this.binsExactRadioButton.TabStop = true;
    381       this.binsExactRadioButton.Text = "&Exact";
    382       this.binsExactRadioButton.UseVisualStyleBackColor = true;
    383       this.binsExactRadioButton.CheckedChanged += new System.EventHandler(this.binNumberRadioButton_CheckedChanged);
    384       //
    385       // binsApproximatelyRadioButton
    386       //
    387       this.binsApproximatelyRadioButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
    388       this.binsApproximatelyRadioButton.AutoSize = true;
    389       this.binsApproximatelyRadioButton.Location = new System.Drawing.Point(173, 19);
    390       this.binsApproximatelyRadioButton.Name = "binsApproximatelyRadioButton";
    391       this.binsApproximatelyRadioButton.Size = new System.Drawing.Size(90, 17);
    392       this.binsApproximatelyRadioButton.TabIndex = 2;
    393       this.binsApproximatelyRadioButton.TabStop = true;
    394       this.binsApproximatelyRadioButton.Text = "&Approximately";
    395       this.binsApproximatelyRadioButton.UseVisualStyleBackColor = true;
    396       this.binsApproximatelyRadioButton.CheckedChanged += new System.EventHandler(this.binNumberRadioButton_CheckedChanged);
    397       //
    398       // label11
    399       //
    400       this.label11.AutoSize = true;
    401       this.label11.Location = new System.Drawing.Point(6, 49);
    402       this.label11.Name = "label11";
    403       this.label11.Size = new System.Drawing.Size(67, 13);
    404       this.label11.TabIndex = 0;
    405       this.label11.Text = "Aggregation:";
    406       //
    407       // aggregationComboBox
    408       //
    409       this.aggregationComboBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    410             | System.Windows.Forms.AnchorStyles.Right)));
    411       this.aggregationComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
    412       this.aggregationComboBox.FormattingEnabled = true;
    413       this.aggregationComboBox.Location = new System.Drawing.Point(82, 45);
    414       this.aggregationComboBox.Name = "aggregationComboBox";
    415       this.aggregationComboBox.Size = new System.Drawing.Size(239, 21);
    416       this.aggregationComboBox.TabIndex = 3;
    417       this.aggregationComboBox.SelectedValueChanged += new System.EventHandler(this.aggregationComboBox_SelectedValueChanged);
    418       //
    419317      // lineChartGroupBox
    420318      //
    421       this.lineChartGroupBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
     319      this.lineChartGroupBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
    422320            | System.Windows.Forms.AnchorStyles.Right)));
    423321      this.lineChartGroupBox.Controls.Add(this.lineWidthNumericUpDown);
    … …  
    436334      // lineWidthNumericUpDown
    437335      //
    438       this.lineWidthNumericUpDown.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
     336      this.lineWidthNumericUpDown.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
    439337            | System.Windows.Forms.AnchorStyles.Right)));
    440338      this.lineWidthNumericUpDown.Location = new System.Drawing.Point(82, 66);
    … …  
    474372      // lineStyleComboBox
    475373      //
    476       this.lineStyleComboBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
     374      this.lineStyleComboBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
    477375            | System.Windows.Forms.AnchorStyles.Right)));
    478376      this.lineStyleComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
    … …  
    497395      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
    498396      this.Controls.Add(this.lineChartGroupBox);
    499       this.Controls.Add(this.histoGramGroupBox);
    500397      this.Controls.Add(this.commonGroupBox);
    501398      this.Name = "DataRowVisualPropertiesControl";
    502       this.Size = new System.Drawing.Size(327, 382);
    503       ((System.ComponentModel.ISupportInitialize)(this.binsNumericUpDown)).EndInit();
     399      this.Size = new System.Drawing.Size(327, 300);
    504400      this.commonGroupBox.ResumeLayout(false);
    505401      this.commonGroupBox.PerformLayout();
    … …  
    510406      this.panel1.ResumeLayout(false);
    511407      this.panel1.PerformLayout();
    512       this.histoGramGroupBox.ResumeLayout(false);
    513       this.histoGramGroupBox.PerformLayout();
    514408      this.lineChartGroupBox.ResumeLayout(false);
    515409      this.lineChartGroupBox.PerformLayout();
    … …  
    525419    private System.Windows.Forms.Button colorButton;
    526420    private System.Windows.Forms.CheckBox startIndexZeroCheckBox;
    527     private System.Windows.Forms.NumericUpDown binsNumericUpDown;
    528421    private System.Windows.Forms.Label label1;
    529422    private System.Windows.Forms.Label label2;
    530     private System.Windows.Forms.Label label3;
    531423    private System.Windows.Forms.GroupBox commonGroupBox;
    532     private System.Windows.Forms.GroupBox histoGramGroupBox;
    533424    private System.Windows.Forms.RadioButton xAxisSecondaryRadioButton;
    534425    private System.Windows.Forms.RadioButton yAxisSecondaryRadioButton;
    … …  
    540431    private System.Windows.Forms.Label label4;
    541432    private System.Windows.Forms.Label label7;
    542     private System.Windows.Forms.RadioButton binsExactRadioButton;
    543     private System.Windows.Forms.RadioButton binsApproximatelyRadioButton;
    544433    private System.Windows.Forms.ComboBox lineStyleComboBox;
    545434    private System.Windows.Forms.Label label8;
    … …  
    552441    private System.Windows.Forms.Label label10;
    553442    private System.Windows.Forms.CheckBox isVisibleInLegendCheckBox;
    554     private System.Windows.Forms.Label label11;
    555     private System.Windows.Forms.ComboBox aggregationComboBox;
    556443    private System.Windows.Forms.Button clearColorButton;
    557444  }
Note: See TracChangeset for help on using the changeset viewer.