Changeset 11000 for branches/DataPreprocessing

Timestamp:

06/11/14 15:33:04 (10 years ago)

Author:

sbreuer

Message:

• derive StringConvertibleMatrixView from core
• delete PreprocessingStringConvertibleMatrixView

Location:

branches/DataPreprocessing

Files:

• HeuristicLab.Data.Views/3.3/StringConvertibleMatrixView.cs (modified) (6 diffs)
• HeuristicLab.DataPreprocessing.Views/3.4/DataGridContentView.cs (modified) (4 diffs)
• HeuristicLab.DataPreprocessing.Views/3.4/HeuristicLab.DataPreprocessing.Views-3.4.csproj (modified) (1 diff)
• HeuristicLab.DataPreprocessing.Views/3.4/PreprocessingStringConvertibleMatrixView.Designer.cs (deleted)
• HeuristicLab.DataPreprocessing.Views/3.4/PreprocessingStringConvertibleMatrixView.cs (deleted)

branches/DataPreprocessing/HeuristicLab.Data.Views/3.3/StringConvertibleMatrixView.cs

@@ -36 +36 @@
   public partial class StringConvertibleMatrixView : AsynchronousContentView {
     protected int[] virtualRowIndices;
-    private List<KeyValuePair<int, SortOrder>> sortedColumnIndices;
+    protected List<KeyValuePair<int, SortOrder>> sortedColumnIndices;
     private RowComparer rowComparer;
 
@@ -261 +261 @@
 
     #region DataGridView Events
-    private void dataGridView_CellValidating(object sender, DataGridViewCellValidatingEventArgs e) {
+    protected virtual void dataGridView_CellValidating(object sender, DataGridViewCellValidatingEventArgs e) {
       if (!dataGridView.ReadOnly) {
         string errorMessage;
@@ -270 +270 @@
       }
     }
-    private void dataGridView_CellParsing(object sender, DataGridViewCellParsingEventArgs e) {
+    protected virtual void dataGridView_CellParsing(object sender, DataGridViewCellParsingEventArgs e) {
       if (!dataGridView.ReadOnly) {
         string value = e.Value.ToString();
@@ -364 +364 @@
     }
 
-    private void PasteValuesToDataGridView() {
+    protected virtual void PasteValuesToDataGridView() {
       string[,] values = SplitClipboardString(Clipboard.GetText());
       int rowIndex = 0;
@@ -432 +432 @@
     }
 
-    private void Sort() {
+    protected void Sort() {
       virtualRowIndices = Sort(sortedColumnIndices);
       UpdateSortGlyph();
@@ -542 +542 @@
     }
 
-    private void dataGridView_SelectionChanged(object sender, EventArgs e) {
+    protected virtual void dataGridView_SelectionChanged(object sender, EventArgs e) {
       string stringFormat = "{0,20:0.0000}";
       statisticsTextBox.Text = string.Empty;

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

@@ -26 +26 @@
 using System.Windows.Forms;
 using HeuristicLab.Data;
+using HeuristicLab.Data.Views;
 using HeuristicLab.DataPreprocessing.Filter;
 using HeuristicLab.MainForm;
@@ -32 +33 @@
   [View("Data Grid Content View")]
   [Content(typeof(IDataGridContent), true)]
-  public partial class DataGridContentView : PreprocessingStringConvertibleMatrixView {
+  public partial class DataGridContentView : StringConvertibleMatrixView {
 
     private bool notOwnEvent = true;
@@ -137 +138 @@
     }
 
-    #region methods which override/modify methods from PreprocessingStringConvertibleMatrixView
-
     protected override void dataGridView_SelectionChanged(object sender, EventArgs e) {
       base.dataGridView_SelectionChanged(sender, e);
@@ -186 +185 @@
       base.ClearSorting();
     }
-
-    #endregion
 
     private void dataGridView_ColumnHeaderMouseClick(object sender, DataGridViewCellMouseEventArgs e) {

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

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