Changeset 10741 for branches/DataPreprocessing

Timestamp:

04/09/14 13:41:30 (11 years ago)

Author:

aesterer

Message:

Handle add/delete column in chart view

File:

• branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views/3.3/PreprocessingChartView.cs (modified) (7 diffs)

branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views/3.3/PreprocessingChartView.cs

@@ -66 +66 @@
         } else {
           DataRow row = GetDataRow(variableName);
-          //row.VisualProperties.Color = GetRandomColor();
           dataTable.Rows.Add(row);
           DataTable d = new DataTable(variableName);
@@ -77 +76 @@
         GenerateChart();
 
-    }
-
-    private Color GetRandomColor() {
-      Random randomGen = new Random();
-      KnownColor[] names = (KnownColor[])Enum.GetValues(typeof(KnownColor));
-      KnownColor randomColorName = names[randomGen.Next(names.Length)];
-      Color randomColor = Color.FromKnownColor(randomColorName);
-      return randomColor;
     }
 
@@ -127 +118 @@
         DataTable d = new DataTable(variableName);
         DataRow row = GetDataRow(variableName);
-        //row.VisualProperties.Color = GetRandomColor();
         d.Rows.Add(row);
         dataTablePerVariable.Add(d);
@@ -156 +146 @@
       switch (e.Type) {
         case DataPreprocessingChangedEventType.DeleteColumn:
-          //RemoveVariable(logic.GetVariableNameByIndex(e.Column));
+          RemoveVariable(logic.GetVariableNameByIndex(e.Column));
           break;
         case DataPreprocessingChangedEventType.AddColumn:
-          //AddVariable(logic.GetVariableNameByIndex(e.Column));
+          AddVariable(logic.GetVariableNameByIndex(e.Column));
           break;
         case DataPreprocessingChangedEventType.ChangeColumn:
@@ -169 +159 @@
         case DataPreprocessingChangedEventType.Any:
           InitData();
-          GenerateChart();
-          
+          GenerateChart();          
           break;
       }
@@ -188 +177 @@
     // add variable to data table and item list
     private void AddVariable(string name) {
-      dataTable.Rows.Add(logic.CreateDataRow(name, chartType));
+      DataRow row = logic.CreateDataRow(name, chartType);
+      dataTable.Rows.Add(row);
+      DataTable d = new DataTable(name);
+      d.Rows.Add(row);
+      dataTablePerVariable.Add(d);
       variableItemList.Add(new StringValue(name));
+      if (!allInOneMode)
+        GenerateChart();
     }
 
@@ -195 +190 @@
     private void RemoveVariable(string name) {
       dataTable.Rows.Remove(name);
+      dataTablePerVariable.Remove(dataTablePerVariable.Find(x => (x.Name == name)));
 
       StringValue stringValue = FindVariableItemList(name);
       if (stringValue != null)
         variableItemList.Remove(stringValue);
-
+      if (!allInOneMode)
+        GenerateChart();
     }