Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
01/03/12 11:22:21 (13 years ago)
Author:
gkronber
Message:

#1081: merged r7214:7266 from trunk into time series branch.

Location:
branches/HeuristicLab.TimeSeries
Files:
10 edited

Legend:

Unmodified
Added
Removed

  • branches/HeuristicLab.TimeSeries

  • branches/HeuristicLab.TimeSeries/HeuristicLab.Analysis

  • branches/HeuristicLab.TimeSeries/HeuristicLab.Analysis/3.3/DataVisualization/DataRow.cs

    r6628 r7268  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • branches/HeuristicLab.TimeSeries/HeuristicLab.Analysis/3.3/DataVisualization/DataRowVisualProperties.cs

    r7213 r7268  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • branches/HeuristicLab.TimeSeries/HeuristicLab.Analysis/3.3/DataVisualization/DataTable.cs

    r7213 r7268  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    9393    public DataTable(string name)
    9494      : base(name) {
    95       VisualProperties = new DataTableVisualProperties();
     95      VisualProperties = new DataTableVisualProperties(name);
    9696      rows = new NamedItemCollection<DataRow>();
    9797      this.RegisterRowsEvents();
    … …  
    9999    public DataTable(string name, string description)
    100100      : base(name, description) {
    101       VisualProperties = new DataTableVisualProperties();
     101      VisualProperties = new DataTableVisualProperties(name);
    102102      rows = new NamedItemCollection<DataRow>();
    103103      this.RegisterRowsEvents();
    … …  
    108108    [StorableHook(HookType.AfterDeserialization)]
    109109    private void AfterDeserialization() {
    110       if (VisualProperties == null) VisualProperties = new DataTableVisualProperties();
     110      if (VisualProperties == null) VisualProperties = new DataTableVisualProperties(name);
     111      if (VisualProperties.Title == null) VisualProperties.Title = name;
    111112    }
    112113    #endregion

  • branches/HeuristicLab.TimeSeries/HeuristicLab.Analysis/3.3/DataVisualization/DataTableHistory.cs

    r7213 r7268  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • branches/HeuristicLab.TimeSeries/HeuristicLab.Analysis/3.3/DataVisualization/DataTableValuesCollector.cs

    r5877 r7268  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • branches/HeuristicLab.TimeSeries/HeuristicLab.Analysis/3.3/DataVisualization/DataTableVisualProperties.cs

    r6676 r7268  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    5252      }
    5353    }
     54    private string title;
     55    public string Title {
     56      get { return title; }
     57      set {
     58        if (title != value) {
     59          title = value;
     60          OnPropertyChanged("Title");
     61        }
     62      }
     63    }
    5464    private Font axisTitleFont;
    5565    public Font AxisTitleFont {
    … …  
    315325      get { return titleColor; }
    316326      set { titleColor = value; }
     327    }
     328    [Storable(Name = "Title")]
     329    private string StorableTitle {
     330      get { return title; }
     331      set { title = value; }
    317332    }
    318333    [Storable(Name = "AxisTitleFont")]
    … …  
    436451      if (original.axisTitleFont != null)
    437452        this.axisTitleFont = (Font)original.axisTitleFont.Clone();
     453      this.title = original.title;
    438454      this.xAxisTitle = original.xAxisTitle;
    439455      this.yAxisTitle = original.yAxisTitle;
    … …  
    458474    }
    459475    public DataTableVisualProperties() {
    460       titleColor = Color.Black;
    461       axisTitleColor = Color.Black;
     476      this.titleColor = Color.Black;
     477      this.axisTitleColor = Color.Black;
     478      this.title = string.Empty;
    462479      this.xAxisTitle = string.Empty;
    463480      this.yAxisTitle = string.Empty;
    … …  
    480497      this.secondYAxisMaximumAuto = true;
    481498      this.secondYAxisMaximumFixedValue = double.NaN;
     499    }
     500    public DataTableVisualProperties(string title)
     501      : this() {
     502      this.title = title;
    482503    }
    483504

  • branches/HeuristicLab.TimeSeries/HeuristicLab.Analysis/3.3/DataVisualization/HeatMap.cs

    r7213 r7268  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • branches/HeuristicLab.TimeSeries/HeuristicLab.Analysis/3.3/DataVisualization/HeatMapHistory.cs

    r7213 r7268  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
Note: See TracChangeset for help on using the changeset viewer.