| Previous changeset 13:8f46605c84ec (2025-05-09) Next changeset 15:54c9a136e24f (2025-12-04) |
|
Commit message:
planemo upload for repository https://github.com/bgruening/galaxytools/tree/master/tools/image_processing/graphicsmagick commit b7029458f591d04c5259dc84cc931924c7194fbf |
|
modified:
convert.xml macros.xml |
|
added:
test-data/outputs/tmp_00.jpg test-data/outputs/tmp_01.jpg test-data/test.pdf |
| b |
| diff -r 8f46605c84ec -r 0ecf92b5a7c5 convert.xml --- a/convert.xml Fri May 09 22:49:50 2025 +0000 +++ b/convert.xml Wed Jul 16 11:48:39 2025 +0000 |
| [ |
| b'@@ -3,33 +3,41 @@\n <macros>\n <import>macros.xml</import>\n </macros>\n- <expand macro="requirements" />\n+ <expand macro="requirements"/>\n <command detect_errors="aggressive">\n <![CDATA[\n- ln -s \'${input}\' input.${input.ext}\n- &&\n- #if str($transformations) != \'None\':\n- #set $trans_options = str($transformations).replace(\',\', \' \')\n- #else:\n- #set $trans_options = \'\'\n- #end if\n+ ln -s \'${input}\' input.${input.ext} &&\n+ #if str($transformations) != \'None\':\n+ #set $trans_options = str($transformations).replace(\',\', \' \')\n+ #else:\n+ #set $trans_options = \'\'\n+ #end if\n \n- gm convert\n- -resize ${resize}%x\n- $trans_options\n- #if $palette.palette_select == "automatic"\n+ gm convert\n+ -resize ${resize}%x\n+ $trans_options\n+ #if $palette.palette_select == "automatic"\n -type Palette\n- #else if $palette.palette_select == "manual"\n+ #else if $palette.palette_select == "manual"\n -colors \'${palette.palette}\'\n- #end if\n- \'input.${input.ext}\'\n- \'temp.${output_format}\'\n+ #end if\n+ \'input.${input.ext}\'\n+ #if $input.ext != \'pdf\':\n+ ## single output file\n+ \'temp.${output_format}\'\n &&\n mv \'temp.${output_format}\' \'${output}\'\n+ #else:\n+ ## create multiple output files for each PDF side\n+ +adjoin temp_%03d.${output_format}\n+ &&\n+ mkdir ./outputs &&\n+ mv temp_* ./outputs\n+ #end if\n ]]>\n </command>\n <inputs>\n- <param format="jpg,png,bmp,gif,svg,eps,tiff" name="input" type="data" label="Image to convert" />\n+ <param format="jpg,png,bmp,gif,svg,eps,tiff,pdf" name="input" type="data" label="Image to convert"/>\n <param name="transformations" multiple="true" type="select" display="checkboxes" label="Transformations">\n <option value="-flip">flip vertically</option>\n <option value="-flop">flip horizontally</option>\n@@ -37,71 +45,86 @@\n <option value="-rotate 270">rotate 90 degree to the left</option>\n <option value="-rotate 180">rotate 180 degree</option>\n </param>\n-\n <conditional name="palette">\n <param name="palette_select" type="select" label="Reduce Color Palette">\n <option value="no" selected="true">No</option>\n <option value="automatic">Automatic</option>\n <option value="manual">Manual</option>\n </param>\n- <when value="automatic" />\n+ <when value="automatic"/>\n <when value="manual">\n <param name="palette" type="integer" min="1" label="Color Palette Size" value="32" help="Number of colors to use, should be in powers of 2 (1, 2, 4, 8, 16, 32, 64, ...), otherwise space is wasted in the palette."/>\n </when>\n- <when value="no" />\n+ <when value="no"/>\n </conditional>\n <param name="resize" type="float" value="100" label="Resize (%)" min="0"/>\n <param name="output_format" type="select" label="Output Format">\n- <option value="jpg">jpg</option>\n- <option value="png">png</option>\n- <option value="bmp">bmp</option>\n- <option value="gif">gif</option>\n- <option value="svg">svg</option>\n- <option value="eps">eps</option>\n- <option value="pdf">pdf</option>\n- <option value="tiff">tiff</option>\n+ <option value="jpg">jpg</option>\n+ <option value="png">png</option>\n+ <option value="bmp">bmp</option>\n+ <option value="gif">gif</option>\n+ <option value="svg">svg</option>\n+ <option value="eps">eps</option>\n+ <option value="pdf">pdf</option>\n+ <option value="tiff">tiff</option>\n '..b'format" value="jpg" format="jpg"/>\n+ <when input="output_format" value="png" format="png"/>\n+ <when input="output_format" value="bmp" format="bmp"/>\n+ <when input="output_format" value="gif" format="gif"/>\n+ <when input="output_format" value="svg" format="svg"/>\n+ <when input="output_format" value="eps" format="eps"/>\n+ <when input="output_format" value="pdf" format="pdf"/>\n+ <when input="output_format" value="tiff" format="tiff"/>\n </change_format>\n+ <filter>input.ext != "pdf"</filter>\n </data>\n+ <collection name="splitted_pdf" type="list" label="${tool.name} on ${on_string} collection">\n+ <discover_datasets pattern="__designation_and_ext__" directory="outputs"/>\n+ <filter>input.ext == "pdf"</filter>\n+ </collection>\n </outputs>\n <tests>\n- <test>\n- <param name="input" value="donald.jpg" />\n- <param name="output_format" value="png" />\n- <param name="transformations" value="-flip" />\n- <param name="resize" value="50" />\n- <output name="output" file="result_image_convert_1.png" compare="sim_size" delta="20000" />\n- </test>\n- <test>\n- <param name="input" value="donald.jpg" />\n- <param name="output_format" value="jpg" />\n- <conditional name="palette">\n- <param name="palette_select" value="automatic" />\n- </conditional>\n- <output name="output" file="donald-palette.jpg" compare="sim_size" delta="20000" />\n- </test>\n- <test>\n- <param name="input" value="donald.jpg" />\n- <param name="output_format" value="jpg" />\n- <conditional name="palette">\n- <param name="palette_select" value="manual" />\n- <param name="palette" value="2" />\n- </conditional>\n- <output name="output" file="donald-colors-2.jpg" compare="sim_size" delta="20000" />\n- </test>\n- </tests>\n+ <test expect_num_outputs="1">\n+ <param name="input" value="donald.jpg"/>\n+ <param name="output_format" value="png"/>\n+ <param name="transformations" value="-flip"/>\n+ <param name="resize" value="50"/>\n+ <output name="output" file="result_image_convert_1.png" compare="sim_size" delta="20000"/>\n+ </test>\n+ <test expect_num_outputs="1">\n+ <param name="input" value="donald.jpg"/>\n+ <param name="output_format" value="jpg"/>\n+ <conditional name="palette">\n+ <param name="palette_select" value="automatic"/>\n+ </conditional>\n+ <output name="output" file="donald-palette.jpg" compare="sim_size" delta="20000"/>\n+ </test>\n+ <test expect_num_outputs="1">\n+ <param name="input" value="donald.jpg"/>\n+ <param name="output_format" value="jpg"/>\n+ <conditional name="palette">\n+ <param name="palette_select" value="manual"/>\n+ <param name="palette" value="2"/>\n+ </conditional>\n+ <output name="output" file="donald-colors-2.jpg" compare="sim_size" delta="20000"/>\n+ </test>\n+ <test expect_num_outputs="1">\n+ <param name="input" value="test.pdf"/>\n+ <param name="output_format" value="jpg"/>\n+ <conditional name="palette">\n+ <param name="palette_select" value="no"/>\n+ </conditional>\n+ <output_collection name="splitted_pdf" count="12" type="list">\n+ <element name="temp_000" file="outputs/tmp_00.jpg" ftype="jpg" />\n+ <element name="temp_001" file="outputs/tmp_01.jpg" ftype="jpg" />\n+ </output_collection>\n+ </test>\n+ </tests>\n <help>\n <![CDATA[\n \n@@ -120,5 +143,5 @@\n \n ]]>\n </help>\n- <expand macro="citations" />\n+ <expand macro="citations"/>\n </tool>\n' |
| b |
| diff -r 8f46605c84ec -r 0ecf92b5a7c5 macros.xml --- a/macros.xml Fri May 09 22:49:50 2025 +0000 +++ b/macros.xml Wed Jul 16 11:48:39 2025 +0000 |
| b |
| @@ -1,6 +1,6 @@ <macros> <token name="@TOOL_VERSION@">1.3.45</token> - <token name="@VERSION_SUFFIX@">0</token> + <token name="@VERSION_SUFFIX@">1</token> <xml name="requirements"> <requirements> <requirement type="package" version="@TOOL_VERSION@">graphicsmagick</requirement> |
| b |
| diff -r 8f46605c84ec -r 0ecf92b5a7c5 test-data/outputs/tmp_00.jpg |
| b |
| Binary file test-data/outputs/tmp_00.jpg has changed |
| b |
| diff -r 8f46605c84ec -r 0ecf92b5a7c5 test-data/outputs/tmp_01.jpg |
| b |
| Binary file test-data/outputs/tmp_01.jpg has changed |
| b |
| diff -r 8f46605c84ec -r 0ecf92b5a7c5 test-data/test.pdf |
| b |
| Binary file test-data/test.pdf has changed |
