Changeset 14525 for branches/DataPreprocessing Enhancements/HeuristicLab.DataPreprocessing.Views/3.4/ScatterPlotSingleView.cs

Timestamp:

12/22/16 16:36:59 (7 years ago)

Author:

pfleck

Message:

#2709

• Added suggestion feature for singlescatterplotview.
• Shows NaN groups in scatterplot (black if gradient is selected).
• Only enables input variables in DataGridContentView per default.
• Added missing resx file (gradient image).

File:

• branches/DataPreprocessing Enhancements/HeuristicLab.DataPreprocessing.Views/3.4/ScatterPlotSingleView.cs (modified) (5 diffs)

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

@@ -103 +103 @@
         var groupVariable = (string)comboBoxGroup.SelectedItem;
 
-        bool groupingActive = useGradientCheckBox.Checked && groupVariable != NoGroupItem;
+        bool isGroupingActive = groupVariable != NoGroupItem;
         double min = 0, max = 1;
-        if (groupingActive) {
+        if (isGroupingActive) {
           var groupValues = Content.PreprocessingData.GetValues<double>(Content.PreprocessingData.GetColumnIndex(groupVariable))
             .Distinct().OrderBy(x => x).ToList();
-          min = groupValues.First();
-          max = groupValues.Last();
+          min = groupValues.FirstOrDefault(x => !double.IsNaN(x));
+          max = groupValues.LastOrDefault(x => !double.IsNaN(x));
         }
         ScatterPlot scatterPlot = Content.CreateScatterPlot(xVariable, yVariable, groupVariable);
@@ -122 +122 @@
           row.VisualProperties.PolynomialRegressionOrder = order;
           row.VisualProperties.IsVisibleInLegend = !useGradientCheckBox.Checked;
-          if (groupingActive)
+          if (isGroupingActive && useGradientCheckBox.Checked)
             row.VisualProperties.Color = GetColor(double.Parse(row.Name), min, max);
         }
@@ -133 +133 @@
         scatterPlotControl.Content = scatterPlot;
 
-        if (groupingActive) {
+        if (isGroupingActive) {
           gradientMinimumLabel.Text = min.ToString("G5");
           gradientMaximumLabel.Text = max.ToString("G5");
@@ -228 +228 @@
         var groupValues = Content.PreprocessingData.GetValues<double>(Content.PreprocessingData.GetColumnIndex(groupVariable))
           .Distinct().OrderBy(x => x).ToList();
-        double min = groupValues.First(), max = groupValues.Last();
+        double min = groupValues.FirstOrDefault(x => !double.IsNaN(x)), max = groupValues.LastOrDefault(x => !double.IsNaN(x));
         foreach (var group in groupValues) {
           ScatterPlotDataRow row;
@@ -249 +249 @@
     private static Color GetColor(double value, double min, double max) {
       if (double.IsNaN(value)) {
-        return Color.DarkGray;
+        return Color.Black;
       }
       var colors = ColorGradient.Colors;