Changeset 14963 for stable/HeuristicLab.DataPreprocessing.Views/3.4/PreprocessingCheckedVariablesView.cs

Timestamp:

05/11/17 13:44:01 (7 years ago)

Author:

gkronber

Message:

#2698: merged r14381 r14382 r14384 r14388 r14418 r14425 from trunk to stable

Location:

stable

Files:

• . (modified) (1 prop)
• HeuristicLab.DataPreprocessing.Views (modified) (1 prop)
• HeuristicLab.DataPreprocessing.Views/3.4/PreprocessingCheckedVariablesView.cs (copied) (copied from trunk/sources/HeuristicLab.DataPreprocessing.Views/3.4/PreprocessingCheckedVariablesView.cs) (5 diffs)

stable/HeuristicLab.DataPreprocessing.Views/3.4/PreprocessingCheckedVariablesView.cs

@@ -21 +21 @@
 
 using System;
+using System.Collections.Generic;
 using System.Drawing;
 using System.Linq;
@@ -43 +44 @@
     }
 
-    protected bool VariableIsChecked(string name) {
+    protected bool IsVariableChecked(string name) {
       return Content.VariableItemList.CheckedItems.Any(x => x.Value.Value == name);
     }
-
+    protected IList<string> GetCheckedVariables() {
+      return checkedItemList.Content.CheckedItems.Select(i => i.Value.Value).ToList();
+    }
 
     protected override void OnContentChanged() {
@@ -53 +56 @@
 
       if (Content.VariableItemList == null) {
-        Content.VariableItemList = Content.CreateVariableItemList();
+        IList<string> inputs = Content.PreprocessingData.InputVariables;
+        if (Content.PreprocessingData.TargetVariable != null)
+          inputs = inputs.Union(new[] { Content.PreprocessingData.TargetVariable }).ToList();
+        Content.VariableItemList = Content.CreateVariableItemList(inputs);
       } else {
         var checkedNames = Content.VariableItemList.CheckedItems.Select(x => x.Value.Value);
-        Content.VariableItemList = Content.CreateVariableItemList(checkedNames);
+        Content.VariableItemList = Content.CreateVariableItemList(checkedNames.ToList());
       }
       Content.VariableItemList.CheckedItemsChanged += CheckedItemsChanged;
@@ -64 +70 @@
       var inputAndTarget = Content.PreprocessingData.InputVariables.Union(target != null ? new[] { target } : new string[] { });
       foreach (var col in Content.PreprocessingData.GetDoubleVariableNames().Except(inputAndTarget)) {
-        var listViewItem = checkedItemList.ItemsListView.FindItemWithText(col);
+        var listViewItem = checkedItemList.ItemsListView.FindItemWithText(col, false, 0, false);
         listViewItem.ForeColor = Color.LightGray;
       }
@@ -103 +109 @@
       Content.VariableItemList.Add(new StringValue(name));
       if (!Content.PreprocessingData.InputVariables.Contains(name) && Content.PreprocessingData.TargetVariable != name) {
-        var listViewItem = checkedItemList.ItemsListView.FindItemWithText(name);
+        var listViewItem = checkedItemList.ItemsListView.FindItemWithText(name, false, 0, false);
         listViewItem.ForeColor = Color.LightGray;
       }