Changeset 10377 for branches/DataPreprocessing

Timestamp:

01/22/14 15:56:14 (11 years ago)

Author:

aesterer

Message:

Added line chart and basic logic for line chart

Location:

branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3

Files:

• HeuristicLab.DataPreprocessing-3.3.csproj (modified) (1 diff)
• Implementations/LineChartLogic.cs (modified) (2 diffs)
• Interfaces/ILineChartLogic.cs (modified) (2 diffs)
• Views/DataPreprocessingView.cs (modified) (1 diff)
• Views/LineChartView.Designer.cs (modified) (1 diff)
• Views/LineChartView.cs (modified) (4 diffs)

branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3/HeuristicLab.DataPreprocessing-3.3.csproj

@@ -157 +157 @@
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\..\HeuristicLab.Analysis\3.3\HeuristicLab.Analysis-3.3.csproj">
+      <Project>{887425b4-4348-49ed-a457-b7d2c26ddbf9}</Project>
+      <Name>HeuristicLab.Analysis-3.3</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\HeuristicLab.Collections\3.3\HeuristicLab.Collections-3.3.csproj">
       <Project>{958b43bc-cc5c-4fa2-8628-2b3b01d890b6}</Project>

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

@@ -3 +3 @@
 using System.Linq;
 using System.Text;
+using HeuristicLab.Analysis;
 
 namespace HeuristicLab.DataPreprocessing
@@ -8 +9 @@
   public class LineChartLogic:ILineChartLogic
   {
+    private IPreprocessingData preprocessingData;
+
+    public LineChartLogic(IPreprocessingData preprocessingData) {
+      this.preprocessingData = preprocessingData;
+ 
+    }
+
+    public void FillDataTable(DataTable dataTable) {
+      IEnumerable<string> variableNames = preprocessingData.VariableNames;
+
+      foreach(string variableName in variableNames)
+      {
+        IList<double> values = preprocessingData.GetValues<double>(variableName);
+        DataRow row = new DataRow(variableName, "", values);
+        dataTable.Rows.Add(row);
+      }
+ 
+    }
   }
 }

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

@@ -3 +3 @@
 using System.Linq;
 using System.Text;
+using HeuristicLab.Analysis;
 
 namespace HeuristicLab.DataPreprocessing
@@ -8 +9 @@
   public interface ILineChartLogic
   {
+    void FillDataTable(DataTable dataTable);
   }
 }

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

@@ -50 +50 @@
       filterContent = new FilterContent(new FilterLogic());
       tranformationContent = new TransformationContent(new TransformationLogic());
-      lineChartContent = new LineChartContent(new LineChartLogic());
+      lineChartContent = new LineChartContent(new LineChartLogic(data));
       histogramContent = new HistogramContent(new HistogramLogic());
 

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

@@ -24 +24 @@
     /// </summary>
     private void InitializeComponent() {
-      components = new System.ComponentModel.Container();
+      this.viewHost = new HeuristicLab.MainForm.WindowsForms.ViewHost();
+      this.variablesListBox = new System.Windows.Forms.CheckedListBox();
+      this.SuspendLayout();
+      // 
+      // viewHost
+      // 
+      this.viewHost.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+      this.viewHost.Caption = "View";
+      this.viewHost.Content = null;
+      this.viewHost.Enabled = false;
+      this.viewHost.Location = new System.Drawing.Point(155, 3);
+      this.viewHost.Name = "viewHost";
+      this.viewHost.ReadOnly = false;
+      this.viewHost.Size = new System.Drawing.Size(922, 576);
+      this.viewHost.TabIndex = 0;
+      this.viewHost.ViewsLabelVisible = true;
+      this.viewHost.ViewType = null;
+      // 
+      // variablesListBox
+      // 
+      this.variablesListBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left)));
+      this.variablesListBox.FormattingEnabled = true;
+      this.variablesListBox.Location = new System.Drawing.Point(4, 4);
+      this.variablesListBox.Name = "variablesListBox";
+      this.variablesListBox.Size = new System.Drawing.Size(145, 574);
+      this.variablesListBox.TabIndex = 1;
+      this.variablesListBox.ItemCheck += new System.Windows.Forms.ItemCheckEventHandler(this.variablesListBox_ItemCheck);
+      // 
+      // LineChartView
+      // 
+      this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+      this.Controls.Add(this.variablesListBox);
+      this.Controls.Add(this.viewHost);
+      this.Name = "LineChartView";
+      this.Size = new System.Drawing.Size(1080, 582);
+      this.ResumeLayout(false);
+
     }
 
     #endregion
+
+    private MainForm.WindowsForms.ViewHost viewHost;
+    private System.Windows.Forms.CheckedListBox variablesListBox;
   }
 }

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

@@ -3 +3 @@
 using System.ComponentModel;
 using System.Drawing;
-using System.Data;
 using System.Linq;
 using System.Text;
@@ -12 +11 @@
 using HeuristicLab.Problems.DataAnalysis;
 using HeuristicLab.Data.Views;
+using HeuristicLab.Analysis;
 
 namespace HeuristicLab.DataPreprocessing.Views {
@@ -18 +18 @@
   [Content(typeof(LineChartContent), false)]
   public partial class LineChartView : ItemView {
+
+    private DataTable dataTable;
+
     public LineChartView() {
       InitializeComponent();
+    }
+
+    private void InitDataTable() {
+      dataTable = new DataTable("LineChart");
+      ILineChartLogic logic = Content.LineChartLogic;
+      logic.FillDataTable(dataTable);
     }
 
@@ -29 +38 @@
     protected override void OnContentChanged() {
       base.OnContentChanged();
+      if (Content != null) {
+        InitDataTable();
+        InitVariablesListBox();
+        viewHost.Content = dataTable;
+
+      }
+    }
+
+    private void InitVariablesListBox() {
+      ILineChartLogic logic = Content.LineChartLogic;
+
+      //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;
+
     }
   }