# HG changeset patch # User galaxyp # Date 1600947354 0 # Node ID 08ebd8da780c58ec6d1c162d83fb6a8e285a8ca9 # Parent a69865da6f806262c991831e733775e340a9036b "planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/cardinal commit 6e8b69ee3aff3c93f745a5de11cc9169130f2e5e" diff -r a69865da6f80 -r 08ebd8da780c macros.xml --- a/macros.xml Wed May 13 14:27:51 2020 -0400 +++ b/macros.xml Thu Sep 24 11:35:54 2020 +0000 @@ -1,10 +1,10 @@ - 2.4.0 + 2.6.0 bioconductor-cardinal - r-base + @@ -175,7 +175,7 @@ - imzml file (upload imzml and ibd file via the "composite" function) `Introduction to the imzml format `_ - Analyze7.5 (upload hdr, img and t2m file via the "composite" function) - - Cardinal "MSImageSet" data saved as .RData + - Cardinal "MSImageSet" or "MSImagingExperiment" saved as .RData ]]> - + diff -r a69865da6f80 -r 08ebd8da780c mz_images.xml --- a/mz_images.xml Wed May 13 14:27:51 2020 -0400 +++ b/mz_images.xml Thu Sep 24 11:35:54 2020 +0000 @@ -64,7 +64,8 @@ for (mass in 1:length(inputmz)){ print(image(msidata, mz=inputmz[mass],plusminus = $plusminus_dalton, normalize.image="$normalize_image", contrast.enhance = "$image_contrast", - smooth.image = "$image_smoothing", strip=$strip, colorkey=$colorkey, colorscale=$colorscale, ylim= c(maximumy,minimumy)))} + smooth.image = "$image_smoothing", colorkey=$colorkey, colorscale=$colorscale, ylim= c(maximumy,minimumy))) + title(inputnames[mass], adj = 0.5, line = 1)} ## optional svg output with original coordinates @@ -99,7 +100,7 @@ legend("$overlay_cond.legend_position", fill=colourvector, - legend=as.numeric(sort(as.character(inputmz)))) + legend=as.numeric(inputmz)) #end if } else {print("The input m/z were invalid")} @@ -134,7 +135,6 @@ - @@ -182,7 +182,6 @@ - @@ -195,7 +194,6 @@ - @@ -207,7 +205,6 @@ - @@ -219,7 +216,6 @@ - @@ -228,7 +224,7 @@ - + diff -r a69865da6f80 -r 08ebd8da780c test-data/112_auto_combined.ibd Binary file test-data/112_auto_combined.ibd has changed diff -r a69865da6f80 -r 08ebd8da780c test-data/112_auto_combined.imzml --- a/test-data/112_auto_combined.imzml Wed May 13 14:27:51 2020 -0400 +++ b/test-data/112_auto_combined.imzml Thu Sep 24 11:35:54 2020 +0000 @@ -9,8 +9,8 @@ - - + + @@ -42,7 +42,7 @@ - + diff -r a69865da6f80 -r 08ebd8da780c test-data/112_auto_combined.imzml.txt --- a/test-data/112_auto_combined.imzml.txt Wed May 13 14:27:51 2020 -0400 +++ b/test-data/112_auto_combined.imzml.txt Thu Sep 24 11:35:54 2020 +0000 @@ -1,4 +1,4 @@ imzML file: total 556 --rw-r--r-- 1 meli meli 537552 Apr 21 12:46 ibd --rw-r--r-- 1 meli meli 27497 Apr 21 12:46 imzml +-rw-rw-r-- 1 meli meli 537552 Aug 30 13:50 ibd +-rw-rw-r-- 1 meli meli 27497 Aug 30 13:50 imzml diff -r a69865da6f80 -r 08ebd8da780c test-data/112_auto_combined_QC.pdf Binary file test-data/112_auto_combined_QC.pdf has changed diff -r a69865da6f80 -r 08ebd8da780c test-data/123_combined.ibd Binary file test-data/123_combined.ibd has changed diff -r a69865da6f80 -r 08ebd8da780c test-data/123_combined.imzml --- a/test-data/123_combined.imzml Wed May 13 14:27:51 2020 -0400 +++ b/test-data/123_combined.imzml Thu Sep 24 11:35:54 2020 +0000 @@ -9,8 +9,8 @@ - - + + @@ -42,7 +42,7 @@ - + diff -r a69865da6f80 -r 08ebd8da780c test-data/123_combined.imzml.txt --- a/test-data/123_combined.imzml.txt Wed May 13 14:27:51 2020 -0400 +++ b/test-data/123_combined.imzml.txt Thu Sep 24 11:35:54 2020 +0000 @@ -1,4 +1,4 @@ imzML file: total 452 --rw-r--r-- 1 meli meli 436764 Apr 21 12:41 ibd --rw-r--r-- 1 meli meli 22855 Apr 21 12:41 imzml +-rw-rw-r-- 1 meli meli 436764 Aug 30 13:46 ibd +-rw-rw-r-- 1 meli meli 22855 Aug 30 13:46 imzml diff -r a69865da6f80 -r 08ebd8da780c test-data/123_combined_QC.pdf Binary file test-data/123_combined_QC.pdf has changed diff -r a69865da6f80 -r 08ebd8da780c test-data/123_combined_auto.ibd Binary file test-data/123_combined_auto.ibd has changed diff -r a69865da6f80 -r 08ebd8da780c test-data/123_combined_auto.imzml --- a/test-data/123_combined_auto.imzml Wed May 13 14:27:51 2020 -0400 +++ b/test-data/123_combined_auto.imzml Thu Sep 24 11:35:54 2020 +0000 @@ -9,8 +9,8 @@ - - + + @@ -42,7 +42,7 @@ - + diff -r a69865da6f80 -r 08ebd8da780c test-data/123_combined_auto.imzml.txt --- a/test-data/123_combined_auto.imzml.txt Wed May 13 14:27:51 2020 -0400 +++ b/test-data/123_combined_auto.imzml.txt Thu Sep 24 11:35:54 2020 +0000 @@ -1,4 +1,4 @@ imzML file: total 452 --rw-r--r-- 1 meli meli 436764 Apr 21 12:43 ibd --rw-r--r-- 1 meli meli 22860 Apr 21 12:43 imzml +-rw-rw-r-- 1 meli meli 436764 Aug 30 13:48 ibd +-rw-rw-r-- 1 meli meli 22860 Aug 30 13:48 imzml diff -r a69865da6f80 -r 08ebd8da780c test-data/123_combined_auto.pdf Binary file test-data/123_combined_auto.pdf has changed diff -r a69865da6f80 -r 08ebd8da780c test-data/12_combined.ibd Binary file test-data/12_combined.ibd has changed diff -r a69865da6f80 -r 08ebd8da780c test-data/12_combined.imzml --- a/test-data/12_combined.imzml Wed May 13 14:27:51 2020 -0400 +++ b/test-data/12_combined.imzml Thu Sep 24 11:35:54 2020 +0000 @@ -9,8 +9,8 @@ - - + + @@ -42,7 +42,7 @@ - + diff -r a69865da6f80 -r 08ebd8da780c test-data/12_combined.imzml.txt --- a/test-data/12_combined.imzml.txt Wed May 13 14:27:51 2020 -0400 +++ b/test-data/12_combined.imzml.txt Thu Sep 24 11:35:54 2020 +0000 @@ -1,4 +1,4 @@ imzML file: total 352 --rw-r--r-- 1 meli meli 335976 Apr 21 12:45 ibd --rw-r--r-- 1 meli meli 18225 Apr 21 12:45 imzml +-rw-rw-r-- 1 meli meli 335976 Aug 30 13:49 ibd +-rw-rw-r-- 1 meli meli 18225 Aug 30 13:49 imzml diff -r a69865da6f80 -r 08ebd8da780c test-data/12_combined_QC.pdf Binary file test-data/12_combined_QC.pdf has changed diff -r a69865da6f80 -r 08ebd8da780c test-data/2123_auto_combined.ibd Binary file test-data/2123_auto_combined.ibd has changed diff -r a69865da6f80 -r 08ebd8da780c test-data/2123_auto_combined.imzml --- a/test-data/2123_auto_combined.imzml Wed May 13 14:27:51 2020 -0400 +++ b/test-data/2123_auto_combined.imzml Thu Sep 24 11:35:54 2020 +0000 @@ -9,8 +9,8 @@ - - + + @@ -42,7 +42,7 @@ - + diff -r a69865da6f80 -r 08ebd8da780c test-data/2123_auto_combined.imzml.txt --- a/test-data/2123_auto_combined.imzml.txt Wed May 13 14:27:51 2020 -0400 +++ b/test-data/2123_auto_combined.imzml.txt Thu Sep 24 11:35:54 2020 +0000 @@ -1,4 +1,4 @@ imzML file: total 656 --rw-r--r-- 1 meli meli 638340 Apr 21 12:46 ibd --rw-r--r-- 1 meli meli 32132 Apr 21 12:46 imzml +-rw-rw-r-- 1 meli meli 638340 Aug 30 13:50 ibd +-rw-rw-r-- 1 meli meli 32132 Aug 30 13:50 imzml diff -r a69865da6f80 -r 08ebd8da780c test-data/2123_auto_combined_QC.pdf Binary file test-data/2123_auto_combined_QC.pdf has changed diff -r a69865da6f80 -r 08ebd8da780c test-data/Heatmaps_LM8_file16.pdf Binary file test-data/Heatmaps_LM8_file16.pdf has changed diff -r a69865da6f80 -r 08ebd8da780c test-data/Heatmaps_analyze75.pdf Binary file test-data/Heatmaps_analyze75.pdf has changed diff -r a69865da6f80 -r 08ebd8da780c test-data/Heatmaps_imzml.pdf Binary file test-data/Heatmaps_imzml.pdf has changed diff -r a69865da6f80 -r 08ebd8da780c test-data/Heatmaps_processed.pdf Binary file test-data/Heatmaps_processed.pdf has changed diff -r a69865da6f80 -r 08ebd8da780c test-data/Heatmaps_rdata.pdf Binary file test-data/Heatmaps_rdata.pdf has changed diff -r a69865da6f80 -r 08ebd8da780c test-data/Plot_analyze75.pdf Binary file test-data/Plot_analyze75.pdf has changed diff -r a69865da6f80 -r 08ebd8da780c test-data/Plot_analyze75_allpixels.pdf Binary file test-data/Plot_analyze75_allpixels.pdf has changed diff -r a69865da6f80 -r 08ebd8da780c test-data/Plot_imzml.pdf Binary file test-data/Plot_imzml.pdf has changed diff -r a69865da6f80 -r 08ebd8da780c test-data/Plot_picked.pdf Binary file test-data/Plot_picked.pdf has changed diff -r a69865da6f80 -r 08ebd8da780c test-data/Plot_processed.pdf Binary file test-data/Plot_processed.pdf has changed diff -r a69865da6f80 -r 08ebd8da780c test-data/Plot_rdata.pdf Binary file test-data/Plot_rdata.pdf has changed diff -r a69865da6f80 -r 08ebd8da780c test-data/QC_analyze75.pdf Binary file test-data/QC_analyze75.pdf has changed diff -r a69865da6f80 -r 08ebd8da780c test-data/QC_empty_spectra.pdf Binary file test-data/QC_empty_spectra.pdf has changed diff -r a69865da6f80 -r 08ebd8da780c test-data/QC_imzml.pdf Binary file test-data/QC_imzml.pdf has changed diff -r a69865da6f80 -r 08ebd8da780c test-data/QC_rdata.pdf Binary file test-data/QC_rdata.pdf has changed diff -r a69865da6f80 -r 08ebd8da780c test-data/analyze75_filtered2.pdf Binary file test-data/analyze75_filtered2.pdf has changed diff -r a69865da6f80 -r 08ebd8da780c test-data/centroids_proc.pdf Binary file test-data/centroids_proc.pdf has changed diff -r a69865da6f80 -r 08ebd8da780c test-data/centroids_rdata.pdf Binary file test-data/centroids_rdata.pdf has changed diff -r a69865da6f80 -r 08ebd8da780c test-data/cluster_skm.RData Binary file test-data/cluster_skm.RData has changed diff -r a69865da6f80 -r 08ebd8da780c test-data/imzml_filtered3.pdf Binary file test-data/imzml_filtered3.pdf has changed diff -r a69865da6f80 -r 08ebd8da780c test-data/imzml_filtered4.pdf Binary file test-data/imzml_filtered4.pdf has changed diff -r a69865da6f80 -r 08ebd8da780c test-data/imzml_filtered5.pdf Binary file test-data/imzml_filtered5.pdf has changed diff -r a69865da6f80 -r 08ebd8da780c test-data/imzml_filtered8.pdf Binary file test-data/imzml_filtered8.pdf has changed diff -r a69865da6f80 -r 08ebd8da780c test-data/kmeans_analyze.pdf Binary file test-data/kmeans_analyze.pdf has changed diff -r a69865da6f80 -r 08ebd8da780c test-data/out3.ibd Binary file test-data/out3.ibd has changed diff -r a69865da6f80 -r 08ebd8da780c test-data/out3.imzml --- a/test-data/out3.imzml Wed May 13 14:27:51 2020 -0400 +++ b/test-data/out3.imzml Thu Sep 24 11:35:54 2020 +0000 @@ -9,8 +9,8 @@ - - + + @@ -42,7 +42,7 @@ - + diff -r a69865da6f80 -r 08ebd8da780c test-data/out3.imzml.txt --- a/test-data/out3.imzml.txt Wed May 13 14:27:51 2020 -0400 +++ b/test-data/out3.imzml.txt Thu Sep 24 11:35:54 2020 +0000 @@ -1,4 +1,4 @@ imzML file: total 24 --rw-r--r-- 1 meli meli 9616 Mär 24 20:25 ibd --rw-r--r-- 1 meli meli 8958 Mär 24 20:25 imzml +-rw-rw-r-- 1 meli meli 9616 Aug 23 17:39 ibd +-rw-rw-r-- 1 meli meli 8958 Aug 23 17:39 imzml diff -r a69865da6f80 -r 08ebd8da780c test-data/out4.ibd Binary file test-data/out4.ibd has changed diff -r a69865da6f80 -r 08ebd8da780c test-data/out4.imzml --- a/test-data/out4.imzml Wed May 13 14:27:51 2020 -0400 +++ b/test-data/out4.imzml Thu Sep 24 11:35:54 2020 +0000 @@ -9,8 +9,8 @@ - - + + @@ -42,7 +42,7 @@ - + diff -r a69865da6f80 -r 08ebd8da780c test-data/out4.imzml.txt --- a/test-data/out4.imzml.txt Wed May 13 14:27:51 2020 -0400 +++ b/test-data/out4.imzml.txt Thu Sep 24 11:35:54 2020 +0000 @@ -1,4 +1,4 @@ imzML file: total 44 --rw-r--r-- 1 meli meli 28792 Mär 24 19:23 ibd --rw-r--r-- 1 meli meli 12046 Mär 24 19:23 imzml +-rw-rw-r-- 1 meli meli 28792 Aug 23 17:39 ibd +-rw-rw-r-- 1 meli meli 12046 Aug 23 17:39 imzml diff -r a69865da6f80 -r 08ebd8da780c test-data/out5.ibd Binary file test-data/out5.ibd has changed diff -r a69865da6f80 -r 08ebd8da780c test-data/out5.imzml --- a/test-data/out5.imzml Wed May 13 14:27:51 2020 -0400 +++ b/test-data/out5.imzml Thu Sep 24 11:35:54 2020 +0000 @@ -9,8 +9,8 @@ - - + + @@ -42,7 +42,7 @@ - + diff -r a69865da6f80 -r 08ebd8da780c test-data/out5.imzml.txt --- a/test-data/out5.imzml.txt Wed May 13 14:27:51 2020 -0400 +++ b/test-data/out5.imzml.txt Thu Sep 24 11:35:54 2020 +0000 @@ -1,4 +1,4 @@ imzML file: total 20 --rw-r--r-- 1 meli meli 380 Mär 24 19:24 ibd --rw-r--r-- 1 meli meli 13525 Mär 24 19:24 imzml +-rw-rw-r-- 1 meli meli 380 Aug 23 17:40 ibd +-rw-rw-r-- 1 meli meli 13525 Aug 23 17:40 imzml diff -r a69865da6f80 -r 08ebd8da780c test-data/out6.ibd Binary file test-data/out6.ibd has changed diff -r a69865da6f80 -r 08ebd8da780c test-data/out6.imzml --- a/test-data/out6.imzml Wed May 13 14:27:51 2020 -0400 +++ b/test-data/out6.imzml Thu Sep 24 11:35:54 2020 +0000 @@ -9,8 +9,8 @@ - - + + @@ -42,7 +42,7 @@ - + diff -r a69865da6f80 -r 08ebd8da780c test-data/out6.imzml.txt --- a/test-data/out6.imzml.txt Wed May 13 14:27:51 2020 -0400 +++ b/test-data/out6.imzml.txt Thu Sep 24 11:35:54 2020 +0000 @@ -1,4 +1,4 @@ imzML file: total 164 --rw-r--r-- 1 meli meli 146896 Mär 24 19:25 ibd --rw-r--r-- 1 meli meli 18221 Mär 24 19:25 imzml +-rw-rw-r-- 1 meli meli 146896 Aug 23 17:41 ibd +-rw-rw-r-- 1 meli meli 18221 Aug 23 17:41 imzml diff -r a69865da6f80 -r 08ebd8da780c test-data/out7.ibd Binary file test-data/out7.ibd has changed diff -r a69865da6f80 -r 08ebd8da780c test-data/out7.imzml --- a/test-data/out7.imzml Wed May 13 14:27:51 2020 -0400 +++ b/test-data/out7.imzml Thu Sep 24 11:35:54 2020 +0000 @@ -9,8 +9,8 @@ - - + + @@ -42,7 +42,7 @@ - + diff -r a69865da6f80 -r 08ebd8da780c test-data/out7.imzml.txt --- a/test-data/out7.imzml.txt Wed May 13 14:27:51 2020 -0400 +++ b/test-data/out7.imzml.txt Thu Sep 24 11:35:54 2020 +0000 @@ -1,4 +1,4 @@ imzML file: total 116 --rw-r--r-- 1 meli meli 95976 Mär 24 19:26 ibd --rw-r--r-- 1 meli meli 18199 Mär 24 19:26 imzml +-rw-rw-r-- 1 meli meli 95976 Aug 23 17:41 ibd +-rw-rw-r-- 1 meli meli 18199 Aug 23 17:41 imzml diff -r a69865da6f80 -r 08ebd8da780c test-data/out8.ibd Binary file test-data/out8.ibd has changed diff -r a69865da6f80 -r 08ebd8da780c test-data/out8.imzml --- a/test-data/out8.imzml Wed May 13 14:27:51 2020 -0400 +++ b/test-data/out8.imzml Thu Sep 24 11:35:54 2020 +0000 @@ -9,8 +9,8 @@ - - + + @@ -42,7 +42,7 @@ - + diff -r a69865da6f80 -r 08ebd8da780c test-data/out8.imzml.txt --- a/test-data/out8.imzml.txt Wed May 13 14:27:51 2020 -0400 +++ b/test-data/out8.imzml.txt Thu Sep 24 11:35:54 2020 +0000 @@ -1,4 +1,4 @@ imzML file: total 348 --rw-r--r-- 1 meli meli 335976 Mär 24 19:27 ibd --rw-r--r-- 1 meli meli 12402 Mär 24 19:27 imzml +-rw-rw-r-- 1 meli meli 335976 Aug 23 17:42 ibd +-rw-rw-r-- 1 meli meli 12402 Aug 23 17:42 imzml diff -r a69865da6f80 -r 08ebd8da780c test-data/pca_imzml.pdf Binary file test-data/pca_imzml.pdf has changed diff -r a69865da6f80 -r 08ebd8da780c test-data/picked.ibd Binary file test-data/picked.ibd has changed diff -r a69865da6f80 -r 08ebd8da780c test-data/picked.imzml --- a/test-data/picked.imzml Wed May 13 14:27:51 2020 -0400 +++ b/test-data/picked.imzml Thu Sep 24 11:35:54 2020 +0000 @@ -8,8 +8,8 @@ - - + + diff -r a69865da6f80 -r 08ebd8da780c test-data/picked.imzml.txt --- a/test-data/picked.imzml.txt Wed May 13 14:27:51 2020 -0400 +++ b/test-data/picked.imzml.txt Thu Sep 24 11:35:54 2020 +0000 @@ -1,4 +1,4 @@ imzML file: total 192 --rw-r--r-- 1 meli meli 157984 Apr 21 12:42 ibd --rw-r--r-- 1 meli meli 35012 Apr 21 12:42 imzml +-rw-rw-r-- 1 meli meli 157984 Aug 30 13:47 ibd +-rw-rw-r-- 1 meli meli 35012 Aug 30 13:47 imzml diff -r a69865da6f80 -r 08ebd8da780c test-data/picked_QC.pdf Binary file test-data/picked_QC.pdf has changed diff -r a69865da6f80 -r 08ebd8da780c test-data/preprocessing_results4.imzml --- a/test-data/preprocessing_results4.imzml Wed May 13 14:27:51 2020 -0400 +++ b/test-data/preprocessing_results4.imzml Thu Sep 24 11:35:54 2020 +0000 @@ -9,8 +9,8 @@ - - + + @@ -42,7 +42,7 @@ - + @@ -86,15 +86,15 @@ - - + + - - - + + + @@ -115,15 +115,15 @@ - - + + - - - + + + @@ -144,15 +144,15 @@ - - + + - - - + + + @@ -173,15 +173,15 @@ - - + + - - - + + + @@ -202,15 +202,15 @@ - - + + - - - + + + @@ -231,15 +231,15 @@ - - + + - - - + + + @@ -260,15 +260,15 @@ - - + + - - - + + + @@ -289,15 +289,15 @@ - - + + - - - + + + @@ -318,15 +318,15 @@ - - + + - - - + + + diff -r a69865da6f80 -r 08ebd8da780c test-data/preprocessing_results4.imzml.txt --- a/test-data/preprocessing_results4.imzml.txt Wed May 13 14:27:51 2020 -0400 +++ b/test-data/preprocessing_results4.imzml.txt Thu Sep 24 11:35:54 2020 +0000 @@ -1,4 +1,4 @@ imzML file: total 84 --rw-r--r-- 1 meli meli 63256 Mai 10 17:40 ibd --rw-r--r-- 1 meli meli 18199 Mai 10 17:40 imzml +-rw-rw-r-- 1 meli meli 62696 Sep 20 11:48 ibd +-rw-rw-r-- 1 meli meli 18199 Sep 20 11:48 imzml diff -r a69865da6f80 -r 08ebd8da780c test-data/preprocessing_results4.pdf Binary file test-data/preprocessing_results4.pdf has changed diff -r a69865da6f80 -r 08ebd8da780c test-data/rdata_notfiltered.pdf Binary file test-data/rdata_notfiltered.pdf has changed diff -r a69865da6f80 -r 08ebd8da780c test-data/test1.pdf Binary file test-data/test1.pdf has changed diff -r a69865da6f80 -r 08ebd8da780c test-data/test2.pdf Binary file test-data/test2.pdf has changed diff -r a69865da6f80 -r 08ebd8da780c test-data/test2.rdata Binary file test-data/test2.rdata has changed diff -r a69865da6f80 -r 08ebd8da780c test-data/test3.pdf Binary file test-data/test3.pdf has changed diff -r a69865da6f80 -r 08ebd8da780c test-data/test4.pdf Binary file test-data/test4.pdf has changed diff -r a69865da6f80 -r 08ebd8da780c test-data/test4.rdata Binary file test-data/test4.rdata has changed diff -r a69865da6f80 -r 08ebd8da780c test-data/test5.pdf Binary file test-data/test5.pdf has changed diff -r a69865da6f80 -r 08ebd8da780c test-data/test6.pdf Binary file test-data/test6.pdf has changed diff -r a69865da6f80 -r 08ebd8da780c test-data/test6.rdata Binary file test-data/test6.rdata has changed diff -r a69865da6f80 -r 08ebd8da780c test-data/test7.pdf Binary file test-data/test7.pdf has changed diff -r a69865da6f80 -r 08ebd8da780c test-data/test7.rdata Binary file test-data/test7.rdata has changed