Changeset 16529 for branches/2520_PersistenceReintegration/HeuristicLab.Analysis

Timestamp:

01/10/19 15:40:44 (6 years ago)

Author:

gkronber

Message:

#2520: merged r16491:16528 from trunk to persistence branch

Location:

branches/2520_PersistenceReintegration

Files:

• . (modified) (1 prop)
• HeuristicLab.Analysis (modified) (1 prop)
• HeuristicLab.Analysis/3.3/DataVisualization/DataRow.cs (modified) (1 diff)
• HeuristicLab.Analysis/3.3/DataVisualization/DataTable.cs (modified) (1 diff)
• HeuristicLab.Analysis/3.3/DataVisualization/IndexedDataRow.cs (modified) (1 diff)
• HeuristicLab.Analysis/3.3/DataVisualization/IndexedDataTable.cs (modified) (4 diffs)
• HeuristicLab.Analysis/3.3/DataVisualization/Interfaces (copied) (copied from trunk/HeuristicLab.Analysis/3.3/DataVisualization/Interfaces)
• HeuristicLab.Analysis/3.3/HeuristicLab.Analysis-3.3.csproj (modified) (1 diff)

branches/2520_PersistenceReintegration/HeuristicLab.Analysis/3.3/DataVisualization/DataRow.cs

@@ -34 +34 @@
   [Item("DataRow", "A row of data values.")]
   [StorableType("34A66F23-0FBB-414C-81C8-D3AA1C470446")]
-  public class DataRow : NamedItem {
+  public class DataRow : NamedItem , IDataRow {
     private DataRowVisualProperties visualProperties;
     public DataRowVisualProperties VisualProperties {

branches/2520_PersistenceReintegration/HeuristicLab.Analysis/3.3/DataVisualization/DataTable.cs

@@ -37 +37 @@
   [Item("DataTable", "A table of data values.")]
   [StorableType("3DD78514-DBCE-4B2A-83B9-847FC67C264D")]
-  public class DataTable : NamedItem, IStringConvertibleMatrix {
+  public class DataTable : NamedItem, IStringConvertibleMatrix, IDataTable<DataRow> {
     public static new Image StaticItemImage {
       get { return HeuristicLab.Common.Resources.VSImageLibrary.Performance; }

branches/2520_PersistenceReintegration/HeuristicLab.Analysis/3.3/DataVisualization/IndexedDataRow.cs

@@ -32 +32 @@
   [Item("IndexedDataRow", "A data row that contains a series of points.")]
   [StorableType("0B0BB900-4C30-4485-82C2-C9E633110685")]
-  public class IndexedDataRow<T> : NamedItem {
+  public class IndexedDataRow<T> : NamedItem, IDataRow {
 
     private DataRowVisualProperties visualProperties;

branches/2520_PersistenceReintegration/HeuristicLab.Analysis/3.3/DataVisualization/IndexedDataTable.cs

@@ -34 +34 @@
   [Item("IndexedDataTable", "A data table where the points are also given with a certain index.")]
   [StorableType("1453C842-6312-4931-9B05-20399A0528D6")]
-  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
     }
 

branches/2520_PersistenceReintegration/HeuristicLab.Analysis/3.3/HeuristicLab.Analysis-3.3.csproj

@@ -141 +141 @@
     <Compile Include="DataVisualization\IndexedDataRow.cs" />
     <Compile Include="DataVisualization\IndexedDataTable.cs" />
+    <Compile Include="DataVisualization\Interfaces\IDataRow.cs" />
+    <Compile Include="DataVisualization\Interfaces\IDataTable.cs" />
     <Compile Include="DataVisualization\ScatterPlotDataRowVisualProperties.cs" />
     <Compile Include="DataVisualization\ScatterPlotDataRow.cs" />