Changeset 10992 for branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views

Timestamp:

06/11/14 15:06:24 (10 years ago)

Author:

rstoll

Message:

• removed ChartLogic and

moved logic accordingly to PreprocessingChartContent, ScatterPlotContent
modified views etc. to use IFilteredPreprocessingData instead of ChartLogic

• reordered code

Location:

branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views/3.4

Files:

• DataPreprocessingView.cs (modified) (2 diffs)
• HistogramView.cs (modified) (3 diffs)
• PreprocessingChartView.cs (modified) (19 diffs)
• ScatterPlotMultiView.cs (modified) (9 diffs)
• ScatterPlotSingleView.cs (modified) (3 diffs)

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

@@ -49 +49 @@
         var statisticsLogic = new StatisticsLogic(data, searchLogic);
         var manipulationLogic = new ManipulationLogic(data, searchLogic, statisticsLogic, dataGridLogic);
-        var chartLogic = new ChartLogic(data);
         //var correlationMatrixLogic = new ChartLogic(data);
         var filterLogic = new FilterLogic(data);
@@ -59 +58 @@
           new StatisticsContent(statisticsLogic),
 
-          new LineChartContent(chartLogic),
-          new HistogramContent(chartLogic),
-          new ScatterPlotContent(Content),
+          new LineChartContent(data),
+          new HistogramContent(data),
+          new ScatterPlotContent(data),
           new CorrelationMatrixContent(Content),
           new DataCompletenessChartContent(dataGridLogic, searchLogic),

branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views/3.4/HistogramView.cs

@@ -18 +18 @@
  * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
  */
-#endregion  
+#endregion
 using System;
 using System.Windows.Forms;
@@ -40 +40 @@
       base.OnContentChanged();
       if (Content != null) {
-        logic = Content.ChartLogic;
 
         classifierComboBox.Items.Clear();
         classifierComboBox.Items.Add("None");
 
-        foreach (string var in logic.GetVariableNamesForHistogramClassification()) {
+        foreach (string var in Content.GetVariableNamesForHistogramClassification()) {
           classifierComboBox.Items.Add(var);
         }
@@ -66 +65 @@
 
       if (classifierComboBox.SelectedIndex != 0) {
-        Classification = logic.GetVariableValues(classifierComboBox.SelectedItem.ToString());
+        int columndIndex = Content.PreprocessingData.GetColumnIndex(classifierComboBox.SelectedItem.ToString());
+        Classification = Content.PreprocessingData.GetValues<double>(columndIndex);
       } else {
         Classification = null;

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

@@ -24 +24 @@
 using System.Windows.Forms;
 using HeuristicLab.Analysis;
-using HeuristicLab.Analysis.Views;
 using HeuristicLab.Collections;
-using HeuristicLab.Core;
 using HeuristicLab.Core.Views;
 using HeuristicLab.Data;
@@ -45 +43 @@
     protected DataRowVisualProperties.DataRowChartType chartType;
     protected string chartTitle;
-    protected IChartLogic logic;
 
     private const string DEFAULT_CHART_TITLE = "Chart";
     private const int FIXED_CHART_SIZE = 300;
-    private const int MAX_TABLE_AUTO_SIZE_ROWS = 3;
+    private const int MAX_TABLE_ROWS = 3;
 
     public IEnumerable<double> Classification { get; set; }
@@ -70 +67 @@
           dataTable.SelectedRows.Remove(variableName);
           dataTablePerVariable.Remove(dataTablePerVariable.Find(x => (x.Name == variableName)));
-        //variable isnt't displayed -> add
+          //variable isnt't displayed -> add
         } else {
           DataRow row = GetDataRow(variableName);
@@ -81 +78 @@
 
           //update selection
-          if (selectedRow != null)
-          {
+          if (selectedRow != null) {
             dataTable.SelectedRows.Add(selectedRow);
             pdt.SelectedRows.Add(selectedRow);
+          }
         }
-      }
       }
 
@@ -106 +102 @@
     protected override void RegisterContentEvents() {
       base.RegisterContentEvents();
-      Content.ChartLogic.Changed += PreprocessingData_Changed;
-      Content.ChartLogic.SelectionChanged += PreprocessingData_SelctionChanged;
+      Content.PreprocessingData.Changed += PreprocessingData_Changed;
+      Content.PreprocessingData.SelectionChanged += PreprocessingData_SelctionChanged;
 
     }
@@ -113 +109 @@
     protected override void DeregisterContentEvents() {
       base.DeregisterContentEvents();
-      Content.ChartLogic.Changed -= PreprocessingData_Changed;
-      Content.ChartLogic.SelectionChanged -= PreprocessingData_SelctionChanged;
+      Content.PreprocessingData.Changed -= PreprocessingData_Changed;
+      Content.PreprocessingData.SelectionChanged -= PreprocessingData_SelctionChanged;
     }
 
@@ -123 +119 @@
 
     private void InitData() {
-      if (Content.VariableItemList == null)
-      {
-        Content.VariableItemList = logic.CreateVariableItemList();
+      if (Content.VariableItemList == null) {
+        Content.VariableItemList = Content.CreateVariableItemList();
       }
       checkedItemList.Content = Content.VariableItemList;
 
       //Create data tables and data rows
-      dataRows = logic.CreateAllDataRows(chartType);
+      dataRows = Content.CreateAllDataRows(chartType);
       dataTable = new PreprocessingDataTable(chartTitle);
       dataTablePerVariable = new List<PreprocessingDataTable>();
 
       //add data rows to data tables according to checked item list
-      foreach (var checkedItem in Content.VariableItemList.CheckedItems)
-      {
+      foreach (var checkedItem in Content.VariableItemList.CheckedItems) {
         string variableName = Content.VariableItemList[checkedItem.Index].Value;
         PreprocessingDataTable d = new PreprocessingDataTable(variableName);
@@ -155 +149 @@
 
       //update data table selection
-      selectedDataRows = logic.CreateAllSelectedDataRows(chartType);
+      selectedDataRows = Content.CreateAllSelectedDataRows(chartType);
       dataTable.SelectedRows.Clear();
       dataTable.SelectedRows.AddRange(selectedDataRows);
@@ -188 +182 @@
       base.OnContentChanged();
       if (Content != null) {
-        logic = Content.ChartLogic;
         InitData();
         Content.VariableItemList.CheckedItemsChanged += CheckedItemsChanged;
@@ -199 +192 @@
       switch (e.Type) {
         case DataPreprocessingChangedEventType.DeleteColumn:
-          RemoveVariable(logic.GetVariableNameByIndex(e.Column));
+          RemoveVariable(Content.PreprocessingData.GetVariableName(e.Column));
           break;
         case DataPreprocessingChangedEventType.AddColumn:
-          AddVariable(logic.GetVariableNameByIndex(e.Column));
+          AddVariable(Content.PreprocessingData.GetVariableName(e.Column));
           break;
         case DataPreprocessingChangedEventType.ChangeColumn:
         case DataPreprocessingChangedEventType.ChangeItem:
-          UpdateDataForVariable(logic.GetVariableNameByIndex(e.Column));
+          UpdateDataForVariable(Content.PreprocessingData.GetVariableName(e.Column));
           break;
         case DataPreprocessingChangedEventType.DeleteRow:
@@ -212 +205 @@
         case DataPreprocessingChangedEventType.Any:
         default:
-           //TODO: test with transform
+          //TODO: test with transform
           InitData();
           GenerateChart();
@@ -224 +217 @@
 
     private void UpdateDataForVariable(string variableName) {
-      DataRow newRow = logic.CreateDataRow(variableName, chartType);
+      DataRow newRow = Content.CreateDataRow(variableName, chartType);
       dataTable.Rows.Remove(variableName);
       dataTable.Rows.Add(newRow);
@@ -236 +229 @@
     // add variable to data table and item list
     private void AddVariable(string name) {
-      DataRow row = logic.CreateDataRow(name, chartType);
+      DataRow row = Content.CreateDataRow(name, chartType);
       dataTable.Rows.Add(row);
       PreprocessingDataTable d = new PreprocessingDataTable(name);
@@ -259 +252 @@
 
     private StringValue FindVariableItemList(string name) {
-      foreach (StringValue stringValue in Content.VariableItemList)
-      {
+      foreach (StringValue stringValue in Content.VariableItemList) {
         if (stringValue.Value == name)
           return stringValue;
@@ -270 +262 @@
 
       ClearTableLayout();
-      if (Content.AllInOneMode)
-      {
+      if (Content.AllInOneMode) {
         GenerateSingleChartLayout();
       } else
@@ -328 +319 @@
       int columns = GetNrOfMultiChartColumns(checkedItemsCnt);
       int rows = GetNrOfMultiChartRows(checkedItemsCnt, columns);
-      tableLayoutPanel.VerticalScroll.Enabled = true;
-      
+
       tableLayoutPanel.ColumnCount = columns;
       tableLayoutPanel.RowCount = rows;
@@ -336 +326 @@
       for (int x = 0; x < columns; x++) {
 
-        if (rows <= MAX_TABLE_AUTO_SIZE_ROWS)
+        if (rows <= MAX_TABLE_ROWS)
           tableLayoutPanel.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 100 / columns));
         else
@@ -345 +335 @@
           if (x == 0) {
             // fixed chart size when there are more than 3 tables
-            if (rows > MAX_TABLE_AUTO_SIZE_ROWS)
+            if (rows > MAX_TABLE_ROWS)
               tableLayoutPanel.RowStyles.Add(new RowStyle(SizeType.Absolute, FIXED_CHART_SIZE));
             else
@@ -354 +344 @@
           PreprocessingDataTable d = enumerator.Current;
           AddDataTableToTableLayout(d, x, y);
-          
+
         }
       }

branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views/3.4/ScatterPlotMultiView.cs

@@ -1 +1 @@
 using System;
 using System.Collections.Generic;
-using System.ComponentModel;
 using System.Drawing;
 using System.Linq;
-using System.Text;
 using System.Windows.Forms;
 using HeuristicLab.Analysis;
-using HeuristicLab.Analysis.Views;
-using HeuristicLab.Collections;
 using HeuristicLab.Common;
-using HeuristicLab.Core;
 using HeuristicLab.Core.Views;
-using HeuristicLab.Data;
 using HeuristicLab.DataPreprocessing.Implementations;
 using HeuristicLab.MainForm;
@@ -47 +41 @@
     private void addHeaderToTableLayoutPanels() {
 
-      List<string> variables = Content.GetVariableNames().ToList();
+      List<string> variables = Content.PreprocessingData.GetDoubleVariableNames().ToList();
 
       for (int i = 1; i < variables.Count + 1; i++) {
@@ -66 +60 @@
     }
 
-    private void GenerateMultiLayout() 
-    {
-      List<string> variables = Content.GetVariableNames().ToList();
+    private void GenerateMultiLayout() {
+      List<string> variables = Content.PreprocessingData.GetDoubleVariableNames().ToList();
 
       tableLayoutPanel.Controls.Clear();
@@ -76 +69 @@
 
       //Set row and column count
-      tableLayoutPanel.ColumnCount = variables.Count+1;
-      tableLayoutPanel.RowCount = variables.Count+1;
+      tableLayoutPanel.ColumnCount = variables.Count + 1;
+      tableLayoutPanel.RowCount = variables.Count + 1;
 
       tableLayoutPanel.ColumnStyles.Add(new ColumnStyle(SizeType.Absolute, HEADER_WIDTH));
       tableLayoutPanel.RowStyles.Add(new RowStyle(SizeType.Absolute, HEADER_HEIGHT));
       // set column and row layout
-      for (int x = 0; x < variables.Count; x++) 
-      {
+      for (int x = 0; x < variables.Count; x++) {
         // auto size
         if (variables.Count <= MAX_AUTO_SIZE_ELEMENTS) {
           tableLayoutPanel.ColumnStyles.Add(new ColumnStyle(SizeType.Absolute, (tableLayoutPanel.Width - HEADER_WIDTH) / variables.Count));
           tableLayoutPanel.RowStyles.Add(new RowStyle(SizeType.Absolute, (tableLayoutPanel.Height - HEADER_HEIGHT) / variables.Count));
-        } 
-        // fixed size
+        }
+          // fixed size
         else {
           tableLayoutPanel.ColumnStyles.Add(new ColumnStyle(SizeType.Absolute, FIXED_CHART_WIDTH));
@@ -98 +90 @@
       addHeaderToTableLayoutPanels();
       addChartsToTableLayoutPanel();
- 
+
     }
 
     private void addChartsToTableLayoutPanel() {
 
-      List<string> variables = Content.GetVariableNames().ToList();
+      List<string> variables = Content.PreprocessingData.GetDoubleVariableNames().ToList();
 
       //set scatter plots and histograms
@@ -119 +111 @@
             tableLayoutPanel.Controls.Add(pcv, y, x);
           }
-          //scatter plot
+            //scatter plot
           else {
             ScatterPlot scatterPlot = Content.CreateScatterPlot(variables[x - 1], variables[y - 1]);
@@ -147 +139 @@
       // only one data row should be in scatter plot
       if (scatterPlot.Rows.Count == 1) {
-        string[] variables = scatterPlot.Rows.ElementAt(0).Name.Split(new string[]{" - "},StringSplitOptions.None); // extract variable names from string
+        string[] variables = scatterPlot.Rows.ElementAt(0).Name.Split(new string[] { " - " }, StringSplitOptions.None); // extract variable names from string
         scatterContent.SelectedXVariable = variables[0];
         scatterContent.SelectedYVariable = variables[1];
@@ -161 +153 @@
 
         // set only variable name checked
-        foreach(var checkedItem in histoContent.VariableItemList)
-        {
-          if(checkedItem.Value == variableName)
-            histoContent.VariableItemList.SetItemCheckedState(checkedItem,true);
+        foreach (var checkedItem in histoContent.VariableItemList) {
+          if (checkedItem.Value == variableName)
+            histoContent.VariableItemList.SetItemCheckedState(checkedItem, true);
           else
-            histoContent.VariableItemList.SetItemCheckedState(checkedItem,false);
-            
+            histoContent.VariableItemList.SetItemCheckedState(checkedItem, false);
+
         }
       }
@@ -174 +165 @@
     //open histogram in new tab with new content when double clicked
     private void HistogramDoubleClick(object sender, EventArgs e) {
-      //PreprocessingDataTableView pcv = (PreprocessingDataTableView)sender;
-      //HistogramContent histoContent = new HistogramContent(Content,);  // create new content     
-      //histoContent.VariableItemList = logic.CreateVariableItemList();
-      //PreprocessingDataTable dataTable = pcv.Content;
-      //setVariableItemListFromDataTable(histoContent, dataTable);
+      PreprocessingDataTableView pcv = (PreprocessingDataTableView)sender;
+      HistogramContent histoContent = new HistogramContent(Content.PreprocessingData);  // create new content     
+      histoContent.VariableItemList = Content.CreateVariableItemList();
+      PreprocessingDataTable dataTable = pcv.Content;
+      setVariableItemListFromDataTable(histoContent, dataTable);
 
-      //MainFormManager.MainForm.ShowContent(histoContent, typeof(HistogramView));  // open in new tab
+      MainFormManager.MainForm.ShowContent(histoContent, typeof(HistogramView));  // open in new tab
     }
-    
+
 
   }
 
-  
+
 }

branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views/3.4/ScatterPlotSingleView.cs

@@ -1 +1 @@
 using System;
 using System.Collections.Generic;
-using System.ComponentModel;
-using System.Drawing;
-using System.Data;
 using System.Linq;
-using System.Text;
 using System.Windows.Forms;
 using HeuristicLab.Analysis;
-using HeuristicLab.Analysis.Views;
-using HeuristicLab.Collections;
-using HeuristicLab.Core;
 using HeuristicLab.Core.Views;
-using HeuristicLab.Data;
-using HeuristicLab.DataPreprocessing.Implementations;
 using HeuristicLab.MainForm;
 
@@ -33 +24 @@
     public void InitData() {
 
-      IEnumerable<string> variables = Content.GetVariableNames();
+      IEnumerable<string> variables = Content.PreprocessingData.GetDoubleVariableNames();
 
       // add variables to combo boxes
@@ -80 +71 @@
   }
 
-  
+
 }