Changeset 15090


Ignore:
Timestamp:
06/29/17 15:18:12 (4 months ago)
Author:
pfleck
Message:

#2709 Adapted to recent trunk changes (r15068)

Location:
branches/DataPreprocessing Enhancements
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/DataPreprocessing Enhancements/HeuristicLab.DataPreprocessing.Views/3.4/HistogramView.cs

    r15027 r15090  
    3636    public HistogramView() {
    3737      InitializeComponent();
    38       aggregationComboBox.DataSource = Enum.GetValues(typeof(DataRowVisualProperties.DataRowHistogramAggregation));
    39       aggregationComboBox.SelectedItem = DataRowVisualProperties.DataRowHistogramAggregation.Overlapping;
     38      aggregationComboBox.DataSource = Enum.GetValues(typeof(DataTableVisualProperties.DataTableHistogramAggregation));
     39      aggregationComboBox.SelectedItem = DataTableVisualProperties.DataTableHistogramAggregation.Overlapping;
    4040      orderComboBox.DataSource = Enum.GetValues(typeof(PreprocessingChartContent.LegendOrder));
    4141      orderComboBox.SelectedItem = PreprocessingChartContent.LegendOrder.Appearance;
     
    5757
    5858    protected override DataTable CreateDataTable(string variableName) {
    59       var aggregation = (DataRowVisualProperties.DataRowHistogramAggregation)aggregationComboBox.SelectedItem;
     59      var aggregation = (DataTableVisualProperties.DataTableHistogramAggregation)aggregationComboBox.SelectedItem;
    6060      var hist = HistogramContent.CreateHistogram(Content.PreprocessingData, variableName, Content.GroupingVariableName, aggregation, Content.Order);
    6161      hist.VisualProperties.TitleFont = new Font(DefaultFont.FontFamily, 10, FontStyle.Bold);
     
    7373    private void aggregationComboBox_SelectedIndexChanged(object sender, EventArgs e) {
    7474      foreach (var dt in dataTables.Values) {
    75         foreach (var row in dt.Rows) {
    76           row.VisualProperties.Aggregation = (DataRowVisualProperties.DataRowHistogramAggregation)aggregationComboBox.SelectedItem;
    77         }
     75        dt.VisualProperties.HistogramAggregation = (DataTableVisualProperties.DataTableHistogramAggregation)aggregationComboBox.SelectedItem;
    7876      }
    7977    }
  • branches/DataPreprocessing Enhancements/HeuristicLab.DataPreprocessing.Views/3.4/ScatterPlotMultiView.cs

    r15043 r15090  
    3131using HeuristicLab.MainForm;
    3232using HeuristicLab.MainForm.WindowsForms;
    33 using AggregationType = HeuristicLab.Analysis.DataRowVisualProperties.DataRowHistogramAggregation;
     33using AggregationType = HeuristicLab.Analysis.DataTableVisualProperties.DataTableHistogramAggregation;
    3434using RegressionType = HeuristicLab.Analysis.ScatterPlotDataRowVisualProperties.ScatterPlotDataRowRegressionType;
    3535
     
    736736        }
    737737
    738         var histogramControl = control.Value as DataTableView;
    739         if (histogramControl != null) {
    740           foreach (var row in histogramControl.Content.Rows) {
    741             row.VisualProperties.Aggregation = aggregation;
    742           }
     738        var histogramView = control.Value as DataTableView;
     739        if (histogramView != null) {
     740          histogramView.Content.VisualProperties.HistogramAggregation = aggregation;
    743741        }
    744742      }
  • branches/DataPreprocessing Enhancements/HeuristicLab.DataPreprocessing/3.4/Content/HistogramContent.cs

    r15036 r15090  
    5454    }
    5555
    56     public static DataTable CreateHistogram(IFilteredPreprocessingData preprocessingData, string variableName, string groupingVariableName, DataRowVisualProperties.DataRowHistogramAggregation aggregation, LegendOrder legendOrder = LegendOrder.Appearance) {
     56    public static DataTable CreateHistogram(IFilteredPreprocessingData preprocessingData, string variableName, string groupingVariableName, DataTableVisualProperties.DataTableHistogramAggregation aggregation, LegendOrder legendOrder = LegendOrder.Appearance) {
    5757      var dataTable = new DataTable {
    58         VisualProperties = { Title = variableName }
     58        VisualProperties = { Title = variableName, HistogramAggregation = aggregation },
    5959      };
    6060
     
    8989          VisualProperties = {
    9090              ChartType = DataRowVisualProperties.DataRowChartType.Histogram,
    91               Aggregation = aggregation,
    9291              IsVisibleInLegend = !string.IsNullOrEmpty(groupingVariableName)
    9392            }
Note: See TracChangeset for help on using the changeset viewer.