Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[ENH] Reset settings button #3795

Merged
merged 5 commits into from
May 31, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion Orange/widgets/data/tests/test_owfeaturestatistics.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
8 changes: 8 additions & 0 deletions Orange/widgets/gui.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
25 changes: 25 additions & 0 deletions Orange/widgets/icons/reset-hover.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
25 changes: 25 additions & 0 deletions Orange/widgets/icons/reset.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 8 additions & 0 deletions Orange/widgets/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {}
Expand Down Expand Up @@ -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:
Expand Down
6 changes: 6 additions & 0 deletions Orange/widgets/tests/test_widget.py
Original file line number Diff line number Diff line change
Expand Up @@ -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):

Expand Down
4 changes: 4 additions & 0 deletions Orange/widgets/visualize/ownomogram.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 6 additions & 0 deletions Orange/widgets/visualize/tests/test_ownomogram.py
Original file line number Diff line number Diff line change
Expand Up @@ -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()
13 changes: 9 additions & 4 deletions Orange/widgets/widget.py
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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.
Expand Down