changeset 54:10f3cb998c4e

small fix
author pieter.lukasse@wur.nl
date Thu, 11 Dec 2014 14:32:19 +0100
parents 70574a6381ea
children 543958f75e83
files datatypes_conf.xml xcms_differential_analysis.r
diffstat 2 files changed, 7 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/datatypes_conf.xml	Thu Dec 11 14:09:27 2014 +0100
+++ b/datatypes_conf.xml	Thu Dec 11 14:32:19 2014 +0100
@@ -6,4 +6,8 @@
         <datatype extension="msclust.csv" type="galaxy.datatypes.tabular:Tabular" mimetype="text/csv" display_in_upload="true" subclass="true">
         </datatype>   
   </registration>
+  <registration display_path="display_applications">
+        <datatype extension="rdata" type="galaxy.datatypes.data:Data" mimetype="application/zip" >
+        </datatype>   
+  </registration>
 </datatypes>
\ No newline at end of file
--- a/xcms_differential_analysis.r	Thu Dec 11 14:09:27 2014 +0100
+++ b/xcms_differential_analysis.r	Thu Dec 11 14:32:19 2014 +0100
@@ -49,6 +49,9 @@
 			
 			# info: levels(xcmsSet@phenoData$class) also gives access to the class names
 			dir.create(file.path(args.htmlReportFile.files_path), showWarnings = FALSE, recursive = TRUE)
+			# set cairo as default for png plots:
+			x11 = function (...) grDevices::x11(...,type='cairo')
+			# run diffreport
 			reporttab <- diffreport(xsetData, args.class1, args.class2, paste(args.htmlReportFile.files_path,"/fig", sep=""), args.topcount, metlin = 0.15, h=480, w=640)
 			
 			# write out tsv table: