Changeset 5994

Timestamp:

04/09/11 00:15:33 (13 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:

• HeuristicLab.Analysis.Views/3.3/AggregatedHistogramHistoryView.Designer.cs (added)
• HeuristicLab.Analysis.Views/3.3/AggregatedHistogramHistoryView.cs (added)
• HeuristicLab.Analysis.Views/3.3/AggregatedHistogramHistoryView.resx (added)
• HeuristicLab.Analysis.Views/3.3/HeuristicLab.Analysis.Views-3.3.csproj (modified) (2 diffs)
• HeuristicLab.Analysis.Views/3.3/HistogramHistoryView.Designer.cs (added)
• HeuristicLab.Analysis.Views/3.3/HistogramHistoryView.cs (added)
• HeuristicLab.Analysis.Views/3.3/HistogramView.cs (modified) (2 diffs)
• HeuristicLab.Analysis/3.3/DataVisualization/Histogram.cs (modified) (1 diff)
• HeuristicLab.Analysis/3.3/HeuristicLab.Analysis-3.3.csproj (modified) (1 diff)
• HeuristicLab.Analysis/3.3/QualityAnalysis/QualityDistributionAnalyzer.cs (added)
• HeuristicLab.Visualization.ChartControlsExtensions/3.3/HistogramControl.cs (modified) (3 diffs)

branches/histogram/HeuristicLab.Analysis.Views/3.3/HeuristicLab.Analysis.Views-3.3.csproj

@@ -124 +124 @@
       <DependentUpon>AlleleFrequencyCollectionView.cs</DependentUpon>
     </Compile>
+    <Compile Include="AggregatedHistogramHistoryView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="AggregatedHistogramHistoryView.Designer.cs">
+      <DependentUpon>AggregatedHistogramHistoryView.cs</DependentUpon>
+    </Compile>
+    <Compile Include="HistogramHistoryView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="HistogramHistoryView.Designer.cs">
+      <DependentUpon>HistogramHistoryView.cs</DependentUpon>
+    </Compile>
     <Compile Include="HeatMapHistoryView.cs">
       <SubType>UserControl</SubType>
@@ -237 +249 @@
   </ItemGroup>
   <ItemGroup>
+    <EmbeddedResource Include="AggregatedHistogramHistoryView.resx">
+      <DependentUpon>AggregatedHistogramHistoryView.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="HeatMapView.resx">
       <DependentUpon>HeatMapView.cs</DependentUpon>

branches/histogram/HeuristicLab.Analysis.Views/3.3/HistogramView.cs

@@ -29 +29 @@
   [View("Histogram View")]
   [Content(typeof(Histogram), IsDefaultView = true)]
-  public sealed partial class HistogramView : NamedItemView {
+  public partial class HistogramView : NamedItemView {
 
     public new Histogram Content {
@@ -70 +70 @@
     protected override void OnContentChanged() {
       base.OnContentChanged();
-      if (Content == null) {
-        histogramControl.ClearPoints();
-      } else {
+      histogramControl.ClearPoints();
+      if (Content != null) {
         histogramControl.AddPoints(Content.Values);
       }

branches/histogram/HeuristicLab.Analysis/3.3/DataVisualization/Histogram.cs

@@ -52 +52 @@
       values = new ObservableCollection<double>();
     }
+    public Histogram(string name)
+      : base(name) {
+      values = new ObservableCollection<double>();
+    }
+    public Histogram(string name, string description)
+      : base(description) {
+      values = new ObservableCollection<double>();
+    }
 
     public override IDeepCloneable Clone(Cloner cloner) {

branches/histogram/HeuristicLab.Analysis/3.3/HeuristicLab.Analysis-3.3.csproj

@@ -140 +140 @@
     <Compile Include="HeuristicLabAnalysisPlugin.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="QualityAnalysis\QualityDistributionAnalyzer.cs" />
     <Compile Include="ValueAnalysis\MinAverageMaxValueAnalyzer.cs" />
     <Compile Include="ValueAnalysis\MinAverageMaxValueCalculator.cs" />

branches/histogram/HeuristicLab.Visualization.ChartControlsExtensions/3.3/HistogramControl.cs

@@ -32 +32 @@
 
     private List<double> points;
+    public int NumberOfBins {
+      get { return (int)binsNumericUpDown.Value; }
+      set { binsNumericUpDown.Value = value; }
+    }
+
+    public int MinimumNumberOfBins {
+      get { return (int)binsNumericUpDown.Minimum; }
+      set { binsNumericUpDown.Minimum = value; }
+    }
+
+    public int MaximumNumberOfBins {
+      get { return (int)binsNumericUpDown.Maximum; }
+      set { binsNumericUpDown.Maximum = value; }
+    }
+
+    public int IncrementNumberOfBins {
+      get { return (int)binsNumericUpDown.Increment; }
+      set { binsNumericUpDown.Increment = value; }
+    }
+
+    public bool CalculateExactBins {
+      get { return exactCheckBox.Checked; }
+      set { exactCheckBox.Checked = value; }
+    }
+
+    public bool ShowExactCheckbox {
+      get { return exactCheckBox.Visible; }
+      set { exactCheckBox.Visible = value; }
+    }
 
     public HistogramControl() {
@@ -64 +93 @@
 
     private void UpdateHistogram() {
-
+      if (InvokeRequired) {
+        Invoke((Action)UpdateHistogram, null);
+        return;
+      }
       Series histogramSeries = chart.Series[SeriesName];
       histogramSeries.Points.Clear();
@@ -113 +145 @@
       double rounding = range / base10;
       if (rounding <= 1.5) rounding = 1;
-      else if (rounding <= 2) rounding = 2;
-      else if (rounding <= 2.5) rounding = 2.5;
-      else if (rounding <= 5) rounding = 5;
+      else if (rounding <= 2.25) rounding = 2;
+      else if (rounding <= 3.75) rounding = 2.5;
+      else if (rounding <= 7.5) rounding = 5;
       else rounding = 10;
       return rounding * base10;