Changeset 9695 for trunk/sources

Timestamp:

07/04/13 14:03:58 (11 years ago)

Author:

mkommend

Message:

#2075: Removed default element names for ValueTypeArrays and added more efficient implementation for the row header update in the view.

Location:

trunk/sources

Files:

• HeuristicLab.Data.Views/3.3/StringConvertibleArrayView.cs (modified) (2 diffs)
• HeuristicLab.Data/3.3/StringArray.cs (modified) (2 diffs)
• HeuristicLab.Data/3.3/ValueTypeArray.cs (modified) (2 diffs)

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

@@ -23 +23 @@
 using System.ComponentModel;
 using System.Drawing;
-using System.Linq;
 using System.Text;
 using System.Windows.Forms;
@@ -105 +104 @@
 
     protected virtual void UpdateRowHeaders() {
-      for (int i = 0; i < dataGridView.RowCount; i++) {
-        if (i < Content.ElementNames.Count())
-          dataGridView.Rows[i].HeaderCell.Value = Content.ElementNames.ElementAt(i);
-        else
-          dataGridView.Rows[i].HeaderCell.Value = string.Empty;
+      int i = 0;
+      foreach (string elementName in Content.ElementNames) {
+        dataGridView.Rows[i].HeaderCell.Value = elementName;
+        i++;
+      }
+      for (; i < dataGridView.RowCount; i++) {
+        dataGridView.Rows[i].HeaderCell.Value = string.Empty;
       }
     }

trunk/sources/HeuristicLab.Data/3.3/StringArray.cs

@@ -51 +51 @@
         if (value == null || !value.Any())
           elementNames = new List<string>();
-        else if (value.Count() != Length)
-          throw new ArgumentException("An element name must be specified for each element.");
+        else if (value.Count() > Length)
+          throw new ArgumentException("The number of element names must not exceed the array length.");
         else
           elementNames = new List<string>(value);
@@ -67 +67 @@
           while (elementNames.Count > value)
             elementNames.RemoveAt(elementNames.Count - 1);
-          if (elementNames.Any()) {
-            while (elementNames.Count < value)
-              elementNames.Add("Element " + elementNames.Count);
-          }
           OnElementNamesChanged();
           OnReset();

trunk/sources/HeuristicLab.Data/3.3/ValueTypeArray.cs

@@ -51 +51 @@
         if (value == null || !value.Any())
           elementNames = new List<string>();
-        else if (value.Count() != Length)
-          throw new ArgumentException("An element name must be specified for each element.");
+        else if (value.Count() > Length)
+          throw new ArgumentException("The number of element names must not exceed the array length.");
         else
           elementNames = new List<string>(value);
@@ -69 +69 @@
           while (elementNames.Count > value)
             elementNames.RemoveAt(elementNames.Count - 1);
-          if (elementNames.Any()) {
-            while (elementNames.Count < value)
-              elementNames.Add("Element " + elementNames.Count);
-          }
           OnElementNamesChanged();
           OnReset();