Merge pull request #7231 from janezd/create-class-non-context-settings

[FIX] Create Class: Remove context settings in favour of schema-only non-context

Author: markotoplak

Orange/widgets/data/owcreateclass.py

@@ -5,7 +5,7 @@
 
 import numpy as np
 
-from AnyQt.QtWidgets import QFrame, QGridLayout, QLabel, QLineEdit, \
+from AnyQt.QtWidgets import QLayout, QFrame, QGridLayout, QLabel, QLineEdit, \
     QSizePolicy, QWidget, QScrollArea
 from AnyQt.QtCore import Qt, QTimer
 
@@ -14,7 +14,7 @@
 from Orange.statistics.util import bincount
 from Orange.preprocess.transformation import Transformation, Lookup
 from Orange.widgets import gui, widget
-from Orange.widgets.settings import DomainContextHandler, ContextSetting
+from Orange.widgets.settings import DomainContextHandler, ContextSetting, Setting
 from Orange.widgets.utils.itemmodels import DomainModel
 from Orange.widgets.utils.localization import pl
 from Orange.widgets.utils.widgetpreview import WidgetPreview
@@ -233,12 +233,14 @@ class Outputs:
     MAX_RULES_AREA_HEIGHT = 360
 
     settingsHandler = DomainContextHandler()
-    attribute = ContextSetting(None)
-    class_name = ContextSetting("class")
-    rules = ContextSetting({})
-    match_beginning = ContextSetting(False)
-    case_sensitive = ContextSetting(False)
-    regular_expressions = ContextSetting(False)
+    attribute = ContextSetting(None, schema_only=True)
+    class_name = Setting("class", schema_only=True)
+    rules = Setting({}, schema_only=True)
+    match_beginning = Setting(False, schema_only=True)
+    case_sensitive = Setting(False, schema_only=True)
+    regular_expressions = Setting(False, schema_only=True)
+
+    settings_version = 2
 
     TRANSFORMERS = {StringVariable: ValueFromStringSubstring,
                     DiscreteVariable: ValueFromDiscreteSubstring}
@@ -277,27 +279,28 @@ def __init__(self):
         #    once the new row's height has been applied
         self._scroll_to_bottom_pending = False
 
-        gui.lineEdit(
+        le = gui.lineEdit(
             self.controlArea, self, "class_name",
             orientation=Qt.Horizontal, box="New Class Name")
+        le.setStyleSheet("QLineEdit { padding-left: 4px; }")
 
-        variable_select_box = gui.vBox(self.controlArea, "Match by Substring")
+        variable_select_box = gui.vBox(self.controlArea, box="Source column and patterns")
 
         combo = gui.comboBox(
-            variable_select_box, self, "attribute", label="From column:",
-            orientation=Qt.Horizontal, searchable=True,
+            variable_select_box, self, "attribute", searchable=True,
             callback=self.update_rules,
             model=DomainModel(valid_types=(StringVariable, DiscreteVariable)))
         # Don't use setSizePolicy keyword argument here: it applies to box,
         # not the combo
         combo.setSizePolicy(QSizePolicy.MinimumExpanding, QSizePolicy.Preferred)
 
         patternbox = gui.vBox(variable_select_box)
+        patternbox.layout().setSpacing(0)
         #: QWidget: the box that contains the remove buttons, line edits and
         #    count labels. The lines are added and removed dynamically.
         self.rules_box = rules_box = QGridLayout()
         rules_box.setSpacing(4)
-        rules_box.setContentsMargins(4, 4, 4, 4)
+        rules_box.setContentsMargins(4, 4, 4, 0)
         self.rules_box.setColumnMinimumWidth(1, 70)
         self.rules_box.setColumnMinimumWidth(0, 10)
         self.rules_box.setColumnStretch(0, 1)
@@ -342,6 +345,7 @@ def __init__(self):
         gui.button(self.buttonsArea, self, "Apply", callback=self.apply)
 
         self.setSizePolicy(QSizePolicy.Preferred, QSizePolicy.Maximum)
+        self.layout().setSizeConstraint(QLayout.SetFixedSize)
 
     @property
     def active_rules(self):
@@ -363,7 +367,6 @@ def rules_to_edits(self):
     def set_data(self, data):
         """Input data signal handler."""
         self.closeContext()
-        self.rules = {}
         self.data = data
         model = self.controls.attribute.model()
         model.set_domain(data.domain if data is not None else None)
@@ -723,6 +726,19 @@ def _count_part():
             self.report_items("Output", [("Class name", self.class_name)])
             self.report_raw(f"<ol>{output}</ol>")
 
+    @classmethod
+    def migrate_settings(cls, settings, version):
+        if version < 2:
+            contexts = settings.pop("context_settings", [])
+            if contexts:
+                context = contexts[0]
+                settings.update(
+                    {name: context.values.pop(name)[0]
+                     for name in ("class_name", "rules", "match_beginning",
+                                  "case_sensitive", "regular_expressions")})
+                context.values["__version__"] = 2
+                settings["context_settings"] = [context]  # selected attribute
+
 
 if __name__ == "__main__":  # pragma: no cover
     WidgetPreview(OWCreateClass).run(Table("zoo"))

Orange/widgets/data/tests/test_owcreateclass.py

@@ -5,6 +5,7 @@
 
 import numpy as np
 
+from orangewidget.settings import Context
 from Orange.data import Table, StringVariable, DiscreteVariable, Domain
 from Orange.widgets.data.owcreateclass import (
     OWCreateClass,
@@ -503,7 +504,7 @@ def _check_thal(self):
         np.testing.assert_equal(classes[fixed], 1)
         self.assertTrue(np.all(np.isnan(classes[~(reversable | fixed)])))
 
-    def test_flow_and_context_handling(self):
+    def test_flow(self):
         widget = self.widget
         self.send_signal(self.widget.Inputs.data, self.heart)
         self._test_default_rules()
@@ -545,27 +546,6 @@ def test_flow_and_context_handling(self):
         self._set_attr(thal)
         self._check_thal()
 
-        prev_rules = widget.rules
-        self.send_signal(self.widget.Inputs.data, self.zoo)
-        self.assertIsNot(widget.rules, prev_rules)
-
-        self.send_signal(self.widget.Inputs.data, self.heart)
-        self._check_thal()
-
-        # Check that sending None as data does not ruin the context, and that
-        # the empty context does not match the true one later
-        self.send_signal(self.widget.Inputs.data, None)
-        self.assertIsNot(widget.rules, prev_rules)
-
-        self.send_signal(self.widget.Inputs.data, self.heart)
-        self._check_thal()
-
-        self.send_signal(self.widget.Inputs.data, self.no_attributes)
-        self.assertIsNot(widget.rules, prev_rules)
-
-        self.send_signal(self.widget.Inputs.data, self.heart)
-        self._check_thal()
-
     def test_add_remove_lines(self):
         widget = self.widget
         self.send_signal(self.widget.Inputs.data, self.heart)
@@ -690,6 +670,33 @@ def test_same_class(self):
             self.get_output(widget2.Outputs.data, widget=widget2).domain.class_var
         )
 
+    def test_migrate_settings_1_2(self):
+        settings = {"__version__": 1, "context_settings": [Context(
+            values= {
+                'attribute': ('eggs', 101),  # not a default selection
+                'case_sensitive': (True, -2),
+                'class_name': ('myclass', -2),
+                'match_beginning': (True, -2),
+                'regular_expressions': (True, -2),
+                'rules': ({'type': [['cam', 'am'], ['cer', 'er'], ['', '']],
+                           'eggs': [['de', 'e1'], ['', '']]},
+                          -2),
+                '__version__': 1},
+            attributes = {'hair': 1, 'feathers': 1, 'eggs': 1, 'type': 1},
+            metas = {'name': 3})]}
+        w = self.create_widget(OWCreateClass, stored_settings=settings)
+        self.send_signal(w.Inputs.data, self.zoo, widget=w)
+        self.assertEqual(w.attribute, self.zoo.domain["eggs"])
+        self.assertEqual(w.active_rules, [['de', 'e1'], ['', '']])
+        self.assertEqual(w.class_name, "myclass")
+        self.assertTrue(w.case_sensitive)
+        self.assertTrue(w.match_beginning)
+        self.assertTrue(w.regular_expressions)
+
+        w.attribute = self.zoo.domain["type"]
+        self.assertEqual(w.active_rules, [['cam', 'am'], ['cer', 'er'], ['', '']])
+
+
 
 if __name__ == "__main__":
     unittest.main()

i18n/si/msgs.jaml

@@ -4881,9 +4881,9 @@ widgets/data/owcreateclass.py:
         def `__init__`:
             class_name: false
             New Class Name: Ime novega razreda
-            Match by Substring: Vzorci in razredi
+            'QLineEdit { padding-left: 4px; }': false
+            Source column and patterns: Izvorni stolpec in vzorci
             attribute: false
-            From column:: Iz stolpca:
             Name: Ime
             Substring: Vzorec
             Count: Primerov
@@ -4934,6 +4934,14 @@ widgets/data/owcreateclass.py:
             Output: Izhod
             Class name: Ime razreda
             <ol>{output}</ol>: false
+        def `migrate_settings`:
+            context_settings: false
+            class_name: false
+            rules: false
+            match_beginning: false
+            case_sensitive: false
+            regular_expressions: false
+            __version__: false
     __main__: false
     zoo: false
 widgets/data/owcreateinstance.py: