Skip to content

Commit 1cf92f8

Browse files
committed
Fix parent typing
1 parent a6f5682 commit 1cf92f8

File tree

4 files changed

+34
-11
lines changed

4 files changed

+34
-11
lines changed

src/napari_matplotlib/base.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import os
22
from pathlib import Path
3-
from typing import List, Tuple
3+
from typing import List, Optional, Tuple
44

55
import napari
66
from matplotlib.axes import Axes
@@ -43,7 +43,11 @@ class NapariMPLWidget(QWidget):
4343
List of currently selected napari layers.
4444
"""
4545

46-
def __init__(self, napari_viewer: napari.viewer.Viewer, parent=None):
46+
def __init__(
47+
self,
48+
napari_viewer: napari.viewer.Viewer,
49+
parent: Optional[QWidget] = None,
50+
):
4751
super().__init__(parent=parent)
4852

4953
self.viewer = napari_viewer

src/napari_matplotlib/histogram.py

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
1+
from typing import Optional
2+
3+
import napari
14
import numpy as np
5+
from qtpy import QWidget
26

37
from .base import NapariMPLWidget
8+
from .util import Interval
49

510
__all__ = ["HistogramWidget"]
611

7-
import napari
8-
9-
from .util import Interval
10-
1112
_COLORS = {"r": "tab:red", "g": "tab:green", "b": "tab:blue"}
1213

1314

@@ -19,7 +20,11 @@ class HistogramWidget(NapariMPLWidget):
1920
n_layers_input = Interval(1, 1)
2021
input_layer_types = (napari.layers.Image,)
2122

22-
def __init__(self, napari_viewer: napari.viewer.Viewer, parent=None):
23+
def __init__(
24+
self,
25+
napari_viewer: napari.viewer.Viewer,
26+
parent: Optional[QWidget] = None,
27+
):
2328
super().__init__(napari_viewer, parent=parent)
2429
self.add_single_axes()
2530
self.update_layers(None)

src/napari_matplotlib/scatter.py

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import numpy.typing as npt
55
from magicgui import magicgui
66
from magicgui.widgets import ComboBox
7+
from pyqt import QWidget
78

89
from .base import NapariMPLWidget
910
from .util import Interval
@@ -20,7 +21,11 @@ class ScatterBaseWidget(NapariMPLWidget):
2021
# the scatter is plotted as a 2D histogram
2122
_threshold_to_switch_to_histogram = 500
2223

23-
def __init__(self, napari_viewer: napari.viewer.Viewer, parent=None):
24+
def __init__(
25+
self,
26+
napari_viewer: napari.viewer.Viewer,
27+
parent: Optional[QWidget] = None,
28+
):
2429
super().__init__(napari_viewer, parent=parent)
2530

2631
self.add_single_axes()
@@ -113,7 +118,11 @@ class FeaturesScatterWidget(ScatterBaseWidget):
113118
napari.layers.Vectors,
114119
)
115120

116-
def __init__(self, napari_viewer: napari.viewer.Viewer, parent=None):
121+
def __init__(
122+
self,
123+
napari_viewer: napari.viewer.Viewer,
124+
parent: Optional[QWidget] = None,
125+
):
117126
super().__init__(napari_viewer, parent=parent)
118127
self._key_selection_widget = magicgui(
119128
self._set_axis_keys,

src/napari_matplotlib/slice.py

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1-
from typing import Any, Dict, Tuple
1+
from typing import Any, Dict, Optional, Tuple
22

33
import napari
44
import numpy as np
55
import numpy.typing as npt
6+
from qtpy import QWidget
67
from qtpy.QtWidgets import QComboBox, QHBoxLayout, QLabel, QSpinBox
78

89
from .base import NapariMPLWidget
@@ -22,7 +23,11 @@ class SliceWidget(NapariMPLWidget):
2223
n_layers_input = Interval(1, 1)
2324
input_layer_types = (napari.layers.Image,)
2425

25-
def __init__(self, napari_viewer: napari.viewer.Viewer, parent=None):
26+
def __init__(
27+
self,
28+
napari_viewer: napari.viewer.Viewer,
29+
parent: Optional[QWidget] = None,
30+
):
2631
# Setup figure/axes
2732
super().__init__(napari_viewer, parent=parent)
2833
self.add_single_axes()

0 commit comments

Comments
 (0)