- Timestamp:
- 01/18/17 13:44:34 (8 years ago)
- Location:
- branches/DataPreprocessing Enhancements/HeuristicLab.DataPreprocessing.Views/3.4
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/DataPreprocessing Enhancements/HeuristicLab.DataPreprocessing.Views/3.4/DataGridContentView.cs
r14546 r14583 70 70 List<KeyValuePair<int, SortOrder>> order = new List<KeyValuePair<int, SortOrder>>(base.sortedColumnIndices); 71 71 base.OnContentChanged(); 72 73 foreach (DataGridViewColumn column in DataGridView.Columns) {74 var variable = column.HeaderText;75 bool isInputTarget = Content.PreProcessingData.InputVariables.Contains(variable)76 || Content.PreProcessingData.TargetVariable == variable;77 column.Visible = isInputTarget;78 }79 72 80 73 DataGridView.RowHeadersWidth = 70; -
branches/DataPreprocessing Enhancements/HeuristicLab.DataPreprocessing.Views/3.4/HistogramView.Designer.cs
r14578 r14583 46 46 private void InitializeComponent() { 47 47 this.optionsBox = new System.Windows.Forms.GroupBox(); 48 this.label2 = new System.Windows.Forms.Label(); 48 49 this.label1 = new System.Windows.Forms.Label(); 50 this.aggregationComboBox = new System.Windows.Forms.ComboBox(); 49 51 this.classifierComboBox = new System.Windows.Forms.ComboBox(); 50 52 ((System.ComponentModel.ISupportInitialize)(this.splitContainer)).BeginInit(); … … 63 65 // optionsBox 64 66 // 67 this.optionsBox.Controls.Add(this.label2); 65 68 this.optionsBox.Controls.Add(this.label1); 69 this.optionsBox.Controls.Add(this.aggregationComboBox); 66 70 this.optionsBox.Controls.Add(this.classifierComboBox); 67 71 this.optionsBox.Dock = System.Windows.Forms.DockStyle.Bottom; 68 this.optionsBox.Location = new System.Drawing.Point(0, 334);72 this.optionsBox.Location = new System.Drawing.Point(0, 292); 69 73 this.optionsBox.Name = "optionsBox"; 70 this.optionsBox.Size = new System.Drawing.Size(180, 69);74 this.optionsBox.Size = new System.Drawing.Size(180, 111); 71 75 this.optionsBox.TabIndex = 7; 72 76 this.optionsBox.TabStop = false; 73 this.optionsBox.Text = "Options"; 77 this.optionsBox.Text = "Grouping Options"; 78 // 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:"; 74 87 // 75 88 // label1 … … 78 91 this.label1.Location = new System.Drawing.Point(3, 15); 79 92 this.label1.Name = "label1"; 80 this.label1.Size = new System.Drawing.Size( 81, 13);93 this.label1.Size = new System.Drawing.Size(48, 13); 81 94 this.label1.TabIndex = 2; 82 this.label1.Text = "Target variable:"; 95 this.label1.Text = "Variable:"; 96 // 97 // aggregationComboBox 98 // 99 this.aggregationComboBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 100 | System.Windows.Forms.AnchorStyles.Right))); 101 this.aggregationComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; 102 this.aggregationComboBox.FormattingEnabled = true; 103 this.aggregationComboBox.Location = new System.Drawing.Point(5, 79); 104 this.aggregationComboBox.Name = "aggregationComboBox"; 105 this.aggregationComboBox.Size = new System.Drawing.Size(169, 21); 106 this.aggregationComboBox.TabIndex = 1; 107 this.aggregationComboBox.SelectedIndexChanged += new System.EventHandler(this.aggregationComboBox_SelectedIndexChanged); 83 108 // 84 109 // classifierComboBox … … 88 113 this.classifierComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; 89 114 this.classifierComboBox.FormattingEnabled = true; 90 this.classifierComboBox.Location = new System.Drawing.Point(5, 3 2);115 this.classifierComboBox.Location = new System.Drawing.Point(5, 33); 91 116 this.classifierComboBox.Name = "classifierComboBox"; 92 117 this.classifierComboBox.Size = new System.Drawing.Size(169, 21); … … 114 139 private System.Windows.Forms.ComboBox classifierComboBox; 115 140 private System.Windows.Forms.Label label1; 116 141 private System.Windows.Forms.Label label2; 142 private System.Windows.Forms.ComboBox aggregationComboBox; 117 143 } 118 144 } -
branches/DataPreprocessing Enhancements/HeuristicLab.DataPreprocessing.Views/3.4/HistogramView.cs
r14581 r14583 36 36 public HistogramView() { 37 37 InitializeComponent(); 38 aggregationComboBox.DataSource = Enum.GetValues(typeof(DataRowVisualProperties.DataRowHistogramAggregation)); 39 aggregationComboBox.SelectedItem = DataRowVisualProperties.DataRowHistogramAggregation.Overlapping; 38 40 } 39 41 … … 82 84 classRow.Name = group.Key; 83 85 classRow.VisualProperties.ChartType = DataRowVisualProperties.DataRowChartType.Histogram; 86 classRow.VisualProperties.Aggregation = (DataRowVisualProperties.DataRowHistogramAggregation)aggregationComboBox.SelectedItem; 84 87 classRow.Values.AddRange(group); 85 88 dataTable.Rows.Add(classRow); … … 96 99 GenerateLayout(); 97 100 } 101 102 private void aggregationComboBox_SelectedIndexChanged(object sender, EventArgs e) { 103 foreach (var dt in dataTables.Values) { 104 foreach (var row in dt.Rows) { 105 row.VisualProperties.Aggregation = (DataRowVisualProperties.DataRowHistogramAggregation)aggregationComboBox.SelectedItem; 106 } 107 } 108 } 98 109 } 99 110 }
Note: See TracChangeset
for help on using the changeset viewer.