Add parent kwargs

Fix parent typing

Fix QWidget import

Author: dstansby

Diff for: src/napari_matplotlib/base.py

@@ -1,6 +1,6 @@
 import os
 from pathlib import Path
-from typing import List, Tuple
+from typing import List, Optional, Tuple
 
 import napari
 from matplotlib.axes import Axes
@@ -43,16 +43,20 @@ class NapariMPLWidget(QWidget):
         List of currently selected napari layers.
     """
 
-    def __init__(self, napari_viewer: napari.viewer.Viewer):
-        super().__init__()
+    def __init__(
+        self,
+        napari_viewer: napari.viewer.Viewer,
+        parent: Optional[QWidget] = None,
+    ):
+        super().__init__(parent=parent)
 
         self.viewer = napari_viewer
         self.canvas = FigureCanvas()
 
         self.canvas.figure.patch.set_facecolor("none")
         self.canvas.figure.set_layout_engine("constrained")
         self.toolbar = NapariNavigationToolbar(
-            self.canvas, self
+            self.canvas, parent=self
         )  # type: ignore[no-untyped-call]
         self._replace_toolbar_icons()
 

Diff for: src/napari_matplotlib/histogram.py

@@ -1,13 +1,14 @@
+from typing import Optional
+
+import napari
 import numpy as np
+from qtpy.QtWidgets import QWidget
 
 from .base import NapariMPLWidget
+from .util import Interval
 
 __all__ = ["HistogramWidget"]
 
-import napari
-
-from .util import Interval
-
 _COLORS = {"r": "tab:red", "g": "tab:green", "b": "tab:blue"}
 
 
@@ -19,8 +20,12 @@ class HistogramWidget(NapariMPLWidget):
     n_layers_input = Interval(1, 1)
     input_layer_types = (napari.layers.Image,)
 
-    def __init__(self, napari_viewer: napari.viewer.Viewer):
-        super().__init__(napari_viewer)
+    def __init__(
+        self,
+        napari_viewer: napari.viewer.Viewer,
+        parent: Optional[QWidget] = None,
+    ):
+        super().__init__(napari_viewer, parent=parent)
         self.add_single_axes()
         self.update_layers(None)
 

Diff for: src/napari_matplotlib/scatter.py

@@ -4,6 +4,7 @@
 import numpy.typing as npt
 from magicgui import magicgui
 from magicgui.widgets import ComboBox
+from qtpy.QtWidgets import QWidget
 
 from .base import NapariMPLWidget
 from .util import Interval
@@ -20,8 +21,12 @@ class ScatterBaseWidget(NapariMPLWidget):
     # the scatter is plotted as a 2D histogram
     _threshold_to_switch_to_histogram = 500
 
-    def __init__(self, napari_viewer: napari.viewer.Viewer):
-        super().__init__(napari_viewer)
+    def __init__(
+        self,
+        napari_viewer: napari.viewer.Viewer,
+        parent: Optional[QWidget] = None,
+    ):
+        super().__init__(napari_viewer, parent=parent)
 
         self.add_single_axes()
         self.update_layers(None)
@@ -113,16 +118,21 @@ class FeaturesScatterWidget(ScatterBaseWidget):
         napari.layers.Vectors,
     )
 
-    def __init__(self, napari_viewer: napari.viewer.Viewer):
-        super().__init__(napari_viewer)
-        self._key_selection_widget = magicgui(
+    def __init__(
+        self,
+        napari_viewer: napari.viewer.Viewer,
+        parent: Optional[QWidget] = None,
+    ):
+        super().__init__(napari_viewer, parent=parent)
+        self._key_selection_function_gui = magicgui(
             self._set_axis_keys,
             x_axis_key={"choices": self._get_valid_axis_keys},
             y_axis_key={"choices": self._get_valid_axis_keys},
             call_button="plot",
         )
-
-        self.layout().addWidget(self._key_selection_widget.native)
+        _key_selection_widget = self._key_selection_function_gui.native
+        _key_selection_widget.setParent(self)
+        self.layout().addWidget(_key_selection_widget)
 
     @property
     def x_axis_key(self) -> Optional[str]:
@@ -231,7 +241,7 @@ def _on_update_layers(self) -> None:
         Called when the layer selection changes by ``self.update_layers()``.
         """
         if hasattr(self, "_key_selection_widget"):
-            self._key_selection_widget.reset_choices()
+            self._key_selection_function_gui.reset_choices()
 
         # reset the axis keys
         self._x_axis_key = None

Diff for: src/napari_matplotlib/slice.py

@@ -1,9 +1,9 @@
-from typing import Any, Dict, Tuple
+from typing import Any, Dict, Optional, Tuple
 
 import napari
 import numpy as np
 import numpy.typing as npt
-from qtpy.QtWidgets import QComboBox, QHBoxLayout, QLabel, QSpinBox
+from qtpy.QtWidgets import QComboBox, QHBoxLayout, QLabel, QSpinBox, QWidget
 
 from .base import NapariMPLWidget
 from .util import Interval
@@ -22,9 +22,13 @@ class SliceWidget(NapariMPLWidget):
     n_layers_input = Interval(1, 1)
     input_layer_types = (napari.layers.Image,)
 
-    def __init__(self, napari_viewer: napari.viewer.Viewer):
+    def __init__(
+        self,
+        napari_viewer: napari.viewer.Viewer,
+        parent: Optional[QWidget] = None,
+    ):
         # Setup figure/axes
-        super().__init__(napari_viewer)
+        super().__init__(napari_viewer, parent=parent)
         self.add_single_axes()
 
         button_layout = QHBoxLayout()