Changeset 15090 for branches/DataPreprocessing Enhancements/HeuristicLab.DataPreprocessing.Views/3.4/HistogramView.cs

Timestamp:

06/29/17 15:18:12 (7 years ago)

Author:

pfleck

Message:

#2709 Adapted to recent trunk changes (r15068)

File:

• branches/DataPreprocessing Enhancements/HeuristicLab.DataPreprocessing.Views/3.4/HistogramView.cs (modified) (3 diffs)

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

@@ -36 +36 @@
     public HistogramView() {
       InitializeComponent();
-      aggregationComboBox.DataSource = Enum.GetValues(typeof(DataRowVisualProperties.DataRowHistogramAggregation));
-      aggregationComboBox.SelectedItem = DataRowVisualProperties.DataRowHistogramAggregation.Overlapping;
+      aggregationComboBox.DataSource = Enum.GetValues(typeof(DataTableVisualProperties.DataTableHistogramAggregation));
+      aggregationComboBox.SelectedItem = DataTableVisualProperties.DataTableHistogramAggregation.Overlapping;
       orderComboBox.DataSource = Enum.GetValues(typeof(PreprocessingChartContent.LegendOrder));
       orderComboBox.SelectedItem = PreprocessingChartContent.LegendOrder.Appearance;
@@ -57 +57 @@
 
     protected override DataTable CreateDataTable(string variableName) {
-      var aggregation = (DataRowVisualProperties.DataRowHistogramAggregation)aggregationComboBox.SelectedItem;
+      var aggregation = (DataTableVisualProperties.DataTableHistogramAggregation)aggregationComboBox.SelectedItem;
       var hist = HistogramContent.CreateHistogram(Content.PreprocessingData, variableName, Content.GroupingVariableName, aggregation, Content.Order);
       hist.VisualProperties.TitleFont = new Font(DefaultFont.FontFamily, 10, FontStyle.Bold);
@@ -73 +73 @@
     private void aggregationComboBox_SelectedIndexChanged(object sender, EventArgs e) {
       foreach (var dt in dataTables.Values) {
-        foreach (var row in dt.Rows) {
-          row.VisualProperties.Aggregation = (DataRowVisualProperties.DataRowHistogramAggregation)aggregationComboBox.SelectedItem;
-        }
+        dt.VisualProperties.HistogramAggregation = (DataTableVisualProperties.DataTableHistogramAggregation)aggregationComboBox.SelectedItem;
       }
     }