diff abims_CAMERA_annotateDiffreport.xml @ 41:2350ab2c7e13 draft

"planemo upload commit f978cc0a7aa81c244591e560f44970f0d61bf74e"
author workflow4metabolomics
date Sat, 28 Mar 2020 14:39:46 +0000
parents 3d943f088143
children 2cb22478651f
line wrap: on
line diff
--- 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**