Skip to content

Commit efe0811

Browse files
committed
Fixed Bioconductor dependency installation issue.
1 parent af01f05 commit efe0811

9 files changed

Lines changed: 50 additions & 90 deletions

DESCRIPTION

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@ Description: CellNet is a network biology-based computational platform that more
66
Depends:
77
R (>= 3.2.2)
88
use_bioc: true
9-
biocViews: GO.db, org.Hs.eg.db, org.Mm.eg.db, preprocessCore, scater
10-
Remotes: bioc::release/scater
119
Imports:
1210
ggplot2,
1311
igraph,
@@ -16,8 +14,8 @@ Imports:
1614
randomForest,
1715
tidyr,
1816
parallel,
19-
gridExtra,
20-
scater
17+
gridExtra
18+
biocViews: GO.db, org.Hs.eg.db, org.Mm.eg.db, preprocessCore
2119
License: Artistic-2.0
2220
Encoding: UTF-8
2321
LazyData: true

R/cn_graphics.R

Lines changed: 30 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -583,6 +583,36 @@ pdf_grn_status <- function
583583

584584
}
585585

586+
#' Create multiplot - adapted from Bioconductor package "scater"
587+
#'
588+
#' @import grid
589+
#'
590+
#' @example multiplot(plotlist = grn_plot_list, layout=plot_layout)
591+
#'
592+
multiplot <- function (plotlist = NULL, layout = NULL, cols = 1)
593+
{
594+
library(grid)
595+
plots <- plotlist
596+
numPlots = length(plots)
597+
if (is.null(layout)) {
598+
layout <- matrix(seq(1, cols * ceiling(numPlots/cols)),
599+
ncol = cols, nrow = ceiling(numPlots/cols))
600+
}
601+
if (numPlots == 1) {
602+
print(plots[[1]])
603+
}
604+
else {
605+
grid.newpage()
606+
pushViewport(viewport(layout = grid.layout(nrow(layout),
607+
ncol(layout))))
608+
for (i in 1:numPlots) {
609+
matchidx <- as.data.frame(which(layout == i, arr.ind = TRUE))
610+
print(plots[[i]], vp = viewport(layout.pos.row = matchidx$row,
611+
layout.pos.col = matchidx$col))
612+
}
613+
}
614+
}
615+
586616
#' Create pdf of GRN status plots, one plot with all dlevel groups for every C/T type
587617
#'
588618
#' @param cnResQuery CellNet query results object
@@ -592,7 +622,6 @@ pdf_grn_status <- function
592622
#'
593623
#' @example plot_grn_status_by_CT(cnResQuery, cnProc, "Study_1", dlevel="description1")
594624
#'
595-
#' @import scater
596625
#'
597626
#' @export
598627
pdf_grn_status_by_CT <- function

man/cn_specGenesAll.Rd

Lines changed: 3 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

man/cn_trainNorm.Rd

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

man/fetch_salmon_indices.Rd

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

man/hm_groups.Rd

Lines changed: 0 additions & 35 deletions
This file was deleted.

man/multiplot.Rd

Lines changed: 11 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

man/rf_classPredict.Rd

Lines changed: 0 additions & 21 deletions
This file was deleted.

man/sc_makeClassifier.Rd

Lines changed: 0 additions & 25 deletions
This file was deleted.

0 commit comments

Comments
 (0)