Changeset 14993 for branches/DataPreprocessing Enhancements/HeuristicLab.DataPreprocessing.Views/3.4/HistogramView.cs

Timestamp:

05/17/17 13:22:51 (7 years ago)

Author:

pfleck

Message:

#2709

• Added Legend order when grouping for histogram and (single and multi)scatterplot.
• Removed the limitation of distinct values for the singlescatterplot (for the color gradient).
• Added a legend-visible checkbox for the multi-scatterplot.

File:

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

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

@@ -28 +28 @@
   [Content(typeof(HistogramContent), true)]
   public partial class HistogramView : PreprocessingChartView {
+
     public new HistogramContent Content {
       get { return (HistogramContent)base.Content; }
@@ -37 +38 @@
       aggregationComboBox.DataSource = Enum.GetValues(typeof(DataRowVisualProperties.DataRowHistogramAggregation));
       aggregationComboBox.SelectedItem = DataRowVisualProperties.DataRowHistogramAggregation.Overlapping;
+      orderComboBox.DataSource = Enum.GetValues(typeof(PreprocessingChartContent.LegendOrder));
+      orderComboBox.SelectedItem = PreprocessingChartContent.LegendOrder.Appearance;
     }
 
@@ -55 +58 @@
     protected override DataTable CreateDataTable(string variableName) {
       var aggregation = (DataRowVisualProperties.DataRowHistogramAggregation)aggregationComboBox.SelectedItem;
-      return HistogramContent.CreateHistogram(Content.PreprocessingData, variableName, Content.GroupingVariableName, aggregation);
+      return HistogramContent.CreateHistogram(Content.PreprocessingData, variableName, Content.GroupingVariableName, aggregation, Content.Order);
     }
 
@@ -73 +76 @@
       }
     }
+
+    private void orderComboBox_SelectedIndexChanged(object sender, EventArgs e) {
+      Content.Order = (PreprocessingChartContent.LegendOrder)orderComboBox.SelectedItem;
+
+      // rebuild datatables
+      InitData();
+      GenerateLayout();
+    }
   }
 }