Update transducer absolute path info handling

This updates SlicerOpenLIFU to work with the change introduced in
OpenwaterHealth/OpenLIFU-python@611ff30
which was part of the work for OpenwaterHealth/OpenLIFU-python#218

Author: ebrahimebrahim

OpenLIFUData/OpenLIFUData.py

@@ -1492,10 +1492,7 @@ def load_session(self, subject_id, session_id) -> None:
         # === Load transducer ===
 
         transducer_openlifu = self.db.load_transducer(session_openlifu.transducer_id)
-        if transducer_openlifu.registration_surface_filename or transducer_openlifu.transducer_body_filename:
-            transducer_abspaths_info = self.db.get_transducer_absolute_filepaths(session_openlifu.transducer_id)
-        else:
-            transducer_abspaths_info = {}
+        transducer_abspaths_info = self.db.get_transducer_absolute_filepaths(session_openlifu.transducer_id)
         newly_loaded_transducer = self.load_transducer_from_openlifu(
             transducer = transducer_openlifu,
             transducer_abspaths_info = transducer_abspaths_info,
@@ -1596,12 +1593,13 @@ def load_transducer_from_file(self, filepath:str) -> None:
         transducer = openlifu_lz().Transducer.from_file(filepath)
         transducer_parent_dir = Path(filepath).parent
 
-        transducer_abspaths_info = {key: transducer_parent_dir.joinpath(filename) 
-                                    for key, filename in {
-                                        'transducer_body_abspath': transducer.transducer_body_filename,
-                                        'registration_surface_abspath': transducer.registration_surface_filename
-                                    }.items() if filename
-                                    }
+        transducer_abspaths_info = {
+            key: transducer_parent_dir.joinpath(filename) if filename else None
+            for key, filename in [
+                ('transducer_body_abspath', transducer.transducer_body_filename),
+                ('registration_surface_abspath', transducer.registration_surface_filename),
+            ]
+        }
 
         self.load_transducer_from_openlifu(transducer, transducer_abspaths_info)
 

OpenLIFULib/OpenLIFULib/transducer.py

@@ -1,5 +1,6 @@
 from typing import Optional, TYPE_CHECKING, Callable, Any
 import numpy as np
+from pathlib import Path
 import vtk
 import slicer
 from slicer import (
@@ -74,8 +75,8 @@ def initialize_from_openlifu_transducer(
         shNode.SetItemParent(shNode.GetItemByDataNode(model_node), parentFolderItem)
         model_node.CreateDefaultDisplayNodes() # toggles the "eyeball" on
 
-        if 'transducer_body_abspath' in transducer_abspaths_info:
-            if transducer.transducer_body_filename != transducer_abspaths_info['transducer_body_abspath'].name:
+        if transducer_abspaths_info['transducer_body_abspath'] is not None:
+            if transducer.transducer_body_filename != Path(transducer_abspaths_info['transducer_body_abspath']).name:
                 raise ValueError("The filename provided in 'transducer_body_abspath' does not match the file specified in the Transducer object")
             body_model_node = slicer.util.loadModel(transducer_abspaths_info['transducer_body_abspath'])
             body_model_node.SetName(f"{slicer_transducer_name}-body")
@@ -84,8 +85,8 @@ def initialize_from_openlifu_transducer(
         else:
             body_model_node = None
 
-        if 'registration_surface_abspath' in transducer_abspaths_info:
-            if transducer.registration_surface_filename != transducer_abspaths_info['registration_surface_abspath'].name:
+        if transducer_abspaths_info['registration_surface_abspath'] is not None:
+            if transducer.registration_surface_filename != Path(transducer_abspaths_info['registration_surface_abspath']).name:
                 raise ValueError("The filename provided in 'registration_surface_abspath' does not match the file specified in the Transducer object")
             surface_model_node = slicer.util.loadModel(transducer_abspaths_info['registration_surface_abspath'])
             shNode.SetItemParent(shNode.GetItemByDataNode(surface_model_node), parentFolderItem)