Add have_results and have_geometry_results functions; update action handler to check for results

Author: PierreRaybaut

datalab/adapters_metadata/__init__.py

@@ -10,6 +10,8 @@
 from .common import (
     ResultData,
     create_resultdata_dict,
+    have_geometry_results,
+    have_results,
     resultadapter_to_html,
     show_resultdata,
 )
@@ -22,6 +24,8 @@
     "ResultData",
     "TableAdapter",
     "create_resultdata_dict",
+    "have_results",
+    "have_geometry_results",
     "resultadapter_to_html",
     "show_resultdata",
 ]

datalab/adapters_metadata/common.py

@@ -104,10 +104,9 @@ def have_results(objs: list[SignalObj | ImageObj]) -> bool:
     Returns:
         True if any object has results, False otherwise
     """
-    return bool(
-        any(GeometryAdapter.iterate_from_obj(obj) for obj in objs)
-        or any(TableAdapter.iterate_from_obj(obj) for obj in objs)
-    )
+    return any(
+        item for obj in objs for item in GeometryAdapter.iterate_from_obj(obj)
+    ) or any(item for obj in objs for item in TableAdapter.iterate_from_obj(obj))
 
 
 def have_geometry_results(objs: list[SignalObj | ImageObj]) -> bool:
@@ -119,7 +118,7 @@ def have_geometry_results(objs: list[SignalObj | ImageObj]) -> bool:
     Returns:
         True if any object has geometry results, False otherwise
     """
-    return bool(any(GeometryAdapter.iterate_from_obj(obj) for obj in objs))
+    return any(item for obj in objs for item in GeometryAdapter.iterate_from_obj(obj))
 
 
 def create_resultdata_dict(

datalab/gui/actionhandler.py

@@ -47,7 +47,7 @@
 from qtpy import QtGui as QG
 from qtpy import QtWidgets as QW
 
-from datalab.adapters_metadata import GeometryAdapter, TableAdapter
+from datalab.adapters_metadata import GeometryAdapter, TableAdapter, have_results
 from datalab.config import Conf, _
 from datalab.gui import newobject
 from datalab.widgets import fitdialog
@@ -176,6 +176,15 @@ def with_annotations(
         """At least one signal or image has annotations"""
         return any(obj.has_annotations() for obj in selected_objects)
 
+    @staticmethod
+    # pylint: disable=unused-argument
+    def with_results(
+        selected_groups: list[ObjectGroup],
+        selected_objects: list[SignalObj | ImageObj],
+    ) -> bool:
+        """At least one signal or image has results"""
+        return have_results(selected_objects)
+
 
 class ActionCategory(enum.Enum):
     """Action categories"""
@@ -353,6 +362,10 @@ def _delete_single_result(
         # Update properties panel to reflect the removal
         if obj is self.panel.objview.get_current_object():
             self.panel.objprop.update_properties_from(obj)
+        # Update action states to reflect the removal
+        selected_groups = self.panel.objview.get_sel_groups()
+        selected_objects = self.panel.objview.get_sel_objects(include_groups=True)
+        self.selected_objects_changed(selected_groups, selected_objects)
         # Refresh the plot to update the display
         # Use the same refresh pattern as delete_results() method
         self.panel.refresh_plot("selected", True, False)

datalab/gui/panel/base.py

@@ -2797,16 +2797,23 @@ def get_objects_with_dialog(
         return None
 
     def __new_objprop_button(
-        self, title: str, icon: str, tooltip: str, callback: Callable
+        self,
+        title: str,
+        icon: str,
+        tooltip: str,
+        callback: Callable,
+        select_condition: Callable = None,
     ) -> QW.QPushButton:
         """Create new object property button"""
         btn = QW.QPushButton(get_icon(icon), title, self)
         btn.setToolTip(tooltip)
         self.objprop.add_button(btn)
         btn.clicked.connect(callback)
+        if select_condition is None:
+            select_condition = actionhandler.SelectCond.at_least_one
         self.acthandler.add_action(
             btn,
-            select_condition=actionhandler.SelectCond.at_least_one,
+            select_condition=select_condition,
         )
         return btn
 
@@ -2817,6 +2824,7 @@ def add_objprop_buttons(self) -> None:
             "show_results.svg",
             _("Show results obtained from previous analysis"),
             self.show_results,
+            select_condition=actionhandler.SelectCond.with_results,
         )
 
         # Add checkbox to toggle result label visibility
@@ -3151,6 +3159,9 @@ def delete_results(self) -> None:
                     GeometryAdapter.remove_all_from(obj)
                     if obj is self.objview.get_current_object():
                         self.objprop.update_properties_from(obj)
+                # Update action states to reflect the removal
+                selected_groups = self.objview.get_sel_groups()
+                self.acthandler.selected_objects_changed(selected_groups, objs)
                 self.refresh_plot("selected", True, False)
         else:
             self.__show_no_result_warning()