Skip to content

Commit 9c6f9c2

Browse files
style(pre-commit.ci): auto fixes [...]
1 parent 725b0d7 commit 9c6f9c2

File tree

9 files changed

+65
-24
lines changed

9 files changed

+65
-24
lines changed

src/ndv/controllers/_array_viewer.py

+27-13
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,8 @@
99
from ndv.controllers._channel_controller import ChannelController
1010
from ndv.models import ArrayDisplayModel, ChannelMode, DataWrapper, LUTModel
1111
from ndv.models._data_display_model import DataResponse, _ArrayDataDisplayModel
12-
from ndv.models._roi_model import RectangularROIModel
1312
from ndv.models._viewer_model import ArrayViewerModel, InteractionMode
1413
from ndv.views import _app
15-
from ndv.views.bases._graphics._canvas_elements import RectangularROI
1614

1715
if TYPE_CHECKING:
1816
from concurrent.futures import Future
@@ -22,7 +20,9 @@
2220

2321
from ndv._types import MouseMoveEvent
2422
from ndv.models._array_display_model import ArrayDisplayModelKwargs
23+
from ndv.models._roi_model import RectangularROIModel
2524
from ndv.views.bases import HistogramCanvas
25+
from ndv.views.bases._graphics._canvas_elements import RectangularROI
2626

2727
LutKey: TypeAlias = int | None
2828

@@ -72,7 +72,9 @@ def __init__(
7272
data_wrapper=data, display=display_model or ArrayDisplayModel(**kwargs)
7373
)
7474
self._viewer_model = ArrayViewerModel()
75-
self._viewer_model.events.interaction_mode.connect(self._on_interaction_mode_changed)
75+
self._viewer_model.events.interaction_mode.connect(
76+
self._on_interaction_mode_changed
77+
)
7678
self._roi_model: RectangularROIModel | None = None
7779

7880
app = _app.gui_frontend()
@@ -96,7 +98,9 @@ def __init__(
9698
self._canvas = canvas_cls(self._viewer_model)
9799

98100
self._histogram: HistogramCanvas | None = None
99-
self._view = frontend_cls(self._canvas.frontend_widget(), self._data_model, self._viewer_model)
101+
self._view = frontend_cls(
102+
self._canvas.frontend_widget(), self._data_model, self._viewer_model
103+
)
100104

101105
self._roi_view: RectangularROI | None = None
102106

@@ -169,7 +173,7 @@ def data(self, data: Any) -> None:
169173
else:
170174
self._data_model.data_wrapper = DataWrapper.create(data)
171175
self._fully_synchronize_view()
172-
176+
173177
@property
174178
def roi(self) -> RectangularROIModel | None:
175179
return self._roi_model
@@ -327,31 +331,39 @@ def _on_model_channel_mode_changed(self, mode: ChannelMode) -> None:
327331
# redraw
328332
self._clear_canvas()
329333
self._request_data()
330-
331-
def _on_roi_model_bounding_box_changed(self, bb: tuple[tuple[float, float], tuple[float, float]]) -> None:
334+
335+
def _on_roi_model_bounding_box_changed(
336+
self, bb: tuple[tuple[float, float], tuple[float, float]]
337+
) -> None:
332338
if self._roi_view is None:
333339
self._roi_view = self._canvas.add_bounding_box()
334340
# HACK
335341
self._roi_view.set_visible(True)
336-
self._roi_view.boundingBoxChanged.connect(self._on_roi_view_bounding_box_changed)
342+
self._roi_view.boundingBoxChanged.connect(
343+
self._on_roi_view_bounding_box_changed
344+
)
337345
self._roi_view.set_bounding_box(*bb)
338346

339347
def _on_roi_model_visible_changed(self, visible: bool) -> None:
340348
if self._roi_view is None:
341349
self._roi_view = self._canvas.add_bounding_box()
342350
# HACK
343351
self._roi_view.set_visible(True)
344-
self._roi_view.boundingBoxChanged.connect(self._on_roi_view_bounding_box_changed)
352+
self._roi_view.boundingBoxChanged.connect(
353+
self._on_roi_view_bounding_box_changed
354+
)
345355
self._roi_view.set_visible(visible)
346-
356+
347357
def _on_interaction_mode_changed(self, mode: InteractionMode) -> None:
348358
# TODO: Unify with _on_roi_model_bounding_box_changed
349359
if mode == InteractionMode.CREATE_ROI:
350360
if self._roi_view:
351361
self._roi_view.remove()
352362
self._roi_view = self._canvas.add_bounding_box()
353363
# HACK
354-
self._roi_view.boundingBoxChanged.connect(self._on_roi_view_bounding_box_changed)
364+
self._roi_view.boundingBoxChanged.connect(
365+
self._on_roi_view_bounding_box_changed
366+
)
355367

356368
def _clear_canvas(self) -> None:
357369
for lut_ctrl in self._lut_controllers.values():
@@ -373,8 +385,10 @@ def _on_view_visible_axes_changed(self) -> None:
373385
def _on_view_reset_zoom_clicked(self) -> None:
374386
"""Reset the zoom level of the canvas."""
375387
self._canvas.set_range()
376-
377-
def _on_roi_view_bounding_box_changed(self, bb: tuple[tuple[float, float], tuple[float, float]]) -> None:
388+
389+
def _on_roi_view_bounding_box_changed(
390+
self, bb: tuple[tuple[float, float], tuple[float, float]]
391+
) -> None:
378392
if self._roi_model:
379393
self._roi_model.bounding_box = bb
380394

src/ndv/views/_jupyter/_array_view.py

+6-1
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,12 @@ def __init__(
211211
width = "604px"
212212

213213
btns = widgets.HBox(
214-
[self._channel_mode_combo, self._ndims_btn, self._add_roi_btn, self._reset_zoom_btn],
214+
[
215+
self._channel_mode_combo,
216+
self._ndims_btn,
217+
self._add_roi_btn,
218+
self._reset_zoom_btn,
219+
],
215220
layout=widgets.Layout(justify_content="flex-end"),
216221
)
217222
self.layout = widgets.VBox(

src/ndv/views/_pygfx/_array_canvas.py

+8-2
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,17 @@
1010
import pygfx
1111
import pylinalg as la
1212

13-
from ndv._types import CursorType, MouseButton, MouseMoveEvent, MousePressEvent, MouseReleaseEvent
13+
from ndv._types import (
14+
CursorType,
15+
MouseButton,
16+
MouseMoveEvent,
17+
MousePressEvent,
18+
MouseReleaseEvent,
19+
)
1420
from ndv.models._viewer_model import ArrayViewerModel, InteractionMode
1521
from ndv.views._app import filter_mouse_events
1622
from ndv.views.bases import ArrayCanvas, CanvasElement, ImageHandle
17-
from ndv.views.bases._graphics._canvas_elements import ROIMoveMode, RectangularROI
23+
from ndv.views.bases._graphics._canvas_elements import RectangularROI, ROIMoveMode
1824

1925
if TYPE_CHECKING:
2026
from collections.abc import Sequence

src/ndv/views/_qt/_app.py

+4-2
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ def __init__(self, canvas: QObject, receiver: Mouseable):
8282
self.receiver = receiver
8383
self.active_button = MouseButton.NONE
8484

85-
def mouse_btn(self, btn : Any) -> MouseButton:
85+
def mouse_btn(self, btn: Any) -> MouseButton:
8686
from qtpy.QtCore import Qt
8787

8888
if btn == Qt.MouseButton.LeftButton:
@@ -128,7 +128,9 @@ def eventFilter(self, obj: QObject | None, qevent: QEvent | None) -> bool:
128128
intercept |= receiver.on_mouse_press(mpe)
129129
receiver.mousePressed.emit(mpe)
130130
elif etype == QEvent.Type.MouseButtonRelease:
131-
mre = MouseReleaseEvent(x=pos.x(), y=pos.y(), btn=self.active_button)
131+
mre = MouseReleaseEvent(
132+
x=pos.x(), y=pos.y(), btn=self.active_button
133+
)
132134
self.active_button = MouseButton.NONE
133135
intercept |= receiver.on_mouse_release(mre)
134136
receiver.mouseReleased.emit(mre)

src/ndv/views/_qt/_array_view.py

+5-2
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
from ndv.models._array_display_model import ChannelMode
3030
from ndv.models._viewer_model import ArrayViewerModel, InteractionMode
3131
from ndv.views.bases import ArrayView, LutView
32-
from ndv.views.bases._graphics._canvas_elements import CanvasElement, RectangularROI
3332

3433
if TYPE_CHECKING:
3534
from collections.abc import Container, Hashable, Mapping, Sequence
@@ -39,6 +38,7 @@
3938

4039
from ndv._types import AxisKey
4140
from ndv.models._data_display_model import _ArrayDataDisplayModel
41+
from ndv.views.bases._graphics._canvas_elements import CanvasElement, RectangularROI
4242

4343
SLIDER_STYLE = """
4444
QSlider::groove:horizontal {
@@ -411,7 +411,10 @@ def closeEvent(self, a0: Any) -> None:
411411

412412
class QtArrayView(ArrayView):
413413
def __init__(
414-
self, canvas_widget: QWidget, data_model: _ArrayDataDisplayModel, viewer_model: ArrayViewerModel
414+
self,
415+
canvas_widget: QWidget,
416+
data_model: _ArrayDataDisplayModel,
417+
viewer_model: ArrayViewerModel,
415418
) -> None:
416419
self._data_model = data_model
417420
self._viewer_model = viewer_model

src/ndv/views/_vispy/_array_canvas.py

+7-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,13 @@
1515
from vispy import scene
1616
from vispy.util.quaternion import Quaternion
1717

18-
from ndv._types import CursorType, MouseButton, MouseMoveEvent, MousePressEvent, MouseReleaseEvent
18+
from ndv._types import (
19+
CursorType,
20+
MouseButton,
21+
MouseMoveEvent,
22+
MousePressEvent,
23+
MouseReleaseEvent,
24+
)
1925
from ndv.models._viewer_model import ArrayViewerModel, InteractionMode
2026
from ndv.views._app import filter_mouse_events
2127
from ndv.views.bases import ArrayCanvas

src/ndv/views/bases/_array_view.py

+5-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,11 @@ class ArrayView(Viewable):
3636
# model: _ArrayDataDisplayModel is likely a temporary parameter
3737
@abstractmethod
3838
def __init__(
39-
self, canvas_widget: Any, model: _ArrayDataDisplayModel, viewer_model: ArrayViewerModel, **kwargs: Any
39+
self,
40+
canvas_widget: Any,
41+
model: _ArrayDataDisplayModel,
42+
viewer_model: ArrayViewerModel,
43+
**kwargs: Any,
4044
) -> None: ...
4145
@abstractmethod
4246
def create_sliders(self, coords: Mapping[int, Sequence]) -> None: ...

src/ndv/views/bases/_graphics/_canvas.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,10 @@
1313
if TYPE_CHECKING:
1414
import numpy as np
1515

16-
from ._canvas_elements import CanvasElement, ImageHandle, RectangularROI
1716
from ndv.models._viewer_model import ArrayViewerModel
1817

18+
from ._canvas_elements import CanvasElement, ImageHandle, RectangularROI
19+
1920

2021
class GraphicsCanvas(Viewable, Mouseable):
2122
"""ABC for graphics canvas providers."""

src/ndv/views/bases/_graphics/_canvas_elements.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
from abc import abstractmethod
44
from enum import Enum, auto
5-
from typing import TYPE_CHECKING, Any
5+
from typing import TYPE_CHECKING
66

77
from psygnal import Signal
88

0 commit comments

Comments
 (0)