@ -1,24 +1,18 @@ |
|||
language: c |
|||
language: r |
|||
r: |
|||
- oldrel |
|||
- release |
|||
- devel |
|||
warnings_are_errors: true |
|||
cache: packages |
|||
r_check_revdep: false |
|||
sudo: required |
|||
|
|||
before_install: |
|||
- curl -OL http://raw.github.com/craigcitro/r-travis/master/scripts/travis-tool.sh |
|||
- chmod 755 ./travis-tool.sh |
|||
- ./travis-tool.sh bootstrap |
|||
env: |
|||
global: |
|||
- CRAN: http://cran.rstudio.com |
|||
|
|||
install: |
|||
- ./travis-tool.sh r_binary_install RColorBrewer |
|||
- ./travis-tool.sh install_deps |
|||
|
|||
script: ./travis-tool.sh run_tests |
|||
|
|||
on_failure: |
|||
- ./travis-tool.sh dump_logs |
|||
|
|||
branches: |
|||
except: |
|||
- /-expt$/ |
|||
notifications: |
|||
email: |
|||
on_success: change |
|||
on_failure: change |
|||
notifications: |
|||
email: |
|||
on_success: change |
|||
on_failure: change |
@ -0,0 +1,33 @@ |
|||
### News |
|||
|
|||
waffle 0.7.0 |
|||
- yet more fixes for latest ggplot2 2.x |
|||
- made factor-level keeping a parameter (TRUE by default) |
|||
|
|||
waffle 0.6.0 |
|||
- keep factor levels; improve default aesthetics |
|||
|
|||
waffle 0.5.1 |
|||
- even moar improved ggplot2 compatibility |
|||
|
|||
waffle 0.5 |
|||
- new & improved ggplot2 compatibility |
|||
|
|||
waffle 0.4 |
|||
- added `use_glyph()` and `glyph_size()` to `waffle()` so you can now make isotype pictograms |
|||
|
|||
waffle 0.3 |
|||
- added a `pad parameter to `waffle to make it easier to align plots |
|||
- added `iron to make it easier to do the alignment |
|||
|
|||
waffle 0.2.3 |
|||
- nulled many margins and made the use of `coord_equal optional via the `equal parameter |
|||
|
|||
waffle 0.2.1 |
|||
- added Travis tests to ensure independent package build confirmation |
|||
|
|||
waffle 0.2 |
|||
- added `as_rcdimple thx to Kent Russell (only in non-CRAN version) |
|||
|
|||
waffle 0.1 |
|||
- initial release |
@ -0,0 +1 @@ |
|||
utils::globalVariables(c("x", "y", "value")) |
@ -0,0 +1,77 @@ |
|||
# VIA: http://stackoverflow.com/q/13294952/1457051 |
|||
|
|||
rbind_gtable_max <- function(...) { |
|||
|
|||
gtl <- list(...) |
|||
|
|||
stopifnot(all(sapply(gtl, is.gtable))) |
|||
|
|||
bind2 <- function (x, y) { |
|||
|
|||
stopifnot(ncol(x) == ncol(y)) |
|||
|
|||
if (nrow(x) == 0) return(y) |
|||
if (nrow(y) == 0) return(x) |
|||
|
|||
y$layout$t <- y$layout$t + nrow(x) |
|||
y$layout$b <- y$layout$b + nrow(x) |
|||
x$layout <- rbind(x$layout, y$layout) |
|||
|
|||
x$heights <- insert_unit(x$heights, y$heights) |
|||
x$rownames <- c(x$rownames, y$rownames) |
|||
x$widths <- unit.pmax(x$widths, y$widths) |
|||
x$grobs <- append(x$grobs, y$grobs) |
|||
|
|||
x |
|||
|
|||
} |
|||
Reduce(bind2, gtl) |
|||
|
|||
} |
|||
|
|||
cbind_gtable_max <- function(...) { |
|||
|
|||
gtl <- list(...) |
|||
|
|||
stopifnot(all(sapply(gtl, is.gtable))) |
|||
|
|||
bind2 <- function (x, y) { |
|||
|
|||
stopifnot(nrow(x) == nrow(y)) |
|||
|
|||
if (ncol(x) == 0) return(y) |
|||
if (ncol(y) == 0) return(x) |
|||
|
|||
y$layout$l <- y$layout$l + ncol(x) |
|||
y$layout$r <- y$layout$r + ncol(x) |
|||
x$layout <- rbind(x$layout, y$layout) |
|||
|
|||
x$widths <- insert_unit(x$widths, y$widths) |
|||
x$colnames <- c(x$colnames, y$colnames) |
|||
x$heights <- unit.pmax(x$heights, y$heights) |
|||
x$grobs <- append(x$grobs, y$grobs) |
|||
|
|||
x |
|||
|
|||
} |
|||
|
|||
Reduce(bind2, gtl) |
|||
|
|||
} |
|||
|
|||
insert_unit <- function (x, values, after = length(x)) { |
|||
|
|||
lengx <- length(x) |
|||
|
|||
if (lengx == 0) return(values) |
|||
if (length(values) == 0) return(x) |
|||
|
|||
if (after <= 0) { |
|||
unit.c(values, x) |
|||
} else if (after >= lengx) { |
|||
unit.c(x, values) |
|||
} else { |
|||
unit.c(x[1L:after], values, x[(after + 1L):lengx]) |
|||
} |
|||
|
|||
} |
Before Width: | Height: | Size: 118 KiB After Width: | Height: | Size: 116 KiB |
Before Width: | Height: | Size: 30 KiB After Width: | Height: | Size: 32 KiB |
Before Width: | Height: | Size: 23 KiB After Width: | Height: | Size: 22 KiB |
Before Width: | Height: | Size: 31 KiB After Width: | Height: | Size: 31 KiB |
Before Width: | Height: | Size: 23 KiB After Width: | Height: | Size: 22 KiB |
Before Width: | Height: | Size: 45 KiB After Width: | Height: | Size: 44 KiB |
After Width: | Height: | Size: 30 KiB |
Before Width: | Height: | Size: 32 KiB After Width: | Height: | Size: 31 KiB |
@ -1,12 +1,11 @@ |
|||
## Why? |
|||
* New functionality (isotype picotgram glphys) |
|||
* No longer drops factor levels (bugfix) |
|||
* Latest revs to ggplot2 broke functionality |
|||
* Depends on ggplot2 >= 2.0.0 now |
|||
|
|||
## Test environments |
|||
* local OS X install, R 3.3.1 & R-devel |
|||
* ubuntu 12.04 (on travis-ci) |
|||
* local OS X install, R 3.3.2 & R-devel |
|||
* ubuntu 12.04 (on travis-ci), R-devel, R-release, R-oldrel |
|||
* win-builder (devel and release) |
|||
|
|||
## R CMD check results |
|||
* glyphs, isotype & pictograms are properly spelled |
|||
* moving personal e-mail address |