Changeset 14472

Timestamp:

12/09/16 15:59:26 (8 years ago)

Author:

pfleck

Message:

#2709 Better initial axis intervals for scatterplots.

Location:

branches/DataPreprocessing Enhancements

Files:

• HeuristicLab.DataPreprocessing.Views/3.4/ScatterPlotSingleView.cs (modified) (1 diff)
• HeuristicLab.DataPreprocessing/3.4/Content/ScatterPlotContent.cs (modified) (2 diffs)
• HeuristicLab.DataPreprocessing/3.4/HeuristicLab.DataPreprocessing-3.4.csproj (modified) (1 diff)
• HeuristicLab.DataPreprocessing/3.4/Plugin.cs.frame (modified) (1 diff)

branches/DataPreprocessing Enhancements/HeuristicLab.DataPreprocessing.Views/3.4/ScatterPlotSingleView.cs

@@ -71 +71 @@
           comboBoxGroup.SelectedIndex = 0;
           UpdateScatterPlot();
+          if (scatterPlotControl.Content != null)
+            foreach (var row in scatterPlotControl.Content.Rows)
+              row.VisualProperties.PointSize = 6;
         }
       }

branches/DataPreprocessing Enhancements/HeuristicLab.DataPreprocessing/3.4/Content/ScatterPlotContent.cs

@@ -20 +20 @@
 #endregion
 
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using HeuristicLab.Analysis;
 using HeuristicLab.Common;
+using HeuristicLab.Visualization.ChartControlsExtensions;
 
 namespace HeuristicLab.DataPreprocessing {
@@ -41 +43 @@
       IList<double> xValues = PreprocessingData.GetValues<double>(PreprocessingData.GetColumnIndex(variableNameX));
       IList<double> yValues = PreprocessingData.GetValues<double>(PreprocessingData.GetColumnIndex(variableNameY));
+
+      double axisMin, axisMax, axisInterval;
+      try {
+        ChartUtil.CalculateOptimalAxisInterval(xValues.Min(), xValues.Max(), out axisMin, out axisMax, out axisInterval);
+        scatterPlot.VisualProperties.XAxisMinimumAuto = false;
+        scatterPlot.VisualProperties.XAxisMaximumAuto = false;
+        scatterPlot.VisualProperties.XAxisMinimumFixedValue = axisMin;
+        scatterPlot.VisualProperties.XAxisMaximumFixedValue = axisMax;
+      } catch (ArgumentOutOfRangeException) { } // missing values lead to NaNs
+      try {
+        ChartUtil.CalculateOptimalAxisInterval(yValues.Min(), yValues.Max(), out axisMin, out axisMax, out axisInterval);
+        scatterPlot.VisualProperties.YAxisMinimumAuto = false;
+        scatterPlot.VisualProperties.YAxisMaximumAuto = false;
+        scatterPlot.VisualProperties.YAxisMinimumFixedValue = axisMin;
+        scatterPlot.VisualProperties.YAxisMaximumFixedValue = axisMax;
+      } catch (ArgumentOutOfRangeException) { } // missing values lead to NaNs
+
       if (variableNameColor == null || variableNameColor == "-") {
         List<Point2D<double>> points = new List<Point2D<double>>();

branches/DataPreprocessing Enhancements/HeuristicLab.DataPreprocessing/3.4/HeuristicLab.DataPreprocessing-3.4.csproj

@@ -115 +115 @@
       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Problems.DataAnalysis-3.4.dll</HintPath>
     </Reference>
+    <Reference Include="HeuristicLab.Visualization.ChartControlsExtensions-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Visualization.ChartControlsExtensions-3.3.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />

branches/DataPreprocessing Enhancements/HeuristicLab.DataPreprocessing/3.4/Plugin.cs.frame

@@ -37 +37 @@
   [PluginDependency("HeuristicLab.Persistence", "3.3")]
   [PluginDependency("HeuristicLab.Problems.DataAnalysis","3.4")]
+  [PluginDependency("HeuristicLab.Visualization.ChartControlsExtensions", "3.3")]
   public class HeuristicLabDataPreprocessingPlugin : PluginBase {
   }