Changeset 10987 for branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views/3.4

Timestamp:

06/11/14 14:23:19 (10 years ago)

Author:

aesterer

Message:

Refactored scatter plot

Location:

branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views/3.4

Files:

• DataPreprocessingView.cs (modified) (1 diff)
• HeuristicLab.DataPreprocessing.Views-3.4.csproj (modified) (2 diffs)
• PreprocessingChartView.cs (modified) (4 diffs)
• ScatterPlotMultiView.Designer.cs (moved) (moved from branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views/3.4/MultiScatterPlotView.Designer.cs) (1 diff)
• ScatterPlotMultiView.cs (moved) (moved from branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views/3.4/MultiScatterPlotView.cs) (12 diffs)
• ScatterPlotSingleView.Designer.cs (moved) (moved from branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views/3.4/SingleScatterPlotView.Designer.cs) (1 diff)
• ScatterPlotSingleView.cs (moved) (moved from branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views/3.4/SingleScatterPlotView.cs) (4 diffs)

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

@@ -61 +61 @@
           new LineChartContent(chartLogic),
           new HistogramContent(chartLogic),
-          new ScatterPlotContent(chartLogic),
+          new ScatterPlotContent(Content),
           new CorrelationMatrixContent(Content),
           new DataCompletenessChartContent(dataGridLogic, searchLogic),

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

@@ -92 +92 @@
       <DependentUpon>ComparisonFilterView.cs</DependentUpon>
     </Compile>
-    <Compile Include="SingleScatterPlotView.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="SingleScatterPlotView.Designer.cs">
-      <DependentUpon>SingleScatterPlotView.cs</DependentUpon>
+    <Compile Include="ScatterPlotSingleView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="ScatterPlotSingleView.Designer.cs">
+      <DependentUpon>ScatterPlotSingleView.cs</DependentUpon>
     </Compile>
     <Compile Include="DataCompletenessView.cs">
@@ -129 +129 @@
       <DependentUpon>FilterView.cs</DependentUpon>
     </Compile>
-    <Compile Include="MultiScatterPlotView.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="MultiScatterPlotView.Designer.cs">
-      <DependentUpon>MultiScatterPlotView.cs</DependentUpon>
+    <Compile Include="ScatterPlotMultiView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="ScatterPlotMultiView.Designer.cs">
+      <DependentUpon>ScatterPlotMultiView.cs</DependentUpon>
     </Compile>
     <Compile Include="PreprocessingScatterPlotView.cs">

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

@@ -49 +49 @@
     private const string DEFAULT_CHART_TITLE = "Chart";
     private const int FIXED_CHART_SIZE = 300;
-    private const int MAX_TABLE_ROWS = 3;
+    private const int MAX_TABLE_AUTO_SIZE_ROWS = 3;
 
     public IEnumerable<double> Classification { get; set; }
@@ -328 +328 @@
       int columns = GetNrOfMultiChartColumns(checkedItemsCnt);
       int rows = GetNrOfMultiChartRows(checkedItemsCnt, columns);
+      tableLayoutPanel.VerticalScroll.Enabled = true;
       
       tableLayoutPanel.ColumnCount = columns;
@@ -335 +336 @@
       for (int x = 0; x < columns; x++) {
 
-        if (rows <= MAX_TABLE_ROWS)
+        if (rows <= MAX_TABLE_AUTO_SIZE_ROWS)
           tableLayoutPanel.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 100 / columns));
         else
@@ -344 +345 @@
           if (x == 0) {
             // fixed chart size when there are more than 3 tables
-            if (rows > MAX_TABLE_ROWS)
+            if (rows > MAX_TABLE_AUTO_SIZE_ROWS)
               tableLayoutPanel.RowStyles.Add(new RowStyle(SizeType.Absolute, FIXED_CHART_SIZE));
             else

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

@@ -1 +1 @@
 namespace HeuristicLab.DataPreprocessing.Views {
-  partial class MultiScatterPlotView {
+  partial class ScatterPlotMultiView {
     /// <summary> 
     /// Required designer variable.

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

@@ -9 +9 @@
 using HeuristicLab.Analysis.Views;
 using HeuristicLab.Collections;
+using HeuristicLab.Common;
 using HeuristicLab.Core;
 using HeuristicLab.Core.Views;
@@ -17 +18 @@
 namespace HeuristicLab.DataPreprocessing.Views {
 
-  [View("Multi Scatter Plot View")]
+  [View("Scatter Plot Multi View")]
   [Content(typeof(ScatterPlotContent), false)]
-  public partial class MultiScatterPlotView : ItemView {
+  public partial class ScatterPlotMultiView : ItemView {
 
     private const int HEADER_WIDTH = 50;
@@ -27 +28 @@
     private const int FIXED_CHART_HEIGHT = 150;
 
-    private IChartLogic logic;
-    private List<string> variables;
-
-    public MultiScatterPlotView() {
+    public ScatterPlotMultiView() {
       InitializeComponent();
     }
@@ -39 +37 @@
     }
 
-    public void InitData() {
-      variables = new List<string>(logic.GetVariableNames());
-    }
-
     protected override void OnContentChanged() {
       base.OnContentChanged();
       if (Content != null) {
-        logic = Content.ChartLogic;
-        InitData();
         GenerateMultiLayout();
       }
@@ -54 +46 @@
     //Add header elements to the table layout panel
     private void addHeaderToTableLayoutPanels() {
+
+      List<string> variables = Content.GetVariableNames().ToList();
 
       for (int i = 1; i < variables.Count + 1; i++) {
@@ -74 +68 @@
     private void GenerateMultiLayout() 
     {
+      List<string> variables = Content.GetVariableNames().ToList();
+
       tableLayoutPanel.Controls.Clear();
       //Clear out the existing row and column styles
@@ -106 +102 @@
 
     private void addChartsToTableLayoutPanel() {
+
+      List<string> variables = Content.GetVariableNames().ToList();
+
       //set scatter plots and histograms
       for (int x = 1; x < variables.Count + 1; x++) {
@@ -113 +112 @@
           if (x == y) {
             PreprocessingDataTable dataTable = new PreprocessingDataTable();
-            DataRow dataRow = logic.CreateDataRow(variables[x - 1], DataRowVisualProperties.DataRowChartType.Histogram);
+            DataRow dataRow = Content.CreateDataRow(variables[x - 1], DataRowVisualProperties.DataRowChartType.Histogram);
             dataTable.Rows.Add(dataRow);
             PreprocessingDataTableView pcv = new PreprocessingDataTableView();
@@ -122 +121 @@
           //scatter plot
           else {
-            ScatterPlot scatterPlot = logic.CreateScatterPlot(variables[x - 1], variables[y - 1]);
+            ScatterPlot scatterPlot = Content.CreateScatterPlot(variables[x - 1], variables[y - 1]);
             PreprocessingScatterPlotView pspv = new PreprocessingScatterPlotView();
             pspv.ChartDoubleClick += ScatterPlotDoubleClick;
@@ -136 +135 @@
     private void ScatterPlotDoubleClick(object sender, EventArgs e) {
       PreprocessingScatterPlotView pspv = (PreprocessingScatterPlotView)sender;
-      ScatterPlotContent scatterContent = new ScatterPlotContent(logic);  // create new content
+      ScatterPlotContent scatterContent = new ScatterPlotContent(Content, new Cloner());  // create new content
       ScatterPlot scatterPlot = pspv.Content;
       setVariablesInContentFromScatterPlot(scatterContent, scatterPlot);
 
-      MainFormManager.MainForm.ShowContent(scatterContent, typeof(SingleScatterPlotView));  // open in new tab
+      MainFormManager.MainForm.ShowContent(scatterContent, typeof(ScatterPlotSingleView));  // open in new tab
     }
 
@@ -148 +147 @@
       // only one data row should be in scatter plot
       if (scatterPlot.Rows.Count == 1) {
-        // TODO -> find better way to get variable names
         string[] variables = scatterPlot.Rows.ElementAt(0).Name.Split(new string[]{" - "},StringSplitOptions.None); // extract variable names from string
         scatterContent.SelectedXVariable = variables[0];
@@ -176 +174 @@
     //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(logic);  // create new content
-      histoContent.VariableItemList = logic.CreateVariableItemList();
-      PreprocessingDataTable dataTable = pcv.Content;
-      setVariableItemListFromDataTable(histoContent, dataTable);
+      //PreprocessingDataTableView pcv = (PreprocessingDataTableView)sender;
+      //HistogramContent histoContent = new HistogramContent(Content,);  // create new content     
+      //histoContent.VariableItemList = logic.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.Designer.cs

@@ -1 +1 @@
 namespace HeuristicLab.DataPreprocessing.Views {
-  partial class SingleScatterPlotView {
+  partial class ScatterPlotSingleView {
     /// <summary> 
     /// Required designer variable.

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

@@ -18 +18 @@
 namespace HeuristicLab.DataPreprocessing.Views {
 
-  [View("Single Scatter Plot View")]
+  [View("Scatter Plot Single View")]
   [Content(typeof(ScatterPlotContent), true)]
-  public partial class SingleScatterPlotView : ItemView {
+  public partial class ScatterPlotSingleView : ItemView {
 
-    private IChartLogic logic;
-
-    public SingleScatterPlotView() {
+    public ScatterPlotSingleView() {
       InitializeComponent();
     }
@@ -35 +33 @@
     public void InitData() {
 
-      IEnumerable<string> variables = logic.GetVariableNames();
+      IEnumerable<string> variables = Content.GetVariableNames();
 
       // add variables to combo boxes
@@ -60 +58 @@
       base.OnContentChanged();
       if (Content != null) {
-        logic = Content.ChartLogic;
         InitData();
       }
@@ -72 +69 @@
       if (comboBoxXVariable.SelectedItem != null && comboBoxYVariable.SelectedItem != null) {
         //get scatter plot with selected x and y variable
-        ScatterPlot scatterPlot = logic.CreateScatterPlot((string)comboBoxXVariable.SelectedItem, (string)comboBoxYVariable.SelectedItem);
+        ScatterPlot scatterPlot = Content.CreateScatterPlot((string)comboBoxXVariable.SelectedItem, (string)comboBoxYVariable.SelectedItem);
         scatterPlotView.Content = scatterPlot;