Changeset 15027 for branches

Timestamp:

06/06/17 14:35:43 (8 years ago)

Author:

pfleck

Message:

#2709 Fixed an issue with empty charts.

Location:

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

Files:

• HistogramView.cs (modified) (1 diff)
• PreprocessingChartView.cs (modified) (1 diff)

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

@@ -80 +80 @@
 
     private void orderComboBox_SelectedIndexChanged(object sender, EventArgs e) {
+      if (Content == null) return;
+
       Content.Order = (PreprocessingChartContent.LegendOrder)orderComboBox.SelectedItem;
 

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

@@ -141 +141 @@
       int rows = (int)Math.Ceiling((float)nrCharts / columns);
 
-      tableLayoutPanel.ColumnCount = columns;
-      tableLayoutPanel.RowCount = rows;
-
-      var width = (splitContainer.Panel2.Width - SystemInformation.VerticalScrollBarWidth) / columns;
-      var height = width * 0.75f;
-
-      using (var enumerator = GetVisibleDataTables().GetEnumerator()) {
-        for (int row = 0; row < rows; row++) {
-          tableLayoutPanel.RowStyles.Add(new RowStyle(SizeType.Absolute, height));
-          for (int col = 0; col < columns; col++) {
-            if (row == 0) { // Add a column-style only when creating the first row
-              tableLayoutPanel.ColumnStyles.Add(new ColumnStyle(SizeType.Absolute, width));
+      tableLayoutPanel.ColumnCount = Math.Max(columns, 0);
+      tableLayoutPanel.RowCount = Math.Max(rows, 0);
+
+      if (columns > 0 && rows > 0) {
+        var width = (splitContainer.Panel2.Width - SystemInformation.VerticalScrollBarWidth) / columns;
+        var height = width * 0.75f;
+
+        using (var enumerator = GetVisibleDataTables().GetEnumerator()) {
+          for (int row = 0; row < rows; row++) {
+            tableLayoutPanel.RowStyles.Add(new RowStyle(SizeType.Absolute, height));
+            for (int col = 0; col < columns; col++) {
+              if (row == 0) {
+                // Add a column-style only when creating the first row
+                tableLayoutPanel.ColumnStyles.Add(new ColumnStyle(SizeType.Absolute, width));
+              }
+
+              if (enumerator.MoveNext())
+                AddDataTableToTableLayout(enumerator.Current, row, col);
+
             }
-
-            if (enumerator.MoveNext())
-              AddDataTableToTableLayout(enumerator.Current, row, col);
-
           }
         }
-      }
-      tableLayoutPanel.RowStyles.Add(new RowStyle(SizeType.Absolute, 0));
+        tableLayoutPanel.RowStyles.Add(new RowStyle(SizeType.Absolute, 0));
+      }
 
       scrollPanel.ResumeRepaint(true);