Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Dev #82

Merged
merged 9 commits into from
Oct 26, 2021
Merged

Dev #82

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
9a645e7
first attempt
stemangiola Sep 28, 2021
3c89a21
merge dev and master
stemangiola Sep 28, 2021
3a6cb61
edit font size
stemangiola Oct 14, 2021
b311e57
added test
stemangiola Oct 14, 2021
1f4ff76
update README
stemangiola Oct 14, 2021
716955f
Merge pull request #81 from stemangiola/ellipse-for-annotation
stemangiola Oct 14, 2021
6aadd80
Update DESCRIPTION
stemangiola Oct 14, 2021
fdbf1bd
fix CHECK docs
stemangiola Oct 15, 2021
905c48c
Merge branch 'dev' of github.com:stemangiola/tidyHeatmap into dev
stemangiola Oct 15, 2021
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
2 changes: 1 addition & 1 deletion DESCRIPTION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Type: Package
Package: tidyHeatmap
Title: A Tidy Implementation of Heatmap
Version: 1.3.1
Version: 1.4.0
Authors@R:
c(person(given = "Stefano",
family = "Mangiola",
Expand Down
5 changes: 3 additions & 2 deletions R/functions.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,6 +289,7 @@ add_grouping = function(my_input_heatmap){
#' @param type A character vector of the set c(\"tile\", \"point\", \"bar\", \"line\")
#' @param palette_discrete A list of character vectors. This is the list of palettes that will be used for horizontal and vertical discrete annotations. The discrete classification of annotations depends on the column type of your input tibble (e.g., character and factor).
#' @param palette_continuous A list of character vectors. This is the list of palettes that will be used for horizontal and vertical continuous annotations. The continuous classification of annotations depends on the column type of your input tibble (e.g., integer, numerical, double).
#' @param ... The arguments that will be passed to top_annotation or left_annotation of the ComplexHeatmap container
#'
#' @details To be added.
#'
Expand All @@ -303,7 +304,7 @@ add_annotation = function(my_input_heatmap,
annotation,
type = rep("tile", length(quo_names(annotation))),
palette_discrete = list(),
palette_continuous = list()) {
palette_continuous = list(), ...) {

# Solve CRAN note
annot_type = NULL
Expand Down Expand Up @@ -363,7 +364,7 @@ add_annotation = function(my_input_heatmap,
get_top_left_annotation( !!.horizontal,
!!.vertical,
!!.abundance,
!!annotation, palette_annotation, type, x_y_annot_cols)
!!annotation, palette_annotation, type, x_y_annot_cols, ...)

# Number of grouping
how_many_discrete = .data_annot %>% filter(annot_type=="discrete") %>% nrow
Expand Down
Loading