Changeset 10583 for branches/DataPreprocessing

Timestamp:

03/12/14 16:28:26 (11 years ago)

Author:

rstoll

Message:

• copied StringConvertibleMatrixView since we need to override dataGridView_CellValidating and dataGridView_CellParsing as well as PasteValuesToDataGridView
• optimising event subscription, do not refresh if event is triggered by the view itself

Location:

branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views/3.3

Files:

• CopyOfStringConvertibleMatrixView.Designer.cs (copied) (copied from branches/DataPreprocessing/HeuristicLab.Data.Views/3.3/StringConvertibleMatrixView.Designer.cs) (1 diff)
• CopyOfStringConvertibleMatrixView.cs (copied) (copied from branches/DataPreprocessing/HeuristicLab.Data.Views/3.3/StringConvertibleMatrixView.cs) (5 diffs)
• DataGridContentView.cs (modified) (5 diffs)
• HeuristicLab.DataPreprocessing.Views-3.3.csproj (modified) (1 diff)
• Plugin.cs.frame (modified) (1 diff)

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

@@ -20 +20 @@
 #endregion
 
-namespace HeuristicLab.Data.Views {
-  partial class StringConvertibleMatrixView {
+namespace HeuristicLab.DataPreprocessing.Views {
+  partial class CopyOfStringConvertibleMatrixView {
     /// <summary> 
     /// Required designer variable.

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

@@ -28 +28 @@
 using System.Windows.Forms;
 using HeuristicLab.Common;
+using HeuristicLab.Data;
+using HeuristicLab.Data.Views;
 using HeuristicLab.MainForm;
 using HeuristicLab.MainForm.WindowsForms;
 
-namespace HeuristicLab.Data.Views {
+namespace HeuristicLab.DataPreprocessing.Views {
   [View("StringConvertibleMatrix View")]
-  [Content(typeof(IStringConvertibleMatrix), true)]
-  public partial class StringConvertibleMatrixView : AsynchronousContentView {
+  [Content(typeof(IStringConvertibleMatrix), false)]
+  public partial class CopyOfStringConvertibleMatrixView : AsynchronousContentView {
+
+    // Was private before
+    protected virtual void dataGridView_CellValidating(object sender, DataGridViewCellValidatingEventArgs e) {
+      if (!dataGridView.ReadOnly) {
+        string errorMessage;
+        if (Content != null && !Content.Validate(e.FormattedValue.ToString(), out errorMessage)) {
+          e.Cancel = true;
+          dataGridView.Rows[e.RowIndex].ErrorText = errorMessage;
+        }
+      }
+    }
+
+    // Was private before
+    protected virtual void dataGridView_CellParsing(object sender, DataGridViewCellParsingEventArgs e) {
+      if (!dataGridView.ReadOnly) {
+        string value = e.Value.ToString();
+        int rowIndex = virtualRowIndices[e.RowIndex];
+        e.ParsingApplied = Content.SetValue(value, rowIndex, e.ColumnIndex);
+        if (e.ParsingApplied) e.Value = Content.GetValue(rowIndex, e.ColumnIndex);
+      }
+    }
+
+    // Was private before
+    protected virtual void PasteValuesToDataGridView() {
+      string[,] values = SplitClipboardString(Clipboard.GetText());
+      int rowIndex = 0;
+      int columnIndex = 0;
+      if (dataGridView.CurrentCell != null) {
+        rowIndex = dataGridView.CurrentCell.RowIndex;
+        columnIndex = dataGridView.CurrentCell.ColumnIndex;
+      }
+      if (Content.Rows < values.GetLength(1) + rowIndex) Content.Rows = values.GetLength(1) + rowIndex;
+      if (Content.Columns < values.GetLength(0) + columnIndex) Content.Columns = values.GetLength(0) + columnIndex;
+
+      for (int row = 0; row < values.GetLength(1); row++) {
+        for (int col = 0; col < values.GetLength(0); col++) {
+          Content.SetValue(values[col, row], row + rowIndex, col + columnIndex);
+        }
+      }
+      ClearSorting();
+    }
+
+    #region unchanged copied from original - see  HeuristicLab.Data.Views.StringConvertibleMatrix
+
     protected int[] virtualRowIndices;
     private List<KeyValuePair<int, SortOrder>> sortedColumnIndices;
@@ -74 +120 @@
     }
 
-    public StringConvertibleMatrixView() {
+    public CopyOfStringConvertibleMatrixView() {
       InitializeComponent();
       ShowRowsAndColumnsTextBox = true;
@@ -261 +307 @@
 
     #region DataGridView Events
-    private void dataGridView_CellValidating(object sender, DataGridViewCellValidatingEventArgs e) {
-      if (!dataGridView.ReadOnly) {
-        string errorMessage;
-        if (Content != null && !Content.Validate(e.FormattedValue.ToString(), out errorMessage)) {
-          e.Cancel = true;
-          dataGridView.Rows[e.RowIndex].ErrorText = errorMessage;
-        }
-      }
-    }
-    private void dataGridView_CellParsing(object sender, DataGridViewCellParsingEventArgs e) {
-      if (!dataGridView.ReadOnly) {
-        string value = e.Value.ToString();
-        int rowIndex = virtualRowIndices[e.RowIndex];
-        e.ParsingApplied = Content.SetValue(value, rowIndex, e.ColumnIndex);
-        if (e.ParsingApplied) e.Value = Content.GetValue(rowIndex, e.ColumnIndex);
-      }
-    }
+
     private void dataGridView_CellEndEdit(object sender, DataGridViewCellEventArgs e) {
       dataGridView.Rows[e.RowIndex].ErrorText = string.Empty;
@@ -364 +394 @@
     }
 
-    private void PasteValuesToDataGridView() {
-      string[,] values = SplitClipboardString(Clipboard.GetText());
-      int rowIndex = 0;
-      int columnIndex = 0;
-      if (dataGridView.CurrentCell != null) {
-        rowIndex = dataGridView.CurrentCell.RowIndex;
-        columnIndex = dataGridView.CurrentCell.ColumnIndex;
-      }
-      if (Content.Rows < values.GetLength(1) + rowIndex) Content.Rows = values.GetLength(1) + rowIndex;
-      if (Content.Columns < values.GetLength(0) + columnIndex) Content.Columns = values.GetLength(0) + columnIndex;
-
-      for (int row = 0; row < values.GetLength(1); row++) {
-        for (int col = 0; col < values.GetLength(0); col++) {
-          Content.SetValue(values[col, row], row + rowIndex, col + columnIndex);
-        }
-      }
-      ClearSorting();
-    }
     private string[,] SplitClipboardString(string clipboardText) {
       if (clipboardText.EndsWith(Environment.NewLine))
@@ -566 +578 @@
     }
   }
+    #endregion
 }

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

@@ -24 +24 @@
 using System.Linq;
 using System.Windows.Forms;
-using HeuristicLab.Data.Views;
 using HeuristicLab.MainForm;
 using System.Drawing;
@@ -31 +30 @@
   [View("Data Grid Content View")]
   [Content(typeof(IDataGridContent), true)]
-  public partial class DataGridContentView : StringConvertibleMatrixView {
+  public partial class DataGridContentView : CopyOfStringConvertibleMatrixView {
 
     private int lastClickedRow;
     private int lastClickedColumn;
+
+    private bool notOwnEvent = true;
 
     public new IDataGridContent Content {
@@ -75 +76 @@
 
     void Content_Changed(object sender, DataPreprocessingChangedEventArgs e) {
-      dataGridView.Refresh();
+      if (notOwnEvent) {
+        dataGridView.Refresh();
+      }
     }
 
-    private void dataGridView_CellValidating(object sender, DataGridViewCellValidatingEventArgs e) {
+    protected override void dataGridView_CellValidating(object sender, DataGridViewCellValidatingEventArgs e) {
       if (!dataGridView.ReadOnly) {
         string errorMessage;
@@ -87 +90 @@
       }
     }
+
+    protected override void dataGridView_CellParsing(object sender, DataGridViewCellParsingEventArgs e) {
+      notOwnEvent = false;
+      base.dataGridView_CellParsing(sender, e);
+      notOwnEvent = true;
+    }
+
+    protected override void PasteValuesToDataGridView() {
+      notOwnEvent = false;
+      base.PasteValuesToDataGridView();
+      notOwnEvent = true;
+    }
+
 
     protected override void SetEnabledStateOfControls() {
@@ -163 +179 @@
     private void ReplaceWithAverage_Click(object sender, EventArgs e) {
       Content.PreprocessingDataManipulation.ReplaceIndicesByAverageValue(lastClickedColumn, new List<int>() { lastClickedRow });
-      OnContentChanged();
     }
 
     private void ReplaceWithMedian_Click(object sender, EventArgs e) {
       Content.PreprocessingDataManipulation.ReplaceIndicesByMedianValue(lastClickedColumn, new List<int>() { lastClickedRow });
-      OnContentChanged();
     }
 
     private void ReplaceWithRandom_Click(object sender, EventArgs e) {
       Content.PreprocessingDataManipulation.ReplaceIndicesByRandomValue(lastClickedColumn, new List<int>() { lastClickedRow });
-      OnContentChanged();
     }
 
     private void ReplaceWithMostCommon_Click(object sender, EventArgs e) {
       Content.PreprocessingDataManipulation.ReplaceIndicesByMostCommonValue(lastClickedColumn, new List<int>() { lastClickedRow });
-      OnContentChanged();
     }
 
     private void ReplaceWithInterpolation_Click(object sender, EventArgs e) {
       Content.PreprocessingDataManipulation.ReplaceIndicesByLinearInterpolationOfNeighbours(lastClickedColumn, new List<int>() { lastClickedRow });
-      OnContentChanged();
     }
   }

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

@@ -96 +96 @@
       <DependentUpon>StatisticsView.cs</DependentUpon>
     </Compile>
+    <Compile Include="CopyOfStringConvertibleMatrixView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="CopyOfStringConvertibleMatrixView.Designer.cs">
+      <DependentUpon>CopyOfStringConvertibleMatrixView.cs</DependentUpon>
+    </Compile>
     <Compile Include="TransformationView.cs">
       <SubType>UserControl</SubType>

branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views/3.3/Plugin.cs.frame

@@ -30 +30 @@
   [PluginDependency("HeuristicLab.DataPreprocessing", "3.3")]
   [PluginDependency("HeuristicLab.Data.Views","3.3")]
+  [PluginDependency("HeuristicLab.Data","3.3")]
   [PluginDependency("HeuristicLab.MainForm", "3.3")]
   [PluginDependency("HeuristicLab.MainForm.WindowsForms", "3.3")]