Changeset 9258 for trunk/sources/HeuristicLab.Analysis.Views/3.3/DataTableView.cs

Timestamp:

02/28/13 15:38:12 (11 years ago)

Author:

mkommend

Message:

#2020: Integrated changes developed in the CMA-ES branch by abeham in the trunk.

File:

• trunk/sources/HeuristicLab.Analysis.Views/3.3/DataTableView.cs (modified) (6 diffs)

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

@@ -20 +20 @@
 #endregion
 
+using HeuristicLab.Collections;
+using HeuristicLab.Core.Views;
+using HeuristicLab.MainForm;
 using System;
 using System.Collections.Generic;
@@ -26 +29 @@
 using System.Windows.Forms;
 using System.Windows.Forms.DataVisualization.Charting;
-using HeuristicLab.Collections;
-using HeuristicLab.Core.Views;
-using HeuristicLab.MainForm;
 
 namespace HeuristicLab.Analysis.Views {
@@ -115 +115 @@
     public void ShowConfiguration() {
       if (Content != null) {
-        using (DataTableVisualPropertiesDialog dialog = new DataTableVisualPropertiesDialog(Content)) {
+        using (var dialog = new DataTableVisualPropertiesDialog(Content)) {
           dialog.ShowDialog(this);
         }
@@ -123 +123 @@
       foreach (var row in rows) {
         RegisterDataRowEvents(row);
-        Series series = new Series(row.Name);
+        var series = new Series(row.Name);
         if (row.VisualProperties.DisplayName.Trim() != String.Empty) series.LegendText = row.VisualProperties.DisplayName;
         else series.LegendText = row.Name;
@@ -231 +231 @@
       if (!Content.VisualProperties.AxisTitleColor.IsEmpty) area.AxisY2.TitleForeColor = Content.VisualProperties.AxisTitleColor;
       area.AxisY2.Title = Content.VisualProperties.SecondYAxisTitle;
+
+      area.AxisX.IsLogarithmic = Content.VisualProperties.XAxisLogScale;
+      area.AxisX2.IsLogarithmic = Content.VisualProperties.SecondXAxisLogScale;
+      area.AxisY.IsLogarithmic = Content.VisualProperties.YAxisLogScale;
+      area.AxisY2.IsLogarithmic = Content.VisualProperties.SecondYAxisLogScale;
     }
 
@@ -500 +505 @@
           break;
         default: {
+            bool yLogarithmic = series.YAxisType == AxisType.Primary
+                                  ? Content.VisualProperties.YAxisLogScale
+                                  : Content.VisualProperties.SecondYAxisLogScale;
+            bool xLogarithmic = series.XAxisType == AxisType.Primary
+                                  ? Content.VisualProperties.XAxisLogScale
+                                  : Content.VisualProperties.SecondXAxisLogScale;
             for (int i = 0; i < row.Values.Count; i++) {
               var value = row.Values[i];
-              DataPoint point = new DataPoint();
-              point.XValue = row.VisualProperties.StartIndexZero ? i : i + 1;
-              if (IsInvalidValue(value))
+              var point = new DataPoint();
+              point.XValue = row.VisualProperties.StartIndexZero && !xLogarithmic ? i : i + 1;
+              if (IsInvalidValue(value) || (yLogarithmic && value <= 0))
                 point.IsEmpty = true;
               else