Merge pull request #3795 from janezd/reset-settings

[ENH] Reset settings button

Author: markotoplak

Orange/widgets/data/tests/test_owfeaturestatistics.py

@@ -439,7 +439,6 @@ def setUp(self):
         self.widget = self.create_widget(
             OWFeatureStatistics, stored_settings={'auto_commit': False}
         )
-        self.widget.resetSettings()
         self.data1 = Table('iris')
         self.data2 = Table('zoo')
         self.select_rows = partial(select_rows, widget=self.widget)

Orange/widgets/gui.py

@@ -138,6 +138,14 @@ def __init__(self, widget=None):
         if widget is not None and widget.settingsHandler:
             widget.settingsHandler.initialize(self)
 
+    def _reset_settings(self):
+        """
+        Copy default settings to instance's settings. This method can be
+        called from OWWidget's reset_settings, but will mostly have to be
+        followed by calling a method that updates the widget.
+        """
+        self.settingsHandler.reset_to_original(self)
+
     def connect_control(self, name, func):
         """
         Add `func` to the list of functions called when the value of the

Orange/widgets/icons/reset-hover.svg

@@ -190,6 +190,10 @@ def initialize(self, instance, data=None):
         self._initialize_settings(instance, data)
         self._initialize_providers(instance, data)
 
+    def reset_to_original(self, instance):
+        self._initialize_settings(instance, None)
+        self._initialize_providers(instance, None)
+
     def _initialize_settings(self, instance, data):
         if data is None:
             data = {}
@@ -502,6 +506,10 @@ def initialize(self, instance, data=None):
 
         provider.initialize(instance, data)
 
+    def reset_to_original(self, instance):
+        provider = self._select_provider(instance)
+        provider.reset_to_original(instance)
+
     def _migrate_settings(self, settings):
         """Ask widget to migrate settings to the latest version."""
         if settings:

Orange/widgets/icons/reset.svg

@@ -208,6 +208,12 @@ class MySubWidget2(MyWidget2):
 
             warn.assert_not_called()
 
+    def test_reset_settings(self):
+        w = MyWidget()
+        w.field = 43
+        w._reset_settings()
+        self.assertEqual(42, w.field)
+
 
 class WidgetMsgTestCase(WidgetTest):
 

Orange/widgets/settings.py

@@ -1191,6 +1191,10 @@ def get_points_from_coeffs(current_value, coefficients, possible_values):
         return sorted_coefficients[i - 1] * sorted_values[i - 1] * k + \
                sorted_coefficients[i] * sorted_values[i] * (1 - k)
 
+    def reset_settings(self):
+        self._reset_settings()
+        self.update_scene()
+
 
 if __name__ == "__main__":  # pragma: no cover
     from Orange.classification import NaiveBayesLearner  #, LogisticRegressionLearner

Orange/widgets/tests/test_widget.py

@@ -244,6 +244,12 @@ def test_output(self):
         attrs = self.get_output(self.widget.Outputs.features)
         self.assertIsNone(attrs)
 
+    def test_reset_settings(self):
+        self.widget.n_attributes = 5
+        self.widget.n_spin.valueChanged.emit(5)
+        self.widget.reset_settings()
+        self.assertEqual(10, self.widget.n_attributes)
+
 
 if __name__ == "__main__":
     unittest.main()

Orange/widgets/visualize/ownomogram.py

@@ -474,6 +474,15 @@ def _():
                 )
                 b.clicked.connect(self.show_report)
                 sb.addWidget(b)
+            if hasattr(self, "reset_settings"):
+                icon = QIcon(gui.resource_filename("icons/reset.svg"))
+                icon.addFile(gui.resource_filename("icons/reset-hover.svg"), mode=QIcon.Active)
+                b = SimpleButton(
+                    icon=icon,
+                    toolTip="Reset settings to defaults"
+                )
+                b.clicked.connect(self.reset_settings)
+                sb.addWidget(b)
             self.message_bar = MessagesWidget(
                 defaultStyleSheet=textwrap.dedent("""
                 div.field-text {
@@ -1026,10 +1035,6 @@ def isBlocking(self):
         """Is this widget blocking signal processing."""
         return self.__blocking
 
-    def resetSettings(self):
-        """Reset the widget settings to default"""
-        self.settingsHandler.reset_settings(self)
-
     def workflowEnv(self):
         """
         Return (a view to) the workflow runtime environment.