Changeset 9627 for branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Data/View

Timestamp:

06/13/13 20:54:50 (11 years ago)

Author:

mkommend

Message:

#1734: Improved data importer usability:

• new closing message
• rename column reacts on lost focus
• updated copyright info

File:

• branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Data/View/ColumnGroupView.cs (modified) (6 diffs)

branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Data/View/ColumnGroupView.cs

@@ -333 +333 @@
         this.commandChain.Add(new SortCommand(DataSet, this.ColumnGroup.Name,
           e.ColumnIndex, (Control.ModifierKeys & Keys.Control) == Keys.Control));
-        //this.UpdateSortGlyph();
-        //this.dataGridView.AutoResizeColumns(DataGridViewAutoSizeColumnsMode.DisplayedCells);
-        //UpdateStateInformation();
       }
     }
@@ -497 +494 @@
 
     private string ToExcelColumnIndex(int index) {
-      //if (symb.Length == 1) {       // 'A' .. 'Z'
-      //  return TryTranslateColumnIndexDigit(symb[0], out columnIndex);
-      //} else if (symb.Length == 2) { // 'AA' ... 'ZZ'
-      //  bool ok;
-      //  int d0, d1;
-      //  ok = TryTranslateColumnIndexDigit(symb[0], out d1) & TryTranslateColumnIndexDigit(symb[1], out d0);
-      //  columnIndex = (d1 + 1) * 26 + d0;
-      //  return ok;
-      //} else {
-      //  columnIndex = 0;
-      //  return false;
-      //}
       #region digits
       var digits = new char[] { 
@@ -553 +538 @@
     #region DataGridView virtual mode event handler
     private void dataGridView_CellValueNeeded(object sender, System.Windows.Forms.DataGridViewCellValueEventArgs e) {
+      if (!ColumnGroup.Columns.Any()) return;
       e.Value = ColumnGroup.Columns.ElementAt(e.ColumnIndex).GetValue(e.RowIndex);
     }
@@ -603 +589 @@
     #region txtColumnName event handler
     private void txtColumnName_Leave(object source, EventArgs e) {
+      if (!this.txtColumnName.Visible) return;
       this.txtColumnName.Visible = false;
+
+      DataGridView.HitTestInfo h = this.dataGridView.HitTest(txtColumnName.Location.X, txtColumnName.Location.Y);
+      if (txtColumnName.Text != this.ColumnGroup.GetColumn(h.ColumnIndex).Name)
+        this.commandChain.Add(new RenameColumnCommand(DataSet, this.ColumnGroup.Name, h.ColumnIndex, txtColumnName.Text));
     }
 
@@ -611 +602 @@
       if (e.KeyCode == Keys.Enter) {
         DataGridView.HitTestInfo h = this.dataGridView.HitTest(txtColumnName.Location.X, txtColumnName.Location.Y);
-        this.commandChain.Add(new RenameColumnCommand(DataSet, this.ColumnGroup.Name, h.ColumnIndex, txtColumnName.Text));
+        if (txtColumnName.Text != this.ColumnGroup.GetColumn(h.ColumnIndex).Name)
+          this.commandChain.Add(new RenameColumnCommand(DataSet, this.ColumnGroup.Name, h.ColumnIndex, txtColumnName.Text));
       }
       this.txtColumnName.Visible = false;
@@ -653 +645 @@
 
     private bool CheckIfNewColumnGroupNameIsAllowed(string newName) {
-      return !this.DataSet.ColumnGroups.Any(cg => cg.Name == newName);
+      return this.DataSet.ColumnGroups.All(cg => cg.Name != newName);
     }
     #endregion