Changeset 12725 for stable/HeuristicLab.Analysis.Views/3.3/HistogramControl.cs

Timestamp:

07/11/15 13:37:32 (9 years ago)

Author:

ascheibe

Message:

#2270 and #2354: merged r12173, r12458, r12077, r12599, r12613, r12112, r12116, r12117, r12131, r12631, r12672, r12684, r12690, r12692 into stable

Location:

stable

Files:

• . (modified) (1 prop)
• HeuristicLab.Analysis.Views (modified) (1 prop)
• HeuristicLab.Analysis.Views/3.3/HistogramControl.cs (modified) (2 diffs)

stable/HeuristicLab.Analysis.Views/3.3/HistogramControl.cs

@@ -139 +139 @@
         if (!point.Value.Any()) continue;
 
-        Series histogramSeries = new Series(point.Key);
-        chart.Series.Add(histogramSeries);
         double minValue = point.Value.Min();
         double maxValue = point.Value.Max();
         double intervalWidth = (maxValue - minValue) / bins;
         if (intervalWidth <= 0) continue;
+
+        Series histogramSeries = new Series(point.Key);
+        chart.Series.Add(histogramSeries);
 
         if (!exactCheckBox.Checked) {
@@ -167 +168 @@
         overallMax = Math.Max(overallMax, maxValue);
         overallMin = Math.Min(overallMin, minValue);
-      }
-
-      chart.ApplyPaletteColors();
-
-      int i = 0;
-      foreach (var point in points) {
-        if (!point.Value.Any()) continue;
-
-        var histogramSeries = chart.Series[i];
+
+        chart.ApplyPaletteColors();
         CalculateDensity(histogramSeries, point.Value, bandwith);
-
-        i++;
-      }
-
+      }
+
+      if (chart.Series.Any()) {
+        noDataLabel.Visible = false;
+      } else {
+        noDataLabel.Visible = true;
+      }
 
       ChartArea chartArea = chart.ChartAreas[0];