Changeset 3346 for trunk/sources

Timestamp:

04/14/10 14:19:46 (14 years ago)

Author:

mkommend

Message:

implemented comments from swa (ticket #968)

Location:

trunk/sources/HeuristicLab.Data.Views/3.3

Files:

• ColumnsVisibilityDialog.Designer.cs (modified) (1 diff)
• StringConvertibleMatrixView.Designer.cs (modified) (1 diff)
• StringConvertibleMatrixView.cs (modified) (6 diffs)

trunk/sources/HeuristicLab.Data.Views/3.3/ColumnsVisibilityDialog.Designer.cs

@@ -49 +49 @@
       this.MinimizeBox = false;
       this.Name = "ColumnsVisibilityDialog";
+      this.ShowIcon = false;
       this.ShowInTaskbar = false;
       this.Text = "Show / Hide Columns";

trunk/sources/HeuristicLab.Data.Views/3.3/StringConvertibleMatrixView.Designer.cs

@@ -84 +84 @@
       this.dataGridView.AllowUserToAddRows = false;
       this.dataGridView.AllowUserToDeleteRows = false;
+      this.dataGridView.AllowUserToOrderColumns = true;
       this.dataGridView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
                   | System.Windows.Forms.AnchorStyles.Left)
                   | System.Windows.Forms.AnchorStyles.Right)));
-      this.dataGridView.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.DisplayedCells;
       this.dataGridView.ClipboardCopyMode = System.Windows.Forms.DataGridViewClipboardCopyMode.EnableWithoutHeaderText;
       this.dataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;

trunk/sources/HeuristicLab.Data.Views/3.3/StringConvertibleMatrixView.cs

@@ -113 +113 @@
       else
         dataGridView.ColumnCount = Content.Columns;
+
       UpdateRowHeaders();
       UpdateColumnHeaders();
+      dataGridView.AutoResizeColumns(DataGridViewAutoSizeColumnsMode.ColumnHeader);
+      dataGridView.AutoResizeRowHeadersWidth(DataGridViewRowHeadersWidthSizeMode.AutoSizeToDisplayedHeaders);
       dataGridView.Enabled = true;
     }
@@ -123 +126 @@
           dataGridView.Columns[i].HeaderText = Content.ColumnNames.ElementAt(i);
         else
-          dataGridView.Columns[i].HeaderText = "Column " + i;
+          dataGridView.Columns[i].HeaderText = "Column " + (i + 1);
       }
       dataGridView.Invalidate();
@@ -133 +136 @@
           dataGridView.Rows[i].HeaderCell.Value = Content.RowNames.ElementAt(i);
         else
-          dataGridView.Rows[i].HeaderCell.Value = i.ToString();
+          dataGridView.Rows[i].HeaderCell.Value = "Row " + (i + 1);
       }
       dataGridView.Invalidate();
@@ -291 +294 @@
       int[] newSortedIndex = Enumerable.Range(0, Content.Rows).ToArray();
       if (sortedColumnIndizes.Count != 0) {
-        rowComparer.sortedIndizes = sortedColumnIndizes;
-        rowComparer.matrix = Content;
+        rowComparer.SortedIndizes = sortedColumnIndizes;
+        rowComparer.Matrix = Content;
         Array.Sort(newSortedIndex, rowComparer);
       }
@@ -308 +311 @@
     #endregion
 
-    private class RowComparer : IComparer<int> {
-      public List<KeyValuePair<int, SortOrder>> sortedIndizes;
-      public IStringConvertibleMatrix matrix;
+    public class RowComparer : IComparer<int> {
       public RowComparer() {
+      }
+
+      private List<KeyValuePair<int, SortOrder>> sortedIndizes;
+      public IEnumerable<KeyValuePair<int, SortOrder>> SortedIndizes {
+        get { return this.sortedIndizes; }
+        set { sortedIndizes = new List<KeyValuePair<int, SortOrder>>(value); }
+      }
+      private IStringConvertibleMatrix matrix;
+      public IStringConvertibleMatrix Matrix {
+        get { return this.matrix; }
+        set { this.matrix = value; }
       }
 
@@ -320 +332 @@
         string string1, string2;
 
-        foreach (KeyValuePair<int, SortOrder> pair in sortedIndizes) {
-          string1 = matrix.GetValue(x, pair.Key);
-          string2 = matrix.GetValue(y, pair.Key);
-          if (double.TryParse(string1, out double1) && double.TryParse(string2, out double2))
-            result = double1.CompareTo(double2);
-          else if (DateTime.TryParse(string1, out dateTime1) && DateTime.TryParse(string2, out dateTime2))
-            result = dateTime1.CompareTo(dateTime2);
-          else {
-            if (string1 != null)
-              result = string1.CompareTo(string2);
-            else if (string2 != null)
-              result = string2.CompareTo(string1) * -1;
-          }
-          if (pair.Value == SortOrder.Descending)
-            result *= -1;
-          if (result != 0)
-            return result;
+        if (matrix == null)
+          throw new InvalidOperationException("Could not sort IStringConvertibleMatrix if the matrix member is null.");
+        if (sortedIndizes == null)
+          return 0;
+
+        foreach (KeyValuePair<int, SortOrder> pair in sortedIndizes.Where(p => p.Value != SortOrder.None)) {
+            string1 = matrix.GetValue(x, pair.Key);
+            string2 = matrix.GetValue(y, pair.Key);
+            if (double.TryParse(string1, out double1) && double.TryParse(string2, out double2))
+              result = double1.CompareTo(double2);
+            else if (DateTime.TryParse(string1, out dateTime1) && DateTime.TryParse(string2, out dateTime2))
+              result = dateTime1.CompareTo(dateTime2);
+            else {
+              if (string1 != null)
+                result = string1.CompareTo(string2);
+              else if (string2 != null)
+                result = string2.CompareTo(string1) * -1;
+            }
+            if (pair.Value == SortOrder.Descending)
+              result *= -1;
+            if (result != 0)
+              return result;
         }
         return result;