Changeset 14075 for stable/HeuristicLab.DataPreprocessing.Views/3.4/ScatterPlotSingleView.cs

Timestamp:

07/14/16 22:38:23 (8 years ago)

Author:

mkommend

Message:

#2559: Merged r13502, r13504, r13507, r13508, r13512, r13514, r13517 into stable.

Location:

stable

Files:

• . (modified) (1 prop)
• HeuristicLab.DataPreprocessing.Views (modified) (1 prop)
• HeuristicLab.DataPreprocessing.Views/3.4/ScatterPlotSingleView.cs (modified) (5 diffs)

stable/HeuristicLab.DataPreprocessing.Views/3.4/ScatterPlotSingleView.cs

@@ -1 @@
-using System;
+#region License Information
+/* HeuristicLab
+ * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
+ * This file is part of HeuristicLab.
+ *
+ * HeuristicLab is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * HeuristicLab is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
+ */
+#endregion
+
+using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Windows.Forms;
 using HeuristicLab.Analysis;
 using HeuristicLab.Core.Views;
@@ -18 +38 @@
     }
 
-    public ScatterPlotSingleView()
-    {
+    public ScatterPlotSingleView() {
       InitializeComponent();
     }
 
     public void InitData() {
-
       IEnumerable<string> variables = Content.PreprocessingData.GetDoubleVariableNames();
 
@@ -30 +48 @@
       comboBoxXVariable.Items.Clear();
       comboBoxYVariable.Items.Clear();
+      comboBoxColor.Items.Clear();
       comboBoxXVariable.Items.AddRange(variables.ToArray());
       comboBoxYVariable.Items.AddRange(variables.ToArray());
+      comboBoxColor.Items.Add("-");
+      for (int i = 0; i < Content.PreprocessingData.Columns; ++i) {
+        if (Content.PreprocessingData.VariableHasType<double>(i)) {
+          double distinctValueCount = Content.PreprocessingData.GetValues<double>(i).GroupBy(x => x).Count();
+          if (distinctValueCount <= 20)
+            comboBoxColor.Items.Add(Content.PreprocessingData.GetVariableName(i));
+        }
+      }
 
       // use x and y variable from content
-      if (Content.SelectedXVariable != null && Content.SelectedYVariable != null) {
+      if (Content.SelectedXVariable != null && Content.SelectedYVariable != null && Content.SelectedColorVariable != null) {
         comboBoxXVariable.SelectedItem = Content.SelectedXVariable;
         comboBoxYVariable.SelectedItem = Content.SelectedYVariable;
+        comboBoxColor.SelectedItem = Content.SelectedColorVariable;
       } else {
         if (variables.Count() >= 2) {
           comboBoxXVariable.SelectedIndex = 0;
           comboBoxYVariable.SelectedIndex = 1;
+          comboBoxColor.SelectedIndex = 0;
           UpdateScatterPlot();
-
         }
       }
@@ -59 +87 @@
 
     private void UpdateScatterPlot() {
-      if (comboBoxXVariable.SelectedItem != null && comboBoxYVariable.SelectedItem != null) {
+      if (comboBoxXVariable.SelectedItem != null && comboBoxYVariable.SelectedItem != null && comboBoxColor.SelectedItem != null) {
         //get scatter plot with selected x and y variable
-        ScatterPlot scatterPlot = Content.CreateScatterPlot((string)comboBoxXVariable.SelectedItem, (string)comboBoxYVariable.SelectedItem);
+        ScatterPlot scatterPlot = Content.CreateScatterPlot(
+          (string)comboBoxXVariable.SelectedItem,
+          (string)comboBoxYVariable.SelectedItem,
+          (string)comboBoxColor.SelectedItem);
         scatterPlotView.Content = scatterPlot;
 
@@ -67 +98 @@
         this.Content.SelectedXVariable = (string)comboBoxXVariable.SelectedItem;
         this.Content.SelectedYVariable = (string)comboBoxYVariable.SelectedItem;
+        this.Content.SelectedColorVariable = (string)comboBoxColor.SelectedItem;
       }
     }
-
   }
-
-
 }