features scatter test img added for points feature 1 v feature 0

ruaridhg · ruaridhg · commit f304e4e464cc · 2023-06-01T14:18:23.000+01:00
diff --git a/src/napari_matplotlib/scatter.py b/src/napari_matplotlib/scatter.py
@@ -24,22 +24,19 @@ 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:
@@ -94,7 +91,6 @@ 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
@@ -123,14 +119,12 @@ 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)
@@ -145,17 +139,13 @@ 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()
 
@@ -164,17 +154,13 @@ 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()
 
@@ -188,7 +174,6 @@ 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:
@@ -199,8 +184,6 @@ 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
 
@@ -217,7 +200,6 @@ def draw(self) -> None:
         """
         Scatter two features from the currently selected layer.
         """
-        print("Feat draw")
         if self._ready_to_scatter():
             super().draw()
 
@@ -238,8 +220,6 @@ def _get_data(self) -> Tuple[npt.NDArray[Any], npt.NDArray[Any], str, str]:
             The title to display on the y axis. Returns
             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]
@@ -248,20 +228,15 @@ 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())
diff --git a/src/napari_matplotlib/tests/baseline/test_features_scatter_widget.png b/src/napari_matplotlib/tests/baseline/test_features_scatter_widget.png
diff --git a/src/napari_matplotlib/tests/test_scatter.py b/src/napari_matplotlib/tests/test_scatter.py
@@ -31,11 +31,9 @@ def test_scatter(make_napari_viewer, astronaut_data):
 
 @pytest.mark.mpl_image_compare
 def test_features_scatter_widget(make_napari_viewer, astronaut_data):
-    print("TEST CREATE WIDGET")
     viewer = make_napari_viewer()
     widget = FeaturesScatterWidget(viewer)
 
-    print("TEST ADD IMAGE")
     viewer.add_image(astronaut_data[0], **astronaut_data[1], name="astronaut")
 
     # make a test label image
@@ -49,7 +47,6 @@ def test_features_scatter_widget(make_napari_viewer, astronaut_data):
     )
     feature_table_1["index"] = feature_table_1["label"]
 
-    print("TEST ADD LABELS")
     viewer.add_labels(
         label_image, name="label+features", features=feature_table_1
     )
@@ -63,22 +60,20 @@ def test_features_scatter_widget(make_napari_viewer, astronaut_data):
         "feature_2": np.random.random((n_points,)),
     }
 
-    print("TEST ADD POINTS")
     viewer.add_points(points_data, features=points_features)
-    # pdb.set_trace()
     # De-select existing selection
-    print("TEST SELECT CLEAR")
     viewer.layers.selection.clear()
-    # pdb.set_trace()
-    print("TEST SELECT ADD")
+
+    # Select points data and chosen features
     viewer.layers.selection.add(
         viewer.layers["points_data"]
     )  # images need to be selected
     x_column = "feature_0"
     widget.x_axis_key = x_column
     y_column = "feature_1"
-    widget.y_axis_key = y_column
+    widget.y_axis_key = y_column  # features need to be set here
 
+    # Select label data and chosen features
     # viewer.layers.selection.add(viewer.layers["label+features"])
     # x_column = "label"
     # widget.x_axis_key = x_column
