| Previous changeset 0:506a90ab5581 (2025-09-01) Next changeset 2:fc43cdc81408 (2026-01-14) |
|
Commit message:
planemo upload for repository https://github.com/bgruening/galaxytools/tree/master/tools/image_processing/imagemagick commit 7540181d97a24b5bf07dde308f6d79bee5f18c9c |
|
modified:
macros.xml montage.xml |
|
added:
test-data/donald-colors-2-chopped.jpg test-data/donald_chopped.jpg |
| b |
| diff -r 506a90ab5581 -r 65703c06c1f6 macros.xml --- a/macros.xml Mon Sep 01 15:51:11 2025 +0000 +++ b/macros.xml Thu Oct 30 17:56:18 2025 +0000 |
| b |
| @@ -1,6 +1,6 @@ <macros> <token name="@TOOL_VERSION@">7.1.2-2</token> - <token name="@VERSION_SUFFIX@">0</token> + <token name="@VERSION_SUFFIX@">1</token> <xml name="requirements"> <requirements> <requirement type="package" version="@TOOL_VERSION@">imagemagick</requirement> |
| b |
| diff -r 506a90ab5581 -r 65703c06c1f6 montage.xml --- a/montage.xml Mon Sep 01 15:51:11 2025 +0000 +++ b/montage.xml Thu Oct 30 17:56:18 2025 +0000 |
| [ |
| @@ -9,14 +9,14 @@ #set $list_inputs = [] #if $label_options.label=="true" and $label_options.label_indexes=="false" : - #for $idx, $data in enumerate($images): - #set $file=$data.input + #for $idx, $data in enumerate($input): + #set $file=$data ln -s $file "${file.element_identifier}.${file.ext}" && $list_inputs.append("%s.%s" % ($file.element_identifier, $file.ext)) #end for #else: - #for $idx, $data in enumerate($images): - #set $file=$data.input + #for $idx, $data in enumerate($input): + #set $file=$data #set $prefix=str($idx+1) ln -s $file "${prefix}.${file.element_identifier}.${file.ext}" && $list_inputs.append("%s.%s.%s" % ($prefix, $file.element_identifier, $file.ext)) @@ -46,9 +46,7 @@ </command> <inputs> - <repeat name="images" title="Dataset"> - <param name="input" type="data" format="jpg,png,bmp,gif,svg,eps,tiff" label="Image"/> - </repeat> + <param name="input" type="data" format="jpg,png,bmp,gif,svg,eps,tiff" multiple="true" label="Image"/> <param name="width" type="integer" value="4" label="# of images wide"/> <param name="resize" type="integer" value="100" label="Resize the image (in percent of the original size)"/> <param name="title" type="text" optional="true" label="Add a Title to the image"/> @@ -71,34 +69,12 @@ </outputs> <tests> <test> - <repeat name="images"> - <param name="input" value="donald.jpg" /> - </repeat> - <repeat name="images"> - <param name="input" value="donald.jpg" /> - </repeat> - <repeat name="images"> - <param name="input" value="Mirror Donald.png" /> - </repeat> - <repeat name="images"> - <param name="input" value="Mirror Donald.png" /> - </repeat> + <param name="input" value="donald.jpg,donald.jpg,Mirror Donald.png,Mirror Donald.png" /> <param name="width" value="3" /> <output name="output" file="result_image_montage_1.png" compare="sim_size" /> </test> <test> - <repeat name="images"> - <param name="input" value="donald.jpg" /> - </repeat> - <repeat name="images"> - <param name="input" value="Mirror Donald.png" /> - </repeat> - <repeat name="images"> - <param name="input" value="donald.jpg" /> - </repeat> - <repeat name="images"> - <param name="input" value="Mirror Donald.png" /> - </repeat> + <param name="input" value="donald.jpg,Mirror Donald.png,donald.jpg,Mirror Donald.png" /> <param name="width" value="2" /> <param name="resize" value="90" /> <conditional name="label_options"> @@ -109,12 +85,7 @@ <output name="output" file="result_image_montage_2.png" compare="sim_size" /> </test> <test> - <repeat name="images"> - <param name="input" value="donald.jpg" /> - </repeat> - <repeat name="images"> - <param name="input" value="Mirror Donald.png" /> - </repeat> + <param name="input" value="donald.jpg,Mirror Donald.png" /> <param name="width" value="2" /> <conditional name="label_options"> <param name="label" value="true" /> |
| b |
| diff -r 506a90ab5581 -r 65703c06c1f6 test-data/donald-colors-2-chopped.jpg |
| b |
| Binary file test-data/donald-colors-2-chopped.jpg has changed |
| b |
| diff -r 506a90ab5581 -r 65703c06c1f6 test-data/donald_chopped.jpg |
| b |
| Binary file test-data/donald_chopped.jpg has changed |
