Changeset 16838 for stable/HeuristicLab.Analysis/3.3/DataVisualization/IndexedDataTable.cs

Timestamp:

04/19/19 10:07:53 (5 years ago)

Author:

gkronber

Message:

#2947: merged r16527 from trunk to stable (without useless mergeinfo properties)

Location:

stable

Files:

• . (modified) (1 prop)
• HeuristicLab.Analysis/3.3/DataVisualization/IndexedDataTable.cs (modified) (4 diffs)

stable/HeuristicLab.Analysis/3.3/DataVisualization/IndexedDataTable.cs

@@ -34 +34 @@
   [Item("IndexedDataTable", "A data table where the points are also given with a certain index.")]
   [StorableClass]
-  public class IndexedDataTable<T> : NamedItem, IStringConvertibleMatrix {
+  public class IndexedDataTable<T> : NamedItem, IStringConvertibleMatrix, IDataTable<IndexedDataRow<T>> {
     public static new Image StaticItemImage {
       get { return HeuristicLab.Common.Resources.VSImageLibrary.Performance; }
@@ -90 +90 @@
     public IndexedDataTable(string name)
       : base(name) {
-      VisualProperties = new DataTableVisualProperties();
+      VisualProperties = new DataTableVisualProperties(name);
       rows = new NamedItemCollection<IndexedDataRow<T>>();
       this.RegisterRowsEvents();
@@ -96 +96 @@
     public IndexedDataTable(string name, string description)
       : base(name, description) {
-      VisualProperties = new DataTableVisualProperties();
+      VisualProperties = new DataTableVisualProperties(name);
       rows = new NamedItemCollection<IndexedDataRow<T>>();
       this.RegisterRowsEvents();
@@ -103 +103 @@
     public override IDeepCloneable Clone(Cloner cloner) {
       return new IndexedDataTable<T>(this, cloner);
+    }
+
+    #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
     }