Changeset 15210


Ignore:
Timestamp:
07/12/17 15:45:31 (3 months ago)
Author:
pfleck
Message:

#2709 Fixed some small issues and some default behavior.

Location:
trunk/sources
Files:
13 edited

Legend:

Unmodified
Added
Removed
  • trunk/sources/HeuristicLab.DataPreprocessing.Views/3.4/DataGridContentView.Designer.cs

    r15110 r15210  
    9999      // statisticsTextBox
    100100      //
    101       this.statisticsTextBox.Size = new System.Drawing.Size(1133, 13);
     101      this.statisticsTextBox.Size = new System.Drawing.Size(421, 13);
    102102      //
    103103      // btnApplySort
  • trunk/sources/HeuristicLab.DataPreprocessing.Views/3.4/FilterView.Designer.cs

    r14185 r15210  
    6262      this.label2 = new System.Windows.Forms.Label();
    6363      this.label3 = new System.Windows.Forms.Label();
     64      this.bottomPanel = new System.Windows.Forms.Panel();
    6465      this.groupBoxFilter.SuspendLayout();
    6566      this.groupBoxFilterInfo.SuspendLayout();
    6667      this.groupBox1.SuspendLayout();
     68      this.bottomPanel.SuspendLayout();
    6769      this.SuspendLayout();
    6870      //
    6971      // groupBoxFilter
    7072      //
    71       this.groupBoxFilter.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
     73      this.groupBoxFilter.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
    7274            | System.Windows.Forms.AnchorStyles.Right)));
    7375      this.groupBoxFilter.Controls.Add(this.checkedFilterView);
     
    9395      // groupBoxFilterInfo
    9496      //
    95       this.groupBoxFilterInfo.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
     97      this.groupBoxFilterInfo.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
    9698            | System.Windows.Forms.AnchorStyles.Right)));
    9799      this.groupBoxFilterInfo.Controls.Add(this.lblPercentage);
     
    103105      this.groupBoxFilterInfo.Location = new System.Drawing.Point(4, 337);
    104106      this.groupBoxFilterInfo.Name = "groupBoxFilterInfo";
    105       this.groupBoxFilterInfo.Size = new System.Drawing.Size(659, 102);
     107      this.groupBoxFilterInfo.Size = new System.Drawing.Size(658, 102);
    106108      this.groupBoxFilterInfo.TabIndex = 1;
    107109      this.groupBoxFilterInfo.TabStop = false;
     
    119121      // tbPercentage
    120122      //
    121       this.tbPercentage.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
     123      this.tbPercentage.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
    122124            | System.Windows.Forms.AnchorStyles.Right)));
    123125      this.tbPercentage.Enabled = false;
    124126      this.tbPercentage.Location = new System.Drawing.Point(104, 71);
    125127      this.tbPercentage.Name = "tbPercentage";
    126       this.tbPercentage.Size = new System.Drawing.Size(549, 20);
     128      this.tbPercentage.Size = new System.Drawing.Size(548, 20);
    127129      this.tbPercentage.TabIndex = 10;
    128130      //
    129       // tbFiltered
    130       //
    131       this.tbRemaining.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
     131      // tbRemaining
     132      //
     133      this.tbRemaining.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
    132134            | System.Windows.Forms.AnchorStyles.Right)));
    133135      this.tbRemaining.Enabled = false;
    134136      this.tbRemaining.Location = new System.Drawing.Point(104, 45);
    135137      this.tbRemaining.Name = "tbRemaining";
    136       this.tbRemaining.Size = new System.Drawing.Size(549, 20);
     138      this.tbRemaining.Size = new System.Drawing.Size(548, 20);
    137139      this.tbRemaining.TabIndex = 9;
    138140      //
    139       // lblFiltered
     141      // lblRemaining
    140142      //
    141143      this.lblRemaining.AutoSize = true;
     
    148150      // tbTotal
    149151      //
    150       this.tbTotal.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
     152      this.tbTotal.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
    151153            | System.Windows.Forms.AnchorStyles.Right)));
    152154      this.tbTotal.Enabled = false;
    153155      this.tbTotal.Location = new System.Drawing.Point(104, 19);
    154156      this.tbTotal.Name = "tbTotal";
    155       this.tbTotal.Size = new System.Drawing.Size(549, 20);
     157      this.tbTotal.Size = new System.Drawing.Size(548, 20);
    156158      this.tbTotal.TabIndex = 7;
    157159      //
     
    167169      // applyFilterButton
    168170      //
    169       this.applyFilterButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
     171      this.applyFilterButton.Anchor = System.Windows.Forms.AnchorStyles.Right;
    170172      this.applyFilterButton.Cursor = System.Windows.Forms.Cursors.Default;
    171173      this.applyFilterButton.Enabled = false;
    172       this.applyFilterButton.Location = new System.Drawing.Point(554, 628);
     174      this.applyFilterButton.Location = new System.Drawing.Point(559, 3);
    173175      this.applyFilterButton.Name = "applyFilterButton";
    174176      this.applyFilterButton.Size = new System.Drawing.Size(107, 23);
     
    180182      // rBtnOr
    181183      //
    182       this.rBtnOr.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
     184      this.rBtnOr.Anchor = System.Windows.Forms.AnchorStyles.Left;
    183185      this.rBtnOr.AutoSize = true;
    184186      this.rBtnOr.Cursor = System.Windows.Forms.Cursors.Default;
    185187      this.rBtnOr.Enabled = false;
    186       this.rBtnOr.Location = new System.Drawing.Point(60, 634);
     188      this.rBtnOr.Location = new System.Drawing.Point(53, 6);
    187189      this.rBtnOr.Name = "rBtnOr";
    188190      this.rBtnOr.Size = new System.Drawing.Size(36, 17);
     
    193195      // rBtnAnd
    194196      //
    195       this.rBtnAnd.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
     197      this.rBtnAnd.Anchor = System.Windows.Forms.AnchorStyles.Left;
    196198      this.rBtnAnd.AutoSize = true;
    197199      this.rBtnAnd.Checked = true;
    198200      this.rBtnAnd.Cursor = System.Windows.Forms.Cursors.Default;
    199201      this.rBtnAnd.Enabled = false;
    200       this.rBtnAnd.Location = new System.Drawing.Point(10, 634);
     202      this.rBtnAnd.Location = new System.Drawing.Point(3, 6);
    201203      this.rBtnAnd.Name = "rBtnAnd";
    202204      this.rBtnAnd.Size = new System.Drawing.Size(44, 17);
     
    209211      // groupBox1
    210212      //
    211       this.groupBox1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
     213      this.groupBox1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
    212214            | System.Windows.Forms.AnchorStyles.Right)));
    213215      this.groupBox1.Controls.Add(this.label4);
     
    215217      this.groupBox1.Controls.Add(this.label2);
    216218      this.groupBox1.Controls.Add(this.label3);
    217       this.groupBox1.Location = new System.Drawing.Point(7, 445);
     219      this.groupBox1.Location = new System.Drawing.Point(4, 445);
    218220      this.groupBox1.Name = "groupBox1";
    219       this.groupBox1.Size = new System.Drawing.Size(659, 130);
     221      this.groupBox1.Size = new System.Drawing.Size(658, 130);
    220222      this.groupBox1.TabIndex = 12;
    221223      this.groupBox1.TabStop = false;
     
    261263      this.label3.Text = "A filter specifies the data rows which should remain.";
    262264      //
     265      // bottomPanel
     266      //
     267      this.bottomPanel.Controls.Add(this.applyFilterButton);
     268      this.bottomPanel.Controls.Add(this.rBtnAnd);
     269      this.bottomPanel.Controls.Add(this.rBtnOr);
     270      this.bottomPanel.Dock = System.Windows.Forms.DockStyle.Bottom;
     271      this.bottomPanel.Location = new System.Drawing.Point(0, 580);
     272      this.bottomPanel.Name = "bottomPanel";
     273      this.bottomPanel.Size = new System.Drawing.Size(670, 30);
     274      this.bottomPanel.TabIndex = 13;
     275      //
    263276      // FilterView
    264277      //
    265278      this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
    266279      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
     280      this.Controls.Add(this.bottomPanel);
    267281      this.Controls.Add(this.groupBox1);
    268       this.Controls.Add(this.rBtnAnd);
    269       this.Controls.Add(this.rBtnOr);
    270       this.Controls.Add(this.applyFilterButton);
    271282      this.Controls.Add(this.groupBoxFilterInfo);
    272283      this.Controls.Add(this.groupBoxFilter);
    273284      this.Name = "FilterView";
    274       this.Size = new System.Drawing.Size(670, 660);
     285      this.Size = new System.Drawing.Size(670, 610);
    275286      this.groupBoxFilter.ResumeLayout(false);
    276287      this.groupBoxFilterInfo.ResumeLayout(false);
     
    278289      this.groupBox1.ResumeLayout(false);
    279290      this.groupBox1.PerformLayout();
     291      this.bottomPanel.ResumeLayout(false);
     292      this.bottomPanel.PerformLayout();
    280293      this.ResumeLayout(false);
    281       this.PerformLayout();
    282294
    283295    }
     
    302314    private System.Windows.Forms.Label label2;
    303315    private System.Windows.Forms.Label label3;
    304 
    305 
     316    private System.Windows.Forms.Panel bottomPanel;
    306317  }
    307318}
  • trunk/sources/HeuristicLab.DataPreprocessing.Views/3.4/HistogramView.cs

    r15110 r15210  
    3939      aggregationComboBox.SelectedItem = DataTableVisualProperties.DataTableHistogramAggregation.Overlapping;
    4040      orderComboBox.DataSource = Enum.GetValues(typeof(PreprocessingChartContent.LegendOrder));
    41       orderComboBox.SelectedItem = PreprocessingChartContent.LegendOrder.Appearance;
     41      orderComboBox.SelectedItem = PreprocessingChartContent.LegendOrder.Alphabetically;
    4242    }
    4343
  • trunk/sources/HeuristicLab.DataPreprocessing.Views/3.4/PreprocessingChartView.Designer.cs

    r15110 r15210  
    6969      //
    7070      this.splitContainer.Panel2.Controls.Add(this.scrollPanel);
     71      this.splitContainer.Panel2.Resize += new System.EventHandler(this.splitContainer_Panel2_Resize);
    7172      //
    7273      // tableLayoutPanel
  • trunk/sources/HeuristicLab.DataPreprocessing.Views/3.4/PreprocessingChartView.cs

    r15110 r15210  
    5151      dataTables = new Dictionary<string, DataTable>();
    5252      dataTableViews = new Dictionary<string, DataTableView>();
     53      scrollPanel.HorizontalScroll.Visible = false;
    5354    }
    5455
     
    203204      GenerateLayout();
    204205    }
     206
     207    private void splitContainer_Panel2_Resize(object sender, EventArgs e) {
     208      if (SuppressCheckedChangedUpdate)
     209        return;
     210
     211      scrollPanel.SuspendRepaint();
     212
     213      if (tableLayoutPanel.ColumnCount > 0 && tableLayoutPanel.RowCount > 0) {
     214        var width = (splitContainer.Panel2.Width - SystemInformation.VerticalScrollBarWidth) / tableLayoutPanel.ColumnCount;
     215        var height = width * 0.75f;
     216
     217        for (int i = 0; i < tableLayoutPanel.RowStyles.Count - 1; i++) {
     218          tableLayoutPanel.RowStyles[i].Height = height;
     219        }
     220        for (int i = 0; i < tableLayoutPanel.ColumnStyles.Count; i++) {
     221          tableLayoutPanel.ColumnStyles[i].Width = width;
     222        }
     223      }
     224
     225      scrollPanel.ResumeRepaint(true);
     226    }
    205227  }
    206228}
  • trunk/sources/HeuristicLab.DataPreprocessing.Views/3.4/PreprocessingIcons.resx

    r15110 r15210  
    120120  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
    121121  <data name="All" type="System.Resources.ResXFileRef, System.Windows.Forms">
    122     <value>icons\all.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
     122    <value>Icons\All.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
    123123  </data>
    124124  <data name="Inputs" type="System.Resources.ResXFileRef, System.Windows.Forms">
    125     <value>icons\inputs.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
     125    <value>Icons\Inputs.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
    126126  </data>
    127127  <data name="None" type="System.Resources.ResXFileRef, System.Windows.Forms">
    128     <value>icons\none.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
     128    <value>Icons\None.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
    129129  </data>
    130130</root>
  • trunk/sources/HeuristicLab.DataPreprocessing.Views/3.4/ScatterPlotMultiView.cs

    r15110 r15210  
    6060
    6161      legendOrderComboBox.DataSource = Enum.GetValues(typeof(PreprocessingChartContent.LegendOrder));
    62       legendOrderComboBox.SelectedItem = PreprocessingChartContent.LegendOrder.Appearance;
     62      legendOrderComboBox.SelectedItem = PreprocessingChartContent.LegendOrder.Alphabetically;
    6363
    6464      #region Initialize Scrollbars
  • trunk/sources/HeuristicLab.DataPreprocessing.Views/3.4/ScatterPlotSingleView.cs

    r15110 r15210  
    4848      regressionTypeComboBox.SelectedItem = RegressionType.None;
    4949      orderComboBox.DataSource = Enum.GetValues(typeof(PreprocessingChartContent.LegendOrder));
    50       orderComboBox.SelectedItem = PreprocessingChartContent.LegendOrder.Appearance;
     50      orderComboBox.SelectedItem = PreprocessingChartContent.LegendOrder.Alphabetically;
    5151    }
    5252
     
    7474      comboBoxYVariable.Items.AddRange(variables.ToArray());
    7575      comboBoxGroup.Items.Add(NoGroupItem);
    76       foreach (string var in Content.PreprocessingData.VariableNames) {
     76      foreach (string var in PreprocessingChartContent.GetVariableNamesForGrouping(Content.PreprocessingData, 50)) {
    7777        comboBoxGroup.Items.Add(var);
    7878      }
     
    148148
    149149    private void comboBoxYVariable_SelectedIndexChanged(object sender, EventArgs e) {
     150      SuspendRepaint();
    150151      var oldPlot = scatterPlotView.Content;
    151152      UpdateScatterPlot();
     
    163164        x.nr.VisualProperties = newVisuapProperties;
    164165      }
     166      ResumeRepaint(true);
    165167    }
    166168
  • trunk/sources/HeuristicLab.DataPreprocessing.Views/3.4/StatisticsView.Designer.cs

    r15110 r15210  
    5353      this.stringMatrixView = new HeuristicLab.Data.Views.StringConvertibleMatrixView();
    5454      this.showVariablesGroupBox = new System.Windows.Forms.GroupBox();
    55       this.checkInputsTargetButton = new System.Windows.Forms.Button();
    56       this.uncheckAllButton = new System.Windows.Forms.Button();
    57       this.checkAllButton = new System.Windows.Forms.Button();
    5855      this.toolTip = new System.Windows.Forms.ToolTip(this.components);
    5956      this.lblTNumValues = new System.Windows.Forms.Label();
     
    6966      this.missingValuesTextBox = new System.Windows.Forms.TextBox();
    7067      this.overviewGroupBox = new System.Windows.Forms.GroupBox();
     68      this.checkInputsTargetButton = new System.Windows.Forms.Button();
     69      this.uncheckAllButton = new System.Windows.Forms.Button();
     70      this.checkAllButton = new System.Windows.Forms.Button();
    7171      this.showVariablesGroupBox.SuspendLayout();
    7272      this.orientationGroupBox.SuspendLayout();
     
    101101      this.lblMissingValuesTotal.AutoSize = true;
    102102      this.lblMissingValuesTotal.Dock = System.Windows.Forms.DockStyle.Fill;
    103       this.lblMissingValuesTotal.Location = new System.Drawing.Point(237, 26);
     103      this.lblMissingValuesTotal.Location = new System.Drawing.Point(275, 26);
    104104      this.lblMissingValuesTotal.Name = "lblMissingValuesTotal";
    105105      this.lblMissingValuesTotal.Size = new System.Drawing.Size(77, 26);
     
    112112      this.lblNumericColumns.AutoSize = true;
    113113      this.lblNumericColumns.Dock = System.Windows.Forms.DockStyle.Fill;
    114       this.lblNumericColumns.Location = new System.Drawing.Point(100, 0);
     114      this.lblNumericColumns.Location = new System.Drawing.Point(119, 0);
    115115      this.lblNumericColumns.Name = "lblNumericColumns";
    116116      this.lblNumericColumns.Size = new System.Drawing.Size(92, 26);
     
    123123      this.lblNominalColumns.AutoSize = true;
    124124      this.lblNominalColumns.Dock = System.Windows.Forms.DockStyle.Fill;
    125       this.lblNominalColumns.Location = new System.Drawing.Point(100, 26);
     125      this.lblNominalColumns.Location = new System.Drawing.Point(119, 26);
    126126      this.lblNominalColumns.Name = "lblNominalColumns";
    127127      this.lblNominalColumns.Size = new System.Drawing.Size(92, 26);
     
    142142      this.stringMatrixView.ShowRowsAndColumnsTextBox = false;
    143143      this.stringMatrixView.ShowStatisticalInformation = true;
    144       this.stringMatrixView.Size = new System.Drawing.Size(592, 331);
     144      this.stringMatrixView.Size = new System.Drawing.Size(655, 374);
    145145      this.stringMatrixView.TabIndex = 4;
    146146      //
     
    150150      this.showVariablesGroupBox.Controls.Add(this.uncheckAllButton);
    151151      this.showVariablesGroupBox.Controls.Add(this.checkAllButton);
    152       this.showVariablesGroupBox.Location = new System.Drawing.Point(393, 0);
     152      this.showVariablesGroupBox.Location = new System.Drawing.Point(458, 0);
    153153      this.showVariablesGroupBox.Name = "showVariablesGroupBox";
    154154      this.showVariablesGroupBox.Size = new System.Drawing.Size(97, 71);
     
    157157      this.showVariablesGroupBox.Text = "Show Variables";
    158158      //
    159       // checkInputsTargetButton
    160       //
    161       this.checkInputsTargetButton.Image = global::HeuristicLab.DataPreprocessing.Views.PreprocessingIcons.Inputs;
    162       this.checkInputsTargetButton.Location = new System.Drawing.Point(36, 19);
    163       this.checkInputsTargetButton.Name = "checkInputsTargetButton";
    164       this.checkInputsTargetButton.Size = new System.Drawing.Size(24, 24);
    165       this.checkInputsTargetButton.TabIndex = 14;
    166       this.toolTip.SetToolTip(this.checkInputsTargetButton, "Show Inputs & Target");
    167       this.checkInputsTargetButton.UseVisualStyleBackColor = true;
    168       this.checkInputsTargetButton.Click += new System.EventHandler(this.checkInputsTargetButton_Click);
    169       //
    170       // uncheckAllButton
    171       //
    172       this.uncheckAllButton.Image = global::HeuristicLab.DataPreprocessing.Views.PreprocessingIcons.None;
    173       this.uncheckAllButton.Location = new System.Drawing.Point(66, 19);
    174       this.uncheckAllButton.Name = "uncheckAllButton";
    175       this.uncheckAllButton.Size = new System.Drawing.Size(24, 24);
    176       this.uncheckAllButton.TabIndex = 12;
    177       this.toolTip.SetToolTip(this.uncheckAllButton, "Show None");
    178       this.uncheckAllButton.UseVisualStyleBackColor = true;
    179       this.uncheckAllButton.Click += new System.EventHandler(this.uncheckAllButton_Click);
    180       //
    181       // checkAllButton
    182       //
    183       this.checkAllButton.Image = global::HeuristicLab.DataPreprocessing.Views.PreprocessingIcons.All;
    184       this.checkAllButton.Location = new System.Drawing.Point(6, 19);
    185       this.checkAllButton.Name = "checkAllButton";
    186       this.checkAllButton.Size = new System.Drawing.Size(24, 24);
    187       this.checkAllButton.TabIndex = 13;
    188       this.toolTip.SetToolTip(this.checkAllButton, "Show All");
    189       this.checkAllButton.UseVisualStyleBackColor = true;
    190       this.checkAllButton.Click += new System.EventHandler(this.checkAllButton_Click);
    191       //
    192159      // lblTNumValues
    193160      //
    194161      this.lblTNumValues.AutoSize = true;
    195162      this.lblTNumValues.Dock = System.Windows.Forms.DockStyle.Fill;
    196       this.lblTNumValues.Location = new System.Drawing.Point(237, 0);
     163      this.lblTNumValues.Location = new System.Drawing.Point(275, 0);
    197164      this.lblTNumValues.Name = "lblTNumValues";
    198165      this.lblTNumValues.Size = new System.Drawing.Size(77, 26);
     
    206173      this.orientationGroupBox.Controls.Add(this.verticalRadioButton);
    207174      this.orientationGroupBox.Controls.Add(this.horizontalRadioButton);
    208       this.orientationGroupBox.Location = new System.Drawing.Point(496, 0);
     175      this.orientationGroupBox.Location = new System.Drawing.Point(561, 0);
    209176      this.orientationGroupBox.Name = "orientationGroupBox";
    210177      this.orientationGroupBox.Size = new System.Drawing.Size(94, 71);
     
    216183      //
    217184      this.verticalRadioButton.AutoSize = true;
     185      this.verticalRadioButton.Checked = true;
    218186      this.verticalRadioButton.Location = new System.Drawing.Point(6, 32);
    219187      this.verticalRadioButton.Name = "verticalRadioButton";
     
    228196      //
    229197      this.horizontalRadioButton.AutoSize = true;
    230       this.horizontalRadioButton.Checked = true;
    231198      this.horizontalRadioButton.Location = new System.Drawing.Point(6, 14);
    232199      this.horizontalRadioButton.Name = "horizontalRadioButton";
    233200      this.horizontalRadioButton.Size = new System.Drawing.Size(72, 17);
    234201      this.horizontalRadioButton.TabIndex = 0;
    235       this.horizontalRadioButton.TabStop = true;
    236202      this.horizontalRadioButton.Text = "Horizontal";
    237203      this.horizontalRadioButton.UseVisualStyleBackColor = true;
     
    244210      this.rowsTextBox.Name = "rowsTextBox";
    245211      this.rowsTextBox.ReadOnly = true;
    246       this.rowsTextBox.Size = new System.Drawing.Size(33, 20);
     212      this.rowsTextBox.Size = new System.Drawing.Size(52, 20);
    247213      this.rowsTextBox.TabIndex = 18;
     214      this.rowsTextBox.TextAlign = System.Windows.Forms.HorizontalAlignment.Right;
    248215      //
    249216      // columnsTextBox
     
    253220      this.columnsTextBox.Name = "columnsTextBox";
    254221      this.columnsTextBox.ReadOnly = true;
    255       this.columnsTextBox.Size = new System.Drawing.Size(33, 20);
     222      this.columnsTextBox.Size = new System.Drawing.Size(52, 20);
    256223      this.columnsTextBox.TabIndex = 18;
     224      this.columnsTextBox.TextAlign = System.Windows.Forms.HorizontalAlignment.Right;
    257225      //
    258226      // totalValuesTextBox
    259227      //
    260228      this.totalValuesTextBox.Dock = System.Windows.Forms.DockStyle.Fill;
    261       this.totalValuesTextBox.Location = new System.Drawing.Point(320, 3);
     229      this.totalValuesTextBox.Location = new System.Drawing.Point(358, 3);
    262230      this.totalValuesTextBox.Name = "totalValuesTextBox";
    263231      this.totalValuesTextBox.ReadOnly = true;
    264       this.totalValuesTextBox.Size = new System.Drawing.Size(55, 20);
     232      this.totalValuesTextBox.Size = new System.Drawing.Size(82, 20);
    265233      this.totalValuesTextBox.TabIndex = 18;
     234      this.totalValuesTextBox.TextAlign = System.Windows.Forms.HorizontalAlignment.Right;
    266235      //
    267236      // overviewTableLayoutPanel
     
    293262      this.overviewTableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle());
    294263      this.overviewTableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
    295       this.overviewTableLayoutPanel.Size = new System.Drawing.Size(378, 52);
     264      this.overviewTableLayoutPanel.Size = new System.Drawing.Size(443, 52);
    296265      this.overviewTableLayoutPanel.TabIndex = 19;
    297266      //
     
    299268      //
    300269      this.numericColumnsTextBox.Dock = System.Windows.Forms.DockStyle.Fill;
    301       this.numericColumnsTextBox.Location = new System.Drawing.Point(198, 3);
     270      this.numericColumnsTextBox.Location = new System.Drawing.Point(217, 3);
    302271      this.numericColumnsTextBox.Name = "numericColumnsTextBox";
    303272      this.numericColumnsTextBox.ReadOnly = true;
    304       this.numericColumnsTextBox.Size = new System.Drawing.Size(33, 20);
     273      this.numericColumnsTextBox.Size = new System.Drawing.Size(52, 20);
    305274      this.numericColumnsTextBox.TabIndex = 18;
     275      this.numericColumnsTextBox.TextAlign = System.Windows.Forms.HorizontalAlignment.Right;
    306276      //
    307277      // nominalColumnsTextBox5
    308278      //
    309279      this.nominalColumnsTextBox5.Dock = System.Windows.Forms.DockStyle.Fill;
    310       this.nominalColumnsTextBox5.Location = new System.Drawing.Point(198, 29);
     280      this.nominalColumnsTextBox5.Location = new System.Drawing.Point(217, 29);
    311281      this.nominalColumnsTextBox5.Name = "nominalColumnsTextBox5";
    312282      this.nominalColumnsTextBox5.ReadOnly = true;
    313       this.nominalColumnsTextBox5.Size = new System.Drawing.Size(33, 20);
     283      this.nominalColumnsTextBox5.Size = new System.Drawing.Size(52, 20);
    314284      this.nominalColumnsTextBox5.TabIndex = 18;
     285      this.nominalColumnsTextBox5.TextAlign = System.Windows.Forms.HorizontalAlignment.Right;
    315286      //
    316287      // missingValuesTextBox
    317288      //
    318289      this.missingValuesTextBox.Dock = System.Windows.Forms.DockStyle.Fill;
    319       this.missingValuesTextBox.Location = new System.Drawing.Point(320, 29);
     290      this.missingValuesTextBox.Location = new System.Drawing.Point(358, 29);
    320291      this.missingValuesTextBox.Name = "missingValuesTextBox";
    321292      this.missingValuesTextBox.ReadOnly = true;
    322       this.missingValuesTextBox.Size = new System.Drawing.Size(55, 20);
     293      this.missingValuesTextBox.Size = new System.Drawing.Size(82, 20);
    323294      this.missingValuesTextBox.TabIndex = 18;
     295      this.missingValuesTextBox.TextAlign = System.Windows.Forms.HorizontalAlignment.Right;
    324296      //
    325297      // overviewGroupBox
     
    328300      this.overviewGroupBox.Location = new System.Drawing.Point(3, 0);
    329301      this.overviewGroupBox.Name = "overviewGroupBox";
    330       this.overviewGroupBox.Size = new System.Drawing.Size(384, 71);
     302      this.overviewGroupBox.Size = new System.Drawing.Size(449, 71);
    331303      this.overviewGroupBox.TabIndex = 20;
    332304      this.overviewGroupBox.TabStop = false;
    333305      this.overviewGroupBox.Text = "Overview";
     306      //
     307      // checkInputsTargetButton
     308      //
     309      this.checkInputsTargetButton.Image = global::HeuristicLab.DataPreprocessing.Views.PreprocessingIcons.Inputs;
     310      this.checkInputsTargetButton.Location = new System.Drawing.Point(36, 19);
     311      this.checkInputsTargetButton.Name = "checkInputsTargetButton";
     312      this.checkInputsTargetButton.Size = new System.Drawing.Size(24, 24);
     313      this.checkInputsTargetButton.TabIndex = 14;
     314      this.toolTip.SetToolTip(this.checkInputsTargetButton, "Show Inputs & Target");
     315      this.checkInputsTargetButton.UseVisualStyleBackColor = true;
     316      this.checkInputsTargetButton.Click += new System.EventHandler(this.checkInputsTargetButton_Click);
     317      //
     318      // uncheckAllButton
     319      //
     320      this.uncheckAllButton.Image = global::HeuristicLab.DataPreprocessing.Views.PreprocessingIcons.None;
     321      this.uncheckAllButton.Location = new System.Drawing.Point(66, 19);
     322      this.uncheckAllButton.Name = "uncheckAllButton";
     323      this.uncheckAllButton.Size = new System.Drawing.Size(24, 24);
     324      this.uncheckAllButton.TabIndex = 12;
     325      this.toolTip.SetToolTip(this.uncheckAllButton, "Show None");
     326      this.uncheckAllButton.UseVisualStyleBackColor = true;
     327      this.uncheckAllButton.Click += new System.EventHandler(this.uncheckAllButton_Click);
     328      //
     329      // checkAllButton
     330      //
     331      this.checkAllButton.Image = global::HeuristicLab.DataPreprocessing.Views.PreprocessingIcons.All;
     332      this.checkAllButton.Location = new System.Drawing.Point(6, 19);
     333      this.checkAllButton.Name = "checkAllButton";
     334      this.checkAllButton.Size = new System.Drawing.Size(24, 24);
     335      this.checkAllButton.TabIndex = 13;
     336      this.toolTip.SetToolTip(this.checkAllButton, "Show All");
     337      this.checkAllButton.UseVisualStyleBackColor = true;
     338      this.checkAllButton.Click += new System.EventHandler(this.checkAllButton_Click);
    334339      //
    335340      // StatisticsView
     
    342347      this.Controls.Add(this.stringMatrixView);
    343348      this.Name = "StatisticsView";
    344       this.Size = new System.Drawing.Size(598, 408);
     349      this.Size = new System.Drawing.Size(661, 451);
    345350      this.showVariablesGroupBox.ResumeLayout(false);
    346351      this.orientationGroupBox.ResumeLayout(false);
  • trunk/sources/HeuristicLab.DataPreprocessing.Views/3.4/StatisticsView.cs

    r15110 r15210  
    3434  [Content(typeof(StatisticsContent), true)]
    3535  public partial class StatisticsView : ItemView {
    36     private bool horizontal = true;
     36    private bool horizontal = false;
    3737    private StringMatrix statisticsMatrix;
    3838    private static readonly string[] StatisticsNames = new[] {
  • trunk/sources/HeuristicLab.DataPreprocessing/3.4/Content/HistogramContent.cs

    r15110 r15210  
    5454    }
    5555
    56     public static DataTable CreateHistogram(IFilteredPreprocessingData preprocessingData, string variableName, string groupingVariableName, DataTableVisualProperties.DataTableHistogramAggregation aggregation, LegendOrder legendOrder = LegendOrder.Appearance) {
     56    public static DataTable CreateHistogram(IFilteredPreprocessingData preprocessingData, string variableName, string groupingVariableName, DataTableVisualProperties.DataTableHistogramAggregation aggregation, LegendOrder legendOrder = LegendOrder.Alphabetically) {
    5757      var dataTable = new DataTable {
    5858        VisualProperties = { Title = variableName, HistogramAggregation = aggregation },
  • trunk/sources/HeuristicLab.DataPreprocessing/3.4/Content/PreprocessingChartContent.cs

    r15110 r15210  
    3434  public class PreprocessingChartContent : Item, IViewShortcut {
    3535    public enum LegendOrder {
    36       Appearance,
    37       Alphabetically
     36      Alphabetically,
     37      Appearance
    3838    }
    3939
     
    9191    }
    9292
    93     private const int MAX_DISTINCT_VALUES_FOR_GROUPING = 20;
    94     public static IEnumerable<string> GetVariableNamesForGrouping(IPreprocessingData preprocessingData) {
     93    public static IEnumerable<string> GetVariableNamesForGrouping(IPreprocessingData preprocessingData, int maxDistinctValues = 20) {
    9594      var variableNames = new List<string>();
    9695
     
    104103          distinctValues = preprocessingData.GetValues<DateTime>(i).GroupBy(x => x).Count();
    105104
    106         if (distinctValues <= MAX_DISTINCT_VALUES_FOR_GROUPING)
     105        if (distinctValues <= maxDistinctValues)
    107106          variableNames.Add(preprocessingData.GetVariableName(i));
    108107      }
  • trunk/sources/HeuristicLab.DataPreprocessing/3.4/Content/ScatterPlotContent.cs

    r15110 r15210  
    4040    }
    4141
    42     public static ScatterPlot CreateScatterPlot(IFilteredPreprocessingData preprocessingData, string variableNameX, string variableNameY, string variableNameGroup = "-", LegendOrder legendOrder = LegendOrder.Appearance) {
     42    public static ScatterPlot CreateScatterPlot(IFilteredPreprocessingData preprocessingData, string variableNameX, string variableNameY, string variableNameGroup = "-", LegendOrder legendOrder = LegendOrder.Alphabetically) {
    4343      ScatterPlot scatterPlot = new ScatterPlot();
    4444
Note: See TracChangeset for help on using the changeset viewer.