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

Timestamp:

12/09/16 11:35:42 (7 years ago)

Author:

pfleck

Message:

#2709

• Removed some groupboxes in ViewShortcutListView.
• Removed unnecessary IViewChartShortcut
• Split ScatterPlot Multi and Single in to separate contents.
• Renamed Color-combo box in Scatterplot to "Group".

File:

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

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

@@ -30 +30 @@
 
   [View("Scatter Plot Single View")]
-  [Content(typeof(ScatterPlotContent), true)]
+  [Content(typeof(SingleScatterPlotContent), true)]
   public partial class ScatterPlotSingleView : ItemView {
 
-    public new ScatterPlotContent Content {
-      get { return (ScatterPlotContent)base.Content; }
+    public new SingleScatterPlotContent Content {
+      get { return (SingleScatterPlotContent)base.Content; }
       set { base.Content = value; }
     }
@@ -48 +48 @@
       comboBoxXVariable.Items.Clear();
       comboBoxYVariable.Items.Clear();
-      comboBoxColor.Items.Clear();
+      comboBoxGroup.Items.Clear();
       comboBoxXVariable.Items.AddRange(variables.ToArray());
       comboBoxYVariable.Items.AddRange(variables.ToArray());
-      comboBoxColor.Items.Add("-");
+      comboBoxGroup.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));
+            comboBoxGroup.Items.Add(Content.PreprocessingData.GetVariableName(i));
         }
       }
 
       // use x and y variable from content
-      if (Content.SelectedXVariable != null && Content.SelectedYVariable != null && Content.SelectedColorVariable != null) {
+      if (Content.SelectedXVariable != null && Content.SelectedYVariable != null && Content.SelectedGroupVariable != null) {
         comboBoxXVariable.SelectedItem = Content.SelectedXVariable;
         comboBoxYVariable.SelectedItem = Content.SelectedYVariable;
-        comboBoxColor.SelectedItem = Content.SelectedColorVariable;
+        comboBoxGroup.SelectedItem = Content.SelectedGroupVariable;
       } else {
         if (variables.Count() >= 2) {
           comboBoxXVariable.SelectedIndex = 0;
           comboBoxYVariable.SelectedIndex = 1;
-          comboBoxColor.SelectedIndex = 0;
+          comboBoxGroup.SelectedIndex = 0;
           UpdateScatterPlot();
         }
@@ -87 +87 @@
 
     private void UpdateScatterPlot() {
-      if (comboBoxXVariable.SelectedItem != null && comboBoxYVariable.SelectedItem != null && comboBoxColor.SelectedItem != null) {
+      if (comboBoxXVariable.SelectedItem != null && comboBoxYVariable.SelectedItem != null && comboBoxGroup.SelectedItem != null) {
         var xVariable = (string)comboBoxXVariable.SelectedItem;
         var yVariable = (string)comboBoxYVariable.SelectedItem;
-        var colorVariable = (string)comboBoxColor.SelectedItem;
-        ScatterPlot scatterPlot = Content.CreateScatterPlot(xVariable, yVariable, colorVariable);
+        var groupVariable = (string)comboBoxGroup.SelectedItem;
+        ScatterPlot scatterPlot = Content.CreateScatterPlot(xVariable, yVariable, groupVariable);
         var vp = scatterPlot.VisualProperties;
         vp.Title = string.Empty;
@@ -98 +98 @@
 
         scatterPlotControl.Content = scatterPlot;
-        
+
         //save selected x and y variable in content
         this.Content.SelectedXVariable = (string)comboBoxXVariable.SelectedItem;
         this.Content.SelectedYVariable = (string)comboBoxYVariable.SelectedItem;
-        this.Content.SelectedColorVariable = (string)comboBoxColor.SelectedItem;
+        this.Content.SelectedGroupVariable = (string)comboBoxGroup.SelectedItem;
       }
     }