diff xcms_plot_chromatogram.r @ 2:e6fdadaf039e draft

planemo upload for repository https://github.com/workflow4metabolomics/xcms commit f01148783819c37e474790dbd56619862960448a
author lecorguille
date Tue, 03 Apr 2018 11:37:40 -0400
parents fe1f0f16d9e6
children 60b156e58529
line wrap: on
line diff
--- a/xcms_plot_chromatogram.r	Thu Mar 08 05:52:12 2018 -0500
+++ b/xcms_plot_chromatogram.r	Tue Apr 03 11:37:40 2018 -0400
@@ -28,28 +28,17 @@
 # ----- PROCESSING INFILE -----
 cat("\tARGUMENTS PROCESSING INFO\n")
 
-#saving the specific parameters
-method <- args$method; args$method <- NULL
-
 cat("\n\n")
 
 
 # ----- ARGUMENTS PROCESSING -----
 cat("\tINFILE PROCESSING INFO\n")
 
-#image is an .RData file necessary to use xset variable given by previous tools
-load(args$image); args$image=NULL
-if (!exists("xdata")) stop("\n\nERROR: The RData doesn't contain any object called 'xdata'. This RData should have been created by an old version of XMCS 2.*")
-
-# Handle infiles
-if (!exists("singlefile")) singlefile <- NULL
-if (!exists("zipfile")) zipfile <- NULL
-rawFilePath <- getRawfilePathFromArguments(singlefile, zipfile, args)
-zipfile <- rawFilePath$zipfile
-singlefile <- rawFilePath$singlefile
-args <- rawFilePath$args
-directory <- retrieveRawfileInTheWorkingDirectory(singlefile, zipfile)
-
+mergeXDataReturn <- mergeXData(args)
+xdata <- mergeXDataReturn$xdata
+singlefile <- mergeXDataReturn$singlefile
+md5sumList <- mergeXDataReturn$md5sumList
+sampleNamesList <- mergeXDataReturn$sampleNamesList
 
 cat("\n\n")
 
@@ -60,7 +49,6 @@
 
 cat("\t\tDRAW GRAPHICS\n")
 
-#@TODO: one day, use xdata instead of xset to draw the TICs and BPC or a complete other method
 getPlotTICs(xdata, pdfname="TICs.pdf")
 getPlotBPIs(xdata, pdfname="BPIs.pdf")