From 1ff605b939d98779fb8c0e23af9605cf20e92b3b Mon Sep 17 00:00:00 2001 From: Jan Stanstrup <stanstrup@gmail.com> Date: Wed, 20 Sep 2017 11:57:50 +0200 Subject: [PATCH 1/2] Fixed bug in getPeaklist I think this is what you meant to do ;) --- R/xsAnnotate.R | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/R/xsAnnotate.R b/R/xsAnnotate.R index 7152345..fa3819a 100644 --- a/R/xsAnnotate.R +++ b/R/xsAnnotate.R @@ -1262,7 +1262,7 @@ getpspectra <- function(object, grp=NULL){ setGeneric("getPeaklist", function(object, intval="into") standardGeneric("getPeaklist")) setMethod("getPeaklist", "xsAnnotate", function(object, intval="into") { - if (! intval %in% colnames(peaks(object(xcmsSet)))) { + if (! intval %in% colnames(peaks(object@xcmsSet))) { stop("unknown intensity value!") } From fe7b36f76bd7b7bb400028aae9f53a3cea3933a2 Mon Sep 17 00:00:00 2001 From: Steffen Neumann <sneumann@ipb-halle.de> Date: Tue, 26 Sep 2017 08:13:19 +0200 Subject: [PATCH 2/2] Bump version, update NEWS --- DESCRIPTION | 2 +- inst/NEWS | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/DESCRIPTION b/DESCRIPTION index 9a6a0e0..31c784e 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,5 +1,5 @@ Package: CAMERA -Version: 1.33.2 +Version: 1.33.3 Date: 2017-09-26 Title: Collection of annotation related methods for mass spectrometry data Author: Carsten Kuhl, Ralf Tautenhahn, Hendrik Treutler, Steffen Neumann {ckuhl|htreutle|sneumann}@ipb-halle.de, rtautenh@scripps.edu diff --git a/inst/NEWS b/inst/NEWS index da2063b..1743dc2 100644 --- a/inst/NEWS +++ b/inst/NEWS @@ -1,3 +1,10 @@ +CHANGES IN VERSION 1.33.3 +------------------------- + +BUG FIXES + + o Fix getPeaklist not pulling rownames correctly, closing #22, thanks to Jan Stanstrup + CHANGES IN VERSION 1.33.2 -------------------------