Changeset 12145 for trunk/sources

Timestamp:

03/05/15 17:02:32 (10 years ago)

Author:

ascheibe

Message:

#2351 the histogram and density curves now have the same color

File:

• trunk/sources/HeuristicLab.Analysis.Views/3.3/HistogramControl.cs (modified) (3 diffs)

trunk/sources/HeuristicLab.Analysis.Views/3.3/HistogramControl.cs

@@ -141 +141 @@
         Series histogramSeries = new Series(point.Key);
         chart.Series.Add(histogramSeries);
-
         double minValue = point.Value.Min();
         double maxValue = point.Value.Max();
@@ -166 +165 @@
         histogramSeries["PointWidth"] = "1";
 
-        CalculateDensity(histogramSeries, point.Value, bandwith);
-
         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];
+        CalculateDensity(histogramSeries, point.Value, bandwith);
+
+        i++;
+      }
+
 
       ChartArea chartArea = chart.ChartAreas[0];
@@ -209 +219 @@
 
       Series newSeries = new Series(densitySeriesName);
+      newSeries.Color = series.Color;
       newSeries.ChartType = SeriesChartType.FastLine;
       newSeries.BorderWidth = 2;