Changeset 6115 for branches/histogram/HeuristicLab.Analysis.Views/3.3/DataTableView.cs

Timestamp:

05/03/11 19:52:35 (13 years ago)

Author:

abeham

Message:

#1465

• Added new interface IConfigureableView to HeuristicLab.MainForm
• Adapted ViewHost to show a configuration button when its ActiveView is of type IConfigureableView
• Changed DataTableHistoryView to be an IConfigureableView
• When changing the configuration of a history view the configuration will be applied to every frame
• Fixed a bug in calculating the histogram (when all values were the same)
• Added preceeding and trailing 0-bar in the histogram to prevent cutting the first and last column in the view
• Added a method Replace(IEnumerable<T>) to the ObservableList to do Clear() and AddRange() with just a single event notification
  • Calling that method from the QualityDistributionAnalyzer (otherwise the result view is flickering)
• Fixing a bug regarding axis labels in the QualityDistributionAnalyzer
• Removed double AfterDeserializationHook in QAP

File:

• branches/histogram/HeuristicLab.Analysis.Views/3.3/DataTableView.cs (modified) (4 diffs)

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

@@ -236 +236 @@
       }
       area.RecalculateAxesScale();
+      area.AxisX.IsMarginVisible = false;
+      area.AxisX2.IsMarginVisible = false;
 
       if (!Content.VisualProperties.XAxisMinimumAuto && !double.IsNaN(Content.VisualProperties.XAxisMinimumFixedValue)) area.AxisX.Minimum = Content.VisualProperties.XAxisMinimumFixedValue;
-      #region Workaround for bug in RecalculateAxesScale() that would assign -1
-      else {
-        if (area.AxisX.IsStartedFromZero
-        && chart.Series.Where(x => x.XAxisType == AxisType.Primary).Any()
-        && chart.Series.Where(x => x.XAxisType == AxisType.Primary).SelectMany(x => x.Points).Any()) {
-          double minX = chart.Series.Where(x => x.XAxisType == AxisType.Primary).SelectMany(x => x.Points).Select(x => x.XValue).Min();
-          if (minX >= 0 && area.AxisX.Minimum < 0) area.AxisX.Minimum = 0;
-        }
-      }
-      #endregion
       if (!Content.VisualProperties.XAxisMaximumAuto && !double.IsNaN(Content.VisualProperties.XAxisMaximumFixedValue)) area.AxisX.Maximum = Content.VisualProperties.XAxisMaximumFixedValue;
       if (!Content.VisualProperties.SecondXAxisMinimumAuto && !double.IsNaN(Content.VisualProperties.SecondXAxisMinimumFixedValue)) area.AxisX2.Minimum = Content.VisualProperties.SecondXAxisMinimumFixedValue;
-      #region Workaround for bug in RecalculateAxesScale() that would assign -1
-      else {
-        if (area.AxisX2.IsStartedFromZero
-         && chart.Series.Where(x => x.XAxisType == AxisType.Secondary).Any()
-         && chart.Series.Where(x => x.XAxisType == AxisType.Secondary).SelectMany(x => x.Points).Any()) {
-          double minX2 = chart.Series.Where(x => x.XAxisType == AxisType.Secondary).SelectMany(x => x.Points).Select(x => x.XValue).Min();
-          if (minX2 >= 0 && area.AxisX2.Minimum < 0) area.AxisX2.Minimum = 0;
-        }
-      }
-      #endregion
       if (!Content.VisualProperties.SecondXAxisMaximumAuto && !double.IsNaN(Content.VisualProperties.SecondXAxisMaximumFixedValue)) area.AxisX2.Maximum = Content.VisualProperties.SecondXAxisMaximumFixedValue;
       if (!Content.VisualProperties.YAxisMinimumAuto && !double.IsNaN(Content.VisualProperties.YAxisMinimumFixedValue)) area.AxisY.Minimum = Content.VisualProperties.YAxisMinimumFixedValue;
@@ -575 +557 @@
       double maxValue = row.Values.Max();
       double intervalWidth = (maxValue - minValue) / bins;
-      if (intervalWidth <= 0) return;
+      if (intervalWidth < 0) return;
+      if (intervalWidth == 0) {
+        series.Points.AddXY(minValue, row.Values.Count);
+        return;
+      }
 
       if (!row.VisualProperties.ExactBins) {
@@ -585 +571 @@
       double current = minValue, intervalCenter = intervalWidth / 2.0;
       int frequency = 0;
+      series.Points.AddXY(current - intervalCenter, 0); // so that the first column is not visually truncated
       foreach (double v in row.Values.Where(x => !IsInvalidValue(x)).OrderBy(x => x)) {
         while (v > current + intervalWidth) {
@@ -594 +581 @@
       }
       series.Points.AddXY(current + intervalCenter, frequency);
+      series.Points.AddXY(current + 3 * intervalCenter, 0); // so that the last column is not visually truncated
     }