Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
04/16/11 11:48:21 (13 years ago)
Author:
abeham
Message:

#1465

  • added sorting of series to move them back and forth
    • the implementation currently is quite memory intensive in that all data rows are cloned, the collection is cleared and then they're readded in the correct order. Since the underlying collection is a collection and not a list I don't have the possibilities to insert them.
  • fixed histogram configuration
  • added a crude check if there are incompatibilities with bars
File:
1 edited

Legend:

Unmodified
Added
Removed

  • branches/histogram/HeuristicLab.Analysis.Views/3.3/DataRowVisualPropertiesControl.Designer.cs

    r6014 r6016  
    5454      this.label3 = new System.Windows.Forms.Label();
    5555      this.commonGroupBox = new System.Windows.Forms.GroupBox();
     56      this.axisGroupBox = new System.Windows.Forms.GroupBox();
     57      this.label5 = new System.Windows.Forms.Label();
     58      this.label6 = new System.Windows.Forms.Label();
     59      this.panel1 = new System.Windows.Forms.Panel();
     60      this.yAxisSecondaryRadioButton = new System.Windows.Forms.RadioButton();
     61      this.yAxisPrimaryRadioButton = new System.Windows.Forms.RadioButton();
    5662      this.panel2 = new System.Windows.Forms.Panel();
    5763      this.xAxisPrimaryRadioButton = new System.Windows.Forms.RadioButton();
    5864      this.xAxisSecondaryRadioButton = new System.Windows.Forms.RadioButton();
    59       this.panel1 = new System.Windows.Forms.Panel();
    60       this.yAxisSecondaryRadioButton = new System.Windows.Forms.RadioButton();
    61       this.yAxisPrimaryRadioButton = new System.Windows.Forms.RadioButton();
    62       this.label6 = new System.Windows.Forms.Label();
    6365      this.histoGramGroupBox = new System.Windows.Forms.GroupBox();
    6466      this.panel3 = new System.Windows.Forms.Panel();
    … …  
    7173      this.lineStyleComboBox = new System.Windows.Forms.ComboBox();
    7274      this.label8 = new System.Windows.Forms.Label();
    73       this.label5 = new System.Windows.Forms.Label();
    74       this.axisGroupBox = new System.Windows.Forms.GroupBox();
    7575      ((System.ComponentModel.ISupportInitialize)(this.binsNumericUpDown)).BeginInit();
    7676      this.commonGroupBox.SuspendLayout();
     77      this.axisGroupBox.SuspendLayout();
     78      this.panel1.SuspendLayout();
    7779      this.panel2.SuspendLayout();
    78       this.panel1.SuspendLayout();
    7980      this.histoGramGroupBox.SuspendLayout();
    8081      this.panel3.SuspendLayout();
    8182      this.lineChartGroupBox.SuspendLayout();
    8283      ((System.ComponentModel.ISupportInitialize)(this.lineWidthNumericUpDown)).BeginInit();
    83       this.axisGroupBox.SuspendLayout();
    8484      this.SuspendLayout();
    8585      //
    … …  
    180180      this.commonGroupBox.Text = "Common";
    181181      //
     182      // axisGroupBox
     183      //
     184      this.axisGroupBox.Controls.Add(this.label5);
     185      this.axisGroupBox.Controls.Add(this.label6);
     186      this.axisGroupBox.Controls.Add(this.panel1);
     187      this.axisGroupBox.Controls.Add(this.panel2);
     188      this.axisGroupBox.Location = new System.Drawing.Point(6, 75);
     189      this.axisGroupBox.Name = "axisGroupBox";
     190      this.axisGroupBox.Size = new System.Drawing.Size(299, 75);
     191      this.axisGroupBox.TabIndex = 9;
     192      this.axisGroupBox.TabStop = false;
     193      this.axisGroupBox.Text = "Display Data on";
     194      //
     195      // label5
     196      //
     197      this.label5.AutoSize = true;
     198      this.label5.Location = new System.Drawing.Point(6, 46);
     199      this.label5.Name = "label5";
     200      this.label5.Size = new System.Drawing.Size(39, 13);
     201      this.label5.TabIndex = 6;
     202      this.label5.Text = "Y Axis:";
     203      //
     204      // label6
     205      //
     206      this.label6.AutoSize = true;
     207      this.label6.Location = new System.Drawing.Point(6, 22);
     208      this.label6.Name = "label6";
     209      this.label6.Size = new System.Drawing.Size(39, 13);
     210      this.label6.TabIndex = 6;
     211      this.label6.Text = "X Axis:";
     212      //
     213      // panel1
     214      //
     215      this.panel1.Controls.Add(this.yAxisSecondaryRadioButton);
     216      this.panel1.Controls.Add(this.yAxisPrimaryRadioButton);
     217      this.panel1.Location = new System.Drawing.Point(63, 40);
     218      this.panel1.Name = "panel1";
     219      this.panel1.Size = new System.Drawing.Size(231, 25);
     220      this.panel1.TabIndex = 5;
     221      //
     222      // yAxisSecondaryRadioButton
     223      //
     224      this.yAxisSecondaryRadioButton.AutoSize = true;
     225      this.yAxisSecondaryRadioButton.Location = new System.Drawing.Point(70, 4);
     226      this.yAxisSecondaryRadioButton.Name = "yAxisSecondaryRadioButton";
     227      this.yAxisSecondaryRadioButton.Size = new System.Drawing.Size(76, 17);
     228      this.yAxisSecondaryRadioButton.TabIndex = 1;
     229      this.yAxisSecondaryRadioButton.TabStop = true;
     230      this.yAxisSecondaryRadioButton.Text = "Secondary";
     231      this.yAxisSecondaryRadioButton.UseVisualStyleBackColor = true;
     232      this.yAxisSecondaryRadioButton.CheckedChanged += new System.EventHandler(this.yAxisRadioButton_CheckedChanged);
     233      //
     234      // yAxisPrimaryRadioButton
     235      //
     236      this.yAxisPrimaryRadioButton.AutoSize = true;
     237      this.yAxisPrimaryRadioButton.Location = new System.Drawing.Point(4, 4);
     238      this.yAxisPrimaryRadioButton.Name = "yAxisPrimaryRadioButton";
     239      this.yAxisPrimaryRadioButton.Size = new System.Drawing.Size(59, 17);
     240      this.yAxisPrimaryRadioButton.TabIndex = 0;
     241      this.yAxisPrimaryRadioButton.TabStop = true;
     242      this.yAxisPrimaryRadioButton.Text = "Primary";
     243      this.yAxisPrimaryRadioButton.UseVisualStyleBackColor = true;
     244      this.yAxisPrimaryRadioButton.CheckedChanged += new System.EventHandler(this.yAxisRadioButton_CheckedChanged);
     245      //
    182246      // panel2
    183247      //
    … …  
    212276      this.xAxisSecondaryRadioButton.UseVisualStyleBackColor = true;
    213277      this.xAxisSecondaryRadioButton.CheckedChanged += new System.EventHandler(this.xAxisRadioButton_CheckedChanged);
    214       //
    215       // panel1
    216       //
    217       this.panel1.Controls.Add(this.yAxisSecondaryRadioButton);
    218       this.panel1.Controls.Add(this.yAxisPrimaryRadioButton);
    219       this.panel1.Location = new System.Drawing.Point(63, 40);
    220       this.panel1.Name = "panel1";
    221       this.panel1.Size = new System.Drawing.Size(231, 25);
    222       this.panel1.TabIndex = 5;
    223       //
    224       // yAxisSecondaryRadioButton
    225       //
    226       this.yAxisSecondaryRadioButton.AutoSize = true;
    227       this.yAxisSecondaryRadioButton.Location = new System.Drawing.Point(70, 4);
    228       this.yAxisSecondaryRadioButton.Name = "yAxisSecondaryRadioButton";
    229       this.yAxisSecondaryRadioButton.Size = new System.Drawing.Size(76, 17);
    230       this.yAxisSecondaryRadioButton.TabIndex = 1;
    231       this.yAxisSecondaryRadioButton.TabStop = true;
    232       this.yAxisSecondaryRadioButton.Text = "Secondary";
    233       this.yAxisSecondaryRadioButton.UseVisualStyleBackColor = true;
    234       this.yAxisSecondaryRadioButton.CheckedChanged += new System.EventHandler(this.yAxisRadioButton_CheckedChanged);
    235       //
    236       // yAxisPrimaryRadioButton
    237       //
    238       this.yAxisPrimaryRadioButton.AutoSize = true;
    239       this.yAxisPrimaryRadioButton.Location = new System.Drawing.Point(4, 4);
    240       this.yAxisPrimaryRadioButton.Name = "yAxisPrimaryRadioButton";
    241       this.yAxisPrimaryRadioButton.Size = new System.Drawing.Size(59, 17);
    242       this.yAxisPrimaryRadioButton.TabIndex = 0;
    243       this.yAxisPrimaryRadioButton.TabStop = true;
    244       this.yAxisPrimaryRadioButton.Text = "Primary";
    245       this.yAxisPrimaryRadioButton.UseVisualStyleBackColor = true;
    246       this.yAxisPrimaryRadioButton.CheckedChanged += new System.EventHandler(this.yAxisRadioButton_CheckedChanged);
    247       //
    248       // label6
    249       //
    250       this.label6.AutoSize = true;
    251       this.label6.Location = new System.Drawing.Point(6, 22);
    252       this.label6.Name = "label6";
    253       this.label6.Size = new System.Drawing.Size(39, 13);
    254       this.label6.TabIndex = 6;
    255       this.label6.Text = "X Axis:";
    256278      //
    257279      // histoGramGroupBox
    … …  
    288310      this.binsApproximatelyRadioButton.Text = "Approximately";
    289311      this.binsApproximatelyRadioButton.UseVisualStyleBackColor = true;
    290       this.binsApproximatelyRadioButton.CheckedChanged += new System.EventHandler(this.yAxisRadioButton_CheckedChanged);
     312      this.binsApproximatelyRadioButton.CheckedChanged += new System.EventHandler(this.binNumberRadioButton_CheckedChanged);
    291313      //
    292314      // binsExactRadioButton
    … …  
    300322      this.binsExactRadioButton.Text = "Exact";
    301323      this.binsExactRadioButton.UseVisualStyleBackColor = true;
    302       this.binsExactRadioButton.CheckedChanged += new System.EventHandler(this.yAxisRadioButton_CheckedChanged);
     324      this.binsExactRadioButton.CheckedChanged += new System.EventHandler(this.binNumberRadioButton_CheckedChanged);
    303325      //
    304326      // lineChartGroupBox
    … …  
    374396      this.label8.Text = "Line Style:";
    375397      //
    376       // label5
    377       //
    378       this.label5.AutoSize = true;
    379       this.label5.Location = new System.Drawing.Point(6, 46);
    380       this.label5.Name = "label5";
    381       this.label5.Size = new System.Drawing.Size(39, 13);
    382       this.label5.TabIndex = 6;
    383       this.label5.Text = "Y Axis:";
    384       //
    385       // axisGroupBox
    386       //
    387       this.axisGroupBox.Controls.Add(this.label5);
    388       this.axisGroupBox.Controls.Add(this.label6);
    389       this.axisGroupBox.Controls.Add(this.panel1);
    390       this.axisGroupBox.Controls.Add(this.panel2);
    391       this.axisGroupBox.Location = new System.Drawing.Point(6, 75);
    392       this.axisGroupBox.Name = "axisGroupBox";
    393       this.axisGroupBox.Size = new System.Drawing.Size(299, 75);
    394       this.axisGroupBox.TabIndex = 9;
    395       this.axisGroupBox.TabStop = false;
    396       this.axisGroupBox.Text = "Display Data on";
    397       //
    398398      // DataRowVisualPropertiesControl
    399399      //
    … …  
    408408      this.commonGroupBox.ResumeLayout(false);
    409409      this.commonGroupBox.PerformLayout();
     410      this.axisGroupBox.ResumeLayout(false);
     411      this.axisGroupBox.PerformLayout();
     412      this.panel1.ResumeLayout(false);
     413      this.panel1.PerformLayout();
    410414      this.panel2.ResumeLayout(false);
    411415      this.panel2.PerformLayout();
    412       this.panel1.ResumeLayout(false);
    413       this.panel1.PerformLayout();
    414416      this.histoGramGroupBox.ResumeLayout(false);
    415417      this.histoGramGroupBox.PerformLayout();
    … …  
    419421      this.lineChartGroupBox.PerformLayout();
    420422      ((System.ComponentModel.ISupportInitialize)(this.lineWidthNumericUpDown)).EndInit();
    421       this.axisGroupBox.ResumeLayout(false);
    422       this.axisGroupBox.PerformLayout();
    423423      this.ResumeLayout(false);
    424424
Note: See TracChangeset for help on using the changeset viewer.