diff --git a/DESCRIPTION b/DESCRIPTION index cfd5327..a04e2e0 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,7 +1,7 @@ Package: EWCE Type: Package Title: Expression Weighted Celltype Enrichment -Version: 1.13.0 +Version: 1.13.1 Authors@R: c(person(given = "Alan", family = "Murphy", @@ -70,6 +70,6 @@ biocViews: GeneExpression, Transcription, DifferentialExpression, mRNAMicroarray, OneChannel, RNASeq, BiomedicalInformatics, Proteomics, Visualization, FunctionalGenomics, SingleCell -RoxygenNote: 7.2.3 +RoxygenNote: 7.3.1 Encoding: UTF-8 Config/testthat/edition: 3 diff --git a/NEWS.md b/NEWS.md index 3ef284e..9891770 100755 --- a/NEWS.md +++ b/NEWS.md @@ -1,3 +1,11 @@ +# EWCE 1.13.1 + +## Bug fixes + +* Making `ewce_plot` functionality more clear - will no fail if +`make_dendro=TRUE` and `ggdendro` is not installed or `CTD` is not provided +rather than issuing a warning. + # EWCE 1.11.5 ## Bug fixes diff --git a/R/ewce_plot.r b/R/ewce_plot.r index 6412bc7..bf86f7a 100755 --- a/R/ewce_plot.r +++ b/R/ewce_plot.r @@ -55,12 +55,17 @@ ewce_plot <- function(total_res, if(isTRUE(make_dendro)){ #### Check if ctd is provided #### if(is.null(ctd)){ - messager( - "Warning: Can only add the dendrogram when ctd is provided.", - "Setting make_dendro=FALSE.", - v=verbose) - make_dendro <- FALSE - } else { + no_ctd_msg <- paste0( + "Error: Can only add the dendrogram when ctd is provided.", + "Please either input CTD or set make_dendro=FALSE.") + stop(no_ctd_msg) + + } else if(!requireNamespace("ggdendro",quietly = TRUE)){ + no_ddg_msg <- paste0( + "Error: Can only add the dendrogram when ggdendro is installed.", + "Please either install ggdendro or set make_dendro=FALSE.") + stop(no_ddg_msg) + }else { # Find the relevant level of the CTD annotation if (length(ctd[[annotLevel]]$plotting) > 0) { annotLevel <- diff --git a/README.md b/README.md index 838ed7c..69158d0 100755 --- a/README.md +++ b/README.md @@ -1,26 +1,26 @@ `EWCE`: `E`xpression `W`eighted `C`elltype `E`nrichment ================
-[![](https://img.shields.io/badge/release%20version-1.6.0-green.svg)](https://www.bioconductor.org/packages/EWCE) -[![](https://img.shields.io/badge/download-112/month-green.svg)](https://bioconductor.org/packages/stats/bioc/EWCE) -[![](https://img.shields.io/badge/download-3669/total-green.svg)](https://bioconductor.org/packages/stats/bioc/EWCE) +[![](https://img.shields.io/badge/release%20version-1.10.2-green.svg)](https://www.bioconductor.org/packages/EWCE) +[![](https://img.shields.io/badge/download-270/month-green.svg)](https://bioconductor.org/packages/stats/bioc/EWCE) +[![](https://img.shields.io/badge/download-5999/total-green.svg)](https://bioconductor.org/packages/stats/bioc/EWCE) [![download](http://www.bioconductor.org/shields/downloads/release/EWCE.svg)](https://bioconductor.org/packages/stats/bioc/EWCE) [![License: GPL-3](https://img.shields.io/badge/license-GPL--3-blue.svg)](https://cran.r-project.org/web/licenses/GPL-3)
-[![](https://img.shields.io/badge/devel%20version-1.7.2-black.svg)](https://github.com/NathanSkene/EWCE) +[![](https://img.shields.io/badge/devel%20version-1.13.1-black.svg)](https://github.com/NathanSkene/EWCE) [![](https://img.shields.io/github/languages/code-size/NathanSkene/EWCE.svg)](https://github.com/NathanSkene/EWCE) [![](https://img.shields.io/github/last-commit/NathanSkene/EWCE.svg)](https://github.com/NathanSkene/EWCE/commits/master)
[![R build status](https://github.com/NathanSkene/EWCE/workflows/rworkflows/badge.svg)](https://github.com/NathanSkene/EWCE/actions) -[![](https://codecov.io/gh/NathanSkene/EWCE/branch/master/graph/badge.svg)](https://codecov.io/gh/NathanSkene/EWCE) +[![](https://codecov.io/gh/NathanSkene/EWCE/branch/master/graph/badge.svg)](https://app.codecov.io/gh/NathanSkene/EWCE)

Authors: Alan Murphy, Brian Schilder, Nathan Skene

-README updated: Apr-03-2023 +README updated: Jul-09-2024