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

Emit event from Points data setter #6117

Merged
merged 6 commits into from Aug 8, 2023
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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
21 changes: 21 additions & 0 deletions napari/layers/points/_tests/test_points.py
Expand Up @@ -2486,3 +2486,24 @@ def test_point_selection_remains_evented_after_update():
assert isinstance(layer.selected_data, Selection)
layer.selected_data = {0, 1}
assert isinstance(layer.selected_data, Selection)


def test_points_data_setter_emits_event():
data = np.random.random((5, 2))
emitted_events = Mock()
layer = Points(data)
layer.events.data.connect(emitted_events)
layer.data = np.random.random((5, 2))
emitted_events.assert_called_once()


def test_points_add_delete_only_emit_one_event():
data = np.random.random((5, 2))
emitted_events = Mock()
layer = Points(data)
layer.events.data.connect(emitted_events)
layer.add(np.random.random(2))
assert emitted_events.call_count == 1
layer.selected_data = {3}
layer.remove_selected()
assert emitted_events.call_count == 2
15 changes: 13 additions & 2 deletions napari/layers/points/points.py
Expand Up @@ -525,6 +525,17 @@ def data(self) -> np.ndarray:

@data.setter
def data(self, data: Optional[np.ndarray]):
"""Set the data array and emit a corresponding event."""
self._set_data(data)
self.events.data(
value=self.data,
action=ActionType.CHANGE.value,
data_indices=slice(None),
vertex_indices=((),),
)

def _set_data(self, data: Optional[np.ndarray]):
"""Set the .data array attribute, without emitting an event."""
data, _ = fix_data_points(data, self.ndim)
cur_npoints = len(self._data)
self._data = data
Expand Down Expand Up @@ -1914,7 +1925,7 @@ def add(self, coords):
Point or points to add to the layer data.
"""
cur_points = len(self.data)
self.data = np.append(self.data, np.atleast_2d(coords), axis=0)
self._set_data(np.append(self.data, np.atleast_2d(coords), axis=0))
self.events.data(
value=self.data,
action=ActionType.ADD.value,
Expand Down Expand Up @@ -1949,7 +1960,7 @@ def remove_selected(self):
self._value -= offset
self._value_stored -= offset

self.data = np.delete(self.data, index, axis=0)
self._set_data(np.delete(self.data, index, axis=0))
self.events.data(
value=self.data,
action=ActionType.REMOVE.value,
Expand Down