Changeset 10871

Timestamp:

05/21/14 12:48:42 (11 years ago)

Author:

mleitner

Message:

Persist Histogram classification setting, disable legend for histogram

Location:

branches/DataPreprocessing

Files:

• HeuristicLab.DataPreprocessing.Views/3.3/HistogramView.cs (modified) (3 diffs)
• HeuristicLab.DataPreprocessing.Views/3.3/PreprocessingDataTableView.cs (modified) (1 diff)
• HeuristicLab.DataPreprocessing/3.3/Implementations/HistogramContent.cs (modified) (2 diffs)

branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views/3.3/HistogramView.cs

@@ -24 +24 @@
       {
         logic = Content.ChartLogic;
-        Content.AllInOneMode = false;
-
+    
         classifierComboBox.Items.Clear();
 
@@ -34 +33 @@
         }
 
-        if (classifierComboBox.SelectedIndex == -1) {
-          classifierComboBox.SelectedIndex = 0;
+        if (classifierComboBox.SelectedItem == null) {
+         // classifierComboBox.SelectedIndex = 0;
+
+          classifierComboBox.SelectedIndex = Content.ClassifierVariableIndex;
         }
       }
@@ -59 +60 @@
       }
 
+      Content.ClassifierVariableIndex = classifierComboBox.SelectedIndex;
+
       GenerateChart();
     }

branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views/3.3/PreprocessingDataTableView.cs

@@ -651 +651 @@
     private void ToggleSeriesVisible(Series series)
     {
+
+      if (!Content.Rows.Any(x => x.Name == series.Name))
+        return;
+
       if (!invisibleSeries.Contains(series))
       {

branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3/Implementations/HistogramContent.cs

@@ -28 +28 @@
   public class HistogramContent : PreprocessingChartContent {
 
+    private int classifierVariableIndex = 0;
+
     public HistogramContent(IChartLogic chartlogic) :base(chartlogic) {
+      AllInOneMode = false;
     }
 
@@ -35 +38 @@
 
     }
+
+    public int ClassifierVariableIndex
+    {
+      get { return this.classifierVariableIndex; }
+      set { this.classifierVariableIndex = value; }
+    }
+
 
     public static new Image StaticItemImage {