Move layout setup

Author: dstansby

src/napari_matplotlib/features.py

@@ -1,6 +1,8 @@
-from typing import List
+from typing import Dict, List
 
+import napari
 import napari.layers
+from qtpy.QtWidgets import QComboBox, QLabel, QVBoxLayout
 
 from napari_matplotlib.base import NapariMPLWidget
 from napari_matplotlib.util import Interval
@@ -10,6 +12,12 @@ class FeaturesMixin(NapariMPLWidget):
     """
     Mixin to help with widgets that plot data from a features table stored
     on a single layer.
+
+    Notes
+    -----
+    This currently only works for widgets that plot two quatities against each other
+    e.g., scatter plots. It is intended to be generalised in the future for widgets
+    that plot one quantity e.g., histograms.
     """
 
     n_layers_input = Interval(1, 1)
@@ -22,6 +30,19 @@ class FeaturesMixin(NapariMPLWidget):
         napari.layers.Vectors,
     )
 
+    def __init__(self) -> None:
+        # Set up selection boxes
+        self.layout().addLayout(QVBoxLayout())
+
+        self._selectors: Dict[str, QComboBox] = {}
+        for dim in ["x", "y"]:
+            self._selectors[dim] = QComboBox()
+            # Re-draw when combo boxes are updated
+            self._selectors[dim].currentTextChanged.connect(self._draw)
+
+            self.layout().addWidget(QLabel(f"{dim}-axis:"))
+            self.layout().addWidget(self._selectors[dim])
+
     def _get_valid_axis_keys(self) -> List[str]:
         """
         Get the valid axis keys from the layer FeatureTable.

src/napari_matplotlib/scatter.py

@@ -1,8 +1,8 @@
-from typing import Any, Dict, Optional, Tuple, Union
+from typing import Any, Optional, Tuple, Union
 
 import napari
 import numpy.typing as npt
-from qtpy.QtWidgets import QComboBox, QLabel, QVBoxLayout, QWidget
+from qtpy.QtWidgets import QWidget
 
 from .base import NapariMPLWidget
 from .features import FeaturesMixin
@@ -25,7 +25,7 @@ def __init__(
         napari_viewer: napari.viewer.Viewer,
         parent: Optional[QWidget] = None,
     ):
-        super().__init__(napari_viewer, parent=parent)
+        NapariMPLWidget.__init__(self, napari_viewer, parent=parent)
         self.add_single_axes()
 
     def clear(self) -> None:
@@ -110,19 +110,8 @@ def __init__(
         napari_viewer: napari.viewer.Viewer,
         parent: Optional[QWidget] = None,
     ):
-        super().__init__(napari_viewer, parent=parent)
-
-        self.layout().addLayout(QVBoxLayout())
-
-        self._selectors: Dict[str, QComboBox] = {}
-        for dim in ["x", "y"]:
-            self._selectors[dim] = QComboBox()
-            # Re-draw when combo boxes are updated
-            self._selectors[dim].currentTextChanged.connect(self._draw)
-
-            self.layout().addWidget(QLabel(f"{dim}-axis:"))
-            self.layout().addWidget(self._selectors[dim])
-
+        ScatterBaseWidget.__init__(self, napari_viewer, parent=parent)
+        FeaturesMixin.__init__(self)
         self._update_layers(None)
 
     @property