Changeset 12808 for branches/PerformanceComparison/HeuristicLab.Analysis.Views/3.3/IndexedDataTableView.cs

Timestamp:

07/28/15 14:41:03 (9 years ago)

Author:

abeham

Message:

#2431:

• added ability to plot curves for multiple targets at once
• fixed bug in IndexedDataTableView regarding log-scaling
• added result that counts restarts
• fixed bugs in IRRestarter
• Set LineWidth = 2 in analyzers for chart
• fixed bugs in RLD view

File:

• branches/PerformanceComparison/HeuristicLab.Analysis.Views/3.3/IndexedDataTableView.cs (modified) (3 diffs)

branches/PerformanceComparison/HeuristicLab.Analysis.Views/3.3/IndexedDataTableView.cs

@@ -128 +128 @@
       chart.ChartAreas[0].AxisY.Title = string.Empty;
       chart.ChartAreas[0].AxisY2.Title = string.Empty;
+      chart.ChartAreas[0].AxisX.IsLogarithmic = false;
+      chart.ChartAreas[0].AxisX2.IsLogarithmic = false;
+      chart.ChartAreas[0].AxisY.IsLogarithmic = false;
+      chart.ChartAreas[0].AxisY2.IsLogarithmic = false;
       chart.Series.Clear();
       if (Content != null) {
@@ -234 +238 @@
         area.AxisX.IntervalAutoMode = IntervalAutoMode.VariableCount;
       }
-
-      area.AxisX.IsLogarithmic = Content.VisualProperties.XAxisLogScale;
-      area.AxisX2.IsLogarithmic = Content.VisualProperties.SecondXAxisLogScale;
-      area.AxisY.IsLogarithmic = Content.VisualProperties.YAxisLogScale;
-      area.AxisY2.IsLogarithmic = Content.VisualProperties.SecondYAxisLogScale;
     }
 
@@ -247 +246 @@
         a.Maximum = double.NaN;
       }
+      // chart controls handle log scaling problems not in a graceful way
+      if (chart.Series.Any(x => x.XAxisType == AxisType.Primary && (x.Points.Count == 0 || x.Points.Any(y => y.XValue <= 0))))
+        area.AxisX.IsLogarithmic = false;
+      else area.AxisX.IsLogarithmic = Content.VisualProperties.XAxisLogScale;
+      if (chart.Series.Any(x => x.XAxisType == AxisType.Secondary && (x.Points.Count == 0 || x.Points.Any(y => y.XValue <= 0))))
+        area.AxisX2.IsLogarithmic = false;
+      else area.AxisX2.IsLogarithmic = Content.VisualProperties.SecondXAxisLogScale;
+
+      if (chart.Series.Any(x => x.YAxisType == AxisType.Primary && (x.Points.Count == 0 || x.Points.Any(y => y.YValues.Min() <= 0))))
+        area.AxisY.IsLogarithmic = false;
+      else area.AxisY.IsLogarithmic = Content.VisualProperties.YAxisLogScale;
+      if (chart.Series.Any(x => x.YAxisType == AxisType.Secondary && (x.Points.Count == 0 || x.Points.Any(y => y.YValues.Min() <= 0))))
+        area.AxisY2.IsLogarithmic = false;
+      else area.AxisY2.IsLogarithmic = Content.VisualProperties.SecondYAxisLogScale;
+
       area.RecalculateAxesScale();
       area.AxisX.IsMarginVisible = false;