Data sets: Disable combos when filter overrides them

Author: janezd

Orange/widgets/data/owdatasets.py

@@ -41,6 +41,9 @@
 GENERAL_DOMAIN = None
 ALL_DOMAINS = ""  # The setting is Optional[str], so don't use other types here
 
+# The number of characters at which filter overrides the domain and language
+FILTER_OVERRIDE_LENGTH = 4
+
 
 def ensure_local(index_url, file_path, local_cache_path,
                  force=False, progress_advance=None):
@@ -180,7 +183,7 @@ def filterAcceptsRow(self, row, parent):
         data = source.index(row, 0).data(Qt.UserRole)
         in_filter = (
             self.__filter is not None
-            and len(self.__filter) >= 4
+            and len(self.__filter) >= FILTER_OVERRIDE_LENGTH
             and self.__filter in data.title.casefold()
         )
         published_ok = data.publication_status == Namespace.PUBLISHED
@@ -190,7 +193,6 @@ def filterAcceptsRow(self, row, parent):
             and (published_ok and domain_ok and language_ok
                  or in_filter))
 
-
 class OWDataSets(OWWidget):
     name = "Datasets"
     description = "Load a dataset from an online repository"
@@ -276,8 +278,13 @@ def __init__(self):
             "Typing four letters or more overrides domain and language filters")
         layout.addWidget(self.filterLineEdit)
 
+        self.combo_elements = []
+
         layout.addSpacing(20)
-        layout.addWidget(QLabel("Show data sets in "))
+        label = QLabel("Show data sets in ")
+        layout.addWidget(label)
+        self.combo_elements.append(label)
+
         lang_combo = self.language_combo = QComboBox()
         languages = [self.DEFAULT_LANG, self.ALL_LANGUAGES]
         if self.language is not None and self.language not in languages:
@@ -289,14 +296,19 @@ def __init__(self):
             lang_combo.setCurrentText(self.language)
         lang_combo.activated.connect(self._on_language_changed)
         layout.addWidget(lang_combo)
+        self.combo_elements.append(lang_combo)
 
         layout.addSpacing(20)
-        layout.addWidget(QLabel("Domain:"))
+        label = QLabel("Domain:")
+        layout.addWidget(label)
+        self.combo_elements.append(label)
+
         domain_combo = self.domain_combo = QComboBox()
         domain_combo.addItem(self.GENERAL_DOMAIN_LABEL)
         domain_combo.activated.connect(self._on_domain_changed)
         if self.core_widget:
             layout.addWidget(domain_combo)
+        self.combo_elements.append(domain_combo)
 
         self.mainArea.layout().addLayout(layout)
 
@@ -622,6 +634,17 @@ def selected_dataset(self):
 
     def filter(self):
         filter_string = self.filterLineEdit.text().strip()
+        enable_combos = len(filter_string) < FILTER_OVERRIDE_LENGTH
+        if enable_combos is not self.domain_combo.isEnabled():
+            for element in self.combo_elements:
+                element.setEnabled(enable_combos)
+            if enable_combos:
+                self.domain_combo.setCurrentText(self.domain)
+                self.language_combo.setCurrentText(self.language)
+            else:
+                self.domain_combo.setCurrentIndex(self.domain_combo.count() - 1)
+                self.language_combo.setCurrentIndex(self.language_combo.count() - 1)
+
         self.filter_hint = filter_string
         proxyModel = self.view.model()
         if proxyModel:

Orange/widgets/data/tests/test_owdatasets.py

@@ -211,7 +211,8 @@ def test_filter_overrides_language_and_domain(self):
         settings = w.settingsHandler.pack_data(w)
         w2 = self.create_widget(OWDataSets, stored_settings=settings)
         self.wait_until_stop_blocking(w2)
-        self.assertEqual(w2.language_combo.currentText(), "English")
+        self.assertEqual(w2.language_combo.currentText(), w2.ALL_LANGUAGES)
+        self.assertFalse(w2.language_combo.isEnabled())
         self.assertEqual(w2.filterLineEdit.text(), "bax d")
         self.assertEqual(self.__titles(w2), {"Bax data set"})
 
@@ -266,8 +267,8 @@ def test_download_iris(self):
         # select the only dataset
         sel_type = QItemSelectionModel.ClearAndSelect | QItemSelectionModel.Rows
         w.view.selectionModel().select(w.view.model().index(0, 0), sel_type)
-        self.assertEqual(w.selected_id, "iris.tab")
         w.commit()
+        self.assertEqual(w.selected_id, "iris.tab")
         iris = self.get_output(w.Outputs.data, w)
         self.assertEqual(len(iris), 150)