Changeset 10628 for branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3/Implementations

Timestamp:

03/19/14 14:24:40 (11 years ago)

Author:

aesterer

Message:

Refactored LineChartLogic and added CheckedItemListView to LineChartView

File:

• branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3/Implementations/LineChartLogic.cs (modified) (3 diffs)

branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3/Implementations/LineChartLogic.cs

@@ -23 +23 @@
 using System.Collections.Generic;
 using HeuristicLab.Analysis;
+using HeuristicLab.Core;
+using HeuristicLab.Data;
 
 namespace HeuristicLab.DataPreprocessing {
   public class LineChartLogic : ILineChartLogic {
+ 
     private ITransactionalPreprocessingData preprocessingData;
-    private DataTable dataTable;
 
     public LineChartLogic(ITransactionalPreprocessingData preprocessingData) {
       this.preprocessingData = preprocessingData;
-      dataTable = new DataTable("LineChart");
-      FillDataTable();
-      preprocessingData.Changed += PreprocessingData_Changed;
     }
 
-    private void FillDataTable() {
-      IEnumerable<string> variableNames = preprocessingData.VariableNames;
+    public DataTable CreateDataTable(String title) {
+      DataTable dataTable = new DataTable(title);
+      IEnumerable<string> variableNames = GetVariableNames();
 
       foreach (string variableName in variableNames) {
-        IList<double> values = preprocessingData.GetValues<double>(variableName);
-        DataRow row = new DataRow(variableName, "", values);
+        DataRow row = CreateDataRow(variableName);
         dataTable.Rows.Add(row);
       }
-
+      return dataTable;
     }
 
-    public IEnumerable<object> GetVariableNames() {
+    public DataRow CreateDataRow(string variableName) {
+      IList<double> values = preprocessingData.GetValues<double>(variableName);
+      DataRow row = new DataRow(variableName, "", values);
+      return row;
+    }
+
+    private IEnumerable<string> GetVariableNames() {
       List<string> doubleVariableNames = new List<string>();
 
@@ -59 +64 @@
     }
 
-    public DataTable GetDataTable() {
-      return dataTable;
-    }
-
-    public void RemoveVariable(string name) {
-      dataTable.Rows.Remove(name);
-    }
-
-    public void AddVariable(string name) {
-      IList<double> values = preprocessingData.GetValues<double>(name);
-      DataRow row = new DataRow(name, "", values);
-      dataTable.Rows.Add(row);
-    }
-
-    public bool VariableIsDisplayed(string name) {
-
-      foreach (var item in dataTable.Rows) {
-        if (item.Name == name)
-          return true;
+    public ICheckedItemList<StringValue> CreateVariableItemList() {
+      ICheckedItemList<StringValue> itemList = new CheckedItemList<StringValue>();
+      foreach (string name in GetVariableNames()) {
+        itemList.Add(new StringValue(name), true);
       }
-      return false;
-    }
-
-    //TODO: refactor: possible code duplication with HistogramLogic
-    void PreprocessingData_Changed(object sender, DataPreprocessingChangedEventArgs e) {
-      switch (e.Type) {
-        case DataPreprocessingChangedEventType.DeleteColumn:
-          dataTable.Rows.Remove(preprocessingData.GetVariableName(e.Column));
-          break;
-        case DataPreprocessingChangedEventType.AddColumn:
-          dataTable.Rows.Add(new DataRow(preprocessingData.GetVariableName(e.Column), String.Empty, preprocessingData.GetValues<double>(e.Column)));
-          break;
-        case DataPreprocessingChangedEventType.ChangeColumn:
-        case DataPreprocessingChangedEventType.ChangeItem:
-          dataTable.Rows.Remove(preprocessingData.GetVariableName(e.Column));
-          dataTable.Rows.Add(new DataRow(preprocessingData.GetVariableName(e.Column), String.Empty, preprocessingData.GetValues<double>(e.Column)));
-          break;
-        case DataPreprocessingChangedEventType.DeleteRow:
-        case DataPreprocessingChangedEventType.AddRow:
-          dataTable.Rows.Clear();
-          FillDataTable();
-          break;
-      }
+      return new ReadOnlyCheckedItemList<StringValue>(itemList);
     }
 
@@ -108 +76 @@
       remove { preprocessingData.Changed -= value; }
     }
+
+    public string GetVariableNameByIndex(int index) {
+      return preprocessingData.GetVariableName(index);
+    }
+
   }
 }