Changeset 12676 for trunk/sources/HeuristicLab.DataPreprocessing.Views/3.4/PreprocessingChartView.cs

Timestamp:

07/08/15 12:53:55 (9 years ago)

Author:

mkommend

Message:

#2335: Merged changes into trunk.

Location:

trunk/sources/HeuristicLab.DataPreprocessing.Views

Files:

• . (modified) (1 prop)
• 3.4/PreprocessingChartView.cs (modified) (7 diffs)

trunk/sources/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;
@@ -49 +50 @@
 
     public IEnumerable<double> Classification { get; set; }
+    public bool IsDetailedChartViewEnabled { get; set; }
 
     public PreprocessingChartView() {
@@ -59 +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;
@@ -121 +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;
@@ -135 +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);
+        }
       }
 
@@ -152 +160 @@
       dataTable.SelectedRows.Clear();
       foreach (var selectedRow in selectedDataRows) {
-        if(VariableIsDisplayed(selectedRow.Name))
+        if (VariableIsDisplayed(selectedRow.Name))
           dataTable.SelectedRows.Add(selectedRow);
       }
@@ -354 +362 @@
       PreprocessingDataTableView dataView = new PreprocessingDataTableView();
       dataView.Classification = Classification;
+      dataView.IsDetailedChartViewEnabled = IsDetailedChartViewEnabled;
 
       if (dataTable == null) {