From 711f1263cf804fac481fd2658811afebed8eac99 Mon Sep 17 00:00:00 2001
From: Juan Nunez-Iglesias <jni@fastmail.com>
Date: Mon, 27 Nov 2023 10:43:50 +1100
Subject: [PATCH] Consider layer transform metadata when applying transform

---
 src/affinder/apply_tf.py | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/src/affinder/apply_tf.py b/src/affinder/apply_tf.py
index 9029e3f..3d4f3ad 100644
--- a/src/affinder/apply_tf.py
+++ b/src/affinder/apply_tf.py
@@ -1,5 +1,6 @@
 from magicgui import magic_factory
 from skimage import transform
+from napari.utils.transforms import CompositeAffine
 import numpy as np
 
 
@@ -62,8 +63,24 @@ def apply_affine(
                 'Only image transforms supported at this point.'
                 )
 
+    reference_meta = CompositeAffine(
+            scale=reference_layer.scale,
+            translate=reference_layer.translate,
+            rotate=reference_layer.rotate,
+            shear=reference_layer.shear,
+            )
+    moving_meta = CompositeAffine(
+            scale=moving_layer.scale,
+            translate=moving_layer.translate,
+            rotate=moving_layer.rotate,
+            shear=moving_layer.shear,
+            )
     # Find the transformation relative to the reference image
-    affine = np.linalg.inv(reference_layer.affine) @ moving_layer.affine
+    affine = (
+            np.linalg.inv(reference_meta)
+            @ np.linalg.inv(reference_layer.affine) @ moving_layer.affine
+            @ moving_meta
+            )
 
     # Apply the transformation
     transformed = _apply_affine_image(