Changeset 7216 for trunk/sources/HeuristicLab.Analysis.Views/3.3/DataTableHistoryView.cs

Timestamp:

12/20/11 17:07:01 (12 years ago)

Author:

abeham

Message:

#1603

• Made display name change transparent
• Changed ok button

#1611

• added warning and added label to show image size
• fixed controls resizing

File:

• trunk/sources/HeuristicLab.Analysis.Views/3.3/DataTableHistoryView.cs (modified) (3 diffs)

trunk/sources/HeuristicLab.Analysis.Views/3.3/DataTableHistoryView.cs

@@ -20 +20 @@
 #endregion
 
-using System.Collections.Generic;
+using System.Linq;
 using System.Windows.Forms;
 using HeuristicLab.Core.Views;
 using HeuristicLab.MainForm;
+using System.Collections.Generic;
 
 namespace HeuristicLab.Analysis.Views {
@@ -39 +40 @@
       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);
-        }
+        HashSet<string> modifiedDisplayNames = new HashSet<string>(dialog.RowsWithModifiedDisplayNames);
         foreach (DataTable dt in Content) {
           if (current == dt) continue;
@@ -51 +47 @@
             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;
           }
         }