Skip to content

Toby rect #178

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

Merged
merged 18 commits into from
Mar 18, 2015
Merged

Toby rect #178

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
e97ee3a
rect test fails
tdhock Mar 7, 2015
0a208f5
test rect fill type mode NA
tdhock Mar 7, 2015
214c376
treat rect as polygon
tdhock Mar 7, 2015
b0878ae
rect tests fail
tdhock Mar 10, 2015
a16b6af
fix y test
tdhock Mar 13, 2015
7b39c3e
special case for polygons and rects inside of group2NA
tdhock Mar 13, 2015
787596f
refactor polygon tests
tdhock Mar 13, 2015
426d89b
first.color -> blue.color
tdhock Mar 13, 2015
52827b6
treat rects as basic polygons, process polygons using group2NA
tdhock Mar 13, 2015
8dcd324
merge conflicts
tdhock Mar 13, 2015
e977416
more rect tests
tdhock Mar 16, 2015
80b1312
more polygon tests
tdhock Mar 16, 2015
8b03e90
test fill=tozerox
tdhock Mar 16, 2015
870e5f8
clarify retrace.first.points only when basic polygon
tdhock Mar 16, 2015
8ac0518
typo
tdhock Mar 16, 2015
49d027a
anyNA
tdhock Mar 18, 2015
a413a8e
rect- prefix
tdhock Mar 18, 2015
10c8bcc
NEWS/VERSION
tdhock Mar 18, 2015
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 @@
Package: plotly
Type: Package
Title: Interactive, publication-quality graphs online.
Version: 0.5.25
Version: 0.5.26
Authors@R: c(person("Chris", "Parmer", role = c("aut", "cre"),
email = "chris@plot.ly"),
person("Scott", "Chamberlain", role = "aut",
Expand Down
4 changes: 4 additions & 0 deletions NEWS
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
0.5.26 -- 18 Mar 2015

Implemented geom_rect #178

0.5.25 -- 10 March 2015

Implemented geom_smooth() #183
Expand Down
6 changes: 5 additions & 1 deletion R/ggplotly.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,11 @@ markLegends <-
# list(point=c("colour", "fill", "shape", "size"),
list(point=c("colour", "fill", "shape"),
path=c("linetype", "size", "colour", "shape"),
polygon=c("colour", "fill", "linetype", "size", "group"),
## NOTE: typically "group" should not be present here, since
## that would mean creating a separate plotly legend for each
## group, even when they have the exact same visual
## characteristics and could be drawn using just 1 trace!
polygon=c("colour", "fill", "linetype", "size"),
bar=c("colour", "fill"),
errorbar=c("colour", "linetype"),
errorbarh=c("colour", "linetype"),
Expand Down
64 changes: 47 additions & 17 deletions R/trace_generation.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -322,14 +322,18 @@ toBasic <- list(
})
group2NA(g, "path")
},
polygon=function(g){
if(is.null(g$params$fill)){
g
}else if(is.na(g$params$fill)){
group2NA(g, "path")
}else{
g
}
rect=function(g){
g$data$group <- 1:nrow(g$data)
used <- c("xmin", "ymin", "xmax", "ymax")
others <- g$data[!names(g$data) %in% used]
g$data <- with(g$data, {
rbind(cbind(x=xmin, y=ymin, others),
cbind(x=xmin, y=ymax, others),
cbind(x=xmax, y=ymax, others),
Copy link
Contributor Author

Choose a reason for hiding this comment

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

geom_polygons are now treated as a basic type so this code is no longer necessary

cbind(x=xmax, y=ymin, others))
})
g$geom <- "polygon"
g
},
Copy link
Contributor Author

Choose a reason for hiding this comment

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

geom_rect is converted to a basic geom "polygon"

path=function(g) {
group2NA(g, "path")
Expand Down Expand Up @@ -411,7 +415,6 @@ toBasic <- list(
}
)


#' Drawing ggplot2 geoms with a group aesthetic is most efficient in
#' plotly when we convert groups of things that look the same to
#' vectors with NA.
Expand All @@ -421,16 +424,41 @@ toBasic <- list(
#' @return list of geom info.
#' @author Toby Dylan Hocking
group2NA <- function(g, geom) {
poly.list <- split(g$data, g$data$group)
poly.list <- split(g$data, g$data$group, drop=TRUE)
is.group <- names(g$data) == "group"
poly.na.df <- data.frame()
for (i in seq_along(poly.list)) {
poly.na.list <- list()
forward.i <- seq_along(poly.list)
## When group2NA is called on geom_polygon (or geom_rect, which is
## treated as a basic polygon), we need to retrace the first points
## of each group, see https://github.com/ropensci/plotly/pull/178
retrace.first.points <- g$geom == "polygon"
for (i in forward.i) {
no.group <- poly.list[[i]][, !is.group, drop=FALSE]
na.row <- no.group[1, ]
na.row[, c("x", "y")] <- NA
poly.na.df <- rbind(poly.na.df, no.group, na.row)
retrace.first <- if(retrace.first.points){
no.group[1,]
}
poly.na.list[[paste(i, "forward")]] <-
rbind(no.group, retrace.first, na.row)
}
if(retrace.first.points){
backward.i <- rev(forward.i[-1])[-1]
for(i in backward.i){
no.group <- poly.list[[i]][1, !is.group, drop=FALSE]
na.row <- no.group[1, ]
na.row[, c("x", "y")] <- NA
poly.na.list[[paste(i, "backward")]] <- rbind(no.group, na.row)
}
if(length(poly.list) > 1){
first.group <- poly.list[[1]][1, !is.group, drop=FALSE]
poly.na.list[["last"]] <- rbind(first.group, first.group)
}
}
g$data <- do.call(rbind, poly.na.list)
if(is.na(g$data$x[nrow(g$data)])){
g$data <- g$data[-nrow(g$data), ]
}
g$data <- poly.na.df
g$geom <- geom
g
}
Expand Down Expand Up @@ -477,10 +505,12 @@ geom2trace <- list(
line=paramORdefault(params, aes2line, line.defaults))
},
polygon=function(data, params){
list(x=c(data$x, data$x[1]),
y=c(data$y, data$y[1]),
g <- list(data=data, geom="polygon")
g <- group2NA(g, "polygon")
list(x=g$data$x,
y=g$data$y,
name=params$name,
text=data$text,
text=g$data$text,
type="scatter",
mode="lines",
line=paramORdefault(params, aes2line, polygon.line.defaults),
Expand Down
Loading