# HG changeset patch
# User galaxyp
# Date 1551363847 18000
# Node ID d94770c22f13857fb926b575f5b16437225accc6
# Parent e30d8b72415ff873bded5256a63a05877ebe2665
planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/cardinal commit 2c4a1a862900b4efbc30824cbcb798f835b168b2
diff -r e30d8b72415f -r d94770c22f13 data_exporter.xml
--- a/data_exporter.xml Fri Feb 15 10:17:43 2019 -0500
+++ b/data_exporter.xml Thu Feb 28 09:24:07 2019 -0500
@@ -224,7 +224,7 @@
#if str($tabular_annotation.load_annotation) == 'yes_annotation':
colnames(annotation_input) = c("x_values", "y_values", "annotation")
- spectra_df = merge(annotation_input,spectra_df, by=c("x_values", "y_values"))
+ spectra_df = merge(spectra_df,annotation_input, by=c("x_values", "y_values"), all.x=TRUE)
## sort columns to have spectra_names as rowname in first column
#if str($counting_calibrants.pixel_with_calibrants) == "yes_calibrants":
diff -r e30d8b72415f -r d94770c22f13 test-data/preprocessing_results1.ibd
Binary file test-data/preprocessing_results1.ibd has changed
diff -r e30d8b72415f -r d94770c22f13 test-data/preprocessing_results1.imzml
--- a/test-data/preprocessing_results1.imzml Fri Feb 15 10:17:43 2019 -0500
+++ b/test-data/preprocessing_results1.imzml Thu Feb 28 09:24:07 2019 -0500
@@ -9,8 +9,8 @@
-
-
+
+
diff -r e30d8b72415f -r d94770c22f13 test-data/preprocessing_results1.imzml.txt
--- a/test-data/preprocessing_results1.imzml.txt Fri Feb 15 10:17:43 2019 -0500
+++ b/test-data/preprocessing_results1.imzml.txt Thu Feb 28 09:24:07 2019 -0500
@@ -1,4 +1,4 @@
imzML file:
total 24
--rw-r--r-- 1 meli meli 96 Feb 12 21:24 ibd
--rw-r--r-- 1 meli meli 16714 Feb 12 21:24 imzml
+-rw-r--r-- 1 meli meli 96 Feb 24 14:11 ibd
+-rw-r--r-- 1 meli meli 16714 Feb 24 14:11 imzml
diff -r e30d8b72415f -r d94770c22f13 test-data/preprocessing_results1.pdf
Binary file test-data/preprocessing_results1.pdf has changed
diff -r e30d8b72415f -r d94770c22f13 test-data/preprocessing_results2.ibd
Binary file test-data/preprocessing_results2.ibd has changed
diff -r e30d8b72415f -r d94770c22f13 test-data/preprocessing_results2.imzml
--- a/test-data/preprocessing_results2.imzml Fri Feb 15 10:17:43 2019 -0500
+++ b/test-data/preprocessing_results2.imzml Thu Feb 28 09:24:07 2019 -0500
@@ -9,8 +9,8 @@
-
-
+
+
diff -r e30d8b72415f -r d94770c22f13 test-data/preprocessing_results2.imzml.txt
--- a/test-data/preprocessing_results2.imzml.txt Fri Feb 15 10:17:43 2019 -0500
+++ b/test-data/preprocessing_results2.imzml.txt Thu Feb 28 09:24:07 2019 -0500
@@ -1,4 +1,4 @@
imzML file:
total 80
--rw-r--r-- 1 meli meli 54720 Feb 12 21:25 ibd
--rw-r--r-- 1 meli meli 21132 Feb 12 21:25 imzml
+-rw-r--r-- 1 meli meli 54720 Feb 24 14:12 ibd
+-rw-r--r-- 1 meli meli 21132 Feb 24 14:12 imzml
diff -r e30d8b72415f -r d94770c22f13 test-data/preprocessing_results2.pdf
Binary file test-data/preprocessing_results2.pdf has changed
diff -r e30d8b72415f -r d94770c22f13 test-data/preprocessing_results3.ibd
Binary file test-data/preprocessing_results3.ibd has changed
diff -r e30d8b72415f -r d94770c22f13 test-data/preprocessing_results3.imzml
--- a/test-data/preprocessing_results3.imzml Fri Feb 15 10:17:43 2019 -0500
+++ b/test-data/preprocessing_results3.imzml Thu Feb 28 09:24:07 2019 -0500
@@ -9,8 +9,8 @@
-
-
+
+
diff -r e30d8b72415f -r d94770c22f13 test-data/preprocessing_results3.imzml.txt
--- a/test-data/preprocessing_results3.imzml.txt Fri Feb 15 10:17:43 2019 -0500
+++ b/test-data/preprocessing_results3.imzml.txt Thu Feb 28 09:24:07 2019 -0500
@@ -1,4 +1,4 @@
imzML file:
total 36
--rw-r--r-- 1 meli meli 14216 Feb 12 21:26 ibd
--rw-r--r-- 1 meli meli 16824 Feb 12 21:26 imzml
+-rw-r--r-- 1 meli meli 14216 Feb 24 14:12 ibd
+-rw-r--r-- 1 meli meli 16824 Feb 24 14:12 imzml
diff -r e30d8b72415f -r d94770c22f13 test-data/preprocessing_results3.pdf
Binary file test-data/preprocessing_results3.pdf has changed
diff -r e30d8b72415f -r d94770c22f13 test-data/preprocessing_results4.ibd
Binary file test-data/preprocessing_results4.ibd has changed
diff -r e30d8b72415f -r d94770c22f13 test-data/preprocessing_results4.imzml
--- a/test-data/preprocessing_results4.imzml Fri Feb 15 10:17:43 2019 -0500
+++ b/test-data/preprocessing_results4.imzml Thu Feb 28 09:24:07 2019 -0500
@@ -9,8 +9,8 @@
-
-
+
+
diff -r e30d8b72415f -r d94770c22f13 test-data/preprocessing_results4.imzml.txt
--- a/test-data/preprocessing_results4.imzml.txt Fri Feb 15 10:17:43 2019 -0500
+++ b/test-data/preprocessing_results4.imzml.txt Thu Feb 28 09:24:07 2019 -0500
@@ -1,4 +1,4 @@
imzML file:
total 28
--rw-r--r-- 1 meli meli 6376 Feb 12 21:29 ibd
--rw-r--r-- 1 meli meli 16801 Feb 12 21:29 imzml
+-rw-r--r-- 1 meli meli 6376 Feb 24 14:13 ibd
+-rw-r--r-- 1 meli meli 16801 Feb 24 14:13 imzml
diff -r e30d8b72415f -r d94770c22f13 test-data/preprocessing_results4.pdf
Binary file test-data/preprocessing_results4.pdf has changed
diff -r e30d8b72415f -r d94770c22f13 test-data/preprocessing_results5.RData
Binary file test-data/preprocessing_results5.RData has changed
diff -r e30d8b72415f -r d94770c22f13 test-data/preprocessing_results5.pdf
Binary file test-data/preprocessing_results5.pdf has changed