changeset 1:f1744c5654b9 draft

planemo upload for repository https://github.com/BMCV/galaxy-image-analysis/tools/projective_transformation_points/ commit 201f4231192bc368b14e72bb1314b9a97b8db8d0
author imgteam
date Wed, 27 Mar 2019 14:54:32 -0400
parents ed8a71e13f7b
children 0d2707c82d29
files projective_transformation_points.py projective_transformation_points.xml test-data/out.tsv
diffstat 3 files changed, 10 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/projective_transformation_points.py	Sat Feb 09 14:45:19 2019 -0500
+++ b/projective_transformation_points.py	Wed Mar 27 14:54:32 2019 -0400
@@ -5,12 +5,12 @@
 
 
 def warp_coords_batch(coord_map, coords, dtype=np.float64, batch_size=1000000):
-    tf_coords = coords.astype(np.float32)
+    tf_coords = coords.astype(np.float32)[:, ::-1]
 
-    for i in range(0, (tf_coords.shape[0]//batch_size+1)):
+    for i in range(0, (tf_coords.shape[0]//batch_size)+1):
         tf_coords[batch_size*i:batch_size*(i+1)] = coord_map(tf_coords[batch_size*i:batch_size*(i+1)])
 
-    return np.unique(np.round(tf_coords).astype(coords.dtype),axis=0)
+    return np.unique(np.round(tf_coords).astype(coords.dtype),axis=0)[:, ::-1]
 
 
 def transform(coords, warp_matrix, out):
--- a/projective_transformation_points.xml	Sat Feb 09 14:45:19 2019 -0500
+++ b/projective_transformation_points.xml	Wed Mar 27 14:54:32 2019 -0400
@@ -1,4 +1,4 @@
-<tool id="ip_projective_transformation_points" name="Projective Transformation" version="0.0.2">
+<tool id="ip_projective_transformation_points" name="Projective Transformation" version="0.0.3">
     <description>of input points</description>
     <requirements>
         <requirement type="package" version="0.14.2">scikit-image</requirement>
--- a/test-data/out.tsv	Sat Feb 09 14:45:19 2019 -0500
+++ b/test-data/out.tsv	Wed Mar 27 14:54:32 2019 -0400
@@ -1,7 +1,7 @@
 x	y
-18	24
-18	25
-18	26
-18	27
-20	22
-25	35
+30	12
+28	14
+28	15
+28	16
+28	17
+35	25