Changeset 10804 for branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views/3.3

Timestamp:

05/07/14 10:49:15 (10 years ago)

Author:

rstoll

Message:

• SelectionEvent added

Location:

branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views/3.3

Files:

• DataGridContentView.cs (modified) (1 diff)
• PreprocessingChartView.cs (modified) (13 diffs)
• PreprocessingDataTableView.cs (modified) (4 diffs)

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

@@ -82 +82 @@
       _highlightedCellsBackground = new Dictionary<int, IList<int>>();
       currentCell = null;
+      DataGridView.SelectionChanged += DataGridView_SelectionChanged;
+    }
+
+    void DataGridView_SelectionChanged(object sender, EventArgs e) {
+      Content.DataGridLogic.SetSelection(GetSelectedCells());
     }
 

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

@@ -22 +22 @@
 using System;
 using System.Collections.Generic;
-using System.Drawing;
 using System.Windows.Forms;
 using HeuristicLab.Analysis;
@@ -64 +63 @@
         if (VariableIsDisplayed(variableName)) {
           dataTable.Rows.Remove(variableName);
-          dataTablePerVariable.Remove(dataTablePerVariable.Find( x => (x.Name == variableName)));
+          dataTablePerVariable.Remove(dataTablePerVariable.Find(x => (x.Name == variableName)));
         } else {
           DataRow row = GetDataRow(variableName);
@@ -91 +90 @@
       base.RegisterContentEvents();
       Content.ChartLogic.Changed += PreprocessingData_Changed;
-      
+
     }
 
@@ -112 +111 @@
       dataTable = new PreprocessingDataTable(chartTitle);
       dataTable.Rows.AddRange(dataRows);
-      
+
 
       // init data table per variable
       dataTablePerVariable = new List<PreprocessingDataTable>();
-      foreach(var checkedItem in variableItemList.CheckedItems)  {
+      foreach (var checkedItem in variableItemList.CheckedItems) {
         string variableName = variableItemList[checkedItem.Index].Value;
         PreprocessingDataTable d = new PreprocessingDataTable(variableName);
@@ -123 +122 @@
         //rowSelect.Name = variableName + "(Selected)";
         //rowSelect.VisualProperties.Color = Color.Green;
-        
+
         d.Rows.Add(row);
         //d.SelectedRows.Add(rowSelect);
-        
+
         dataTablePerVariable.Add(d);
 
@@ -144 +143 @@
       if (Content != null) {
         logic = Content.ChartLogic;
-        InitData();       
+        InitData();
         variableItemList.CheckedItemsChanged += CheckedItemsChanged;
-        GenerateChart();                
+        GenerateChart();
       }
     }
@@ -167 +166 @@
         case DataPreprocessingChangedEventType.Any:
           InitData();
-          GenerateChart();          
+          GenerateChart();
           break;
       }
@@ -217 +216 @@
     protected void GenerateChart() {
 
-      ClearTableLayout();  
+      ClearTableLayout();
 
       if (allInOneMode) {
@@ -234 +233 @@
       tableLayoutPanel.AutoScroll = false;
       tableLayoutPanel.AutoScroll = true;
-    }   
+    }
 
     private void GenerateSingleChartLayout() {
@@ -247 +246 @@
     private void GenerateMultiChartLayout() {
       int checkedItemsCnt = 0;
-      foreach(var item in variableItemList.CheckedItems)
+      foreach (var item in variableItemList.CheckedItems)
         checkedItemsCnt++;
 
@@ -262 +261 @@
 
       if (columns == 3)
-        rows = (checkedItemsCnt+2) / columns;
-      else if(columns == 2)
+        rows = (checkedItemsCnt + 2) / columns;
+      else if (columns == 2)
         rows = (checkedItemsCnt + 1) / columns;
       else
@@ -274 +273 @@
       List<PreprocessingDataTable>.Enumerator enumerator = dataTablePerVariable.GetEnumerator();
       for (int x = 0; x < columns; x++) {
-        
-        if(rows <= 3)
+
+        if (rows <= 3)
           tableLayoutPanel.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 100 / columns));
         else
@@ -298 +297 @@
             p.Dock = DockStyle.Fill;
             tableLayoutPanel.Controls.Add(p, y, x);
-          }
-          else {
+          } else {
             dataView.Content = d;
             dataView.Dock = DockStyle.Fill;

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

@@ -20 +20 @@
 #endregion
 
-using HeuristicLab.Collections;
-using HeuristicLab.Core.Views;
-using HeuristicLab.MainForm;
 using System;
 using System.Collections.Generic;
@@ -29 +26 @@
 using System.Windows.Forms;
 using System.Windows.Forms.DataVisualization.Charting;
+using HeuristicLab.Collections;
+using HeuristicLab.Core.Views;
 using HeuristicLab.DataPreprocessing.Implementations;
+using HeuristicLab.MainForm;
 
 namespace HeuristicLab.Analysis.Views {
@@ -172 +172 @@
       else series.Color = Color.Empty;
       series.IsVisibleInLegend = row.VisualProperties.IsVisibleInLegend;
-     
+
       switch (row.VisualProperties.ChartType) {
         case DataRowVisualProperties.DataRowChartType.Line:
@@ -535 +535 @@
 
     // get minimum ignores nan values
-    private double GetMinimum(IEnumerable<double> values)
-    {
+    private double GetMinimum(IEnumerable<double> values) {
       double min = Double.MaxValue;
 
       foreach (double value in values) {
         if (!Double.IsNaN(value) && value < min)
-          min = value;      
+          min = value;
       }
       return min;