Skip to content

[FIX] DataProjectionWidget: Update combos on new data #4405

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.

Sign up for GitHub

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

Merged
janezd merged 2 commits into from
Feb 10, 2020
Merged

[FIX] DataProjectionWidget: Update combos on new data #4405

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2521f67
DataProjectionWidget: Update combos on new data
VesnaT Feb 10, 2020
d15c24f
DataProjectionWidget: Add test for model update
janezd Feb 10, 2020
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
18 changes: 18 additions & 0 deletions Orange/widgets/visualize/tests/test_owprojectionwidget.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
from Orange.widgets.tests.base import (
WidgetTest, WidgetOutputsTestMixin, ProjectionWidgetTestMixin
)
from Orange.widgets.utils.colorpalettes import ContinuousPalettes
from Orange.widgets.visualize.utils.widget import (
OWDataProjectionWidget, OWProjectionWidgetBase
)
Expand Down Expand Up @@ -230,6 +231,23 @@ def test_unconditional_commit_on_new_signal(self):
self.send_signal(self.widget.Inputs.data, self.data)
commit.assert_called()

def test_model_update(self):
widget = self.widget

data = Table("iris")
domain = data.domain

self.send_signal(widget.Inputs.data, data)
self.assertIs(widget.controls.attr_color.model()[4], domain[0])

copy0 = domain[0].copy()
assert copy0.palette.name != "linear_kryw_0_100_c71"
copy0.palette = ContinuousPalettes["linear_kryw_0_100_c71"]
domain = Domain((copy0, ) + domain.attributes[1:], domain.class_var)
data0 = data.transform(domain)
self.send_signal(widget.Inputs.data, data0)
self.assertIs(widget.controls.attr_color.model()[4], copy0)


if __name__ == "__main__":
unittest.main()
5 changes: 1 addition & 4 deletions Orange/widgets/visualize/utils/widget.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -430,13 +430,10 @@ def effective_data(self):
def set_data(self, data):
data_existed = self.data is not None
effective_data = self.effective_data if data_existed else None
same_domain = (data_existed and data is not None and
data.domain.checksum() == self.data.domain.checksum())
self.closeContext()
self.data = data
self.check_data()
if not same_domain:
self.init_attr_values()
self.init_attr_values()
self.openContext(self.data)
self._invalidated = not (
data_existed and self.data is not None and
Expand Down