Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
01/10/19 13:29:27 (5 years ago)
Author:
pfleck
Message:

#2947 merged branch to trunk

Location:
trunk
Files:
9 edited
1 copied

Legend:

Unmodified
Added
Removed

  • trunk

  • trunk/HeuristicLab.Analysis

  • trunk/HeuristicLab.Analysis/3.3/DataVisualization/DataRow.cs

    r15583 r16527  
    3434  [Item("DataRow", "A row of data values.")]
    3535  [StorableClass]
    36   public class DataRow : NamedItem {
     36  public class DataRow : NamedItem , IDataRow {
    3737    private DataRowVisualProperties visualProperties;
    3838    public DataRowVisualProperties VisualProperties {

  • trunk/HeuristicLab.Analysis/3.3/DataVisualization/DataTable.cs

    r15583 r16527  
    3737  [Item("DataTable", "A table of data values.")]
    3838  [StorableClass]
    39   public class DataTable : NamedItem, IStringConvertibleMatrix {
     39  public class DataTable : NamedItem, IStringConvertibleMatrix, IDataTable<DataRow> {
    4040    public static new Image StaticItemImage {
    4141      get { return HeuristicLab.Common.Resources.VSImageLibrary.Performance; }

  • trunk/HeuristicLab.Analysis/3.3/DataVisualization/IndexedDataRow.cs

    r16177 r16527  
    3232  [Item("IndexedDataRow", "A data row that contains a series of points.")]
    3333  [StorableClass]
    34   public class IndexedDataRow<T> : NamedItem {
     34  public class IndexedDataRow<T> : NamedItem, IDataRow {
    3535
    3636    private DataRowVisualProperties visualProperties;

  • trunk/HeuristicLab.Analysis/3.3/DataVisualization/IndexedDataTable.cs

    r15583 r16527  
    3434  [Item("IndexedDataTable", "A data table where the points are also given with a certain index.")]
    3535  [StorableClass]
    36   public class IndexedDataTable<T> : NamedItem, IStringConvertibleMatrix {
     36  public class IndexedDataTable<T> : NamedItem, IStringConvertibleMatrix, IDataTable<IndexedDataRow<T>> {
    3737    public static new Image StaticItemImage {
    3838      get { return HeuristicLab.Common.Resources.VSImageLibrary.Performance; }
    … …  
    9090    public IndexedDataTable(string name)
    9191      : base(name) {
    92       VisualProperties = new DataTableVisualProperties();
     92      VisualProperties = new DataTableVisualProperties(name);
    9393      rows = new NamedItemCollection<IndexedDataRow<T>>();
    9494      this.RegisterRowsEvents();
    … …  
    9696    public IndexedDataTable(string name, string description)
    9797      : base(name, description) {
    98       VisualProperties = new DataTableVisualProperties();
     98      VisualProperties = new DataTableVisualProperties(name);
    9999      rows = new NamedItemCollection<IndexedDataRow<T>>();
    100100      this.RegisterRowsEvents();
    … …  
    103103    public override IDeepCloneable Clone(Cloner cloner) {
    104104      return new IndexedDataTable<T>(this, cloner);
     105    }
     106
     107    #region BackwardsCompatibility3.3
     108    // Using the name as title is the old style
     109    [Storable(DefaultValue = true)]
     110    private bool useNameAsTitle = false;
     111    #endregion
     112
     113    [StorableHook(HookType.AfterDeserialization)]
     114    private void AfterDeserialization() {
     115      // BackwardsCompatibility3.3
     116      #region Backwards compatible code, remove with 3.4
     117      // Previously, the Name of the IndexedDataTable was used as Title
     118      if (useNameAsTitle && string.IsNullOrEmpty(VisualProperties.Title)) {
     119        VisualProperties.Title = Name;
     120        useNameAsTitle = false;
     121      }
     122      #endregion
    105123    }
    106124

  • trunk/HeuristicLab.Analysis/3.3/DataVisualization/Interfaces/IDataRow.cs

    r16149 r16527  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • trunk/HeuristicLab.Analysis/3.3/DataVisualization/Interfaces/IDataTable.cs

    r16149 r16527  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • trunk/HeuristicLab.Analysis/3.3/HeuristicLab.Analysis-3.3.csproj

    r14734 r16527  
    134134    <Compile Include="DataVisualization\IndexedDataRow.cs" />
    135135    <Compile Include="DataVisualization\IndexedDataTable.cs" />
     136    <Compile Include="DataVisualization\Interfaces\IDataRow.cs" />
     137    <Compile Include="DataVisualization\Interfaces\IDataTable.cs" />
    136138    <Compile Include="DataVisualization\ScatterPlotDataRowVisualProperties.cs" />
    137139    <Compile Include="DataVisualization\ScatterPlotDataRow.cs" />
Note: See TracChangeset for help on using the changeset viewer.