28

src/ceus/application_model.py

@@ -88,6 +88,7 @@ class ApplicationModel(BaseModel):
 
     # Additional signals for application-specific events
     image_loaded = pyqtSignal(UltrasoundImage)
+    bmode_image_loaded = pyqtSignal(UltrasoundImage)
     segmentation_loaded = pyqtSignal(CeusSeg)
 
     def __init__(self):
@@ -97,7 +98,10 @@ def __init__(self):
         self._scan_loaders: Dict[str, Any] = {}
         self._selected_scan_type: Optional[str] = None
         self._image_data: Optional[UltrasoundImage] = None
+        self._bmode_image_data: Optional[UltrasoundImage] = None
         self._scan_worker: Optional[ScanLoadingWorker] = None
+        self._bmode_scan_worker: Optional[ScanLoadingWorker] = None
+        self._pending_bmode_load: bool = False  # True when B-mode load is in progress
 
         # Segmentation loading state
         self._seg_loaders: Dict[str, Any] = {}
@@ -148,6 +152,11 @@ def image_data(self) -> Optional[UltrasoundImage]:
         """Get the currently loaded image data."""
         return self._image_data
 
+    @property
+    def bmode_image_data(self) -> Optional[UltrasoundImage]:
+        """Get the currently loaded B-mode image data."""
+        return self._bmode_image_data
+
     def set_scan_type(self, scan_type_display_name: str) -> bool:
         """
         Set the selected scan type.
@@ -211,15 +220,20 @@ def get_image_loading_options(self) -> list:
     def load_image(self, image_path: str, scan_loader_kwargs: Dict[str, Any] = None) -> None:
         """
         Load scan image data.
-        
+
         Args:
             image_path: Path to image file
             scan_loader_kwargs: Additional loader arguments (optional)
         """
         if not self._selected_scan_type:
             self._emit_error("No scan type selected")
             return
-
+
+        # Reset state for new load cycle
+        self._image_data = None
+        self._bmode_image_data = None
+        self._pending_bmode_load = False
+
         if scan_loader_kwargs is None:
             scan_loader_kwargs = {}
 
@@ -337,6 +351,31 @@ def enhance_image(self, image: UltrasoundImage, func_configs: List[Dict[str, Any
             print(f"DEBUG: enhance_image error: {e}")
             return image
 
+    def compute_ceus_noise_floor(self, image_data: UltrasoundImage, n_ref_frames: int, noise_std_multiplier: float) -> float:
+        """
+        Compute the noise floor from pre-contrast frames.
+
+        Args:
+            image_data: UltrasoundImage object
+            n_ref_frames: Number of reference frames
+            noise_std_multiplier: Multiplier for standard deviation
+
+        Returns:
+            float: The computed noise floor
+        """
+        try:
+            funcs = self.get_preprocessing_options()
+            if 'compute_ceus_noise_floor' in funcs:
+                return funcs['compute_ceus_noise_floor'](
+                    image_data, 
+                    n_ref_frames=n_ref_frames, 
+                    noise_std_multiplier=noise_std_multiplier
+                )
+            return 0.0
+        except Exception as e:
+            print(f"WARNING: compute_ceus_noise_floor failed in model: {e}")
+            return 0.0
+
     def _validate_image_input(self, input_data: Dict[str, Any]) -> bool:
         """
         Validate input data for scan loading.
@@ -370,16 +409,14 @@ def _validate_image_input(self, input_data: Dict[str, Any]) -> bool:
     def _on_image_loading_complete(self, image_data: UltrasoundImage) -> None:
         """
         Handle completion of scan loading.
-        
+
         Args:
             image_data: Loaded ultrasound image data
         """
-        self._set_loading(False)
-
         # Check if loading was successful
         if isinstance(image_data, UltrasoundImage):
             self._image_data = image_data
-            
+
             # Print NIfTI information if applicable
             scan_path = getattr(image_data, 'scan_path', '')
             if scan_path and scan_path.lower().endswith(('.nii', '.nii.gz')):
@@ -389,17 +426,81 @@ def _on_image_loading_complete(self, image_data: UltrasoundImage) -> None:
                 print(f"Pixel Dimensions: {getattr(image_data, 'pixdim', 'Unknown')}")
                 print(f"Frame Rate: {getattr(image_data, 'frame_rate', 'Unknown')}")
                 print(f"----------------------------------------\n")
-
+
+            # If B-mode is still loading, wait for it before emitting
+            if self._pending_bmode_load:
+                return
+            self._set_loading(False)
             self.image_loaded.emit(image_data)
         else:
+            self._set_loading(False)
             print(f"DEBUG: Image loading failed - invalid image data:")
             print(f"  - scan_path: {getattr(image_data, 'scan_path', 'Missing')}")
             print(f"  - has pixel_data: {hasattr(image_data, 'pixel_data')}")
             print(f"  - pixel_data is None: {getattr(image_data, 'pixel_data', None) is None}")
             print(f"  - has intensity: {hasattr(image_data, 'intensities_for_analysis')}")
             print(f"  - intensities_for_analysis is None: {getattr(image_data, 'intensities_for_analysis', None) is None}")
             self._emit_error("Failed to load image data - image loading was unsuccessful")
-
+
+    def load_bmode_image(self, bmode_path: str, scan_loader_kwargs: Dict[str, Any] = None) -> None:
+        """
+        Load B-mode image data in the background.
+
+        Args:
+            bmode_path: Path to B-mode image file
+            scan_loader_kwargs: Additional loader arguments (optional)
+        """
+        if not self._selected_scan_type:
+            self._emit_error("No scan type selected for B-mode loading")
+            return
+
+        if scan_loader_kwargs is None:
+            scan_loader_kwargs = {}
+
+        if not os.path.exists(bmode_path):
+            self._emit_error(f"B-mode file not found: {bmode_path}")
+            return
+
+        self._pending_bmode_load = True
+
+        # Stop any existing B-mode worker
+        if self._bmode_scan_worker and self._bmode_scan_worker.isRunning():
+            self._bmode_scan_worker.quit()
+            self._bmode_scan_worker.wait()
+
+        self._bmode_scan_worker = ScanLoadingWorker(
+            self._selected_scan_type,
+            bmode_path,
+            scan_loader_kwargs
+        )
+
+        self._bmode_scan_worker.finished.connect(self._on_bmode_loading_complete)
+        self._bmode_scan_worker.error_msg.connect(self._on_bmode_loading_error)
+        self._bmode_scan_worker.start()
+
+    def _on_bmode_loading_complete(self, image_data: UltrasoundImage) -> None:
+        """Handle completion of B-mode image loading."""
+        self._pending_bmode_load = False
+        if isinstance(image_data, UltrasoundImage):
+            self._bmode_image_data = image_data
+            self.bmode_image_loaded.emit(image_data)
+        else:
+            self._emit_error("Failed to load B-mode image data")
+
+        # If CEUS already finished loading, emit image_loaded now
+        if self._image_data is not None:
+            self._set_loading(False)
+            self.image_loaded.emit(self._image_data)
+
+    def _on_bmode_loading_error(self, error_msg: str) -> None:
+        """Handle B-mode loading error — proceed with CEUS only."""
+        self._pending_bmode_load = False
+        self._emit_error(error_msg)
+        # Still allow proceeding with CEUS image if it loaded successfully
+        if self._image_data is not None:
+            self._set_loading(False)
+            self.image_loaded.emit(self._image_data)
+
     # Segmentation Loading Properties and Methods
     @property
     def seg_loaders(self) -> Dict[str, Any]:
@@ -551,7 +652,12 @@ def cleanup(self) -> None:
             self._scan_worker.quit()
             self._scan_worker.wait()
             self._scan_worker = None
-
+
+        if self._bmode_scan_worker and self._bmode_scan_worker.isRunning():
+            self._bmode_scan_worker.quit()
+            self._bmode_scan_worker.wait()
+            self._bmode_scan_worker = None
+
         if self._seg_worker and self._seg_worker.isRunning():
             self._seg_worker.quit()
             self._seg_worker.wait()

src/ceus/image_loading/image_loading_controller.py

@@ -61,7 +61,7 @@ def _handle_scan_type_selection(self, scan_type_name: str) -> None:
     def _handle_image_loading(self, load_data: dict) -> None:
         """
         Handle image loading request.
-        
+
         Args:
             load_data: Dictionary with loading parameters
         """
@@ -70,7 +70,15 @@ def _handle_image_loading(self, load_data: dict) -> None:
                 image_path=load_data['image_path'],
                 scan_loader_kwargs=load_data['scan_loader_kwargs']
             )
-
+
+            # Load B-mode image if path was provided
+            bmode_path = load_data.get('bmode_path')
+            if bmode_path:
+                self.model.load_bmode_image(
+                    bmode_path=bmode_path,
+                    scan_loader_kwargs=load_data['scan_loader_kwargs']
+                )
+
         except Exception as e:
             print(f"DEBUG: Error in image loading: {e}")
             import traceback

src/ceus/image_loading/ui/file_selection.ui

@@ -474,7 +474,7 @@
      </layout>
     </item>
     <item>
-     <layout class="QVBoxLayout" name="img_selection_layout" stretch="2,0,0,0,3,0,2">
+     <layout class="QVBoxLayout" name="img_selection_layout" stretch="2,0,0,0,0,3,0,2">
       <property name="spacing">
        <number>20</number>
       </property>
@@ -656,6 +656,119 @@
         </item>
        </layout>
       </item>
+      <item>
+       <layout class="QVBoxLayout" name="chooseBmodeLayout">
+        <property name="leftMargin">
+         <number>20</number>
+        </property>
+        <property name="rightMargin">
+         <number>20</number>
+        </property>
+        <item>
+         <widget class="QLabel" name="bmode_path_label">
+          <property name="styleSheet">
+           <string notr="true">QLabel {
+	background-color: rgba(255, 255, 255, 0);
+	color: white;
+	font-size: 17px;
+}</string>
+          </property>
+          <property name="text">
+           <string>Input Path to B-mode Image (optional)</string>
+          </property>
+          <property name="alignment">
+           <set>Qt::AlignCenter</set>
+          </property>
+          <property name="textInteractionFlags">
+           <set>Qt::NoTextInteraction</set>
+          </property>
+         </widget>
+        </item>
+        <item alignment="Qt::AlignHCenter|Qt::AlignVCenter">
+         <widget class="QLineEdit" name="bmode_path_input">
+          <property name="minimumSize">
+           <size>
+            <width>201</width>
+            <height>31</height>
+           </size>
+          </property>
+          <property name="maximumSize">
+           <size>
+            <width>401</width>
+            <height>31</height>
+           </size>
+          </property>
+          <property name="styleSheet">
+           <string notr="true">QLineEdit {
+	background-color: rgb(249, 249, 249);
+	color: black;
+}</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <layout class="QHBoxLayout" name="chooseBmodeButtonsLayout">
+          <property name="spacing">
+           <number>6</number>
+          </property>
+          <item alignment="Qt::AlignRight|Qt::AlignVCenter">
+           <widget class="QPushButton" name="choose_bmode_path_button">
+            <property name="minimumSize">
+             <size>
+              <width>131</width>
+              <height>41</height>
+             </size>
+            </property>
+            <property name="maximumSize">
+             <size>
+              <width>131</width>
+              <height>41</height>
+             </size>
+            </property>
+            <property name="styleSheet">
+             <string notr="true">QPushButton {
+	color: white;
+	font-size: 16px;
+	background: rgb(90, 37, 255);
+	border-radius: 15px;
+}</string>
+            </property>
+            <property name="text">
+             <string>Choose File</string>
+            </property>
+           </widget>
+          </item>
+          <item alignment="Qt::AlignLeft|Qt::AlignVCenter">
+           <widget class="QPushButton" name="clear_bmode_path_button">
+            <property name="minimumSize">
+             <size>
+              <width>131</width>
+              <height>41</height>
+             </size>
+            </property>
+            <property name="maximumSize">
+             <size>
+              <width>131</width>
+              <height>41</height>
+             </size>
+            </property>
+            <property name="styleSheet">
+             <string notr="true">QPushButton {
+	color: white;
+	font-size: 16px;
+	background: rgb(90, 37, 255);
+	border-radius: 15px;
+}</string>
+            </property>
+            <property name="text">
+             <string>Clear Path</string>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </item>
+       </layout>
+      </item>
       <item>
        <widget class="QLabel" name="loading_options_label">
         <property name="styleSheet">