Changeset 8331 for branches/ScatterSearch (trunk integration)/HeuristicLab.Data.Views

Timestamp:

07/26/12 09:51:13 (12 years ago)

Author:

jkarder

Message:

#1331: merged r8086:8330 from trunk

Location:

branches/ScatterSearch (trunk integration)

Files:

• . (modified) (2 props)
• HeuristicLab.Data.Views/3.3/Plugin.cs.frame (modified) (1 diff)
• HeuristicLab.Data.Views/3.3/Properties/AssemblyInfo.cs.frame (modified) (1 diff)
• HeuristicLab.Data.Views/3.3/StringConvertibleMatrixView.cs (modified) (14 diffs)

branches/ScatterSearch (trunk integration)

@@ -21 +21 @@
 protoc.exe
 _ReSharper.HeuristicLab 3.3 Tests
+Google.ProtocolBuffers-2.4.1.473.dll

@@ -21 +21 @@
 protoc.exe
 _ReSharper.HeuristicLab 3.3 Tests
+Google.ProtocolBuffers-2.4.1.473.dll

branches/ScatterSearch (trunk integration)/HeuristicLab.Data.Views/3.3/Plugin.cs.frame

@@ -29 +29 @@
   /// Plugin class for HeuristicLab.Data.Views plugin.
   /// </summary>
-  [Plugin("HeuristicLab.Data.Views", "3.3.6.$WCREV$")]
+  [Plugin("HeuristicLab.Data.Views", "3.3.7.$WCREV$")]
   [PluginFile("HeuristicLab.Data.Views-3.3.dll", PluginFileType.Assembly)]
   [PluginDependency("HeuristicLab.Common", "3.3")]

branches/ScatterSearch (trunk integration)/HeuristicLab.Data.Views/3.3/Properties/AssemblyInfo.cs.frame

@@ -54 +54 @@
 // by using the '*' as shown below:
 [assembly: AssemblyVersion("3.3.0.0")]
-[assembly: AssemblyFileVersion("3.3.6.$WCREV$")]
+[assembly: AssemblyFileVersion("3.3.7.$WCREV$")]

branches/ScatterSearch (trunk integration)/HeuristicLab.Data.Views/3.3/StringConvertibleMatrixView.cs

@@ -35 +35 @@
   [Content(typeof(IStringConvertibleMatrix), true)]
   public partial class StringConvertibleMatrixView : AsynchronousContentView {
-    private int[] virtualRowIndizes;
-    private List<KeyValuePair<int, SortOrder>> sortedColumnIndizes;
+    private int[] virtualRowIndices;
+    private List<KeyValuePair<int, SortOrder>> sortedColumnIndices;
     private RowComparer rowComparer;
 
@@ -82 +82 @@
       errorProvider.SetIconAlignment(columnsTextBox, ErrorIconAlignment.MiddleLeft);
       errorProvider.SetIconPadding(columnsTextBox, 2);
-      sortedColumnIndizes = new List<KeyValuePair<int, SortOrder>>();
+      sortedColumnIndices = new List<KeyValuePair<int, SortOrder>>();
       rowComparer = new RowComparer();
     }
@@ -108 +108 @@
         dataGridView.Rows.Clear();
         dataGridView.Columns.Clear();
-        virtualRowIndizes = new int[0];
+        virtualRowIndices = new int[0];
       } else
         UpdateData();
@@ -128 +128 @@
       columnsTextBox.Text = Content.Columns.ToString();
       columnsTextBox.Enabled = true;
-      virtualRowIndizes = Enumerable.Range(0, Content.Rows).ToArray();
+      virtualRowIndices = Enumerable.Range(0, Content.Rows).ToArray();
 
       if (Content.Columns == 0 && dataGridView.ColumnCount != Content.Columns && !Content.ReadOnly)
@@ -178 +178 @@
 
       while (updatedRows < count) {
-        if (virtualRowIndizes[index] < Content.RowNames.Count())
-          dataGridView.Rows[index].HeaderCell.Value = Content.RowNames.ElementAt(virtualRowIndizes[index]);
+        if (virtualRowIndices[index] < Content.RowNames.Count())
+          dataGridView.Rows[index].HeaderCell.Value = Content.RowNames.ElementAt(virtualRowIndices[index]);
         else
           dataGridView.Rows[index].HeaderCell.Value = "Row " + (index + 1);
@@ -273 +273 @@
       if (!dataGridView.ReadOnly) {
         string value = e.Value.ToString();
-        int rowIndex = virtualRowIndizes[e.RowIndex];
+        int rowIndex = virtualRowIndices[e.RowIndex];
         e.ParsingApplied = Content.SetValue(value, rowIndex, e.ColumnIndex);
         if (e.ParsingApplied) e.Value = Content.GetValue(rowIndex, e.ColumnIndex);
@@ -283 +283 @@
     private void dataGridView_CellValueNeeded(object sender, DataGridViewCellValueEventArgs e) {
       if (Content != null && e.RowIndex < Content.Rows && e.ColumnIndex < Content.Columns) {
-        int rowIndex = virtualRowIndizes[e.RowIndex];
+        int rowIndex = virtualRowIndices[e.RowIndex];
         e.Value = Content.GetValue(rowIndex, e.ColumnIndex);
       }
@@ -340 +340 @@
 
       for (int i = minRowIndex; i <= maxRowIndex; i++) {
-        int rowIndex = this.virtualRowIndizes[i];
+        int rowIndex = this.virtualRowIndices[i];
         if (addRowNames) {
           s.Append(Content.RowNames.ElementAt(rowIndex));
@@ -399 +399 @@
       if (Content != null) {
         if (e.Button == MouseButtons.Left && Content.SortableView) {
-          bool addToSortedIndizes = (Control.ModifierKeys & Keys.Control) == Keys.Control;
+          bool addToSortedIndices = (Control.ModifierKeys & Keys.Control) == Keys.Control;
           SortOrder newSortOrder = SortOrder.Ascending;
-          if (sortedColumnIndizes.Any(x => x.Key == e.ColumnIndex)) {
-            SortOrder oldSortOrder = sortedColumnIndizes.Where(x => x.Key == e.ColumnIndex).First().Value;
+          if (sortedColumnIndices.Any(x => x.Key == e.ColumnIndex)) {
+            SortOrder oldSortOrder = sortedColumnIndices.Where(x => x.Key == e.ColumnIndex).First().Value;
             int enumLength = Enum.GetValues(typeof(SortOrder)).Length;
             newSortOrder = oldSortOrder = (SortOrder)Enum.Parse(typeof(SortOrder), ((((int)oldSortOrder) + 1) % enumLength).ToString());
           }
 
-          if (!addToSortedIndizes)
-            sortedColumnIndizes.Clear();
-
-          if (sortedColumnIndizes.Any(x => x.Key == e.ColumnIndex)) {
-            int sortedIndex = sortedColumnIndizes.FindIndex(x => x.Key == e.ColumnIndex);
+          if (!addToSortedIndices)
+            sortedColumnIndices.Clear();
+
+          if (sortedColumnIndices.Any(x => x.Key == e.ColumnIndex)) {
+            int sortedIndex = sortedColumnIndices.FindIndex(x => x.Key == e.ColumnIndex);
             if (newSortOrder != SortOrder.None)
-              sortedColumnIndizes[sortedIndex] = new KeyValuePair<int, SortOrder>(e.ColumnIndex, newSortOrder);
+              sortedColumnIndices[sortedIndex] = new KeyValuePair<int, SortOrder>(e.ColumnIndex, newSortOrder);
             else
-              sortedColumnIndizes.RemoveAt(sortedIndex);
+              sortedColumnIndices.RemoveAt(sortedIndex);
           } else
             if (newSortOrder != SortOrder.None)
-              sortedColumnIndizes.Add(new KeyValuePair<int, SortOrder>(e.ColumnIndex, newSortOrder));
+              sortedColumnIndices.Add(new KeyValuePair<int, SortOrder>(e.ColumnIndex, newSortOrder));
           Sort();
         }
@@ -425 +425 @@
 
     protected virtual void ClearSorting() {
-      virtualRowIndizes = Enumerable.Range(0, Content.Rows).ToArray();
-      sortedColumnIndizes.Clear();
+      virtualRowIndices = Enumerable.Range(0, Content.Rows).ToArray();
+      sortedColumnIndices.Clear();
       UpdateSortGlyph();
     }
 
     private void Sort() {
-      virtualRowIndizes = Sort(sortedColumnIndizes);
+      virtualRowIndices = Sort(sortedColumnIndices);
       UpdateSortGlyph();
       UpdateRowHeaders();
@@ -439 +439 @@
       int[] newSortedIndex = Enumerable.Range(0, Content.Rows).ToArray();
       if (sortedColumns.Count() != 0) {
-        rowComparer.SortedIndizes = sortedColumns;
+        rowComparer.SortedIndices = sortedColumns;
         rowComparer.Matrix = Content;
         Array.Sort(newSortedIndex, rowComparer);
@@ -448 +448 @@
       foreach (DataGridViewColumn col in this.dataGridView.Columns)
         col.HeaderCell.SortGlyphDirection = SortOrder.None;
-      foreach (KeyValuePair<int, SortOrder> p in sortedColumnIndizes)
+      foreach (KeyValuePair<int, SortOrder> p in sortedColumnIndices)
         this.dataGridView.Columns[p.Key].HeaderCell.SortGlyphDirection = p.Value;
     }
@@ -457 +457 @@
       }
 
-      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 List<KeyValuePair<int, SortOrder>> sortedIndices;
+      public IEnumerable<KeyValuePair<int, SortOrder>> SortedIndices {
+        get { return this.sortedIndices; }
+        set { sortedIndices = new List<KeyValuePair<int, SortOrder>>(value); }
       }
       private IStringConvertibleMatrix matrix;
@@ -477 +477 @@
         if (matrix == null)
           throw new InvalidOperationException("Could not sort IStringConvertibleMatrix if the matrix member is null.");
-        if (sortedIndizes == null)
+        if (sortedIndices == null)
           return 0;
 
-        foreach (KeyValuePair<int, SortOrder> pair in sortedIndizes.Where(p => p.Value != SortOrder.None)) {
+        foreach (KeyValuePair<int, SortOrder> pair in sortedIndices.Where(p => p.Value != SortOrder.None)) {
           string1 = matrix.GetValue(x, pair.Key);
           string2 = matrix.GetValue(y, pair.Key);

@@ -21 +21 @@
 protoc.exe
 _ReSharper.HeuristicLab 3.3 Tests
+Google.ProtocolBuffers-2.4.1.473.dll