Changeset 9595

Timestamp:

06/06/13 14:50:43 (11 years ago)

Author:

mkommend

Message:

#2068: Corrected insert position in new column commands.

Location:

branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Command/ChangeColumnGroup

Files:

• AddNewColumnCommandBase.cs (modified) (2 diffs)
• AddNewProgrammableColumnCommand.cs (modified) (1 diff)

branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Command/ChangeColumnGroup/AddNewColumnCommandBase.cs

@@ -48 +48 @@
 
     [Storable]
+    private int columnIndex = -1;
+    protected int ColumnIndex {
+      get { return this.columnIndex; }
+      set { this.columnIndex = value; }
+    }
+
+    [Storable]
     private string columnName;
     protected string ColumnName {
@@ -66 +73 @@
       newColumn.Resize(ColumnGroup.RowCount);
 
-      ColumnBase cb = ColumnGroup.Columns.FirstOrDefault(x => x.Selected);
-      if (cb != null) {
-        ColumnGroup.InsertColumn(ColumnGroup.IndexOfColumn(cb) + 1, NewColumn);
+      if (ColumnIndex == -1) {
+        ColumnBase cb = ColumnGroup.Columns.FirstOrDefault(x => x.Selected);
+        if (cb != null) ColumnIndex = ColumnGroup.IndexOfColumn(cb);
+      }
+      if (ColumnIndex != -1) {
+        ColumnGroup.InsertColumn(ColumnIndex + 1, NewColumn);
       } else {
         ColumnGroup.AddColumn(NewColumn);

branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Command/ChangeColumnGroup/AddNewProgrammableColumnCommand.cs

@@ -66 +66 @@
       }
 
-      ColumnBase cb = ColumnGroup.Columns.FirstOrDefault(x => x.Selected);
-      if (cb != null) {
-        ColumnGroup.InsertColumn(ColumnGroup.IndexOfColumn(cb) + 1, NewColumn);
+      if (ColumnIndex == -1) {
+        ColumnBase cb = ColumnGroup.Columns.FirstOrDefault(x => x.Selected);
+        if (cb != null) ColumnIndex = ColumnGroup.IndexOfColumn(cb);
+      }
+      if (ColumnIndex != -1) {
+        ColumnGroup.InsertColumn(ColumnIndex + 1, NewColumn);
       } else {
         ColumnGroup.AddColumn(NewColumn);