Changeset 8676

Timestamp:

09/21/12 10:19:59 (12 years ago)

Author:

mkommend

Message:

#1956: Changed AddNewProgrammableColumnCommand to respect the currently selected columns.

Location:

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

Files:

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

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

@@ -66 +66 @@
       newColumn.Resize(ColumnGroup.RowCount);
 
-      ColumnBase cb = ColumnGroup.Columns.Where(x => x.Selected).FirstOrDefault();
+      ColumnBase cb = ColumnGroup.Columns.FirstOrDefault(x => x.Selected);
       if (cb != null) {
         ColumnGroup.InsertColumn(ColumnGroup.IndexOfColumn(cb) + 1, NewColumn);

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

@@ -20 +20 @@
 #endregion
 
-using System;
-using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using System.Xml;
+using HeuristicLab.DataImporter.Command.View;
+using HeuristicLab.DataImporter.Data;
 using HeuristicLab.DataImporter.Data.CommandBase;
 using HeuristicLab.DataImporter.Data.Model;
-using HeuristicLab.DataImporter.Data;
-using HeuristicLab.DataImporter.Command.View;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
@@ -70 +66 @@
       }
 
-      ColumnGroup.AddColumn(NewColumn);
+      ColumnBase cb = ColumnGroup.Columns.FirstOrDefault(x => x.Selected);
+      if (cb != null) {
+        ColumnGroup.InsertColumn(ColumnGroup.IndexOfColumn(cb) + 1, NewColumn);
+      } else {
+        ColumnGroup.AddColumn(NewColumn);
+      }
       ColumnGroup.FireChanged();
       ColumnGroup = null;