Changeset 14270

Timestamp:

08/31/16 16:15:35 (8 years ago)

Author:

pfleck

Message:

#2663

• Fixed reordering issue by enabling/disabling series rather than removing the DataRow.
• Reduced flickering by suspending layouting during variable un/rechecking.

Location:

trunk/sources/HeuristicLab.DataPreprocessing.Views/3.4

Files:

• . (modified) (1 prop)
• PreprocessingChartView.cs (modified) (3 diffs)
• PreprocessingDataTableView.cs (modified) (1 diff)

trunk/sources/HeuristicLab.DataPreprocessing.Views/3.4

@@ -1 +1 @@
 ComparisonFilterView.resx
 FilterView.resx
+*.user

@@ -1 +1 @@
 ComparisonFilterView.resx
 FilterView.resx
+*.user

trunk/sources/HeuristicLab.DataPreprocessing.Views/3.4/PreprocessingChartView.cs

@@ -59 +59 @@
     //Add or remove data row
     private void CheckedItemsChanged(object sender, CollectionItemsChangedEventArgs<IndexedItem<StringValue>> checkedItems) {
-
+      tableLayoutPanel.SuspendLayout();
       foreach (IndexedItem<StringValue> item in checkedItems.Items) {
         string variableName = item.Value.Value;
 
-        //variable is displayed -> remove
-        if (VariableIsDisplayed(variableName)) {
-          dataTable.Rows.Remove(variableName);
+        // not checked -> remove
+        if (!VariableIsChecked(variableName)) {
+          dataTableView.SetRowEnabled(variableName, false);
           dataTable.SelectedRows.Remove(variableName);
           dataTablePerVariable.Remove(dataTablePerVariable.Find(x => (x.Name == variableName)));
-          //variable isnt't displayed -> add
         } else {
           DataRow row = GetDataRow(variableName);
           DataRow selectedRow = GetSelectedDataRow(variableName);
-          dataTable.Rows.Add(row);
+          dataTableView.SetRowEnabled(variableName, true);
 
           PreprocessingDataTable pdt = new PreprocessingDataTable(variableName);
           pdt.Rows.Add(row);
-          dataTablePerVariable.Add(pdt);
+          // dataTablePerVariable does not contain unchecked variables => reduce insert position by number of uncheckt variables to correct the index
+          int uncheckedUntilVariable = checkedItemList.Content.TakeWhile(x => x.Value != variableName).Count(x => !checkedItemList.Content.ItemChecked(x));
+          dataTablePerVariable.Insert(item.Index - uncheckedUntilVariable, pdt);
 
           //update selection
@@ -89 +90 @@
       if (Content != null && !Content.AllInOneMode)
         GenerateChart();
-
-    }
-
-    private bool VariableIsDisplayed(string name) {
-
-      foreach (var item in dataTable.Rows) {
-        if (item.Name == name)
-          return true;
-      }
-      return false;
+      tableLayoutPanel.ResumeLayout(true);
+    }
+
+    private bool VariableIsChecked(string name) {
+      return Content.VariableItemList.CheckedItems.Any(x => x.Value.Value == name);
     }
 
@@ -158 +154 @@
       dataTable.SelectedRows.Clear();
       foreach (var selectedRow in selectedDataRows) {
-        if (VariableIsDisplayed(selectedRow.Name))
+        if (VariableIsChecked(selectedRow.Name))
           dataTable.SelectedRows.Add(selectedRow);
       }

trunk/sources/HeuristicLab.DataPreprocessing.Views/3.4/PreprocessingDataTableView.cs

@@ -139 +139 @@
         }
       } else MessageBox.Show("Nothing to configure.");
+    }
+
+    public bool IsRowEnabled(string name) {
+      return chart.Series.FindByName(name) != null && chart.Series[name].Enabled;
+    }
+    public void SetRowEnabled(string name, bool enabled) {
+      if (chart.Series.FindByName(name) != null)
+        chart.Series[name].Enabled = enabled;
     }
 

@@ -1 +1 @@
 ComparisonFilterView.resx
 FilterView.resx
+*.user