small fixes

Author: robert-graf

TPTBox/core/nii_poi_abstract.py

@@ -1,7 +1,6 @@
 from __future__ import annotations
 
 import sys
-import warnings
 from dataclasses import dataclass
 from typing import TYPE_CHECKING, Any
 
@@ -495,6 +494,7 @@ def local_to_global(self, x: COORDINATE) -> tuple:
         Returns:
             tuple: World-space coordinate rounded to 7 decimal places.
         """
+        # TODO ITK version
         a = self.rotation @ (np.array(x) * np.array(self.zoom)) + self.origin
         return tuple(round(float(v), 7) for v in a)
 

TPTBox/core/poi_fun/poi_abstract.py

@@ -1030,12 +1030,16 @@ def join_left(self, pois: Self, inplace=False, _right_join=False) -> Self:
             Self: The combined set of centroids, either in-place or as a new set, depending on the 'inplace' parameter.
         """
         ctd_list = self.centroids
+        if "label_name" in pois.info and "label_name" not in self.info:
+            self.info["label_name"] = {}
         if not inplace:
             ctd_list = ctd_list.copy()
         for x, y, c in pois.items():
             if (x, y) in self and not _right_join:
                 continue
             ctd_list[x, y] = c
+            if "label_name" in pois.info and f"({x}, {y})" in pois.info["label_name"]:
+                self.info["label_name"][f"({x}, {y})"] = pois.info["label_name"][f"({x}, {y})"]
         if inplace:
             return self
         return self.copy(ctd_list)

TPTBox/core/poi_fun/save_load.py

@@ -135,8 +135,12 @@ def convert(o):
             return str(o.absolute())
         raise TypeError(type(o))
 
-    with open(out_path, "w") as f:
-        json.dump(json_object, f, default=convert, indent=4)
+    try:
+        with open(out_path, "w") as f:
+            json.dump(json_object, f, default=convert, indent=4)
+    except TypeError:
+        Path(out_path).unlink(missing_ok=True)
+        raise
     log.print("POIs saved:", out_path, print_add, ltype=Log_Type.SAVE, verbose=verbose)
 
 

unit_tests/test_testsamples.py

@@ -113,6 +113,12 @@ def test_POIs_CT(self):
             Location.Vertebral_Body_Endplate_Inferior,
             Location.Rib_Left,
             Location.Rib_Right,
+            Location.Sacrum_Sacral_Ala_Left,
+            Location.Sacrum_Sacral_Ala_Right,
+            Location.Sacrum_Posterior_Sacral_Elements,
+            Location.Sacrum_Body,
+            Location.Sacrum_Endplate,
+            Location.Metal,
         ]
         self.make_POIs(vert_nii, subreg_nii, label, ignore_list)
 
@@ -134,6 +140,12 @@ def test_POIs_MR(self):
             Location.Vertebral_Body_Endplate_Inferior,
             Location.Rib_Left,
             Location.Rib_Right,
+            Location.Sacrum_Sacral_Ala_Left,
+            Location.Sacrum_Sacral_Ala_Right,
+            Location.Sacrum_Posterior_Sacral_Elements,
+            Location.Sacrum_Body,
+            Location.Sacrum_Endplate,
+            Location.Metal,
         ]
         self.make_POIs(vert_nii, subreg_nii, label, ignore_list)