enh: finalize storing affines in X5

Co-authored-by: Julien Marabotto <166002186+jmarabotto@users.noreply.github.com>
Co-authored-by: sgiavasis <sgiava77@gmail.com>

Author: 3 people

nitransforms/linear.py

@@ -27,7 +27,7 @@
     EQUALITY_TOL,
 )
 from nitransforms.io import get_linear_factory, TransformFileError
-from nitransforms.io.x5 import X5Transform, X5Domain
+from nitransforms.io.x5 import X5Transform, X5Domain, to_filename as save_x5
 
 
 class Affine(TransformBase):
@@ -260,9 +260,12 @@ def map(self, x, inverse=False):
             affine = self._inverse
         return affine.dot(coords).T[..., :-1]
 
-    def to_filename(self, filename, fmt="X5", moving=None):
+    def to_filename(self, filename, fmt="X5", moving=None, x5_inverse=False):
         """Store the transform in the requested output format."""
-        writer = get_linear_factory(fmt, is_array=False)
+        if fmt.upper() == "X5":
+            return save_x5(filename, [self.to_x5(store_inverse=x5_inverse)])
+
+        writer = get_linear_factory(fmt, is_array=isinstance(self, LinearTransformsMapping))
 
         if fmt.lower() in ("itk", "ants", "elastix"):
             writer.from_ras(self.matrix).to_filename(filename)
@@ -407,21 +410,6 @@ def map(self, x, inverse=False):
             affine = self._inverse
         return np.swapaxes(affine.dot(coords), 1, 2)
 
-    def to_filename(self, filename, fmt="X5", moving=None):
-        """Store the transform in the requested output format."""
-        writer = get_linear_factory(fmt, is_array=True)
-
-        if fmt.lower() in ("itk", "ants", "elastix"):
-            writer.from_ras(self.matrix).to_filename(filename)
-        else:
-            # Rest of the formats peek into moving and reference image grids
-            writer.from_ras(
-                self.matrix,
-                reference=self.reference,
-                moving=ImageGrid(moving) if moving is not None else self.reference,
-            ).to_filename(filename)
-        return filename
-
 
 def load(filename, fmt=None, reference=None, moving=None):
     """

nitransforms/tests/test_linear.py

@@ -263,7 +263,7 @@ def test_linear_to_x5(tmpdir, store_inverse):
     assert node.array_length == 1
     assert (node.metadata or {}).get("GeneratedBy") == "FreeSurfer 8"
 
-    io.x5.to_filename("export1.x5", [node])
+    aff.to_filename("export1.x5", x5_inverse=store_inverse)
 
     # Test with Domain
     img = nb.Nifti1Image(np.zeros((2, 2, 2), dtype="float32"), np.eye(4))
@@ -273,7 +273,7 @@ def test_linear_to_x5(tmpdir, store_inverse):
     node = aff.to_x5()
     assert node.domain.grid
     assert node.domain.size == aff.reference.shape
-    io.x5.to_filename("export2.x5", [node])
+    aff.to_filename("export2.x5", x5_inverse=store_inverse)
 
     # Test with Jacobian
     node.jacobian = np.zeros((2, 2, 2), dtype="float32")