4
4
import napari
5
5
import numpy as np
6
6
from magicgui import magicgui
7
+ from magicgui .widgets import ComboBox
7
8
8
9
from .base import NapariMPLWidget
9
10
from .util import Interval
@@ -135,7 +136,7 @@ def x_axis_key(self) -> Optional[str]:
135
136
return self ._x_axis_key
136
137
137
138
@x_axis_key .setter
138
- def x_axis_key (self , key : Optional [str ]):
139
+ def x_axis_key (self , key : Optional [str ]) -> None :
139
140
self ._x_axis_key = key
140
141
self ._draw ()
141
142
@@ -145,17 +146,17 @@ def y_axis_key(self) -> Optional[str]:
145
146
return self ._y_axis_key
146
147
147
148
@y_axis_key .setter
148
- def y_axis_key (self , key : Optional [str ]):
149
+ def y_axis_key (self , key : Optional [str ]) -> None :
149
150
self ._y_axis_key = key
150
151
self ._draw ()
151
152
152
- def _set_axis_keys (self , x_axis_key : str , y_axis_key : str ):
153
+ def _set_axis_keys (self , x_axis_key : str , y_axis_key : str ) -> None :
153
154
"""Set both axis keys and then redraw the plot"""
154
155
self ._x_axis_key = x_axis_key
155
156
self ._y_axis_key = y_axis_key
156
157
self ._draw ()
157
158
158
- def _get_valid_axis_keys (self , combo_widget = None ) -> List [str ]:
159
+ def _get_valid_axis_keys (self , combo_widget : ComboBox ) -> List [str ]:
159
160
"""
160
161
Get the valid axis keys from the layer FeatureTable.
161
162
@@ -188,7 +189,7 @@ def _get_data(self) -> Tuple[List[np.ndarray], str, str]:
188
189
if not hasattr (self .layers [0 ], "features" ):
189
190
# if the selected layer doesn't have a featuretable,
190
191
# skip draw
191
- return np .array ([]), "" , ""
192
+ return [ np .array ([])] , "" , ""
192
193
193
194
feature_table = self .layers [0 ].features
194
195
@@ -197,7 +198,7 @@ def _get_data(self) -> Tuple[List[np.ndarray], str, str]:
197
198
or (self .x_axis_key is None )
198
199
or (self .y_axis_key is None )
199
200
):
200
- return np .array ([]), "" , ""
201
+ return [ np .array ([])] , "" , ""
201
202
202
203
data_x = feature_table [self .x_axis_key ]
203
204
data_y = feature_table [self .y_axis_key ]
0 commit comments