Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .github/workflows/check-bioc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -159,10 +159,11 @@ jobs:
## https://stat.ethz.ch/pipermail/bioc-devel/2020-April/016675.html
## https://github.com/r-lib/remotes/issues/296
## Ideally, all dependencies should get installed in the first pass.
install.packages("remotes")
BiocManager::install("RforMassSpectrometry/Chromatograms")
install.packages("pak")
pak::local_install_dev_deps(ask = FALSE)
pak::local_install(depdendencies = TRUE)
BiocManager::install(c("rmarkdown", "BiocStyle"))
continue-on-error: true
shell: Rscript {0}

Expand Down
9 changes: 5 additions & 4 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Package: xcms
Version: 4.11.1
Version: 4.11.2
Title: LC-MS and GC-MS Data Analysis
Description: Framework for processing and visualization of chromatographically
separated and single-spectra mass spectral data. Imports from AIA/ANDI NetCDF,
Expand Down Expand Up @@ -53,7 +53,7 @@ Imports:
mzR (>= 2.25.3),
methods,
Biobase,
BiocGenerics,
BiocGenerics (>= 0.59.12),
ProtGenerics (>= 1.37.1),
lattice,
MassSpecWavelet (>= 1.66.0),
Expand All @@ -67,7 +67,8 @@ Imports:
progress,
RColorBrewer,
MetaboCoreUtils (>= 1.11.2),
data.table
data.table,
Chromatograms (>= 1.3.3)

Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

BioC devel currently has Chromatograms 1.3.2, but the PR works if installed from GH.

Suggests:
BiocStyle,
caTools,
Expand All @@ -94,7 +95,6 @@ URL: https://github.com/sneumann/xcms
BugReports: https://github.com/sneumann/xcms/issues/new
VignetteBuilder: knitr
biocViews: ImmunoOncology, MassSpectrometry, Metabolomics
RoxygenNote: 7.3.3
Encoding: UTF-8
Roxygen: list(markdown=TRUE)
Collate:
Expand Down Expand Up @@ -164,3 +164,4 @@ Collate:
'writemztab.R'
'xcmsSource.R'
'zzz.R'
Config/roxygen2/version: 8.1.0
16 changes: 12 additions & 4 deletions NAMESPACE
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ importMethodsFrom("ProtGenerics", "peaks", "chromatogram", "writeMSData",
"estimatePrecursorIntensity")
importClassesFrom("ProtGenerics", "Param")
importFrom("BiocGenerics", "updateObject", "fileName", "subset",
"dirname", "dirname<-")
## import("Biobase")
"dirname", "dirname<-")
importMethodsFrom("BiocGenerics", "group")
importFrom("Biobase", "AnnotatedDataFrame")
importClassesFrom("Biobase", "AnnotatedDataFrame")
importMethodsFrom("Biobase", "phenoData",
Expand Down Expand Up @@ -375,7 +375,6 @@ exportMethods("hasChromPeaks",
"removeIntensity",
"filterColumnsIntensityAbove",
"filterColumnsKeepTop",
"plotChromatogramsOverlay",
"transformIntensity",
"filterChromPeaks",
"filterFeatureDefinitions",
Expand All @@ -385,7 +384,9 @@ exportMethods("hasChromPeaks",
"chromPeakSpectra",
"chromPeakChromatograms",
"featureChromatograms",
"chromPeakSummary"
"chromPeakSummary",
"featureChromPeaks",
"featurePeakidx"
)

## feature grouping functions and methods.
Expand Down Expand Up @@ -467,3 +468,10 @@ export("BlankFlag")

## HDF5 storage mode
exportClasses("XcmsExperimentHdf5")
export("XcmsExperimentHdf5")

## Chromatograms
importMethodsFrom("Chromatograms", "Chromatograms")
importClassesFrom("Chromatograms", "Chromatograms")
importMethodsFrom("Chromatograms", "plotChromatogramsOverlay")
exportMethods("plotChromatogramsOverlay")
16 changes: 16 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,21 @@
# xcms 4.11

## Changes in version 4.11.2

- Add support to return chromatographic data as a `Chromatograms` object with
the `chromatogram()` method from `MsExperiment`, `XcmsExperiment` and
`XcmsExperimentHdf5` objects.
- Add support for `Chromatograms` to the `chromPeakChromatograms()` method for
`XcmsExperiment` and `XcmsExperimentHdf5` objects.
- Add support for `Chromatograms` to the `featureChromatograms()` method for
`XcmsExperiment` and `XcmsExperimentHdf5` objects.
- Add new methods `featureChromPeaks()` and `featurePeakidx()` to access the
mapping between features and chromatographic peaks.
- `loadXcmsData()` updates parameter class definitions in the object's *process
history*.
- Fix `chromPeakData<-` for `XcmsExperiment` not supporting a `DataFrame` as
input (issue #839).

## Changes in version 4.11.1

- `refineChromPeaks,MergeNeighboringPeakParam`: drop row names of intermediate
Expand Down
Loading
Loading