Skip to content

Commit ec8a90b

Browse files
committedMay 18, 2023
Tidy up public API for slicing
1 parent 654f005 commit ec8a90b

File tree

1 file changed

+8
-17
lines changed

1 file changed

+8
-17
lines changed
 

‎src/napari_matplotlib/slice.py

Lines changed: 8 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ def __init__(self, napari_viewer: napari.viewer.Viewer):
5050
self.update_layers(None)
5151

5252
@property
53-
def layer(self) -> napari.layers.Layer:
53+
def _layer(self) -> napari.layers.Layer:
5454
"""
5555
Layer being plotted.
5656
"""
@@ -73,28 +73,19 @@ def current_dim_index(self) -> int:
7373
return _dims[::-1].index(self.current_dim)
7474

7575
@property
76-
def selector_values(self) -> Dict[str, int]:
76+
def _selector_values(self) -> Dict[str, int]:
7777
"""
7878
Values of the slice selectors.
7979
"""
8080
return {d: self.slice_selectors[d].value() for d in _dims_sel}
8181

82-
def update_slice_selectors(self) -> None:
83-
"""
84-
Update range and enabled status of the slice selectors, and the value
85-
of the z slice selector.
86-
"""
87-
# Update min/max
88-
for i, dim in enumerate(_dims_sel):
89-
self.slice_selectors[dim].setRange(0, self.layer.data.shape[i])
90-
91-
def get_xy(self) -> Tuple[npt.NDArray[Any], npt.NDArray[Any]]:
82+
def _get_xy(self) -> Tuple[npt.NDArray[Any], npt.NDArray[Any]]:
9283
"""
9384
Get data for plotting.
9485
"""
95-
x = np.arange(self.layer.data.shape[self.current_dim_index])
86+
x = np.arange(self._layer.data.shape[self.current_dim_index])
9687

97-
vals = self.selector_values
88+
vals = self._selector_values
9889
vals.update({"z": self.current_z})
9990

10091
slices = []
@@ -109,7 +100,7 @@ def get_xy(self) -> Tuple[npt.NDArray[Any], npt.NDArray[Any]]:
109100

110101
# Reverse since z is the first axis in napari
111102
slices = slices[::-1]
112-
y = self.layer.data[tuple(slices)].ravel()
103+
y = self._layer.data[tuple(slices)].ravel()
113104

114105
return x, y
115106

@@ -123,8 +114,8 @@ def draw(self) -> None:
123114
"""
124115
Clear axes and draw a 1D plot.
125116
"""
126-
x, y = self.get_xy()
117+
x, y = self._get_xy()
127118

128119
self.axes.plot(x, y)
129120
self.axes.set_xlabel(self.current_dim)
130-
self.axes.set_title(self.layer.name)
121+
self.axes.set_title(self._layer.name)

0 commit comments

Comments
 (0)
Please sign in to comment.