Free cookie consent management tool by TermsFeed Policy Generator

Changeset 5994


Ignore:
Timestamp:
04/09/11 00:15:33 (12 years ago)
Author:
abeham
Message:

#1465

  • Added movie view for HistogramHistory
  • Added QualityDistributionAnalyzer for analyzing the development of the quality distributions in a population
  • Added AggregatedHistogramHistoryView for displaying a histogram of the accumulated data in a history
Location:
branches/histogram
Files:
6 added
5 edited

Legend:

Unmodified
Added
Removed
  • branches/histogram/HeuristicLab.Analysis.Views/3.3/HeuristicLab.Analysis.Views-3.3.csproj

    r5961 r5994  
    124124      <DependentUpon>AlleleFrequencyCollectionView.cs</DependentUpon>
    125125    </Compile>
     126    <Compile Include="AggregatedHistogramHistoryView.cs">
     127      <SubType>UserControl</SubType>
     128    </Compile>
     129    <Compile Include="AggregatedHistogramHistoryView.Designer.cs">
     130      <DependentUpon>AggregatedHistogramHistoryView.cs</DependentUpon>
     131    </Compile>
     132    <Compile Include="HistogramHistoryView.cs">
     133      <SubType>UserControl</SubType>
     134    </Compile>
     135    <Compile Include="HistogramHistoryView.Designer.cs">
     136      <DependentUpon>HistogramHistoryView.cs</DependentUpon>
     137    </Compile>
    126138    <Compile Include="HeatMapHistoryView.cs">
    127139      <SubType>UserControl</SubType>
     
    237249  </ItemGroup>
    238250  <ItemGroup>
     251    <EmbeddedResource Include="AggregatedHistogramHistoryView.resx">
     252      <DependentUpon>AggregatedHistogramHistoryView.cs</DependentUpon>
     253    </EmbeddedResource>
    239254    <EmbeddedResource Include="HeatMapView.resx">
    240255      <DependentUpon>HeatMapView.cs</DependentUpon>
  • branches/histogram/HeuristicLab.Analysis.Views/3.3/HistogramView.cs

    r5970 r5994  
    2929  [View("Histogram View")]
    3030  [Content(typeof(Histogram), IsDefaultView = true)]
    31   public sealed partial class HistogramView : NamedItemView {
     31  public partial class HistogramView : NamedItemView {
    3232
    3333    public new Histogram Content {
     
    7070    protected override void OnContentChanged() {
    7171      base.OnContentChanged();
    72       if (Content == null) {
    73         histogramControl.ClearPoints();
    74       } else {
     72      histogramControl.ClearPoints();
     73      if (Content != null) {
    7574        histogramControl.AddPoints(Content.Values);
    7675      }
  • branches/histogram/HeuristicLab.Analysis/3.3/DataVisualization/Histogram.cs

    r5961 r5994  
    5252      values = new ObservableCollection<double>();
    5353    }
     54    public Histogram(string name)
     55      : base(name) {
     56      values = new ObservableCollection<double>();
     57    }
     58    public Histogram(string name, string description)
     59      : base(description) {
     60      values = new ObservableCollection<double>();
     61    }
    5462
    5563    public override IDeepCloneable Clone(Cloner cloner) {
  • branches/histogram/HeuristicLab.Analysis/3.3/HeuristicLab.Analysis-3.3.csproj

    r5961 r5994  
    140140    <Compile Include="HeuristicLabAnalysisPlugin.cs" />
    141141    <Compile Include="Properties\AssemblyInfo.cs" />
     142    <Compile Include="QualityAnalysis\QualityDistributionAnalyzer.cs" />
    142143    <Compile Include="ValueAnalysis\MinAverageMaxValueAnalyzer.cs" />
    143144    <Compile Include="ValueAnalysis\MinAverageMaxValueCalculator.cs" />
  • branches/histogram/HeuristicLab.Visualization.ChartControlsExtensions/3.3/HistogramControl.cs

    r5970 r5994  
    3232
    3333    private List<double> points;
     34    public int NumberOfBins {
     35      get { return (int)binsNumericUpDown.Value; }
     36      set { binsNumericUpDown.Value = value; }
     37    }
     38
     39    public int MinimumNumberOfBins {
     40      get { return (int)binsNumericUpDown.Minimum; }
     41      set { binsNumericUpDown.Minimum = value; }
     42    }
     43
     44    public int MaximumNumberOfBins {
     45      get { return (int)binsNumericUpDown.Maximum; }
     46      set { binsNumericUpDown.Maximum = value; }
     47    }
     48
     49    public int IncrementNumberOfBins {
     50      get { return (int)binsNumericUpDown.Increment; }
     51      set { binsNumericUpDown.Increment = value; }
     52    }
     53
     54    public bool CalculateExactBins {
     55      get { return exactCheckBox.Checked; }
     56      set { exactCheckBox.Checked = value; }
     57    }
     58
     59    public bool ShowExactCheckbox {
     60      get { return exactCheckBox.Visible; }
     61      set { exactCheckBox.Visible = value; }
     62    }
    3463
    3564    public HistogramControl() {
     
    6493
    6594    private void UpdateHistogram() {
    66 
     95      if (InvokeRequired) {
     96        Invoke((Action)UpdateHistogram, null);
     97        return;
     98      }
    6799      Series histogramSeries = chart.Series[SeriesName];
    68100      histogramSeries.Points.Clear();
     
    113145      double rounding = range / base10;
    114146      if (rounding <= 1.5) rounding = 1;
    115       else if (rounding <= 2) rounding = 2;
    116       else if (rounding <= 2.5) rounding = 2.5;
    117       else if (rounding <= 5) rounding = 5;
     147      else if (rounding <= 2.25) rounding = 2;
     148      else if (rounding <= 3.75) rounding = 2.5;
     149      else if (rounding <= 7.5) rounding = 5;
    118150      else rounding = 10;
    119151      return rounding * base10;
Note: See TracChangeset for help on using the changeset viewer.