diff --git a/Orange/widgets/unsupervised/owkmeans.py b/Orange/widgets/unsupervised/owkmeans.py index 11cc4a9f90d..f6f38f3bf9a 100644 --- a/Orange/widgets/unsupervised/owkmeans.py +++ b/Orange/widgets/unsupervised/owkmeans.py @@ -322,7 +322,7 @@ def __commit_finished(self): assert self.data is not None self.__task = None - self.setBlocking(False) + self.setInvalidated(False) self.progressBarFinished() if self.optimize_k: @@ -355,7 +355,7 @@ def __launch_tasks(self, ks): self.__task = Task(futures, watcher) self.progressBarInit() - self.setBlocking(True) + self.setInvalidated(True) def cancel(self): if self.__task is not None: @@ -368,7 +368,7 @@ def cancel(self): task.watcher.doneAll.disconnect(self.__commit_finished) self.progressBarFinished() - self.setBlocking(False) + self.setInvalidated(False) def run_optimization(self): if not self.enough_data_instances(self.k_from): diff --git a/Orange/widgets/unsupervised/tests/test_owkmeans.py b/Orange/widgets/unsupervised/tests/test_owkmeans.py index 5c3fa3af4fd..cf3fffafe6c 100644 --- a/Orange/widgets/unsupervised/tests/test_owkmeans.py +++ b/Orange/widgets/unsupervised/tests/test_owkmeans.py @@ -73,7 +73,7 @@ def test_optimization_report_display(self): self.assertFalse(self.widget.mainArea.isHidden()) self.widget.apply_button.button.click() - self.wait_until_stop_blocking() + self.wait_until_finished() self.assertEqual(self.widget.table_view.model().rowCount() > 0, True) def test_changing_k_changes_radio(self): @@ -284,13 +284,13 @@ def test_optimization_fails(self): self.KMeansFail.fail_on = set(range(3, 9)) widget.invalidate() - self.wait_until_stop_blocking() + self.wait_until_finished() self.assertTrue(widget.Error.failed.is_shown()) self.assertIsNone(self.get_output(self.widget.Outputs.annotated_data)) self.KMeansFail.fail_on = set() widget.invalidate() - self.wait_until_stop_blocking() + self.wait_until_finished() self.assertFalse(widget.Error.failed.is_shown()) self.assertEqual(widget.selected_row(), 0) self.assertIsNotNone(self.get_output(self.widget.Outputs.annotated_data)) @@ -307,7 +307,7 @@ def test_run_fails(self): self.KMeansFail.fail_on = set() self.widget.invalidate() - self.wait_until_stop_blocking() + self.wait_until_finished() self.assertFalse(self.widget.Error.failed.is_shown()) self.assertIsNotNone(self.get_output(self.widget.Outputs.annotated_data)) @@ -429,7 +429,7 @@ def test_invalidate_clusterings_cancels_jobs(self): # Now, invalidate by changing max_iter widget.max_iterations = widget.max_iterations + 1 widget.invalidate() - self.wait_until_stop_blocking() + self.wait_until_finished() self.assertEqual(widget.clusterings, {}) @@ -513,7 +513,7 @@ def test_saved_selection(self): self.widget.send_data = Mock() self.widget.optimize_k = True self.send_signal(self.widget.Inputs.data, self.data) - self.wait_until_stop_blocking() + self.wait_until_finished() self.widget.table_view.selectRow(2) self.assertEqual(self.widget.selected_row(), 2) self.assertEqual(self.widget.send_data.call_count, 3) @@ -522,7 +522,7 @@ def test_saved_selection(self): w = self.create_widget(OWKMeans, stored_settings=settings) w.send_data = Mock() self.send_signal(w.Inputs.data, self.data, widget=w) - self.wait_until_stop_blocking(widget=w) + self.wait_until_finished(widget=w) self.assertEqual(w.send_data.call_count, 2) self.assertEqual(self.widget.selected_row(), w.selected_row())