Mercurial > repos > imgteam > image_registration_affine

changeset 2:77dc68af2b40 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
"planemo upload for repository https://github.com/BMCV/galaxy-image-analysis/tools/image_registration_affine/ commit ded1703bcd6e295b26201505edb58381991b265e"
author imgteam
date Mon, 28 Feb 2022 17:35:49 +0000
parents fa769715b6b0
children 5030651c2993
files image_registration_affine.py image_registration_affine.xml test-data/fixed.png test-data/moving.png test-data/tmat.tsv
diffstat 5 files changed, 7 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/image_registration_affine.py	Thu Jan 20 00:45:30 2022 +0000
+++ b/image_registration_affine.py	Mon Feb 28 17:35:49 2022 +0000
@@ -109,6 +109,8 @@
     tmat[0, :] = result.x.take([0, 1, 2])
     tmat[1, :] = result.x.take([3, 4, 5])
 
+    tmat = np.linalg.inv(tmat)
+
     pd.DataFrame(tmat).to_csv(fn_out, header=None, index=False, sep="\t")
 
 
--- a/image_registration_affine.xml	Thu Jan 20 00:45:30 2022 +0000
+++ b/image_registration_affine.xml	Mon Feb 28 17:35:49 2022 +0000
@@ -1,4 +1,4 @@
-<tool id="ip_image_registration" name="Image Registration" version="0.0.2" profile="20.05"> 
+<tool id="ip_image_registration" name="Image Registration" version="0.0.3" profile="20.05"> 
     <description>based on intensity information</description>
     <requirements>
         <requirement type="package" version="0.18.1">scikit-image</requirement>
@@ -22,9 +22,9 @@
         <param name="fn_fixed" type="data" format="tiff,png,jpg" label="Fixed (reference) image" />
         <param name="sigma" type="float" value="3" label="Sigma of Gaussian filter for smoothing input images" />
         <param name="metric" type="select" label="Image similarity metric">
-            <option value="lcc" selected="True">Local cross-correlation</option>
-            <option value="mse">Mean squared error</option>
+            <option value="mse" selected="True">Mean squared error</option>
             <option value="mae">Mean absolute error</option>
+            <option value="lcc">Local cross-correlation</option>
         </param>
     </inputs>
     <outputs>
Binary file test-data/fixed.png has changed
Binary file test-data/moving.png has changed
--- a/test-data/tmat.tsv	Thu Jan 20 00:45:30 2022 +0000
+++ b/test-data/tmat.tsv	Mon Feb 28 17:35:49 2022 +0000
@@ -1,3 +1,3 @@
-0.8513326357669146	0.5366986237200791	-51.80508130298601
--0.5191006904557887	0.8391654313316298	89.65319219211344
+0.9999953761892572	-3.4540516900938576e-06	0.0010064125193630824
+7.084236474277291e-06	1.0000016307496928	14.99826055220615
 0.0	0.0	1.0