scatter working with print statements

ruaridhg · ruaridhg · commit fb1e6df1263a · 2023-06-01T14:18:23.000+01:00
diff --git a/src/napari_matplotlib/scatter.py b/src/napari_matplotlib/scatter.py
@@ -24,19 +24,22 @@ def __init__(
         napari_viewer: napari.viewer.Viewer,
         parent: Optional[QWidget] = None,
     ):
+        print("ScatterBase init")
         super().__init__(napari_viewer, parent=parent)
         self.add_single_axes()
 
     def clear(self) -> None:
         """
         Clear the axes.
         """
+        print("ScatterBase clear")
         self.axes.clear()
 
     def draw(self) -> None:
         """
         Scatter the currently selected layers.
         """
+        print("ScatterBase draw")
         x, y, x_axis_name, y_axis_name = self._get_data()
 
         if x.size > self._threshold_to_switch_to_histogram:
@@ -91,6 +94,7 @@ def _get_data(self) -> Tuple[npt.NDArray[Any], npt.NDArray[Any], str, str]:
         y_axis_name: str
             The title to display on the y axis
         """
+        print("Scatter get data")
         x = self.layers[0].data[self.current_z]
         y = self.layers[1].data[self.current_z]
         x_axis_name = self.layers[0].name
@@ -119,12 +123,14 @@ def __init__(
         napari_viewer: napari.viewer.Viewer,
         parent: Optional[QWidget] = None,
     ):
+        print("FeatureScatter init")
         super().__init__(napari_viewer, parent=parent)
 
         self.layout().addLayout(QVBoxLayout())
 
         self._selectors: Dict[str, QComboBox] = {}
         for dim in ["x", "y"]:
+            # pdb.set_trace()
             self._selectors[dim] = QComboBox()
             # Re-draw when combo boxes are updated
             self._selectors[dim].currentTextChanged.connect(self._draw)
@@ -139,13 +145,17 @@ def x_axis_key(self) -> Union[str, None]:
         """
         Key for the x-axis data.
         """
+        # print('Feat x axis key @property')
         if self._selectors["x"].count() == 0:
+            print("IF X self selectors count = 0")
             return None
         else:
+            # print('ELSE X self selectors currentText')
             return self._selectors["x"].currentText()
 
     @x_axis_key.setter
     def x_axis_key(self, key: str) -> None:
+        print("Feat x axis key @setter = ", key)
         self._selectors["x"].setCurrentText(key)
         self._draw()
 
@@ -154,13 +164,17 @@ def y_axis_key(self) -> Union[str, None]:
         """
         Key for the y-axis data.
         """
+        # print('Feat y axis key @property')
         if self._selectors["y"].count() == 0:
+            print("IF Y self selectors count = 0")
             return None
         else:
+            # print('ELSE Y self selectors currentText')
             return self._selectors["y"].currentText()
 
     @y_axis_key.setter
     def y_axis_key(self, key: str) -> None:
+        print("Feat y axis key @setter = ", key)
         self._selectors["y"].setCurrentText(key)
         self._draw()
 
@@ -174,6 +188,7 @@ def _get_valid_axis_keys(self) -> List[str]:
             The valid axis keys in the FeatureTable. If the table is empty
             or there isn't a table, returns an empty list.
         """
+        print("Feat get valid axis keys")
         if len(self.layers) == 0 or not (hasattr(self.layers[0], "features")):
             return []
         else:
@@ -184,6 +199,8 @@ def _ready_to_scatter(self) -> bool:
         Return True if selected layer has a feature table we can scatter with,
         and the two columns to be scatterd have been selected.
         """
+        # pdb.set_trace()
+        print("Feat ready to scatter")
         if not hasattr(self.layers[0], "features"):
             return False
 
@@ -200,6 +217,7 @@ def draw(self) -> None:
         """
         Scatter two features from the currently selected layer.
         """
+        print("Feat draw")
         if self._ready_to_scatter():
             super().draw()
 
@@ -221,6 +239,7 @@ def _get_data(self) -> Tuple[npt.NDArray[Any], npt.NDArray[Any], str, str]:
             an empty string if nothing to plot.
         """
         # pdb.set_trace()
+        print("Feat get data")
         feature_table = self.layers[0].features
 
         x = feature_table[self.x_axis_key]
@@ -229,15 +248,20 @@ def _get_data(self) -> Tuple[npt.NDArray[Any], npt.NDArray[Any], str, str]:
         x_axis_name = str(self.x_axis_key)
         y_axis_name = str(self.y_axis_key)
 
+        print("x-axis = ", str(self.x_axis_key))
+        print("y-axis = ", str(self.y_axis_key))
+
         return x, y, x_axis_name, y_axis_name
 
     def on_update_layers(self) -> None:
         """
         Called when the layer selection changes by ``self.update_layers()``.
         """
         # Clear combobox
+        print("Feat on update layers")
         for dim in ["x", "y"]:
             while self._selectors[dim].count() > 0:
                 self._selectors[dim].removeItem(0)
             # Add keys for newly selected layer
+            # pdb.set_trace()
             self._selectors[dim].addItems(self._get_valid_axis_keys())
