Changeset 12501

Timestamp:

06/23/15 17:12:33 (9 years ago)

Author:

ehopf

Message:

#2335: Adjusted the code of the Histogram-View to prevent an outdated CheckedItemList after the deletion of a column (Defect 4).

Location:

branches/DataPreprocessingImprovements

Files:

• HeuristicLab.DataPreprocessing.Views/3.4/PreprocessingChartView.cs (modified) (5 diffs)
• HeuristicLab.DataPreprocessing/3.4/Implementations/PreprocessingChartContent.cs (modified) (2 diffs)

branches/DataPreprocessingImprovements/HeuristicLab.DataPreprocessing.Views/3.4/PreprocessingChartView.cs

@@ -22 +22 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Windows.Forms;
 using HeuristicLab.Analysis;
@@ -60 +61 @@
     //Add or remove data row
     private void CheckedItemsChanged(object sender, CollectionItemsChangedEventArgs<IndexedItem<StringValue>> checkedItems) {
+
       foreach (IndexedItem<StringValue> item in checkedItems.Items) {
         string variableName = item.Value.Value;
@@ -122 +124 @@
       if (Content.VariableItemList == null) {
         Content.VariableItemList = Content.CreateVariableItemList();
+      } else {
+        var checkedNames = Content.VariableItemList.CheckedItems.Select(x => x.Value.Value);
+        Content.VariableItemList = Content.CreateVariableItemList(checkedNames);
       }
       checkedItemList.Content = Content.VariableItemList;
@@ -136 +141 @@
         DataRow row = GetDataRow(variableName);
 
-        //add row to data table 
-        dataTable.Rows.Add(row);
-
-        //add row to data table per variable
-        d.Rows.Add(row);
-        dataTablePerVariable.Add(d);
+        if (row != null) {
+          //add row to data table
+          dataTable.Rows.Add(row);
+
+          //add row to data table per variable
+          d.Rows.Add(row);
+          dataTablePerVariable.Add(d);
+        }
       }
 
@@ -153 +160 @@
       dataTable.SelectedRows.Clear();
       foreach (var selectedRow in selectedDataRows) {
-        if(VariableIsDisplayed(selectedRow.Name))
+        if (VariableIsDisplayed(selectedRow.Name))
           dataTable.SelectedRows.Add(selectedRow);
       }

branches/DataPreprocessingImprovements/HeuristicLab.DataPreprocessing/3.4/Implementations/PreprocessingChartContent.cs

@@ -23 +23 @@
 using System.Collections.Generic;
 using System.Drawing;
+using System.Linq;
 using HeuristicLab.Analysis;
 using HeuristicLab.Common;
@@ -126 +127 @@
 
 
-    public ICheckedItemList<StringValue> CreateVariableItemList() {
+    public ICheckedItemList<StringValue> CreateVariableItemList(IEnumerable<string> checkedItems = null) {
       ICheckedItemList<StringValue> itemList = new CheckedItemList<StringValue>();
       foreach (string name in PreprocessingData.GetDoubleVariableNames()) {
-        itemList.Add(new StringValue(name), true);
+        var n = new StringValue(name);
+        itemList.Add(n, (checkedItems == null) ? true : checkedItems.Contains(name));
       }
       return new ReadOnlyCheckedItemList<StringValue>(itemList);