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
tdhock 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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),

@tdhocktdhockMar 16, 2015

Copy link
Copy Markdown
ContributorAuthor

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
},

@tdhocktdhockMar 16, 2015

Copy link
Copy Markdown
ContributorAuthor

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 DownExpand 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 DownExpand 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
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

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

tdhock
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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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),
@tdhocktdhockMar 16, 2015

Copy link


Copy Markdown

ContributorAuthor
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
 },
@tdhocktdhockMar 16, 2015

Copy link


Copy Markdown

ContributorAuthor
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 DownExpand 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 DownExpand 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

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

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

tdhock
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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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),
@tdhocktdhockMar 16, 2015

Copy link


Copy Markdown

ContributorAuthor
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
 },
@tdhocktdhockMar 16, 2015

Copy link


Copy Markdown

ContributorAuthor
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 DownExpand 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 DownExpand 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

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

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

tdhock
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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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),
@tdhocktdhockMar 16, 2015

Copy link


Copy Markdown

ContributorAuthor
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
 },
@tdhocktdhockMar 16, 2015

Copy link


Copy Markdown

ContributorAuthor
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 DownExpand 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 DownExpand 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

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

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

tdhock
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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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),
@tdhocktdhockMar 16, 2015

Copy link


Copy Markdown

ContributorAuthor
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
 },
@tdhocktdhockMar 16, 2015

Copy link


Copy Markdown

ContributorAuthor
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 DownExpand 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 DownExpand 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

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

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

tdhock
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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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),
@tdhocktdhockMar 16, 2015

Copy link


Copy Markdown

ContributorAuthor
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
 },
@tdhocktdhockMar 16, 2015

Copy link


Copy Markdown

ContributorAuthor
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 DownExpand 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 DownExpand 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

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

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

tdhock
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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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),
@tdhocktdhockMar 16, 2015

Copy link


Copy Markdown

ContributorAuthor
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
 },
@tdhocktdhockMar 16, 2015

Copy link


Copy Markdown

ContributorAuthor
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 DownExpand 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 DownExpand 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

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

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

tdhock
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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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),
@tdhocktdhockMar 16, 2015

Copy link


Copy Markdown

ContributorAuthor
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
 },
@tdhocktdhockMar 16, 2015

Copy link


Copy Markdown

ContributorAuthor
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 DownExpand 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 DownExpand 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