Changeset 14418 for trunk

Timestamp:

11/25/16 16:16:20 (8 years ago)

Author:

pfleck

Message:

#2698 Only input and target variables are pre-checked for linechart, histrogram and scatterplot.

Location:

trunk/sources

Files:

• HeuristicLab.DataPreprocessing.Views/3.4/PreprocessingChartView.cs (modified) (3 diffs)
• HeuristicLab.DataPreprocessing.Views/3.4/PreprocessingCheckedVariablesView.cs (modified) (1 diff)
• HeuristicLab.DataPreprocessing/3.4/Content/PreprocessingChartContent.cs (modified) (2 diffs)

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

@@ -61 +61 @@
         InitData();
         GenerateChart();
+
+        foreach (var row in dataRows) {
+          string variableName = row.Name;
+          if (!IsVariableChecked(variableName)) {
+            dataTableView.SetRowEnabled(variableName, false);
+            dataTable.SelectedRows.Remove(variableName);
+            dataTablePerVariable.Remove(dataTablePerVariable.Find(x => (x.Name == variableName)));
+          }
+        }
       }
     }
@@ -71 +80 @@
 
       //add data rows to data tables according to checked item list
-      foreach (var checkedItem in Content.VariableItemList.CheckedItems) {
-        string variableName = Content.VariableItemList[checkedItem.Index].Value;
+      foreach (var row in dataRows) {
+        string variableName = row.Name;
+
+        //add row to data table
+        dataTable.Rows.Add(row);
+
+        //add row to data table per variable
         PreprocessingDataTable d = new PreprocessingDataTable(variableName);
-        DataRow row = GetDataRow(variableName);
-
-        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);
-        }
+        d.Rows.Add(row);
+        dataTablePerVariable.Add(d);
       }
 
@@ -95 +101 @@
         string variableName = item.Value.Value;
 
-        // not checked -> remove
+
         if (!IsVariableChecked(variableName)) {
+          // not checked -> remove
           dataTableView.SetRowEnabled(variableName, false);
           dataTable.SelectedRows.Remove(variableName);
           dataTablePerVariable.Remove(dataTablePerVariable.Find(x => (x.Name == variableName)));
         } else {
+          // checked -> add
           DataRow row = GetDataRow(variableName);
           DataRow selectedRow = GetSelectedDataRow(variableName);

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

@@ -56 +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;

trunk/sources/HeuristicLab.DataPreprocessing/3.4/Content/PreprocessingChartContent.cs

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