typing, merge fixes, activable downsampling item, remove print logging

Author: vld-codra

plotpy/items/image/base.py

@@ -421,7 +421,6 @@ def set_color_map(self, name_or_table: str | CustomQwtLinearColormap) -> None:
         Args:
             name_or_table: Colormap name or colormap
         """
-        print(f"set_color_map to {name_or_table=}")
         if name_or_table is self.cmap_table:
             # This avoids rebuilding the LUT all the time
             return

plotpy/styles/curve.py

@@ -45,10 +45,9 @@ class CurveParam(DataSet):
     use_downsampling = BoolItem(_("Use downsampling"), default=False).set_prop(
         "display", store=_downsampling_prop
     )
-    # downsampling_factor = IntItem(_("Downsampling factor"), default=10, min=1).set_prop(
-    #     "display", active=GetAttrProp(_downsampling_prop)
-    # )
-    downsampling_factor = IntItem(_("Downsampling factor"), default=10, min=1)
+    downsampling_factor = IntItem(_("Downsampling factor"), default=10, min=1).set_prop(
+        "display", active=_downsampling_prop
+    )
 
     def update_param(self, curve: CurveItem | PolygonMapItem):
         """

plotpy/tests/unit/test_baseplot.py

@@ -28,9 +28,6 @@ def test_baseplot_api():
         plot.manager.add_tool(EditPointTool)
         plot.manager.add_tool(DownSampleCurveTool)  # noqa: F821
         plot.get_default_item()
-        plot.manager.add_tool(SelectPointsTool)
-        plot.manager.add_tool(EditPointTool)
-        plot.manager.add_tool(DownsampleCurveTool)
         title = "Test title"
         plot.set_title(title)
         assert plot.get_title() == title

plotpy/tools/base.py

@@ -27,7 +27,7 @@ def __init__(self, manager, toolbar_id=DefaultToolbarID):
 
         # pylint: disable=assignment-from-none
         self.action = self.create_action(manager)
-        self.menu = self.create_action_menu(manager)
+        self.menu: QW.QMenu | None = self.create_action_menu(manager)
 
         if self.menu is not None:
             self.action.setMenu(self.menu)

plotpy/tools/image.py

@@ -363,7 +363,7 @@ def __init__(self, manager, toolbar_id=DefaultToolbarID):
         self.default_icon = build_icon_from_cmap_name(self._active_colormap)
         self.action.setIcon(self.default_icon)
 
-    def create_action_menu(self, manager):
+    def create_action_menu(self, manager) -> QW.QMenu:
         """Create and return menu for the tool's action"""
         menu = QW.QMenu()
 

plotpy/widgets/colormap_manager.py

@@ -237,7 +237,8 @@ def close(self):
             )
             if save:
                 self.cmap_manager.saveColormap()
-        super().close()
+        if self.cmap_manager._changes_saved:
+            super().close()
 
     def show(self) -> None:
         return super().show()