Changeset 10253

Timestamp:

12/18/13 16:23:21 (11 years ago)

Author:

sbreuer

Message:

• added apply sorting button to datagridcontentview with click handler
• modified sorting

Location:

branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3

Files:

• Implementations/DataGridContent.cs (modified) (1 diff)
• Implementations/PreprocessingDataManipulation.cs (modified) (1 diff)
• Interfaces/IDataGridContent.cs (modified) (1 diff)
• Interfaces/IPreprocessingDataManipulation.cs (modified) (1 diff)
• Views/DataGridContentView.Designer.cs (modified) (5 diffs)
• Views/DataGridContentView.cs (modified) (2 diffs)

branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3/Implementations/DataGridContent.cs

@@ -11 +11 @@
 
     private readonly IDataGridLogic dataGridLogic;
-    public DataGridContent(IDataGridLogic theDataGridLogic) {
+    private readonly IPreprocessingDataManipulation preprocessingDataManipulation;
+    public DataGridContent(IDataGridLogic theDataGridLogic, IPreprocessingDataManipulation thePreprocessingDataManipulation) {
       dataGridLogic = theDataGridLogic;
+      preprocessingDataManipulation = thePreprocessingDataManipulation;
     }
 
     public DataGridContent(DataGridContent dataGridContent, Cloner cloner)
       : base(dataGridContent, cloner) {
+    }
 
+    public IPreprocessingDataManipulation PreprocessingDataManipulation {
+      get { return preprocessingDataManipulation; }
     }
 

branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3/Implementations/PreprocessingDataManipulation.cs

@@ -115 +115 @@
         }
 
-        foreach (string variableName in preprocessingData.VariableNames) {
-          if (preprocessingData.IsType<double>(variableName)) {
-            reOrderToIndices<double>(variableName, shuffledIndices);
-          } else if (preprocessingData.IsType<string>(variableName)) {
-            reOrderToIndices<string>(variableName, shuffledIndices);
-          } else if (preprocessingData.IsType<DateTime>(variableName)) {
-            reOrderToIndices<DateTime>(variableName, shuffledIndices);
-          }
+        reOrdertoIndices(shuffledIndices);
+      }
+    }
+
+    public void reOrdertoIndices(IList<Tuple<int, int>> indices) {
+      foreach (string variableName in preprocessingData.VariableNames) {
+        if (preprocessingData.IsType<double>(variableName)) {
+          reOrderToIndices<double>(variableName, indices);
+        } else if (preprocessingData.IsType<string>(variableName)) {
+          reOrderToIndices<string>(variableName, indices);
+        } else if (preprocessingData.IsType<DateTime>(variableName)) {
+          reOrderToIndices<DateTime>(variableName, indices);
         }
       }
     }
 
-    public void reOrderToIndices<T>(string variableName, List<Tuple<int, int>> indices) {
+    private void reOrderToIndices<T>(string variableName, IList<Tuple<int, int>> indices) {
       // process all columns equally
       foreach (Tuple<int, int> index in indices) {

branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3/Interfaces/IDataGridContent.cs

@@ -8 +8 @@
   public interface IDataGridContent : IStringConvertibleMatrix {
     IDataGridLogic DataGridLogic { get; }
+    IPreprocessingDataManipulation PreprocessingDataManipulation { get; }
   }
 }

branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3/Interfaces/IPreprocessingDataManipulation.cs

@@ -3 +3 @@
 namespace HeuristicLab.DataPreprocessing {
   interface IPreprocessingDataManipulation {
-    void reOrderToIndices<T>(string variableName, List<Tuple<int, int>> indices);
+    void reOrderToIndices(IList<Tuple<int, int>> indices);
     void ReplaceIndicesByAverageValue(string variableName, IEnumerable<int> indices);
     void ReplaceIndicesByLinearInterpolationOfNeighbours(string variableName, IEnumerable<int> indices);

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

@@ -24 +24 @@
     /// </summary>
     private void InitializeComponent() {
+      this.btnApplySort = new System.Windows.Forms.Button();
       ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).BeginInit();
       this.SuspendLayout();
@@ -32 +33 @@
       this.errorProvider.SetIconPadding(this.rowsTextBox, 2);
       this.rowsTextBox.ReadOnly = true;
+      this.rowsTextBox.Size = new System.Drawing.Size(296, 20);
       // 
       // columnsTextBox
       // 
       this.columnsTextBox.ReadOnly = true;
+      this.columnsTextBox.Size = new System.Drawing.Size(296, 20);
+      // 
+      // statisticsTextBox
+      // 
+      this.statisticsTextBox.Size = new System.Drawing.Size(522, 13);
+      // 
+      // btnApplySort
+      // 
+      this.btnApplySort.Location = new System.Drawing.Point(398, 18);
+      this.btnApplySort.Name = "btnApplySort";
+      this.btnApplySort.Size = new System.Drawing.Size(75, 23);
+      this.btnApplySort.TabIndex = 7;
+      this.btnApplySort.Text = "Apply Sort";
+      this.btnApplySort.UseVisualStyleBackColor = true;
+      this.btnApplySort.Click += new System.EventHandler(this.btnApplySort_Click);
       // 
       // DataGridContentView
@@ -41 +58 @@
       this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+      this.Controls.Add(this.btnApplySort);
       this.Name = "DataGridContentView";
+      this.Size = new System.Drawing.Size(528, 404);
       this.Controls.SetChildIndex(this.statisticsTextBox, 0);
       this.Controls.SetChildIndex(this.rowsLabel, 0);
@@ -47 +66 @@
       this.Controls.SetChildIndex(this.rowsTextBox, 0);
       this.Controls.SetChildIndex(this.columnsTextBox, 0);
+      this.Controls.SetChildIndex(this.btnApplySort, 0);
       ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).EndInit();
       this.ResumeLayout(false);
@@ -54 +74 @@
 
     #endregion
+
+    private System.Windows.Forms.Button btnApplySort;
   }
 }

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

@@ -23 +23 @@
     protected override void OnContentChanged() {
       base.OnContentChanged();
+    }
 
-    }
 
     private void dataGridView_CellValidating(object sender, DataGridViewCellValidatingEventArgs e) {
@@ -35 +35 @@
       }
     }
+
+    private void btnApplySort_Click(object sender, System.EventArgs e) {
+     
+    }
   }
 }