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

Timestamp:

05/17/17 13:22:51 (7 years ago)

Author:

pfleck

Message:

#2709

• Added Legend order when grouping for histogram and (single and multi)scatterplot.
• Removed the limitation of distinct values for the singlescatterplot (for the color gradient).
• Added a legend-visible checkbox for the multi-scatterplot.

File:

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

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

@@ -54 +54 @@
       aggregationComboBox.SelectedItem = AggregationType.Overlapping;
 
+      legendOrderComboBox.DataSource = Enum.GetValues(typeof(PreprocessingChartContent.LegendOrder));
+      legendOrderComboBox.SelectedItem = PreprocessingChartContent.LegendOrder.Appearance;
+
       #region Initialize Scrollbars
       columnHeaderScrollPanel.HorizontalScroll.Enabled = true;
@@ -412 +415 @@
             rowVariable,
             (string)groupingComboBox.SelectedItem,
-            (AggregationType)aggregationComboBox.SelectedItem);
+            (AggregationType)aggregationComboBox.SelectedItem,
+            (PreprocessingChartContent.LegendOrder)legendOrderComboBox.SelectedItem);
           dataTable.VisualProperties.Title = string.Empty;
-          foreach (var dataRow in dataTable.Rows)
-            dataRow.VisualProperties.IsVisibleInLegend = groupingComboBox.SelectedIndex > 0;
+          foreach (var dataRow in dataTable.Rows) {
+            dataRow.VisualProperties.IsVisibleInLegend = legendCheckbox.Checked && groupingComboBox.SelectedIndex > 0;
+          }
           var pcv = new DataTableView {
             Name = key.ToString(),
@@ -430 +435 @@
             colVariable,
             rowVariable,
-            (string)groupingComboBox.SelectedItem);
+            (string)groupingComboBox.SelectedItem,
+            (PreprocessingChartContent.LegendOrder)legendOrderComboBox.SelectedItem);
           var regressionType = (RegressionType)regressionTypeComboBox.SelectedValue;
           int order = (int)polynomialRegressionOrderNumericUpDown.Value;
@@ -439 +445 @@
             row.VisualProperties.Color = Color.FromArgb((int)(pointOpacityNumericUpDown.Value * 255),
               row.VisualProperties.Color.IsEmpty ? colors[i++ % colors.Length] : row.VisualProperties.Color);
-            //row.VisualProperties.IsVisibleInLegend = true;
+            row.VisualProperties.IsVisibleInLegend = legendCheckbox.Checked && groupingComboBox.SelectedIndex > 0;
             row.VisualProperties.IsRegressionVisibleInLegend = false;
             row.VisualProperties.RegressionType = regressionType;
@@ -467 +473 @@
     #region Generate Charts
     private void GenerateCharts(bool clearCache) {
-      if (suppressCheckedChangedUpdate) return;
+      if (Content == null || suppressCheckedChangedUpdate) return;
 
       // Clear old layouts and cache
@@ -477 +483 @@
 
       if (clearCache) {
-        foreach (var control in bodyCache.Values
-          .Concat(columnHeaderCache.Values)
-          .Concat(rowHeaderCache.Values)) {
+        foreach (var control in bodyCache.Values.Concat(columnHeaderCache.Values).Concat(rowHeaderCache.Values)) {
           control.Dispose();
         }
@@ -549 +553 @@
       }
 
-      MainFormManager.MainForm.ShowContent(scatterContent, typeof(ScatterPlotSingleView));  // open in new tab
+      MainFormManager.MainForm.ShowContent(scatterContent, typeof(ScatterPlotSingleView)); // open in new tab
     }
 
@@ -568 +572 @@
         }
       }
-      MainFormManager.MainForm.ShowContent(histoContent, typeof(HistogramView));  // open in new tab
+      MainFormManager.MainForm.ShowContent(histoContent, typeof(HistogramView)); // open in new tab
     }
     #endregion
@@ -716 +720 @@
     #region Grouping
     private void groupingComboBox_SelectedIndexChanged(object sender, EventArgs e) {
+      aggregationLabel.Enabled = groupingComboBox.SelectedIndex > 0;
       aggregationComboBox.Enabled = groupingComboBox.SelectedIndex > 0;
+      legendGroupBox.Enabled = groupingComboBox.SelectedIndex > 0;
       GenerateCharts(true); // new series within charts -> clear cache
     }
@@ -736 +742 @@
       }
     }
+
+    private void legendCheckbox_CheckedChanged(object sender, EventArgs e) {
+      foreach (var control in bodyCache.ToList()) {
+        var histogramControl = control.Value as DataTableView;
+        if (histogramControl != null) {
+          foreach (var row in histogramControl.Content.Rows) {
+            row.VisualProperties.IsVisibleInLegend = legendCheckbox.Checked && groupingComboBox.SelectedIndex > 0;
+          }
+        }
+        var scatterplotControl = control.Value as ScatterPlotView;
+        if (scatterplotControl != null) {
+          foreach (var row in scatterplotControl.Content.Rows) {
+            row.VisualProperties.IsVisibleInLegend = legendCheckbox.Checked && groupingComboBox.SelectedIndex > 0;
+          }
+        }
+      }
+    }
+
+    private void legendOrderComboBox_SelectedIndexChanged(object sender, EventArgs e) {
+      GenerateCharts(true);
+    }
     #endregion
   }