4 quantus ceus mp4 analysis gui cannot proceed after roi drawing

.gitignore

@@ -7,5 +7,5 @@ fixed_wheels/
 .vscode/
 .DS_Store
 *.so
-/**/*_ui.py
 Visualization_Results/
+/**/*_ui.py

src/ceus/analysis_loading/analysis_loading_controller.py

@@ -10,7 +10,8 @@
 
 from ..mvc.base_controller import BaseController
 from .analysis_loading_view_coordinator import AnalysisLoadingViewCoordinator
-from engines.ceus.src.data_objs import UltrasoundImage, CeusSeg 
+from engines.ceus.src.data_objs.image import UltrasoundImage
+from engines.ceus.src.data_objs.seg import CeusSeg
 from engines.ceus.src.time_series_analysis.curves.framework import CurvesAnalysis
 
 
@@ -64,20 +65,31 @@ def _connect_signals(self) -> None:
     def _setup_analysis_options(self) -> None:
         """Setup available analysis types and functions in the view."""
         analysis_types, analysis_functions = self._model.get_analysis_types()
+        print(f"DEBUG: Available analysis types: {list(analysis_types.keys())}")
 
-        # Automatically select "Paramap" as the analysis type
-        paramap_type = "paramap"
-        if paramap_type in analysis_types:
-            self._selected_analysis_type = paramap_type
-            if self._model.set_analysis_type(paramap_type):
-                # Get available functions for Paramap analysis
-                available_functions = self._model.get_analysis_functions(paramap_type)
+        # Automatically select the best available analysis type
+        # Prefer curves_paramap, then curves, or just the first available one
+        # For CEUS, 'curves' is the standard non-parametric analysis.
+        selected_type = None
+        for preferred in ["curves", "curves_paramap", "paramap"]:
+            if preferred in analysis_types:
+                selected_type = preferred
+                break
+
+        if not selected_type and analysis_types:
+            selected_type = list(analysis_types.keys())[0]
+
+        if selected_type:
+            self._selected_analysis_type = selected_type
+            if self._model.set_analysis_type(selected_type):
+                # Get available functions for selected analysis type
+                available_functions = self._model.get_analysis_functions(selected_type)
                 # Skip analysis type selection and go directly to function selection
                 self._view_coordinator.show_function_selection(available_functions)
             else:
-                self._view_coordinator.show_error("Failed to set Paramap analysis type")
+                self._view_coordinator.show_error(f"Failed to set {selected_type} analysis type")
         else:
-            self._view_coordinator.show_error("Paramap analysis type not available")
+            self._view_coordinator.show_error("No analysis types available")
 
     def _on_user_action(self, action_name: str, action_data: Any) -> None:
         """
@@ -98,7 +110,7 @@ def _on_user_action(self, action_name: str, action_data: Any) -> None:
             print(f"DEBUG: Controller received analysis_execution_started action")
             print(f"DEBUG: action_data = {action_data}")
             self._handle_analysis_execution(action_data)
-        elif action_name == "analysis_completed":
+        elif action_name == "analysis_loading_completed":
             self._handle_analysis_completion(action_data)
         else:
             # Forward unknown actions to application controller

src/ceus/analysis_loading/analysis_loading_view_coordinator.py

@@ -10,12 +10,13 @@
 from PyQt6.QtWidgets import QWidget, QStackedWidget
 from PyQt6.QtCore import pyqtSignal
 
-from quantus.gui.mvc.base_view import BaseViewMixin
+from ..mvc.base_view import BaseViewMixin
 from .views.analysis_function_selection_widget import AnalysisFunctionSelectionWidget
-from quantus.gui.config_loading.views.analysis_params_widget import AnalysisParamsWidget
+from .views.analysis_params_widget import AnalysisParamsWidget
 from .views.analysis_execution_widget import AnalysisExecutionWidget
-from quantus.data_objs import UltrasoundRfImage, BmodeSeg, RfAnalysisConfig
-from quantus.analysis.paramap.framework import ParamapAnalysis
+from engines.ceus.src.data_objs.image import UltrasoundImage
+from engines.ceus.src.data_objs.seg import CeusSeg
+from engines.ceus.src.time_series_analysis.curves.framework import CurvesAnalysis
 
 
 class AnalysisLoadingViewCoordinator(QStackedWidget, BaseViewMixin):
@@ -40,19 +41,14 @@ class AnalysisLoadingViewCoordinator(QStackedWidget, BaseViewMixin):
     # ============================================================================
 
 
-    def __init__(self, image_data: UltrasoundRfImage, seg_data: BmodeSeg, config_data: RfAnalysisConfig, parent: Optional[QWidget] = None):
+    def __init__(self, image_data: UltrasoundImage, seg_data: CeusSeg, config_data, parent: Optional[QWidget] = None):
         super().__init__(parent)
         self.__init_base_view__(parent)
         self._image_data = image_data
         self._seg_data = seg_data
         self._config_data = config_data
 
         print(f"DEBUG: AnalysisLoadingViewCoordinator - image_data = {image_data is not None}")
-        if image_data is not None:
-            print(f"DEBUG: AnalysisLoadingViewCoordinator - scan_name = {image_data.scan_name}")
-            print(f"DEBUG: AnalysisLoadingViewCoordinator - phantom_name = {image_data.phantom_name}")
-        else:
-            print(f"DEBUG: AnalysisLoadingViewCoordinator - image_data is None!")
 
         # Widget instances
         self._function_selection_widget: Optional[AnalysisFunctionSelectionWidget] = None
@@ -63,7 +59,7 @@ def __init__(self, image_data: UltrasoundRfImage, seg_data: BmodeSeg, config_dat
         self._selected_analysis_type: Optional[str] = None
         self._selected_functions: List[str] = []
         self._analysis_params: dict = {}
-        self._analysis_data: Optional[ParamapAnalysis] = None
+        self._analysis_data: Optional[CurvesAnalysis] = None
 
         # Note: Analysis type selection is now skipped - Paramap is automatically selected
         # The controller will call show_function_selection directly
@@ -106,12 +102,16 @@ def show_error(self, error_message: str) -> None:
             error_message: Error message to display
         """
         current_widget: BaseViewMixin = self.currentWidget()
-        current_widget.show_error(error_message)
+        if current_widget:
+            current_widget.show_error(error_message)
+        else:
+            print(f"ERROR (no active widget): {error_message}")
 
     def clear_error(self) -> None:
         """Clear error message in the current widget."""
         current_widget: BaseViewMixin = self.currentWidget()
-        current_widget.clear_error()
+        if current_widget:
+            current_widget.clear_error()
 
     # ============================================================================
     # NAVIGATION METHODS - Methods to show different widgets
@@ -160,13 +160,19 @@ def show_params_configuration(self, required_params: List[str], selected_functio
             print(f"DEBUG: Creating AnalysisParamsWidget with image_data = {self._image_data is not None}")
             if self._image_data is not None:
                 print(f"DEBUG: Passing scan_name = {self._image_data.scan_name}")
-                print(f"DEBUG: Passing phantom_name = {self._image_data.phantom_name}")
+                if hasattr(self._image_data, 'phantom_name'):
+                    print(f"DEBUG: Passing phantom_name = {self._image_data.phantom_name}")
             self._params_widget = AnalysisParamsWidget(self._image_data, self._seg_data, self._config_data)
             self._params_widget.setup_ui()
             self._params_widget.connect_signals()
             self._params_widget.params_configured.connect(self._on_params_configured)
             self._params_widget.back_requested.connect(self._on_params_back)
             self.addWidget(self._params_widget)
+        else:
+            # Update data in existing widget
+            self._params_widget._image_data = self._image_data
+            self._params_widget._seg_data = self._seg_data
+            self._params_widget._config_data = self._config_data
 
         print(f"DEBUG: Calling set_required_params...")
         self._params_widget.set_required_params(required_params, selected_functions)
@@ -198,6 +204,10 @@ def show_analysis_execution(self, execution_summary: Dict) -> None:
             print(f"DEBUG: AnalysisExecutionWidget created and added to stack")
         else:
             print(f"DEBUG: Using existing AnalysisExecutionWidget")
+            # Update data in existing widget
+            self._execution_widget._image_data = self._image_data
+            self._execution_widget._seg_data = self._seg_data
+            self._execution_widget._config_data = self._config_data
 
         print(f"DEBUG: Setting execution summary...")
         self._execution_widget.set_execution_summary(execution_summary)
@@ -208,7 +218,7 @@ def show_analysis_execution(self, execution_summary: Dict) -> None:
         self._execution_widget.clear_error()
         print(f"DEBUG: show_analysis_execution completed - execution screen should be visible")
 
-    def show_analysis_results(self, analysis_data: ParamapAnalysis) -> None:
+    def show_analysis_results(self, analysis_data: CurvesAnalysis) -> None:
         """
         Show analysis results in the execution widget.
 
@@ -260,7 +270,7 @@ def _on_execution_started(self, execution_data: dict) -> None:
         self._emit_user_action("analysis_execution_started", execution_data)
         print(f"DEBUG: user_action signal emitted")
 
-    def _on_analysis_confirmed(self, analysis_data: ParamapAnalysis) -> None:
+    def _on_analysis_confirmed(self, analysis_data: CurvesAnalysis) -> None:
         """
         Handle analysis completion confirmation.