Changeset 10717 for branches

Timestamp:

04/02/14 16:01:01 (11 years ago)

Author:

aesterer

Message:

Added chart per variable feature to preprocessing chart view

Location:

branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views/3.3

Files:

• HeuristicLab.DataPreprocessing.Views-3.3.csproj (modified) (2 diffs)
• LineChartView.Designer.cs (modified) (1 diff)
• LineChartView.cs (modified) (2 diffs)
• PreprocessingChartView.Designer.cs (modified) (3 diffs)
• PreprocessingChartView.cs (modified) (8 diffs)

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

@@ -43 +43 @@
       <HintPath>..\..\bin\HeuristicLab.Collections-3.3.dll</HintPath>
     </Reference>
+    <Reference Include="HeuristicLab.Problems.ExternalEvaluation-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\bin\HeuristicLab.Problems.ExternalEvaluation-3.3.dll</HintPath>
+    </Reference>
     <Reference Include="HeuristicLab.Problems.Instances-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
@@ -229 +233 @@
       <Project>{DF87C13E-A889-46FF-8153-66DCAA8C5674}</Project>
       <Name>HeuristicLab.Problems.DataAnalysis-3.4</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\HeuristicLab.Problems.ExternalEvaluation.Views\3.3\HeuristicLab.Problems.ExternalEvaluation.Views-3.3.csproj">
+      <Project>{3081630C-9521-47D7-8075-1777C12F212C}</Project>
+      <Name>HeuristicLab.Problems.ExternalEvaluation.Views-3.3</Name>
     </ProjectReference>
     <ProjectReference Include="..\..\HeuristicLab.Visualization.ChartControlsExtensions\3.3\HeuristicLab.Visualization.ChartControlsExtensions-3.3.csproj">

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

@@ -24 +24 @@
     /// </summary>
     private void InitializeComponent() {
-      components = new System.ComponentModel.Container();
+      this.groupBox1 = new System.Windows.Forms.GroupBox();
+      this.checkBox1 = new System.Windows.Forms.CheckBox();
+      this.groupBox1.SuspendLayout();
+      this.SuspendLayout();
+      // 
+      // groupBox1
+      // 
+      this.groupBox1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+      this.groupBox1.Controls.Add(this.checkBox1);
+      this.groupBox1.Location = new System.Drawing.Point(4, 262);
+      this.groupBox1.Name = "groupBox1";
+      this.groupBox1.Size = new System.Drawing.Size(151, 134);
+      this.groupBox1.TabIndex = 7;
+      this.groupBox1.TabStop = false;
+      this.groupBox1.Text = "Options";
+      // 
+      // checkBox1
+      // 
+      this.checkBox1.AutoSize = true;
+      this.checkBox1.Location = new System.Drawing.Point(7, 20);
+      this.checkBox1.Name = "checkBox1";
+      this.checkBox1.Size = new System.Drawing.Size(66, 17);
+      this.checkBox1.TabIndex = 0;
+      this.checkBox1.Text = "AllInOne";
+      this.checkBox1.UseVisualStyleBackColor = true;
+      this.checkBox1.CheckedChanged += new System.EventHandler(this.checkBox1_CheckedChanged);
+      // 
+      // LineChartView
+      // 
+      this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+      this.Controls.Add(this.groupBox1);
+      this.Name = "LineChartView";
+      this.Controls.SetChildIndex(this.groupBox1, 0);
+      this.groupBox1.ResumeLayout(false);
+      this.groupBox1.PerformLayout();
+      this.ResumeLayout(false);
+
     }
 
     #endregion
+
+    private System.Windows.Forms.GroupBox groupBox1;
+    private System.Windows.Forms.CheckBox checkBox1;
   }
 }

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

@@ -20 +20 @@
 #endregion
 
+using System;
 using System.Windows.Forms;
 using HeuristicLab.Analysis;
@@ -42 +43 @@
       set { base.Content = value; }
     }
+
+    private void checkBox1_CheckedChanged(object sender, EventArgs e) {
+      if (allInOneMode == false)
+        allInOneMode = true;
+      else
+        allInOneMode = false;
+      GenerateChart();
+    }
   }
 }

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

@@ -46 +46 @@
     /// </summary>
     private void InitializeComponent() {
+      this.dataTableView = new HeuristicLab.Analysis.Views.DataTableView();
+      this.tableLayoutPanel = new System.Windows.Forms.TableLayoutPanel();
       this.checkedItemList = new HeuristicLab.DataPreprocessing.Views.PreprocessingCheckedItemListView();
-      this.chartPanel = new System.Windows.Forms.Panel();
-      this.dataTableView = new HeuristicLab.Analysis.Views.DataTableView();
-      this.chartPanel.SuspendLayout();
+      this.tableLayoutPanel.SuspendLayout();
       this.SuspendLayout();
+      // 
+      // dataTableView
+      // 
+      this.dataTableView.Caption = "DataTable View";
+      this.dataTableView.Content = null;
+      this.dataTableView.Dock = System.Windows.Forms.DockStyle.Fill;
+      this.dataTableView.Location = new System.Drawing.Point(3, 3);
+      this.dataTableView.Name = "dataTableView";
+      this.dataTableView.ReadOnly = false;
+      this.dataTableView.Size = new System.Drawing.Size(486, 390);
+      this.dataTableView.TabIndex = 0;
+      // 
+      // tableLayoutPanel
+      // 
+      this.tableLayoutPanel.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.tableLayoutPanel.AutoScroll = true;
+      this.tableLayoutPanel.ColumnCount = 1;
+      this.tableLayoutPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
+      this.tableLayoutPanel.Controls.Add(this.dataTableView, 0, 0);
+      this.tableLayoutPanel.Location = new System.Drawing.Point(162, 4);
+      this.tableLayoutPanel.Name = "tableLayoutPanel";
+      this.tableLayoutPanel.RowCount = 1;
+      this.tableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle());
+      this.tableLayoutPanel.Size = new System.Drawing.Size(492, 396);
+      this.tableLayoutPanel.TabIndex = 6;
+      this.tableLayoutPanel.Layout += new System.Windows.Forms.LayoutEventHandler(this.tableLayoutPanel_Layout);
       // 
       // checkedItemList
@@ -64 +92 @@
       this.checkedItemList.TabIndex = 4;
       // 
-      // chartPanel
-      // 
-      this.chartPanel.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.chartPanel.Controls.Add(this.dataTableView);
-      this.chartPanel.Location = new System.Drawing.Point(163, 4);
-      this.chartPanel.Name = "chartPanel";
-      this.chartPanel.Size = new System.Drawing.Size(488, 396);
-      this.chartPanel.TabIndex = 5;
-      // 
-      // dataTableView
-      // 
-      this.dataTableView.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.dataTableView.Caption = "DataTable View";
-      this.dataTableView.Content = null;
-      this.dataTableView.Location = new System.Drawing.Point(3, 3);
-      this.dataTableView.Name = "dataTableView";
-      this.dataTableView.ReadOnly = false;
-      this.dataTableView.Size = new System.Drawing.Size(482, 390);
-      this.dataTableView.TabIndex = 0;
-      // 
-      // LineChartView
+      // PreprocessingChartView
       // 
       this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-      this.Controls.Add(this.chartPanel);
+      this.Controls.Add(this.tableLayoutPanel);
       this.Controls.Add(this.checkedItemList);
-      this.Name = "LineChartView";
+      this.Name = "PreprocessingChartView";
       this.Size = new System.Drawing.Size(654, 403);
-      this.chartPanel.ResumeLayout(false);
+      this.tableLayoutPanel.ResumeLayout(false);
       this.ResumeLayout(false);
 
@@ -104 +108 @@
 
     private PreprocessingCheckedItemListView checkedItemList;
-    private System.Windows.Forms.Panel chartPanel;
     private Analysis.Views.DataTableView dataTableView;
+    private System.Windows.Forms.TableLayoutPanel tableLayoutPanel;
   }
 }

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

@@ -20 +20 @@
 #endregion
 
+using System;
+using System.Collections.Generic;
+using System.Drawing;
 using System.Windows.Forms;
 using HeuristicLab.Analysis;
+using HeuristicLab.Analysis.Views;
 using HeuristicLab.Collections;
 using HeuristicLab.Core;
@@ -36 +40 @@
     private IChartLogic logic;
     private DataTable dataTable;
+    private List<DataTable> dataTablePerVariable;
     private ICheckedItemList<StringValue> variableItemList;
+    private List<DataRow> dataRows;
+
     protected DataRowVisualProperties.DataRowChartType chartType;
     protected string chartTitle;
+    protected bool allInOneMode = true;
 
     private const string DEFAULT_CHART_TITLE = "Chart";
@@ -54 +62 @@
         if (VariableIsDisplayed(variableName)) {
           dataTable.Rows.Remove(variableName);
+          dataTablePerVariable.Remove(dataTablePerVariable.Find( x => (x.Name == variableName)));
         } else {
-          dataTable.Rows.Add(logic.CreateDataRow(variableName, chartType));
+          DataRow row = GetDataRow(variableName);
+          //row.VisualProperties.Color = GetRandomColor();
+          dataTable.Rows.Add(row);
+          DataTable d = new DataTable(variableName);
+          d.Rows.Add(row);
+          dataTablePerVariable.Add(d);
         }
       }
-    }
-
-    public bool VariableIsDisplayed(string name) {
+
+      if (!allInOneMode)
+        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;
+    }
+
+    private bool VariableIsDisplayed(string name) {
 
       foreach (var item in dataTable.Rows) {
@@ -69 +95 @@
     }
 
-    private void InitDataTable() {
-      dataTable = logic.CreateDataTable(chartTitle, chartType);
-      dataTableView.Content = dataTable;
-    }
-
-    private void InitVariablesListBox() {
-      variableItemList = logic.CreateVariableItemList();
-      checkedItemList.Content = variableItemList;
-    }
-
     protected override void RegisterContentEvents() {
       base.RegisterContentEvents();
@@ -96 +112 @@
       get { return (PreprocessingChartContent)base.Content; }
       set { base.Content = value; }
+    }
+
+    private void InitData() {
+      variableItemList = logic.CreateVariableItemList();
+      dataRows = logic.CreateAllDataRows(chartType);
+
+      // init data table
+      dataTable = new DataTable(chartTitle);
+      dataTable.Rows.AddRange(dataRows);
+
+      // init data table per variable
+      dataTablePerVariable = new List<DataTable>();
+      foreach(var checkedItem in variableItemList.CheckedItems)  {
+        string variableName = variableItemList[checkedItem.Index].Value;
+        DataTable d = new DataTable(variableName);
+        DataRow row = GetDataRow(variableName);
+        //row.VisualProperties.Color = GetRandomColor();
+        d.Rows.Add(row);
+        dataTablePerVariable.Add(d);
+      }
+
+    }
+
+    private DataRow GetDataRow(string variableName) {
+      foreach (DataRow row in dataRows) {
+        if (row.Name == variableName)
+          return row;
+      }
+      return null;
     }
 
@@ -102 +147 @@
       if (Content != null) {
         logic = Content.ChartLogic;
-        InitDataTable();
-        InitVariablesListBox();
+        InitData();
+        checkedItemList.Content = variableItemList;
+        GenerateChart();
         variableItemList.CheckedItemsChanged += CheckedItemsChanged;
         logic.Changed += PreprocessingData_Changed;
@@ -109 +155 @@
     }
 
-    //TODO: refactor: possible code duplication with HistogramLogic
+    // TODO : handle also other changed events
     void PreprocessingData_Changed(object sender, DataPreprocessingChangedEventArgs e) {
       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:
         case DataPreprocessingChangedEventType.ChangeItem:
-          dataTable.Rows.Remove(logic.GetVariableNameByIndex(e.Column));
-          dataTable.Rows.Add(logic.CreateDataRow(logic.GetVariableNameByIndex(e.Column), chartType));
+          //UpdateDataForVariable(logic.GetVariableNameByIndex(e.Column));
+
           break;
         case DataPreprocessingChangedEventType.DeleteRow:
         case DataPreprocessingChangedEventType.AddRow:
-          InitDataTable();
           break;
       }
+    }
+
+    private void UpdateDataForVariable(string variableName) {
+      DataRow newRow = logic.CreateDataRow(variableName, chartType);
+      dataTable.Rows.Remove(variableName);
+      dataTable.Rows.Add(newRow);
+      DataTable dt = dataTablePerVariable.Find(x => (x.Rows.ItemName == variableName));
+      dt.Rows.Remove(variableName);
+      dt.Rows.Add(newRow);
     }
 
@@ -154 +208 @@
     }
 
+    protected void GenerateChart() {
+
+      //Clear out the existing controls
+      tableLayoutPanel.Controls.Clear();
+
+      //Clear out the existing row and column styles
+      tableLayoutPanel.ColumnStyles.Clear();
+      tableLayoutPanel.RowStyles.Clear();
+      tableLayoutPanel.AutoScroll = false;
+      tableLayoutPanel.AutoScroll = true;    
+
+      if (allInOneMode) {
+        GenerateSingleChartLayout();
+      } else
+        GenerateMultiChartLayout();
+    }
+
+    private void GenerateSingleChartLayout() {
+      tableLayoutPanel.ColumnCount = 1;
+      tableLayoutPanel.RowCount = 1;
+      tableLayoutPanel.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 100));
+      tableLayoutPanel.RowStyles.Add(new RowStyle(SizeType.Percent, 100));
+      tableLayoutPanel.Controls.Add(dataTableView, 0, 0);
+      dataTableView.Content = dataTable;
+    }
+
+    private void GenerateMultiChartLayout() {
+      int checkedItemsCnt = 0;
+      foreach(var item in variableItemList.CheckedItems)
+        checkedItemsCnt++;
+
+      int rows = 0;
+      int columns = 0;
+
+      // set columns and rows based on number of items
+      if (checkedItemsCnt <= 2)
+        columns = 1;
+      else if (checkedItemsCnt <= 6)
+        columns = 2;
+      else
+        columns = 3;
+
+      if (columns == 3)
+        rows = (checkedItemsCnt+2) / columns;
+      else if(columns == 2)
+        rows = (checkedItemsCnt + 1) / columns;
+      else
+        rows = checkedItemsCnt / columns;
+
+      //Now we will generate the table, setting up the row and column counts first
+      tableLayoutPanel.ColumnCount = columns;
+      tableLayoutPanel.RowCount = rows;
+
+      List<DataTable>.Enumerator enumerator = dataTablePerVariable.GetEnumerator();
+      for (int x = 0; x < columns; x++) {
+        
+        if(rows <= 3)
+          tableLayoutPanel.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 100 / columns));
+        else
+          //scrollbar is shown if there are more than 3 rows -> remove scroll bar width from total width
+          tableLayoutPanel.ColumnStyles.Add(new ColumnStyle(SizeType.Absolute, (tableLayoutPanel.Width - System.Windows.Forms.SystemInformation.VerticalScrollBarWidth) / columns));
+        for (int y = 0; y < rows; y++) {
+          //Add a row only when creating the first column
+          if (x == 0) {
+            // fixed chart size when there are more than 3 tables
+            if (rows > 3)
+              tableLayoutPanel.RowStyles.Add(new RowStyle(SizeType.Absolute, 300));
+            else
+              tableLayoutPanel.RowStyles.Add(new RowStyle(SizeType.Percent, 100 / rows));
+          }
+
+          DataTableView dataView = new DataTableView();
+          enumerator.MoveNext();
+          DataTable d = enumerator.Current;
+          if (d == null) {
+            // dummy panel for empty field 
+            Panel p = new Panel();
+            p.Dock = DockStyle.Fill;
+            tableLayoutPanel.Controls.Add(p, y, x);
+          }
+          else {
+            dataView.Content = d;
+            dataView.Dock = DockStyle.Fill;
+            tableLayoutPanel.Controls.Add(dataView, y, x);
+          }
+        }
+      }
+    }
+
+    //Remove horizontal scroll bar if visible
+    private void tableLayoutPanel_Layout(object sender, LayoutEventArgs e) {
+      if (tableLayoutPanel.HorizontalScroll.Visible) {
+        // Add padding on the right in order to accomodate the vertical scrollbar
+        int vWidth = SystemInformation.VerticalScrollBarWidth;
+        tableLayoutPanel.Padding = new Padding(0, 0, vWidth, 0);
+      } else {
+        // Reset padding
+        tableLayoutPanel.Padding = new Padding(0);
+      }
+    }
+
+    private void radioButton1_CheckedChanged(object sender, EventArgs e) {
+      if (allInOneMode == false)
+        allInOneMode = true;
+      else
+        allInOneMode = false;
+      GenerateChart();
+    }
+
+
+
   }
 }