Changeset 15036 for branches/DataPreprocessing Enhancements/HeuristicLab.DataPreprocessing.Views

Timestamp:

06/19/17 16:56:34 (7 years ago)

Author:

pfleck

Message:

#2709

• Used title for showing variable name in the histogram instead of the legend. Legend is now used for grouping only.
• Fixed Variables/Datarows in StatisticsView (were switched).
• Improved the "Warning Dialog" for the MultiScatterPlot when too many variables might be shown.
  • Option for checking "None".
  • Show the dialog before the charts are calculated internally.

Location:

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

Files:

• ScatterPlotMultiView.cs (modified) (4 diffs)
• StatisticsView.cs (modified) (1 diff)

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

@@ -1 @@
-#region License Information
-/* HeuristicLab
+/* HeuristicLab
  * Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
@@ -18 +17 @@
  * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
  */
-#endregion
 
 using System;
@@ -37 +35 @@
   [View("Scatter Plot Multi View")]
   [Content(typeof(MultiScatterPlotContent), true)]
-  public partial class ScatterPlotMultiView : PreprocessingCheckedVariablesView {
+  public sealed partial class ScatterPlotMultiView : PreprocessingCheckedVariablesView {
     private readonly IDictionary<string, Label> columnHeaderCache = new Dictionary<string, Label>();
     private readonly IDictionary<string, VerticalLabel> rowHeaderCache = new Dictionary<string, VerticalLabel>();
@@ -90 +88 @@
           groupingComboBox.Items.Add(var);
         }
+        SuppressCheckedChangedUpdate = true;
         groupingComboBox.SelectedItem = Content.GroupingVariable ?? string.Empty;
+        SuppressCheckedChangedUpdate = false;
 
         // uncheck variables that max 20 vars are selected initially
-        var list = Content.VariableItemList;
-        int numChecked = list.CheckedItems.Count();
+        var variables = Content.VariableItemList;
+        int numChecked = variables.CheckedItems.Count();
         if (numChecked > 20) {
-          string message = string.Format("Displaying {0} variables ({1} charts) can slown down HeuristicLab. " +
-                                         "Should the number of initially checked variables be reduced to 20?",
+          string message = string.Format("Display all {0} input variables ({1} charts)?" + Environment.NewLine +
+                                         "Press No to reduce the number of checked variables to 20." + Environment.NewLine +
+                                         "Press Cancel to uncheck all.",
             numChecked, numChecked * numChecked);
-          if (MessageBox.Show(this, message, "Reduce befor continue?", MessageBoxButtons.YesNo, MessageBoxIcon.Warning) == DialogResult.Yes) {
+          var dialogResult = MessageBox.Show(this, message, "Display All Input Variables?", MessageBoxButtons.YesNoCancel, MessageBoxIcon.Warning);
+          if (dialogResult == DialogResult.No || dialogResult == DialogResult.Cancel) {
             SuppressCheckedChangedUpdate = true;
-            foreach (var var in list.CheckedItems.Reverse().Take(numChecked - 20)) {
-              Content.VariableItemList.SetItemCheckedState(var.Value, false);
-            }
+            IEnumerable<StringValue> toUncheck = variables;
+            if (dialogResult == DialogResult.No) // only show the first 20
+              toUncheck = variables.CheckedItems.Reverse().Take(numChecked - 20).Select(x => x.Value);
+            foreach (var var in toUncheck)
+              Content.VariableItemList.SetItemCheckedState(var, false);
             SuppressCheckedChangedUpdate = false;
           }

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

@@ -88 +88 @@
     private void UpdateData(Dictionary<string, bool> oldVisibility = null) {
       var logic = Content.StatisticsLogic;
-      rowsTextBox.Text = logic.GetColumnCount().ToString();
-      columnsTextBox.Text = logic.GetRowCount().ToString();
+      rowsTextBox.Text = logic.GetRowCount().ToString();
+      columnsTextBox.Text = logic.GetColumnCount().ToString();
       numericColumnsTextBox.Text = logic.GetNumericColumnCount().ToString();
       nominalColumnsTextBox5.Text = logic.GetNominalColumnCount().ToString();