Mercurial > repos > lecorguille > camera_annotate
changeset 41:2350ab2c7e13 draft
"planemo upload commit f978cc0a7aa81c244591e560f44970f0d61bf74e"
| author | workflow4metabolomics |
|---|---|
| date | Sat, 28 Mar 2020 14:39:46 +0000 |
| parents | 3d943f088143 |
| children | 2cb22478651f |
| files | README.rst abims_CAMERA_annotateDiffreport.xml lib.r macros.xml |
| diffstat | 4 files changed, 17 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/README.rst Thu Feb 13 22:22:06 2020 +0000 +++ b/README.rst Sat Mar 28 14:39:46 2020 +0000 @@ -2,9 +2,13 @@ Changelog/News -------------- +**Version 2.2.6+camera1.42.0+galaxy1 - 09/03/2020** + +- BUGFIX: Fix the zip export of the pictures (eic and boxplot) + **Version 2.2.5+camera1.42.0 - 13/02/2020** -- UPGRADE: upgrade the xcms version from 3.0.0 to 1.42.0 (see CAMERA News_) +- UPGRADE: upgrade the CAMERA version from 1.38.1 to 1.42.0 (see CAMERA News_) **Version 2.2.5 - 09/04/2019**
--- a/abims_CAMERA_annotateDiffreport.xml Thu Feb 13 22:22:06 2020 +0000 +++ b/abims_CAMERA_annotateDiffreport.xml Sat Mar 28 14:39:46 2020 +0000 @@ -1,4 +1,4 @@ -<tool id="abims_CAMERA_annotateDiffreport" name="CAMERA.annotate" version="2.2.5+camera@TOOL_VERSION@+galaxy0"> +<tool id="abims_CAMERA_annotateDiffreport" name="CAMERA.annotate" version="2.2.6+camera@TOOL_VERSION@+galaxy1"> <description>CAMERA annotate function. Returns annotation results (isotope peaks, adducts and fragments) and a diffreport if more than one condition.</description> @@ -185,13 +185,13 @@ </data> <data name="output_diffreport_eic_zip" format="zip" label="${image.name[:-6]}.annotateDiffreport_eic.zip" from_work_dir="eic.zip" > - <filter>diffreport['options']['option'] == 'show' and diffreport['options']['png2'] == 'zip'</filter> + <filter>diffreport['options']['option'] == 'show' and diffreport['options']['eicmax'] > 0 and diffreport['options']['png2'] == 'zip'</filter> </data> <data name="output_diffreport_box_zip" format="zip" label="${image.name[:-6]}.annotateDiffreport_box.zip" from_work_dir="box.zip" > - <filter>diffreport['options']['option'] == 'show' and diffreport['options']['png2'] == 'zip'</filter> + <filter>diffreport['options']['option'] == 'show' and diffreport['options']['eicmax'] > 0 and diffreport['options']['png2'] == 'zip'</filter> </data> <collection name="output_diffreport_picture_pdf" type="list" label="${image.name[:-6]}.annotateDiffreport.pdf"> - <filter>diffreport['options']['option'] == 'show' and diffreport['options']['png2'] == 'pdf'</filter> + <filter>diffreport['options']['option'] == 'show' and diffreport['options']['eicmax'] > 0 and diffreport['options']['png2'] == 'pdf'</filter> <discover_datasets pattern="__designation_and_ext__" directory="pdf" format="pdf" /> </collection> @@ -436,6 +436,10 @@ .. _News: https://bioconductor.org/packages/release/bioc/news/CAMERA/NEWS +**Version 2.2.5+camera1.42.0+galaxy1 - 09/03/2020** + +- BUGFIX: Fix the zip export of the pictures (eic and boxplot) + @HELP_CAMERA_NEWVERSION_1420@ **Version 2.2.5 - 09/04/2019**
--- a/lib.r Thu Feb 13 22:22:06 2020 +0000 +++ b/lib.r Sat Mar 28 14:39:46 2020 +0000 @@ -187,12 +187,12 @@ if (args$eicmax != 0) { if (args$png2 == "pdf") diffreport_png2pdf(filebase) + if (args$png2 == "zip") + diffreport_png2zip() } } } } - if (args$png2 == "zip") - diffreport_png2zip() if (args$tabular2 == "zip") diffreport_tabular2zip() }
--- a/macros.xml Thu Feb 13 22:22:06 2020 +0000 +++ b/macros.xml Sat Mar 28 14:39:46 2020 +0000 @@ -161,9 +161,9 @@ </token> <token name="@HELP_CAMERA_NEWVERSION_1420@"> -**Version 2.2.5+camera1.42.0 - 13/02/2020** +**Version 2.2.6+camera1.42.0 - 13/02/2020** -- UPGRADE: upgrade the xcms version from 3.0.0 to 1.42.0 (see CAMERA News_) +- UPGRADE: upgrade the CAMERA version from 1.38.0 to 1.42.0 (see CAMERA News_) </token> <xml name="citation">