Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
08/04/11 10:04:09 (13 years ago)
Author:
abeham
Message:

#1541, #1603, #1606, #1607

  • merged to trunk
Location:
trunk/sources
Files:
6 edited
1 copied

Legend:

Unmodified
Added
Removed
  • trunk/sources

  • trunk/sources/HeuristicLab.Analysis

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

    r5445 r6628  
    8383    public DataRow(string name)
    8484      : base(name) {
    85       VisualProperties = new DataRowVisualProperties();
     85      VisualProperties = new DataRowVisualProperties(name);
    8686      values = new ObservableList<double>();
    8787    }
    8888    public DataRow(string name, string description)
    8989      : base(name, description) {
    90       VisualProperties = new DataRowVisualProperties();
     90      VisualProperties = new DataRowVisualProperties(name);
    9191      values = new ObservableList<double>();
    9292    }
    9393    public DataRow(string name, string description, IEnumerable<double> values)
    9494      : base(name, description) {
    95       VisualProperties = new DataRowVisualProperties();
     95      VisualProperties = new DataRowVisualProperties(name);
    9696      this.values = new ObservableList<double>(values);
    9797    }
  • trunk/sources/HeuristicLab.Analysis/3.3/DataVisualization/DataRowVisualProperties.cs

    r6342 r6628  
    2020#endregion
    2121
     22using System;
    2223using System.ComponentModel;
    2324using System.Drawing;
     
    141142      }
    142143    }
     144    private string displayName;
     145    public string DisplayName {
     146      get { return displayName == null ? String.Empty : displayName; }
     147      set {
     148        if (displayName != value) {
     149          if (value == null && displayName != String.Empty) {
     150            displayName = String.Empty;
     151            OnPropertyChanged("DisplayName");
     152          } else if (value != null) {
     153            displayName = value;
     154            OnPropertyChanged("DisplayName");
     155          }
     156        }
     157      }
     158    }
    143159
    144160    #region Persistence Properties
     
    187203      get { return exactBins; }
    188204      set { exactBins = value; }
     205    }
     206    [Storable(Name = "DisplayName")]
     207    private string StorableDisplayName {
     208      get { return displayName; }
     209      set { displayName = value; }
    189210    }
    190211    #endregion
     
    203224      this.bins = original.bins;
    204225      this.exactBins = original.exactBins;
     226      this.displayName = original.displayName;
    205227    }
    206228    public DataRowVisualProperties() {
     
    214236      bins = 10;
    215237      exactBins = false;
     238      displayName = String.Empty;
     239    }
     240    public DataRowVisualProperties(string displayName)
     241      : this() {
     242      this.displayName = displayName;
    216243    }
    217244
  • trunk/sources/HeuristicLab.Analysis/3.3/HeuristicLab.Analysis-3.3.csproj

    r6342 r6628  
    139139    <Compile Include="Properties\AssemblyInfo.cs" />
    140140    <Compile Include="QualityAnalysis\QualityDistributionAnalyzer.cs" />
     141    <Compile Include="QualityAnalysis\ScaledQualityDifferenceAnalyzer.cs" />
    141142    <Compile Include="ValueAnalysis\MinAverageMaxValueAnalyzer.cs" />
    142143    <Compile Include="ValueAnalysis\MinAverageMaxValueCalculator.cs" />
  • trunk/sources/HeuristicLab.Analysis/3.3/QualityAnalysis/QualityDistributionAnalyzer.cs

    r6342 r6628  
    126126          string appendix = " at " + iterationName + " " + iteration.Value.ToString();
    127127          table.Name += appendix;
    128           table.Rows["QualityDistribution"].Name += appendix;
     128          table.Rows["QualityDistribution"].VisualProperties.DisplayName += appendix;
    129129        }
    130130        qdHistory.Add(table);
Note: See TracChangeset for help on using the changeset viewer.