Changeset 10952 for branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views/3.4/SingleScatterPlotView.cs

Timestamp:

06/04/14 15:32:33 (10 years ago)

Author:

aesterer

Message:

Completed scatter plot view

File:

• branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views/3.4/SingleScatterPlotView.cs (modified) (3 diffs)

branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views/3.4/SingleScatterPlotView.cs

@@ -19 +19 @@
 
   [View("Single Scatter Plot View")]
-  [Content(typeof(ScatterPlotContent), false)]
+  [Content(typeof(ScatterPlotContent), true)]
   public partial class SingleScatterPlotView : ItemView {
 
@@ -42 +42 @@
       comboBoxYVariable.Items.AddRange(variables.ToArray());
 
-      if (variables.Count() >= 2) {
-        comboBoxXVariable.SelectedIndex = 0;
-        comboBoxYVariable.SelectedIndex = 1;
-        UpdateScatterPlot();
-        
+      // use x and y variable from content
+      if (Content.SelectedXVariable != null && Content.SelectedYVariable != null) {
+        comboBoxXVariable.SelectedItem = Content.SelectedXVariable;
+        comboBoxYVariable.SelectedItem = Content.SelectedYVariable;
+      } else {
+        if (variables.Count() >= 2) {
+          comboBoxXVariable.SelectedIndex = 0;
+          comboBoxYVariable.SelectedIndex = 1;
+          UpdateScatterPlot();
+
+        }
       }
 
@@ -67 +73 @@
         ScatterPlot scatterPlot = logic.CreateScatterPlot((string)comboBoxXVariable.SelectedItem, (string)comboBoxYVariable.SelectedItem);
         scatterPlotView.Content = scatterPlot;
+
+        //save selected x and y variable in content
+        this.Content.SelectedXVariable = (string)comboBoxXVariable.SelectedItem;
+        this.Content.SelectedYVariable = (string)comboBoxYVariable.SelectedItem;
       }
     }