# HG changeset patch
# User lain
# Date 1611235878 0
# Node ID 6748b0663fb406f479a8fc671fe20f588a362e3c
# Parent  b7ebb4748e591dfddc54c7cd9f9960c96cef72ce
" master branch Updating"

diff -r b7ebb4748e59 -r 6748b0663fb4 XSeekerPreparator.R
--- a/XSeekerPreparator.R	Thu Jan 21 13:02:58 2021 +0000
+++ b/XSeekerPreparator.R	Thu Jan 21 13:31:18 2021 +0000
@@ -1,7 +1,7 @@
 
 
 TOOL_NAME <- "XSeekerPreparator"
-VERSION <- "1.1.4"
+VERSION <- "1.1.5"
 
 OUTPUT_SPECIFIC_TOOL <- "XSeeker_Galaxy"
 
@@ -644,7 +644,7 @@
         curent_var_meta <- var_meta[row, ]
 
         peak_list <- context$peaks[context$groupidx[[row]], ]
-        sample_peak_list <- peak_list[peak_list[, "sample"] == context$sample_no, , drop=FALSE]
+        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"))) {
                 dummy_feature$set_int_o(int_o)
diff -r b7ebb4748e59 -r 6748b0663fb4 XSeekerPreparator.xml
--- a/XSeekerPreparator.xml	Thu Jan 21 13:02:58 2021 +0000
+++ b/XSeekerPreparator.xml	Thu Jan 21 13:31:18 2021 +0000
@@ -1,6 +1,6 @@
 <tool id="xseeker_preparator"
       name="XSeeker Preparator"
-      version="1.1.4"
+      version="1.1.5"
 >
     <description>Prepare RData file from CAMERA to be visualized in XSeeker</description>
     
diff -r b7ebb4748e59 -r 6748b0663fb4 galaxy/tools/LC-MSMS/XSeekerPreparator.R
--- a/galaxy/tools/LC-MSMS/XSeekerPreparator.R	Thu Jan 21 13:02:58 2021 +0000
+++ b/galaxy/tools/LC-MSMS/XSeekerPreparator.R	Thu Jan 21 13:31:18 2021 +0000
@@ -1,7 +1,7 @@
 
 
 TOOL_NAME <- "XSeekerPreparator"
-VERSION <- "1.1.4"
+VERSION <- "1.1.5"
 
 OUTPUT_SPECIFIC_TOOL <- "XSeeker_Galaxy"
 
@@ -644,7 +644,7 @@
         curent_var_meta <- var_meta[row, ]
 
         peak_list <- context$peaks[context$groupidx[[row]], ]
-        sample_peak_list <- peak_list[peak_list[, "sample"] == context$sample_no, , drop=FALSE]
+        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"))) {
                 dummy_feature$set_int_o(int_o)
diff -r b7ebb4748e59 -r 6748b0663fb4 galaxy/tools/LC-MSMS/XSeekerPreparator.xml
--- a/galaxy/tools/LC-MSMS/XSeekerPreparator.xml	Thu Jan 21 13:02:58 2021 +0000
+++ b/galaxy/tools/LC-MSMS/XSeekerPreparator.xml	Thu Jan 21 13:31:18 2021 +0000
@@ -1,6 +1,6 @@
 <tool id="xseeker_preparator"
       name="XSeeker Preparator"
-      version="1.1.4"
+      version="1.1.5"
 >
     <description>Prepare RData file from CAMERA to be visualized in XSeeker</description>