Changeset 7290 for branches/RegressionBenchmarks/HeuristicLab.Analysis.Views/3.3/DataTableHistoryView.cs

Timestamp:

01/08/12 19:13:14 (12 years ago)

Author:

gkronber

Message:

#1669 merged r7209:7283 from trunk into regression benchmark branch

Location:

branches/RegressionBenchmarks

Files:

• . (modified) (2 props)
• HeuristicLab.Analysis.Views/3.3/DataTableHistoryView.cs (modified) (3 diffs)

branches/RegressionBenchmarks

@@ -18 +18 @@
 bin
 protoc.exe
+*.user

@@ -18 +18 @@
 bin
 protoc.exe
+*.user

branches/RegressionBenchmarks/HeuristicLab.Analysis.Views/3.3/DataTableHistoryView.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -38 +38 @@
       if (current == null) return;
       using (DataTableVisualPropertiesDialog dialog = new DataTableVisualPropertiesDialog(current)) {
-        if (dialog.ShowDialog() != DialogResult.OK) return;
-        Dictionary<string, bool> changeDisplayName = new Dictionary<string, bool>();
-        foreach (DataRow row in current.Rows) {
-          var answer = MessageBox.Show("Change display name for series " + row.Name + " to " + row.VisualProperties.DisplayName + " for all frames?", "Confirm change", MessageBoxButtons.YesNoCancel, MessageBoxIcon.Question, MessageBoxDefaultButton.Button2);
-          if (answer == DialogResult.Cancel) return;
-          changeDisplayName[row.Name] = (answer == DialogResult.Yes);
-        }
+        if (dialog.ShowDialog(this) != DialogResult.OK) return;
+        HashSet<string> modifiedDisplayNames = new HashSet<string>(dialog.RowsWithModifiedDisplayNames);
         foreach (DataTable dt in Content) {
           if (current == dt) continue;
@@ -51 +46 @@
             if (!dt.Rows.ContainsKey(row.Name)) continue;
             string oldDisplayName = dt.Rows[row.Name].VisualProperties.DisplayName;
-            var props = (DataRowVisualProperties)row.VisualProperties.Clone();
-            if (!changeDisplayName[row.Name]) props.DisplayName = oldDisplayName;
-            dt.Rows[row.Name].VisualProperties = props;
+            dt.Rows[row.Name].VisualProperties = (DataRowVisualProperties)row.VisualProperties.Clone();
+            if (!modifiedDisplayNames.Contains(row.Name))
+              dt.Rows[row.Name].VisualProperties.DisplayName = oldDisplayName;
           }
         }
       }
     }
-
   }
 }

@@ -18 +18 @@
 bin
 protoc.exe
+*.user