Merge pull request #3117 from irgolic/keyword-search

[ENH] Match Keywords in Widget Search

Author: lanzagar

Orange/canvas/document/quickmenu.py

@@ -323,7 +323,20 @@ def filterFunc(self):
         return self.__filterFunc
 
     def filterAcceptsRow(self, row, parent=QModelIndex()):
-        accepted = QSortFilterProxyModel.filterAcceptsRow(self, row, parent)
+        flat_model = self.sourceModel()
+        index = flat_model.index(row, self.filterKeyColumn(), parent)
+        description = flat_model.data(index, role=QtWidgetRegistry.WIDGET_DESC_ROLE)
+        name = description.name
+        keywords = description.keywords
+
+        # match name and keywords
+        accepted = False
+        for keyword in [name] + keywords:
+            if self.filterRegExp().indexIn(keyword) > -1:
+                accepted = True
+                break
+
+        # if matches query, apply filter function (compatibility with paired widget)
         if accepted and self.__filterFunc is not None:
             model = self.sourceModel()
             index = model.index(row, self.filterKeyColumn(), parent)

Orange/widgets/data/owconcatenate.py

@@ -27,6 +27,7 @@ class OWConcatenate(widget.OWWidget):
     description = "Concatenate (append) two or more datasets."
     priority = 1111
     icon = "icons/Concatenate.svg"
+    keywords = ["append", "join", "extend"]
 
     class Inputs:
         primary_data = Input("Primary Data", Orange.data.Table)

Orange/widgets/data/owcontinuize.py

@@ -24,7 +24,7 @@ class OWContinuize(widget.OWWidget):
                    "optionally, normalize numeric values.")
     icon = "icons/Continuize.svg"
     category = "Data"
-    keywords = ["data", "continuize"]
+    keywords = []
 
     class Inputs:
         data = Input("Data", Orange.data.Table)

Orange/widgets/data/owcreateclass.py

@@ -127,7 +127,7 @@ class OWCreateClass(widget.OWWidget):
     description = "Create class attribute from a string attribute"
     icon = "icons/CreateClass.svg"
     category = "Data"
-    keywords = ["data"]
+    keywords = []
 
     class Inputs:
         data = Input("Data", Table)

Orange/widgets/data/owdatainfo.py

@@ -23,7 +23,7 @@ class OWDataInfo(widget.OWWidget):
     icon = "icons/DataInfo.svg"
     priority = 80
     category = "Data"
-    keywords = ["data", "info"]
+    keywords = ["information", "inspect"]
 
     class Inputs:
         data = Input("Data", Table)

Orange/widgets/data/owdatasampler.py

@@ -22,7 +22,7 @@ class OWDataSampler(OWWidget):
     icon = "icons/DataSampler.svg"
     priority = 100
     category = "Data"
-    keywords = ["data", "sample"]
+    keywords = ["random"]
 
     _MAX_SAMPLE_SIZE = 2 ** 31 - 1
 

Orange/widgets/data/owdatasets.py

@@ -130,6 +130,7 @@ class OWDataSets(widget.OWWidget):
     icon = "icons/DataSets.svg"
     priority = 20
     replaces = ["orangecontrib.prototypes.widgets.owdatasets.OWDataSets"]
+    keywords = ["online"]
 
     # The following constants can be overridden in a subclass
     # to reuse this widget for a different repository

Orange/widgets/data/owdiscretize.py

@@ -127,6 +127,7 @@ class OWDiscretize(widget.OWWidget):
     name = "Discretize"
     description = "Discretize the numeric data features."
     icon = "icons/Discretize.svg"
+    keywords = []
 
     class Inputs:
         data = Input("Data", Orange.data.Table, doc="Input data table")

Orange/widgets/data/oweditdomain.py

@@ -461,6 +461,7 @@ class OWEditDomain(widget.OWWidget):
     description = "Rename features and their values."
     icon = "icons/EditDomain.svg"
     priority = 3125
+    keywords = []
 
     class Inputs:
         data = Input("Data", Orange.data.Table)

Orange/widgets/data/owfeatureconstructor.py

@@ -333,6 +333,7 @@ class OWFeatureConstructor(OWWidget):
     description = "Construct new features (data columns) from a set of " \
                   "existing features in the input dataset."
     icon = "icons/FeatureConstructor.svg"
+    keywords = []
 
     class Inputs:
         data = Input("Data", Orange.data.Table)