Changeset 16524

Timestamp:

01/09/19 12:47:01 (6 years ago)

Author:

pfleck

Message:

#2947

• Added backwards compatibility for IndexedDataTable.VisualProperties.Title
• Removed syncing of ItemName and VisualProperties.Title when (Indexed)DataTable is active.

Location:

branches/2947_ConfigurableIndexedDataTable

Files:

• HeuristicLab.Analysis.Views/3.3/DataTableView.cs (modified) (1 diff)
• HeuristicLab.Analysis.Views/3.3/IndexedDataTableView.cs (modified) (1 diff)
• HeuristicLab.Analysis/3.3/DataVisualization/IndexedDataTable.cs (modified) (1 diff)

branches/2947_ConfigurableIndexedDataTable/HeuristicLab.Analysis.Views/3.3/DataTableView.cs

@@ -337 +337 @@
     #region Event Handlers
     #region Content Event Handlers
-    protected override void Content_NameChanged(object sender, EventArgs e) {
-      if (InvokeRequired)
-        Invoke(new EventHandler(Content_NameChanged), sender, e);
-      else {
-        Content.VisualProperties.Title = Content.Name;
-        base.Content_NameChanged(sender, e);
-      }
-    }
     private void Content_VisualPropertiesChanged(object sender, EventArgs e) {
       if (InvokeRequired)

branches/2947_ConfigurableIndexedDataTable/HeuristicLab.Analysis.Views/3.3/IndexedDataTableView.cs

@@ -324 +324 @@
     #region Event Handlers
     #region Content Event Handlers
-    protected override void Content_NameChanged(object sender, EventArgs e) {
-      if (InvokeRequired)
-        Invoke(new EventHandler(Content_NameChanged), sender, e);
-      else {
-        chart.Titles[0].Text = Content.Name;
-        base.Content_NameChanged(sender, e);
-      }
-    }
     private void Content_VisualPropertiesChanged(object sender, EventArgs e) {
       if (InvokeRequired)

branches/2947_ConfigurableIndexedDataTable/HeuristicLab.Analysis/3.3/DataVisualization/IndexedDataTable.cs

@@ -105 +105 @@
     }
 
+    #region BackwardsCompatibility3.3
+    // Using the name as title is the old style
+    [Storable(DefaultValue = true)]
+    private bool useNameAsTitle = false;
+    #endregion
+
+    [StorableHook(HookType.AfterDeserialization)]
+    private void AfterDeserialization() {
+      // BackwardsCompatibility3.3
+      #region Backwards compatible code, remove with 3.4
+      // Previously, the Name of the IndexedDataTable was used as Title
+      if (useNameAsTitle && string.IsNullOrEmpty(VisualProperties.Title)) {
+        VisualProperties.Title = Name;
+        useNameAsTitle = false;
+      }
+      #endregion
+    }
+
     public event EventHandler VisualPropertiesChanged;
     protected virtual void OnVisualPropertiesChanged() {