Changeset 15090 for branches/DataPreprocessing Enhancements

Timestamp:

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

Author:

pfleck

Message:

#2709 Adapted to recent trunk changes (r15068)

Location:

branches/DataPreprocessing Enhancements

Files:

• HeuristicLab.DataPreprocessing.Views/3.4/HistogramView.cs (modified) (3 diffs)
• HeuristicLab.DataPreprocessing.Views/3.4/ScatterPlotMultiView.cs (modified) (2 diffs)
• HeuristicLab.DataPreprocessing/3.4/Content/HistogramContent.cs (modified) (2 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;
       }
     }

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

@@ -31 +31 @@
 using HeuristicLab.MainForm;
 using HeuristicLab.MainForm.WindowsForms;
-using AggregationType = HeuristicLab.Analysis.DataRowVisualProperties.DataRowHistogramAggregation;
+using AggregationType = HeuristicLab.Analysis.DataTableVisualProperties.DataTableHistogramAggregation;
 using RegressionType = HeuristicLab.Analysis.ScatterPlotDataRowVisualProperties.ScatterPlotDataRowRegressionType;
 
@@ -736 +736 @@
         }
 
-        var histogramControl = control.Value as DataTableView;
-        if (histogramControl != null) {
-          foreach (var row in histogramControl.Content.Rows) {
-            row.VisualProperties.Aggregation = aggregation;
-          }
+        var histogramView = control.Value as DataTableView;
+        if (histogramView != null) {
+          histogramView.Content.VisualProperties.HistogramAggregation = aggregation;
         }
       }

branches/DataPreprocessing Enhancements/HeuristicLab.DataPreprocessing/3.4/Content/HistogramContent.cs

@@ -54 +54 @@
     }
 
-    public static DataTable CreateHistogram(IFilteredPreprocessingData preprocessingData, string variableName, string groupingVariableName, DataRowVisualProperties.DataRowHistogramAggregation aggregation, LegendOrder legendOrder = LegendOrder.Appearance) {
+    public static DataTable CreateHistogram(IFilteredPreprocessingData preprocessingData, string variableName, string groupingVariableName, DataTableVisualProperties.DataTableHistogramAggregation aggregation, LegendOrder legendOrder = LegendOrder.Appearance) {
       var dataTable = new DataTable {
-        VisualProperties = { Title = variableName }
+        VisualProperties = { Title = variableName, HistogramAggregation = aggregation },
       };
 
@@ -89 +89 @@
           VisualProperties = {
               ChartType = DataRowVisualProperties.DataRowChartType.Histogram,
-              Aggregation = aggregation,
               IsVisibleInLegend = !string.IsNullOrEmpty(groupingVariableName)
             }