Changeset 10382 for branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3

Timestamp:

01/22/14 16:32:24 (10 years ago)

Author:

aesterer

Message:

Added variable selection in line chart

Location:

branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3

Files:

• Implementations/LineChartLogic.cs (modified) (2 diffs)
• Interfaces/ILineChartLogic.cs (modified) (1 diff)
• Views/LineChartView.Designer.cs (modified) (2 diffs)
• Views/LineChartView.cs (modified) (4 diffs)

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

@@ -7 +7 @@
 namespace HeuristicLab.DataPreprocessing
 {
-  public class LineChartLogic:ILineChartLogic
+  public class LineChartLogic : ILineChartLogic
   {
     private IPreprocessingData preprocessingData;
+    private DataTable dataTable;
 
     public LineChartLogic(IPreprocessingData preprocessingData) {
       this.preprocessingData = preprocessingData;
- 
+      dataTable = new DataTable("LineChart");
+      FillDataTable();
     }
 
-    public void FillDataTable(DataTable dataTable) {
+    private void FillDataTable() {
       IEnumerable<string> variableNames = preprocessingData.VariableNames;
 
@@ -27 +29 @@
  
     }
+
+    public IEnumerable<object> GetVariableNames()
+    {
+      return preprocessingData.VariableNames;
+    }
+
+    public DataTable GetDataTable()
+    {
+      return dataTable;
+    }
+
+
+    #region ILineChartLogic Members
+
+    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);
+    }
+
+    #endregion
+
+    public bool VariableIsDisplayed(string name) {
+
+      foreach (var item in dataTable.Rows) {
+         if(item.Name == name)
+           return true;
+      }
+      return false;
+    }
+
   }
 }

branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3/Interfaces/ILineChartLogic.cs

@@ -9 +9 @@
   public interface ILineChartLogic
   {
-    void FillDataTable(DataTable dataTable);
+
+    void RemoveVariable(string name);
+
+    void AddVariable(string name);
+
+    IEnumerable<object> GetVariableNames();
+
+    DataTable GetDataTable();
+
+    bool VariableIsDisplayed(string name);
   }
 }

branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3/Views/LineChartView.Designer.cs

@@ -36 +36 @@
       this.viewHost.Content = null;
       this.viewHost.Enabled = false;
-      this.viewHost.Location = new System.Drawing.Point(155, 3);
+      this.viewHost.Location = new System.Drawing.Point(155, 4);
       this.viewHost.Name = "viewHost";
       this.viewHost.ReadOnly = false;
-      this.viewHost.Size = new System.Drawing.Size(922, 576);
+      this.viewHost.Size = new System.Drawing.Size(922, 559);
       this.viewHost.TabIndex = 0;
       this.viewHost.ViewsLabelVisible = true;
@@ -49 +49 @@
             | System.Windows.Forms.AnchorStyles.Left)));
       this.variablesListBox.FormattingEnabled = true;
-      this.variablesListBox.Location = new System.Drawing.Point(4, 4);
+      this.variablesListBox.Location = new System.Drawing.Point(3, 4);
       this.variablesListBox.Name = "variablesListBox";
-      this.variablesListBox.Size = new System.Drawing.Size(145, 574);
+      this.variablesListBox.Size = new System.Drawing.Size(146, 559);
       this.variablesListBox.TabIndex = 1;
       this.variablesListBox.ItemCheck += new System.Windows.Forms.ItemCheckEventHandler(this.variablesListBox_ItemCheck);

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

@@ -19 +19 @@
   public partial class LineChartView : ItemView {
 
-    private DataTable dataTable;
-
     public LineChartView() {
       InitializeComponent();
@@ -26 +24 @@
 
     private void InitDataTable() {
-      dataTable = new DataTable("LineChart");
       ILineChartLogic logic = Content.LineChartLogic;
-      logic.FillDataTable(dataTable);
+      viewHost.Content = logic.GetDataTable();
     }
 
@@ -41 +38 @@
         InitDataTable();
         InitVariablesListBox();
-        viewHost.Content = dataTable;
-
       }
     }
@@ -49 +44 @@
       ILineChartLogic logic = Content.LineChartLogic;
 
-      //foreach (var variableName in logic.GetVariableNames()) {
-      //  variablesListBox.Items.Add(variableName,true); 
-      //}
+      foreach (var variableName in logic.GetVariableNames()) {
+        variablesListBox.Items.Add(variableName,true); 
+      }
     }
 
     private void variablesListBox_ItemCheck(object sender, ItemCheckEventArgs e) {
-      //string item = variablesListBox.Items[e.Index] as string;
+      string item = variablesListBox.Items[e.Index] as string;
 
+
+      if (e.NewValue == CheckState.Checked && !Content.LineChartLogic.VariableIsDisplayed(item))
+        Content.LineChartLogic.AddVariable(item);
+      else if(e.NewValue == CheckState.Unchecked && Content.LineChartLogic.VariableIsDisplayed(item))
+        Content.LineChartLogic.RemoveVariable(item);
     }
   }