Mercurial > repos > lain > xseekerpreparator

changeset 10:bb9ebd6365ea draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
" master branch Updating"
author lain
date Thu, 21 Jan 2021 15:00:39 +0000
parents 6748b0663fb4
children f4fc4a0f41e2
files XSeekerPreparator.R XSeekerPreparator.xml galaxy/tools/LC-MSMS/XSeekerPreparator.R galaxy/tools/LC-MSMS/XSeekerPreparator.xml
diffstat 4 files changed, 10 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/XSeekerPreparator.R	Thu Jan 21 13:31:18 2021 +0000
+++ b/XSeekerPreparator.R	Thu Jan 21 15:00:39 2021 +0000
@@ -1,7 +1,7 @@
 
 
 TOOL_NAME <- "XSeekerPreparator"
-VERSION <- "1.1.5"
+VERSION <- "1.1.6"
 
 OUTPUT_SPECIFIC_TOOL <- "XSeeker_Galaxy"
 
@@ -644,6 +644,9 @@
         curent_var_meta <- var_meta[row, ]
 
         peak_list <- context$peaks[context$groupidx[[row]], ]
+        if (! ("matrix" %in% class(peak_list))) {
+            peak_list <- matrix(peak_list, nrow=1, ncol=length(peak_list), dimnames=list(c(), names(peak_list)))
+        }
         sample_peak_list <- peak_list[as.integer(peak_list[, "sample"]) == context$sample_no, , drop=FALSE]
         if (!identical(sample_peak_list, numeric(0)) && !is.null(nrow(sample_peak_list)) && nrow(sample_peak_list) != 0) {
             if (!is.na(int_o <- extract_peak_var(sample_peak_list, "into"))) {
--- a/XSeekerPreparator.xml	Thu Jan 21 13:31:18 2021 +0000
+++ b/XSeekerPreparator.xml	Thu Jan 21 15:00:39 2021 +0000
@@ -1,6 +1,6 @@
 <tool id="xseeker_preparator"
       name="XSeeker Preparator"
-      version="1.1.5"
+      version="1.1.6"
 >
     <description>Prepare RData file from CAMERA to be visualized in XSeeker</description>
     
--- a/galaxy/tools/LC-MSMS/XSeekerPreparator.R	Thu Jan 21 13:31:18 2021 +0000
+++ b/galaxy/tools/LC-MSMS/XSeekerPreparator.R	Thu Jan 21 15:00:39 2021 +0000
@@ -1,7 +1,7 @@
 
 
 TOOL_NAME <- "XSeekerPreparator"
-VERSION <- "1.1.5"
+VERSION <- "1.1.6"
 
 OUTPUT_SPECIFIC_TOOL <- "XSeeker_Galaxy"
 
@@ -644,6 +644,9 @@
         curent_var_meta <- var_meta[row, ]
 
         peak_list <- context$peaks[context$groupidx[[row]], ]
+        if (! ("matrix" %in% class(peak_list))) {
+            peak_list <- matrix(peak_list, nrow=1, ncol=length(peak_list), dimnames=list(c(), names(peak_list)))
+        }
         sample_peak_list <- peak_list[as.integer(peak_list[, "sample"]) == context$sample_no, , drop=FALSE]
         if (!identical(sample_peak_list, numeric(0)) && !is.null(nrow(sample_peak_list)) && nrow(sample_peak_list) != 0) {
             if (!is.na(int_o <- extract_peak_var(sample_peak_list, "into"))) {
--- a/galaxy/tools/LC-MSMS/XSeekerPreparator.xml	Thu Jan 21 13:31:18 2021 +0000
+++ b/galaxy/tools/LC-MSMS/XSeekerPreparator.xml	Thu Jan 21 15:00:39 2021 +0000
@@ -1,6 +1,6 @@
 <tool id="xseeker_preparator"
       name="XSeeker Preparator"
-      version="1.1.5"
+      version="1.1.6"
 >
     <description>Prepare RData file from CAMERA to be visualized in XSeeker</description>