Merge pull request #3165 from ales-erjavec/fixes/box-plot-empty-contingency-check

[FIX] OWBoxPlot: Fix empty continuous contingency check

Author: lanzagar

Orange/widgets/visualize/owboxplot.py

@@ -427,12 +427,17 @@ def compute_box_data(self):
             self.conts = contingency.get_contingency(
                 dataset, attr, self.group_var)
             if self.is_continuous:
-                self.stats = [BoxData(cont, attr, i, self.group_var)
-                              for i, cont in enumerate(self.conts)
-                              if np.sum(cont) > 0]
-            self.label_txts_all = \
-                [v for v, c in zip(self.group_var.values, self.conts)
-                 if np.sum(c) > 0]
+                stats, label_texts = [], []
+                for i, cont in enumerate(self.conts):
+                    if np.sum(cont[1]):
+                        stats.append(BoxData(cont, attr, i, self.group_var))
+                        label_texts.append(self.group_var.values[i])
+                self.stats = stats
+                self.label_txts_all = label_texts
+            else:
+                self.label_txts_all = \
+                    [v for v, c in zip(self.group_var.values, self.conts)
+                     if np.sum(c) > 0]
         else:
             self.dist = distribution.get_distribution(dataset, attr)
             self.conts = []
@@ -544,6 +549,7 @@ def display_changed(self):
         self.select_box_items()
 
     def display_changed_disc(self):
+        assert not self.is_continuous
         self.clear_scene()
         self.attr_labels = [QGraphicsSimpleTextItem(lab)
                             for lab in self.label_txts_all]
@@ -608,6 +614,7 @@ def __draw_row_counts(self, y, row):
         row: int
             row index
         """
+        assert not self.is_continuous
         label = self.labels[row]
         b = label.boundingRect()
         if self.group_var:
@@ -793,6 +800,7 @@ def draw_axis_disc(self):
         """
         Draw the horizontal axis and sets self.scale_x for discrete attributes
         """
+        assert not self.is_continuous
         if self.stretched:
             if not self.attr_labels:
                 return

Orange/widgets/visualize/tests/test_owboxplot.py

@@ -4,7 +4,6 @@
 
 import numpy as np
 from AnyQt.QtCore import QItemSelectionModel
-from AnyQt.QtTest import QTest
 
 from Orange.data import Table, ContinuousVariable, StringVariable, Domain
 from Orange.widgets.visualize.owboxplot import (
@@ -161,9 +160,9 @@ def test_label_overlap(self):
         self.widget.stretched = False
         self.__select_variable("chest pain")
         self.__select_group("gender")
-        self.widget.show()
-        QTest.qWait(3000)
-        self.widget.hide()
+        self.widget.adjustSize()
+        self.widget.layout().activate()
+        self.widget.grab()  # ensure that the painting code is run
 
     def test_empty_groups(self):
         """Test if groups with zero elements are not shown"""