- Timestamp:
- 06/27/17 10:06:34 (7 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/sources/HeuristicLab.Analysis.Views/3.3/DataTableView.cs
r15042 r15068 206 206 break; 207 207 case DataRowVisualProperties.DataRowChartType.Histogram: 208 bool stacked = row.VisualProperties.Aggregation == DataRowVisualProperties.DataRowHistogramAggregation.Stacked;208 bool stacked = Content.VisualProperties.HistogramAggregation == DataTableVisualProperties.DataTableHistogramAggregation.Stacked; 209 209 series.ChartType = stacked ? SeriesChartType.StackedColumn : SeriesChartType.Column; 210 bool sideBySide = row.VisualProperties.Aggregation == DataRowVisualProperties.DataRowHistogramAggregation.SideBySide;210 bool sideBySide = Content.VisualProperties.HistogramAggregation == DataTableVisualProperties.DataTableHistogramAggregation.SideBySide; 211 211 series.SetCustomProperty("DrawSideBySide", sideBySide ? "True" : "False"); 212 212 series.SetCustomProperty("PointWidth", "1"); … … 330 330 private bool RequiresTransparency(DataRow row) { 331 331 return row.VisualProperties.ChartType == DataRowVisualProperties.DataRowChartType.Histogram 332 && row.VisualProperties.Aggregation == DataRowVisualProperties.DataRowHistogramAggregation.Overlapping;332 && Content.VisualProperties.HistogramAggregation == DataTableVisualProperties.DataTableHistogramAggregation.Overlapping; 333 333 } 334 334 … … 349 349 ConfigureChartArea(chart.ChartAreas[0]); 350 350 RecalculateAxesScale(chart.ChartAreas[0]); // axes min/max could have changed 351 foreach (var row in Content.Rows.Where(r => r.VisualProperties.ChartType == DataRowVisualProperties.DataRowChartType.Histogram)) 352 Row_VisualPropertiesChanged(row, EventArgs.Empty); // Histogram properties could have changed 353 chart.Update(); // side-by-side series are not always correctly displayed without an update 351 354 } 352 355 } … … 562 565 switch (row.VisualProperties.ChartType) { 563 566 case DataRowVisualProperties.DataRowChartType.Histogram: 564 // when a single histogram is updated, all histograms must be updated. otherwise the value ranges and bin sizesmay not be equal.567 // when a single histogram is updated, all histograms must be updated. otherwise the value ranges may not be equal. 565 568 var histograms = Content.Rows 566 569 .Where(r => r.VisualProperties.ChartType == DataRowVisualProperties.DataRowChartType.Histogram) … … 606 609 if (!validValues.Any()) return; 607 610 608 int bins = histogramRows.Max(r => r.VisualProperties.Bins);611 int bins = Content.VisualProperties.HistogramBins; 609 612 decimal minValue = (decimal)validValues.Min(); 610 613 decimal maxValue = (decimal)validValues.Max(); … … 616 619 } 617 620 618 if (! histogramRows.Any(r => r.VisualProperties.ExactBins)) {621 if (!Content.VisualProperties.HistogramExactBins) { 619 622 intervalWidth = (decimal)HumanRoundRange((double)intervalWidth); 620 623 minValue = Math.Floor(minValue / intervalWidth) * intervalWidth;
Note: See TracChangeset
for help on using the changeset viewer.