Merge pull request #2697 from jerneju/domainmodel-changeorder

[ENH] Domain Model: order without separators

Author: janezd

Orange/widgets/utils/itemmodels.py

@@ -869,8 +869,25 @@ class DomainModel(VariableListModel):
                  ATTRIBUTES)
     PRIMITIVE = (DiscreteVariable, ContinuousVariable)
 
-    def __init__(self, order=SEPARATED, placeholder=None,
+    def __init__(self, order=SEPARATED, separators=True, placeholder=None,
                  valid_types=None, alphabetical=False, skip_hidden_vars=True, **kwargs):
+        """
+
+        Parameters
+        ----------
+        order: tuple or int
+            Order of attributes, metas, classes, separators and other options
+        separators: bool
+            If False, remove separators from `order`.
+        placeholder: str
+            The text that is shown when no variable is selected
+        valid_types: tuple
+            (Sub)types of `Variable` that are included in the model
+        alphabetical: bool
+            If true, variables are sorted alphabetically.
+        skip_hidden_vars: bool
+            If true, variables marked as "hidden" are skipped.
+        """
         super().__init__(placeholder=placeholder, **kwargs)
         if isinstance(order, int):
             order = (order,)
@@ -880,6 +897,8 @@ def __init__(self, order=SEPARATED, placeholder=None,
             order = (None,) + \
                     (self.Separator, ) * (self.Separator in order) + \
                     order
+        if not separators:
+            order = [e for e in order if e is not self.Separator]
         self.order = order
         self.valid_types = valid_types
         self.alphabetical = alphabetical

Orange/widgets/utils/tests/test_itemmodels.py

@@ -310,3 +310,21 @@ def test_filtering(self):
                             skip_hidden_vars=False)
         model.set_domain(Domain(attrs))
         self.assertEqual(list(model), disc)
+
+    def test_no_separators(self):
+        """
+        GH-2697
+        """
+        attrs = [ContinuousVariable(n) for n in "abg"]
+        classes = [ContinuousVariable(n) for n in "deh"]
+        metas = [ContinuousVariable(n) for n in "ijf"]
+
+        model = DomainModel(order=DomainModel.SEPARATED, separators=False)
+        model.set_domain(Domain(attrs, classes, metas))
+        self.assertEqual(list(model), classes + metas + attrs)
+
+        model = DomainModel(order=DomainModel.SEPARATED, separators=True)
+        model.set_domain(Domain(attrs, classes, metas))
+        self.assertEqual(
+            list(model),
+            classes + [PyListModel.Separator] + metas + [PyListModel.Separator] + attrs)