# HG changeset patch
# User galaxyp
# Date 1630221311 0
# Node ID 268f8b213cee104b3e2e13cf13326df3244a0e3e
# Parent  d64858cd48c600d0d10c1045103579a2372385ea
"planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/cardinal commit c8d3adac445b4e08e2724e22d7201bfc38bbf40f"

diff -r d64858cd48c6 -r 268f8b213cee combine.xml
--- a/combine.xml	Fri May 07 09:50:35 2021 +0000
+++ b/combine.xml	Sun Aug 29 07:15:11 2021 +0000
@@ -1,4 +1,4 @@
-<tool id="cardinal_combine" name="MSI combine" version="@VERSION@.1">
+<tool id="cardinal_combine" name="MSI combine" version="@VERSION@.0">
     <description>
         combine several mass spectrometry imaging datasets into one
     </description>
@@ -6,9 +6,9 @@
         <import>macros.xml</import>
     </macros>
     <expand macro="requirements">
-        <requirement type="package" version="3.3.2">r-ggplot2</requirement>
+        <requirement type="package" version="3.3.5">r-ggplot2</requirement>
         <requirement type="package" version="0.12">r-maldiquantforeign</requirement>
-        <requirement type="package" version="1.19.3">r-maldiquant</requirement>
+        <requirement type="package" version="1.20">r-maldiquant</requirement>
     </expand>
     <command detect_errors="exit_code">
     <![CDATA[
diff -r d64858cd48c6 -r 268f8b213cee macros.xml
--- a/macros.xml	Fri May 07 09:50:35 2021 +0000
+++ b/macros.xml	Sun Aug 29 07:15:11 2021 +0000
@@ -1,5 +1,5 @@
 <macros>
-    <token name="@VERSION@">2.6.0</token>
+    <token name="@VERSION@">2.10.0</token>
 
     <xml name="requirements">
         <requirements>
diff -r d64858cd48c6 -r 268f8b213cee test-data/QC_imzml_shortreport.pdf
Binary file test-data/QC_imzml_shortreport.pdf has changed
diff -r d64858cd48c6 -r 268f8b213cee test-data/preprocessing_results4.ibd
Binary file test-data/preprocessing_results4.ibd has changed
diff -r d64858cd48c6 -r 268f8b213cee test-data/preprocessing_results4.imzml
--- a/test-data/preprocessing_results4.imzml	Fri May 07 09:50:35 2021 +0000
+++ b/test-data/preprocessing_results4.imzml	Sun Aug 29 07:15:11 2021 +0000
@@ -9,8 +9,8 @@
 		<fileContent>
 			<cvParam cvRef="MS" accession="MS:1000579" name="MS1 spectrum" value="" />
 			<cvParam cvRef="MS" accession="MS:1000128" name="profile spectrum" value="" />
-			<cvParam cvRef="IMS" accession="IMS:1000080" name="universally unique identifier" value="48842eaf-40e5-4a3f-831c-2d7a3b7e04b9" />
-			<cvParam cvRef="IMS" accession="IMS:1000091" name="ibd SHA-1" value="2010ba5b7d44695d891cfe3b6674a5699fa610c0" />
+			<cvParam cvRef="IMS" accession="IMS:1000080" name="universally unique identifier" value="04431b64-9f3d-44b4-9e63-81b9e4924aec" />
+			<cvParam cvRef="IMS" accession="IMS:1000091" name="ibd SHA-1" value="38a4fadd32374bdf0e4b2bb7d976f6067d542a29" />
 			<cvParam cvRef="IMS" accession="IMS:1000030" name="continuous" value="" />
 		</fileContent>
 	</fileDescription>
@@ -42,7 +42,7 @@
 		</sample>
 	</sampleList>
 	<softwareList count="1">
-		<software id="Cardinal" version="2.6.0">
+		<software id="Cardinal" version="2.10.0">
 			<cvParam cvRef="MS" accession="MS:1000799" name="custom unreleased software tool" value="" />
 		</software>
 	</softwareList>
diff -r d64858cd48c6 -r 268f8b213cee test-data/preprocessing_results4.imzml.txt
--- a/test-data/preprocessing_results4.imzml.txt	Fri May 07 09:50:35 2021 +0000
+++ b/test-data/preprocessing_results4.imzml.txt	Sun Aug 29 07:15:11 2021 +0000
@@ -1,4 +1,4 @@
 imzML file:
 total 84
--rw-rw-r-- 1 meli meli 62696 Oct  5 19:58 ibd
--rw-rw-r-- 1 meli meli 18199 Oct  5 19:58 imzml
+-rw-rw-r-- 1 meli meli 62696 Aug 28 16:41 ibd
+-rw-rw-r-- 1 meli meli 18200 Aug 28 16:41 imzml
diff -r d64858cd48c6 -r 268f8b213cee test-data/preprocessing_results4.pdf
Binary file test-data/preprocessing_results4.pdf has changed
diff -r d64858cd48c6 -r 268f8b213cee test-data/test1.pdf
Binary file test-data/test1.pdf has changed
diff -r d64858cd48c6 -r 268f8b213cee test-data/test2.pdf
Binary file test-data/test2.pdf has changed
diff -r d64858cd48c6 -r 268f8b213cee test-data/test3.pdf
Binary file test-data/test3.pdf has changed
diff -r d64858cd48c6 -r 268f8b213cee test-data/test4.pdf
Binary file test-data/test4.pdf has changed
diff -r d64858cd48c6 -r 268f8b213cee test-data/test5.pdf
Binary file test-data/test5.pdf has changed
diff -r d64858cd48c6 -r 268f8b213cee test-data/test6.pdf
Binary file test-data/test6.pdf has changed
diff -r d64858cd48c6 -r 268f8b213cee test-data/test6.rdata
Binary file test-data/test6.rdata has changed
diff -r d64858cd48c6 -r 268f8b213cee test-data/test7.pdf
Binary file test-data/test7.pdf has changed
diff -r d64858cd48c6 -r 268f8b213cee test-data/test7.rdata
Binary file test-data/test7.rdata has changed