Changeset 10992 for branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views/3.4/ScatterPlotMultiView.cs

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

File:

• branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views/3.4/ScatterPlotMultiView.cs (modified) (9 diffs)

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
     }
-    
+
 
   }
 
-  
+
 }