Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
05/17/17 13:22:51 (8 years ago)
Author:
pfleck
Message:

#2709

  • Added Legend order when grouping for histogram and (single and multi)scatterplot.
  • Removed the limitation of distinct values for the singlescatterplot (for the color gradient).
  • Added a legend-visible checkbox for the multi-scatterplot.
File:
1 edited

Legend:

Unmodified
Added
Removed

  • branches/DataPreprocessing Enhancements/HeuristicLab.DataPreprocessing.Views/3.4/HistogramView.Designer.cs

    r14583 r14993  
    4545    /// </summary>
    4646    private void InitializeComponent() {
     47      this.components = new System.ComponentModel.Container();
    4748      this.optionsBox = new System.Windows.Forms.GroupBox();
    48       this.label2 = new System.Windows.Forms.Label();
    49       this.label1 = new System.Windows.Forms.Label();
     49      this.groupingTableLayoutPanel = new System.Windows.Forms.TableLayoutPanel();
     50      this.variableLabel = new System.Windows.Forms.Label();
     51      this.orderLabel = new System.Windows.Forms.Label();
     52      this.aggregationLabel = new System.Windows.Forms.Label();
     53      this.orderComboBox = new System.Windows.Forms.ComboBox();
     54      this.classifierComboBox = new System.Windows.Forms.ComboBox();
    5055      this.aggregationComboBox = new System.Windows.Forms.ComboBox();
    51       this.classifierComboBox = new System.Windows.Forms.ComboBox();
     56      this.toolTip = new System.Windows.Forms.ToolTip(this.components);
    5257      ((System.ComponentModel.ISupportInitialize)(this.splitContainer)).BeginInit();
    5358      this.splitContainer.Panel1.SuspendLayout();
    5459      this.splitContainer.SuspendLayout();
    5560      this.optionsBox.SuspendLayout();
     61      this.groupingTableLayoutPanel.SuspendLayout();
    5662      this.SuspendLayout();
    5763      //
     64      // sizeGroupBox
     65      //
     66      this.sizeGroupBox.Location = new System.Drawing.Point(0, 258);
     67      //
    5868      // splitContainer
    5969      //
    … …  
    6575      // optionsBox
    6676      //
    67       this.optionsBox.Controls.Add(this.label2);
    68       this.optionsBox.Controls.Add(this.label1);
    69       this.optionsBox.Controls.Add(this.aggregationComboBox);
    70       this.optionsBox.Controls.Add(this.classifierComboBox);
     77      this.optionsBox.Controls.Add(this.groupingTableLayoutPanel);
    7178      this.optionsBox.Dock = System.Windows.Forms.DockStyle.Bottom;
    72       this.optionsBox.Location = new System.Drawing.Point(0, 292);
     79      this.optionsBox.Location = new System.Drawing.Point(0, 302);
    7380      this.optionsBox.Name = "optionsBox";
    74       this.optionsBox.Size = new System.Drawing.Size(180, 111);
     81      this.optionsBox.Size = new System.Drawing.Size(180, 101);
    7582      this.optionsBox.TabIndex = 7;
    7683      this.optionsBox.TabStop = false;
    7784      this.optionsBox.Text = "Grouping Options";
    7885      //
    79       // label2
    80       //
    81       this.label2.AutoSize = true;
    82       this.label2.Location = new System.Drawing.Point(2, 61);
    83       this.label2.Name = "label2";
    84       this.label2.Size = new System.Drawing.Size(67, 13);
    85       this.label2.TabIndex = 2;
    86       this.label2.Text = "Aggregation:";
    87       //
    88       // label1
    89       //
    90       this.label1.AutoSize = true;
    91       this.label1.Location = new System.Drawing.Point(3, 15);
    92       this.label1.Name = "label1";
    93       this.label1.Size = new System.Drawing.Size(48, 13);
    94       this.label1.TabIndex = 2;
    95       this.label1.Text = "Variable:";
     86      // groupingTableLayoutPanel
     87      //
     88      this.groupingTableLayoutPanel.ColumnCount = 2;
     89      this.groupingTableLayoutPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
     90      this.groupingTableLayoutPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F));
     91      this.groupingTableLayoutPanel.Controls.Add(this.variableLabel, 0, 0);
     92      this.groupingTableLayoutPanel.Controls.Add(this.orderLabel, 0, 2);
     93      this.groupingTableLayoutPanel.Controls.Add(this.aggregationLabel, 0, 1);
     94      this.groupingTableLayoutPanel.Controls.Add(this.orderComboBox, 1, 2);
     95      this.groupingTableLayoutPanel.Controls.Add(this.classifierComboBox, 1, 0);
     96      this.groupingTableLayoutPanel.Controls.Add(this.aggregationComboBox, 1, 1);
     97      this.groupingTableLayoutPanel.Dock = System.Windows.Forms.DockStyle.Fill;
     98      this.groupingTableLayoutPanel.Location = new System.Drawing.Point(3, 16);
     99      this.groupingTableLayoutPanel.Name = "groupingTableLayoutPanel";
     100      this.groupingTableLayoutPanel.RowCount = 3;
     101      this.groupingTableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle());
     102      this.groupingTableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle());
     103      this.groupingTableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle());
     104      this.groupingTableLayoutPanel.Size = new System.Drawing.Size(174, 82);
     105      this.groupingTableLayoutPanel.TabIndex = 3;
     106      //
     107      // variableLabel
     108      //
     109      this.variableLabel.AutoSize = true;
     110      this.variableLabel.Dock = System.Windows.Forms.DockStyle.Fill;
     111      this.variableLabel.Location = new System.Drawing.Point(3, 0);
     112      this.variableLabel.Name = "variableLabel";
     113      this.variableLabel.Size = new System.Drawing.Size(48, 27);
     114      this.variableLabel.TabIndex = 2;
     115      this.variableLabel.Text = "Variable:";
     116      this.variableLabel.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
     117      //
     118      // orderLabel
     119      //
     120      this.orderLabel.AutoSize = true;
     121      this.orderLabel.Dock = System.Windows.Forms.DockStyle.Fill;
     122      this.orderLabel.Location = new System.Drawing.Point(3, 54);
     123      this.orderLabel.Name = "orderLabel";
     124      this.orderLabel.Size = new System.Drawing.Size(48, 28);
     125      this.orderLabel.TabIndex = 2;
     126      this.orderLabel.Text = "Order:";
     127      this.orderLabel.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
     128      this.toolTip.SetToolTip(this.orderLabel, "Order of Legend Entries");
     129      //
     130      // aggregationLabel
     131      //
     132      this.aggregationLabel.AutoSize = true;
     133      this.aggregationLabel.Dock = System.Windows.Forms.DockStyle.Fill;
     134      this.aggregationLabel.Location = new System.Drawing.Point(3, 27);
     135      this.aggregationLabel.Name = "aggregationLabel";
     136      this.aggregationLabel.Size = new System.Drawing.Size(48, 27);
     137      this.aggregationLabel.TabIndex = 2;
     138      this.aggregationLabel.Text = "Aggr.:";
     139      this.aggregationLabel.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
     140      this.toolTip.SetToolTip(this.aggregationLabel, "Aggregation");
     141      //
     142      // orderComboBox
     143      //
     144      this.orderComboBox.Dock = System.Windows.Forms.DockStyle.Fill;
     145      this.orderComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
     146      this.orderComboBox.FormattingEnabled = true;
     147      this.orderComboBox.Location = new System.Drawing.Point(57, 57);
     148      this.orderComboBox.Name = "orderComboBox";
     149      this.orderComboBox.Size = new System.Drawing.Size(114, 21);
     150      this.orderComboBox.TabIndex = 1;
     151      this.orderComboBox.SelectedIndexChanged += new System.EventHandler(this.orderComboBox_SelectedIndexChanged);
     152      //
     153      // classifierComboBox
     154      //
     155      this.classifierComboBox.Dock = System.Windows.Forms.DockStyle.Fill;
     156      this.classifierComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
     157      this.classifierComboBox.FormattingEnabled = true;
     158      this.classifierComboBox.Location = new System.Drawing.Point(57, 3);
     159      this.classifierComboBox.Name = "classifierComboBox";
     160      this.classifierComboBox.Size = new System.Drawing.Size(114, 21);
     161      this.classifierComboBox.TabIndex = 1;
     162      this.classifierComboBox.SelectedIndexChanged += new System.EventHandler(this.classifierComboBox_SelectedIndexChanged);
    96163      //
    97164      // aggregationComboBox
    98165      //
    99       this.aggregationComboBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    100             | System.Windows.Forms.AnchorStyles.Right)));
     166      this.aggregationComboBox.Dock = System.Windows.Forms.DockStyle.Fill;
    101167      this.aggregationComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
    102168      this.aggregationComboBox.FormattingEnabled = true;
    103       this.aggregationComboBox.Location = new System.Drawing.Point(5, 79);
     169      this.aggregationComboBox.Location = new System.Drawing.Point(57, 30);
    104170      this.aggregationComboBox.Name = "aggregationComboBox";
    105       this.aggregationComboBox.Size = new System.Drawing.Size(169, 21);
     171      this.aggregationComboBox.Size = new System.Drawing.Size(114, 21);
    106172      this.aggregationComboBox.TabIndex = 1;
    107173      this.aggregationComboBox.SelectedIndexChanged += new System.EventHandler(this.aggregationComboBox_SelectedIndexChanged);
    108       //
    109       // classifierComboBox
    110       //
    111       this.classifierComboBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    112             | System.Windows.Forms.AnchorStyles.Right)));
    113       this.classifierComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
    114       this.classifierComboBox.FormattingEnabled = true;
    115       this.classifierComboBox.Location = new System.Drawing.Point(5, 33);
    116       this.classifierComboBox.Name = "classifierComboBox";
    117       this.classifierComboBox.Size = new System.Drawing.Size(169, 21);
    118       this.classifierComboBox.TabIndex = 1;
    119       this.classifierComboBox.SelectedIndexChanged += new System.EventHandler(this.classifierComboBox_SelectedIndexChanged);
    120174      //
    121175      // HistogramView
    … …  
    129183      this.splitContainer.ResumeLayout(false);
    130184      this.optionsBox.ResumeLayout(false);
    131       this.optionsBox.PerformLayout();
     185      this.groupingTableLayoutPanel.ResumeLayout(false);
     186      this.groupingTableLayoutPanel.PerformLayout();
    132187      this.ResumeLayout(false);
    133188
    … …  
    138193    private System.Windows.Forms.GroupBox optionsBox;
    139194    private System.Windows.Forms.ComboBox classifierComboBox;
    140     private System.Windows.Forms.Label label1;
    141     private System.Windows.Forms.Label label2;
     195    private System.Windows.Forms.Label variableLabel;
     196    private System.Windows.Forms.Label aggregationLabel;
    142197    private System.Windows.Forms.ComboBox aggregationComboBox;
     198    private System.Windows.Forms.TableLayoutPanel groupingTableLayoutPanel;
     199    private System.Windows.Forms.Label orderLabel;
     200    private System.Windows.Forms.ComboBox orderComboBox;
     201    private System.Windows.Forms.ToolTip toolTip;
    143202  }
    144203}
Note: See TracChangeset for help on using the changeset viewer.