Changeset 14725 for branches/DataPreprocessing Enhancements/HeuristicLab.DataPreprocessing.Views/3.4/ScatterPlotMultiView.cs

Timestamp:

03/07/17 16:55:03 (7 years ago)

Author:

mkommend

Message:

#2709: Added grouping for multi scatter plot view.

File:

• branches/DataPreprocessing Enhancements/HeuristicLab.DataPreprocessing.Views/3.4/ScatterPlotMultiView.cs (modified) (4 diffs)

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

@@ -55 +55 @@
       base.OnContentChanged();
       if (Content != null) {
+        groupingComboBox.Items.Add("");
+        foreach (string var in PreprocessingChartContent.GetVariableNamesForGrouping(Content.PreprocessingData)) {
+          groupingComboBox.Items.Add(var);
+        }
+        groupingComboBox.SelectedItem = Content.GroupingVariable;
+
         GenerateCharts();
       }
@@ -261 +267 @@
       if (!bodyCache.ContainsKey(key)) {
         if (rowVariable == colVariable) { // use historgram if x and y variable are equal
-          var dataTable = new DataTable();
-          DataRow dataRow = Content.CreateDataRow(rowVariable, DataRowVisualProperties.DataRowChartType.Histogram);
-          dataRow.VisualProperties.IsVisibleInLegend = false;
-          dataTable.Rows.Add(dataRow);
+          var dataTable = HistogramContent.CreateHistogram(Content.PreprocessingData, rowVariable, (string)groupingComboBox.SelectedItem, DataRowVisualProperties.DataRowHistogramAggregation.Overlapping);
+          foreach (var dataRow in dataTable.Rows)
+            dataRow.VisualProperties.IsVisibleInLegend = false;
+
           var pcv = new DataTableControl {
             Name = key.ToString(),
@@ -275 +281 @@
           bodyCache.Add(key, pcv);
         } else { //scatter plot
-          var scatterPlot = Content.CreateScatterPlot(colVariable, rowVariable);
+          var scatterPlot = ScatterPlotContent.CreateScatterPlot(Content.PreprocessingData, colVariable, rowVariable, (string)groupingComboBox.SelectedItem);
           var regressionType = (RegressionType)regressionTypeComboBox.SelectedValue;
           int order = (int)polynomialRegressionOrderNumericUpDown.Value;
@@ -486 +492 @@
     }
     #endregion
+
+    private void groupingComboBox_SelectedIndexChanged(object sender, EventArgs e) {
+      GenerateCharts();
+    }
   }
 }