# HG changeset patch
# User imgteam
# Date 1576663359 18000
# Node ID bc324ec667198e12acf7304460788a05c9f5c499
# Parent  165a9330fc90a5c6910202f743d01fc111ff2b93
"planemo upload for repository https://github.com/BMCV/galaxy-image-analysis/tools/overlay_moving_and_fixed_image/ commit 3d389fdec0db29cf6fbd783c0501455bf624fa90"

diff -r 165a9330fc90 -r bc324ec66719 overlay_moving_and_fixed_image.py
--- a/overlay_moving_and_fixed_image.py	Sat Feb 09 14:39:40 2019 -0500
+++ b/overlay_moving_and_fixed_image.py	Wed Dec 18 05:02:39 2019 -0500
@@ -29,7 +29,7 @@
     tf_coords = tf_coords.T.reshape((-1, cols, rows)).swapaxes(1, 2)
 
     _stackcopy(coords[1, ...], tf_coords[0, ...])
-    _stackcopy(coords[0, ...], tf_coords[1, ...])
+    _stackcopy(coords[0, ...], tf_coords[1, ...]) 
     if len(shape) == 3:
         coords[2, ...] = range(shape[2])
 
@@ -47,7 +47,7 @@
     fixed_image = Image.fromarray(fixed_image).convert("RGBA")
     overlay_out = Image.blend(moving_image, fixed_image, factor)
     overlay_out.save(overlay_out_path, "PNG")
-
+ 
 
 if __name__=="__main__":
     parser = argparse.ArgumentParser(description = "Overlay two images")
diff -r 165a9330fc90 -r bc324ec66719 overlay_moving_and_fixed_image.xml
--- a/overlay_moving_and_fixed_image.xml	Sat Feb 09 14:39:40 2019 -0500
+++ b/overlay_moving_and_fixed_image.xml	Wed Dec 18 05:02:39 2019 -0500
@@ -1,4 +1,4 @@
-<tool id="ip_viz_overlay_moving_and_fixed_image" name="Overlay" version="0.0.1">
+<tool id="ip_viz_overlay_moving_and_fixed_image" name="Overlay" version="0.0.2">
     <description>moving and fixed image</description>
     <requirements>
         <requirement type="package" version="0.14.2">scikit-image</requirement>
@@ -6,11 +6,12 @@
         <requirement type="package" version="1.15.4">numpy</requirement>
         <requirement type="package" version="1.1.0">scipy</requirement>
         <requirement type="package" version="5.3.0">pillow</requirement>
+        <requirement type="package" version="0.15.1">tifffile</requirement>
     </requirements>
-    <command><![CDATA[
+    <command detect_errors="aggressive"><![CDATA[
          python '$__tool_directory__/overlay_moving_and_fixed_image.py'
              '$fixed_image'
-             '$moving_image'
+             '$moving_image' 
              '$warp_matrix'
              '$overlay_out'
              --factor $factor