Avoid layering multiple bars when there should be one#213

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
cpsievert merged 7 commits into from
May 21, 2015
Merged

Avoid layering multiple bars when there should be one #213

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e32273a
Avoid layering multiple bars when there should be one
cpsievert Apr 30, 2015
3362a6b
whoops; don't add cookbook tests
cpsievert Apr 30, 2015
c00b5b8
merge with master
cpsievert May 7, 2015
a026b9b
Map text if no data reduction occurred
cpsievert May 19, 2015
4e00343
moar space
cpsievert May 19, 2015
d861518
Remove 2 extra lines at end of file
mkcor May 20, 2015
edf055b
Increment version number
mkcor May 20, 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.6.1
Version: 0.6.2
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.6.2 -- 19 May 2015

In geom_bar(stat = "identity"), sum y values if multiple for a given x.

0.6.1 -- 5 May 2015

Add test-cookbook-lines.R and fix bugs that showed up in those tests.
Expand Down
2 changes: 1 addition & 1 deletion R/plotly-package.r
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,7 @@
#' \itemize{
#' \item Package: plotly
#' \item Type: Package
#' \item Version: 0.6.1
#' \item Version: 0.6.2
#' \item Date: 2014-03-07
#' \item License: MIT
#' }
Expand Down
2 changes: 1 addition & 1 deletion R/plotly.R
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -82,7 +82,7 @@ For more help, see https://plot.ly/R or contact <chris@plot.ly>.")

# public attributes/methods that the user has access to
pub <- list(username=username, key=key, filename="from api", fileopt=NULL,
version="0.6.1")
version="0.6.2")
priv <- list()

pub$makecall <- function(args, kwargs, origin) {
Expand Down
20 changes: 13 additions & 7 deletions R/trace_generation.R
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -579,14 +579,20 @@ geom2trace <- list(
# Convert days into milliseconds
x <- as.numeric(x) * 24 * 60 * 60 * 1000
}
L <- list(x=x,
y=data$y,
type="bar",
name=params$name,
text=data$text,
marker=list(color=toRGB(params$fill)))
# if there is more than one y-value for a particular combination of
# x, PANEL, and group; then take the _max_ y.
data$x <- x
dat <- plyr::ddply(data, c("x", "PANEL", if ("group" %in% names(data)) "group"),
plyr::summarise, count = max(y))

@mkcormkcorMay 19, 2015

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Why not? I know this is not native R/ggplot2, as it won't render in the static ggplot version, but let's make use of this field for interesting hover info in the interactive plotly version! (Remember this email where I replied to a user with a link to your https://cpsievert.shinyapps.io/ggtree/?)

@cpsievertcpsievertMay 19, 2015

Copy link
Copy Markdown
CollaboratorAuthor

Choose a reason for hiding this comment

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

I was being overly paranoid since it won't make sense unless stat="identity", but it looks as though data$text is NULL whenever the stat is not the identity (my bad).

However, even when stat="identity", a text aesthetic still might not make much sense (for example, the bar-category-names test), so in a026b9b, I added an extra check.

(BTW, this link should be more stable -- https://gallery.shinyapps.io/ggtree/ )

L <- list(x = dat$x,
y = dat$count,
type = "bar",
# text only makes sense if no dimension reduction occurred
text = if (nrow(dat) == nrow(data)) data$text else NULL,
name = params$name,
marker = list(color = toRGB(params$fill)))
if (!is.null(params$colour)) {
L$marker$line <- list(color=toRGB(params$colour))
L$marker$line <- list(color = toRGB(params$colour))
L$marker$line$width <- if (is.null(params$size)) 1 else params$size
}
if (!is.null(params$alpha)) L$opacity <- params$alpha
Expand Down
2 changes: 1 addition & 1 deletion man/plotly-package.Rd
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,7 @@ An example of an interactive graph made from the R API: https://plot.ly/~chris/4
\itemize{
\item Package: plotly
\item Type: Package
\item Version: 0.6.1
\item Version: 0.6.2
\item Date: 2014-03-07
\item License: MIT
}
Expand Down
11 changes: 11 additions & 0 deletions tests/testthat/test-ggplot-bar.R
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -191,3 +191,14 @@ test_that("geom_bar(position = 'fill') stacks proportions", {
expect_identical(prop, 1)
})

d <- head(diamonds, 50)
gbar <- ggplot(d, aes(cut, price)) + geom_bar(stat = "identity")

test_that("For a given x value, if multiple y exist, sum them. ", {
info <- expect_traces(gbar, 1, "category-names")
expect_identical(info$traces[[1]]$type, "bar")
y <- with(d, tapply(price, cut, sum))
# make sure order of counts match
y <- y[info$traces[[1]]$x]
expect_equal(info$traces[[1]]$y, as.numeric(y))
})
14 changes: 0 additions & 14 deletions tests/testthat/test-ggplot-categorical.R
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,17 +11,3 @@ test_that("axis type=category when we plot factors", {

save_outputs(gg, "bar-factor-category")
})

test_that("Bar charts of type=category show category names", {
gbar <- ggplot(d, aes(cut, price)) + geom_bar(stat="identity")
info <- gg2list(gbar)

expect_equal(length(info$data), 1) # 1 trace
expect_identical(info$layout$xaxis$type, "category")
expect_identical(info$layout$xaxis$title, "cut")
expect_identical(info$layout$yaxis$type, "linear")
expect_true(all(c("Fair", "Good", "Very Good", "Premium", "Ideal") %in%
info$data[[1]]$x))

save_outputs(gbar, "bar-category-names")
})
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n 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;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} 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
Avoid layering multiple bars when there should be one#213

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

cpsievert
merged 7 commits into

from

May 21, 2015
 Merged


Avoid layering multiple bars when there should be one
#213
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
e32273a

Avoid layering multiple bars when there should be one


cpsievert Apr 30, 2015
3362a6b

whoops; don't add cookbook tests


cpsievert Apr 30, 2015
c00b5b8

merge with master


cpsievert May 7, 2015
a026b9b

Map text if no data reduction occurred


cpsievert May 19, 2015
4e00343

moar space


cpsievert May 19, 2015
d861518

Remove 2 extra lines at end of file


mkcor May 20, 2015
edf055b

Increment version number


mkcor May 20, 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.6.1
Version: 0.6.2
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.6.2 -- 19 May 2015

In geom_bar(stat = "identity"), sum y values if multiple for a given x.

0.6.1 -- 5 May 2015

Add test-cookbook-lines.R and fix bugs that showed up in those tests.
Expand Down

2 changes: 1 addition & 1 deletion
R/plotly-package.r

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,7 @@
#' \itemize{
#' \item Package: plotly
#' \item Type: Package
#' \item Version: 0.6.1
#' \item Version: 0.6.2
#' \item Date: 2014-03-07
#' \item License: MIT
#' }
Expand Down

2 changes: 1 addition & 1 deletion
R/plotly.R

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -82,7 +82,7 @@ For more help, see https://plot.ly/R or contact <chris@plot.ly>.")

 # public attributes/methods that the user has access to
 pub <- list(username=username, key=key, filename="from api", fileopt=NULL,
 version="0.6.1")
 version="0.6.2")
 priv <- list()

 pub$makecall <- function(args, kwargs, origin) {
Expand Down

20 changes: 13 additions & 7 deletions
R/trace_generation.R

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -579,14 +579,20 @@ geom2trace <- list(
 # Convert days into milliseconds
 x <- as.numeric(x) * 24 * 60 * 60 * 1000
 }
 L <- list(x=x,
 y=data$y,
 type="bar",
 name=params$name,
 text=data$text,
 marker=list(color=toRGB(params$fill)))
 # if there is more than one y-value for a particular combination of
 # x, PANEL, and group; then take the _max_ y.
 data$x <- x
 dat <- plyr::ddply(data, c("x", "PANEL", if ("group" %in% names(data)) "group"),
 plyr::summarise, count = max(y))
@mkcormkcorMay 19, 2015

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Why not? I know this is not native R/ggplot2, as it won't render in the static ggplot version, but let's make use of this field for interesting hover info in the interactive plotly version! (Remember this email where I replied to a user with a link to your https://cpsievert.shinyapps.io/ggtree/?)
@cpsievertcpsievertMay 19, 2015

Copy link


Copy Markdown

CollaboratorAuthor
Choose a reason for hiding this comment

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

I was being overly paranoid since it won't make sense unless stat="identity", but it looks as though data$text is NULL whenever the stat is not the identity (my bad).
However, even when stat="identity", a text aesthetic still might not make much sense (for example, the bar-category-names test), so in a026b9b, I added an extra check.
(BTW, this link should be more stable -- https://gallery.shinyapps.io/ggtree/ )
 L <- list(x = dat$x,
 y = dat$count,
 type = "bar",
 # text only makes sense if no dimension reduction occurred
 text = if (nrow(dat) == nrow(data)) data$text else NULL,
 name = params$name,
 marker = list(color = toRGB(params$fill)))
 if (!is.null(params$colour)) {
 L$marker$line <- list(color=toRGB(params$colour))
 L$marker$line <- list(color = toRGB(params$colour))
 L$marker$line$width <- if (is.null(params$size)) 1 else params$size
 }
 if (!is.null(params$alpha)) L$opacity <- params$alpha
Expand Down

2 changes: 1 addition & 1 deletion
man/plotly-package.Rd

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,7 @@ An example of an interactive graph made from the R API: https://plot.ly/~chris/4
\itemize{
 \item Package: plotly
 \item Type: Package
 \item Version: 0.6.1
 \item Version: 0.6.2
 \item Date: 2014-03-07
 \item License: MIT
}
Expand Down

11 changes: 11 additions & 0 deletions
tests/testthat/test-ggplot-bar.R

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -191,3 +191,14 @@ test_that("geom_bar(position = 'fill') stacks proportions", {
 expect_identical(prop, 1)
})

d <- head(diamonds, 50)
gbar <- ggplot(d, aes(cut, price)) + geom_bar(stat = "identity")

test_that("For a given x value, if multiple y exist, sum them. ", {
 info <- expect_traces(gbar, 1, "category-names")
 expect_identical(info$traces[[1]]$type, "bar")
 y <- with(d, tapply(price, cut, sum))
 # make sure order of counts match
 y <- y[info$traces[[1]]$x]
 expect_equal(info$traces[[1]]$y, as.numeric(y))
})

14 changes: 0 additions & 14 deletions
tests/testthat/test-ggplot-categorical.R

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,17 +11,3 @@ test_that("axis type=category when we plot factors", {

 save_outputs(gg, "bar-factor-category")
})

test_that("Bar charts of type=category show category names", {
 gbar <- ggplot(d, aes(cut, price)) + geom_bar(stat="identity")
 info <- gg2list(gbar)

 expect_equal(length(info$data), 1) # 1 trace
 expect_identical(info$layout$xaxis$type, "category")
 expect_identical(info$layout$xaxis$title, "cut")
 expect_identical(info$layout$yaxis$type, "linear")
 expect_true(all(c("Fair", "Good", "Very Good", "Premium", "Ideal") %in%
 info$data[[1]]$x))

 save_outputs(gbar, "bar-category-names")
})

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

Skip to content
Avoid layering multiple bars when there should be one#213

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

cpsievert
merged 7 commits into

from

May 21, 2015
 Merged


Avoid layering multiple bars when there should be one
#213
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
e32273a

Avoid layering multiple bars when there should be one


cpsievert Apr 30, 2015
3362a6b

whoops; don't add cookbook tests


cpsievert Apr 30, 2015
c00b5b8

merge with master


cpsievert May 7, 2015
a026b9b

Map text if no data reduction occurred


cpsievert May 19, 2015
4e00343

moar space


cpsievert May 19, 2015
d861518

Remove 2 extra lines at end of file


mkcor May 20, 2015
edf055b

Increment version number


mkcor May 20, 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.6.1
Version: 0.6.2
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.6.2 -- 19 May 2015

In geom_bar(stat = "identity"), sum y values if multiple for a given x.

0.6.1 -- 5 May 2015

Add test-cookbook-lines.R and fix bugs that showed up in those tests.
Expand Down

2 changes: 1 addition & 1 deletion
R/plotly-package.r

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,7 @@
#' \itemize{
#' \item Package: plotly
#' \item Type: Package
#' \item Version: 0.6.1
#' \item Version: 0.6.2
#' \item Date: 2014-03-07
#' \item License: MIT
#' }
Expand Down

2 changes: 1 addition & 1 deletion
R/plotly.R

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -82,7 +82,7 @@ For more help, see https://plot.ly/R or contact <chris@plot.ly>.")

 # public attributes/methods that the user has access to
 pub <- list(username=username, key=key, filename="from api", fileopt=NULL,
 version="0.6.1")
 version="0.6.2")
 priv <- list()

 pub$makecall <- function(args, kwargs, origin) {
Expand Down

20 changes: 13 additions & 7 deletions
R/trace_generation.R

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -579,14 +579,20 @@ geom2trace <- list(
 # Convert days into milliseconds
 x <- as.numeric(x) * 24 * 60 * 60 * 1000
 }
 L <- list(x=x,
 y=data$y,
 type="bar",
 name=params$name,
 text=data$text,
 marker=list(color=toRGB(params$fill)))
 # if there is more than one y-value for a particular combination of
 # x, PANEL, and group; then take the _max_ y.
 data$x <- x
 dat <- plyr::ddply(data, c("x", "PANEL", if ("group" %in% names(data)) "group"),
 plyr::summarise, count = max(y))
@mkcormkcorMay 19, 2015

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Why not? I know this is not native R/ggplot2, as it won't render in the static ggplot version, but let's make use of this field for interesting hover info in the interactive plotly version! (Remember this email where I replied to a user with a link to your https://cpsievert.shinyapps.io/ggtree/?)
@cpsievertcpsievertMay 19, 2015

Copy link


Copy Markdown

CollaboratorAuthor
Choose a reason for hiding this comment

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

I was being overly paranoid since it won't make sense unless stat="identity", but it looks as though data$text is NULL whenever the stat is not the identity (my bad).
However, even when stat="identity", a text aesthetic still might not make much sense (for example, the bar-category-names test), so in a026b9b, I added an extra check.
(BTW, this link should be more stable -- https://gallery.shinyapps.io/ggtree/ )
 L <- list(x = dat$x,
 y = dat$count,
 type = "bar",
 # text only makes sense if no dimension reduction occurred
 text = if (nrow(dat) == nrow(data)) data$text else NULL,
 name = params$name,
 marker = list(color = toRGB(params$fill)))
 if (!is.null(params$colour)) {
 L$marker$line <- list(color=toRGB(params$colour))
 L$marker$line <- list(color = toRGB(params$colour))
 L$marker$line$width <- if (is.null(params$size)) 1 else params$size
 }
 if (!is.null(params$alpha)) L$opacity <- params$alpha
Expand Down

2 changes: 1 addition & 1 deletion
man/plotly-package.Rd

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,7 @@ An example of an interactive graph made from the R API: https://plot.ly/~chris/4
\itemize{
 \item Package: plotly
 \item Type: Package
 \item Version: 0.6.1
 \item Version: 0.6.2
 \item Date: 2014-03-07
 \item License: MIT
}
Expand Down

11 changes: 11 additions & 0 deletions
tests/testthat/test-ggplot-bar.R

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -191,3 +191,14 @@ test_that("geom_bar(position = 'fill') stacks proportions", {
 expect_identical(prop, 1)
})

d <- head(diamonds, 50)
gbar <- ggplot(d, aes(cut, price)) + geom_bar(stat = "identity")

test_that("For a given x value, if multiple y exist, sum them. ", {
 info <- expect_traces(gbar, 1, "category-names")
 expect_identical(info$traces[[1]]$type, "bar")
 y <- with(d, tapply(price, cut, sum))
 # make sure order of counts match
 y <- y[info$traces[[1]]$x]
 expect_equal(info$traces[[1]]$y, as.numeric(y))
})

14 changes: 0 additions & 14 deletions
tests/testthat/test-ggplot-categorical.R

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,17 +11,3 @@ test_that("axis type=category when we plot factors", {

 save_outputs(gg, "bar-factor-category")
})

test_that("Bar charts of type=category show category names", {
 gbar <- ggplot(d, aes(cut, price)) + geom_bar(stat="identity")
 info <- gg2list(gbar)

 expect_equal(length(info$data), 1) # 1 trace
 expect_identical(info$layout$xaxis$type, "category")
 expect_identical(info$layout$xaxis$title, "cut")
 expect_identical(info$layout$yaxis$type, "linear")
 expect_true(all(c("Fair", "Good", "Very Good", "Premium", "Ideal") %in%
 info$data[[1]]$x))

 save_outputs(gbar, "bar-category-names")
})

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

Skip to content
Avoid layering multiple bars when there should be one#213

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

cpsievert
merged 7 commits into

from

May 21, 2015
 Merged


Avoid layering multiple bars when there should be one
#213
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
e32273a

Avoid layering multiple bars when there should be one


cpsievert Apr 30, 2015
3362a6b

whoops; don't add cookbook tests


cpsievert Apr 30, 2015
c00b5b8

merge with master


cpsievert May 7, 2015
a026b9b

Map text if no data reduction occurred


cpsievert May 19, 2015
4e00343

moar space


cpsievert May 19, 2015
d861518

Remove 2 extra lines at end of file


mkcor May 20, 2015
edf055b

Increment version number


mkcor May 20, 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.6.1
Version: 0.6.2
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.6.2 -- 19 May 2015

In geom_bar(stat = "identity"), sum y values if multiple for a given x.

0.6.1 -- 5 May 2015

Add test-cookbook-lines.R and fix bugs that showed up in those tests.
Expand Down

2 changes: 1 addition & 1 deletion
R/plotly-package.r

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,7 @@
#' \itemize{
#' \item Package: plotly
#' \item Type: Package
#' \item Version: 0.6.1
#' \item Version: 0.6.2
#' \item Date: 2014-03-07
#' \item License: MIT
#' }
Expand Down

2 changes: 1 addition & 1 deletion
R/plotly.R

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -82,7 +82,7 @@ For more help, see https://plot.ly/R or contact <chris@plot.ly>.")

 # public attributes/methods that the user has access to
 pub <- list(username=username, key=key, filename="from api", fileopt=NULL,
 version="0.6.1")
 version="0.6.2")
 priv <- list()

 pub$makecall <- function(args, kwargs, origin) {
Expand Down

20 changes: 13 additions & 7 deletions
R/trace_generation.R

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -579,14 +579,20 @@ geom2trace <- list(
 # Convert days into milliseconds
 x <- as.numeric(x) * 24 * 60 * 60 * 1000
 }
 L <- list(x=x,
 y=data$y,
 type="bar",
 name=params$name,
 text=data$text,
 marker=list(color=toRGB(params$fill)))
 # if there is more than one y-value for a particular combination of
 # x, PANEL, and group; then take the _max_ y.
 data$x <- x
 dat <- plyr::ddply(data, c("x", "PANEL", if ("group" %in% names(data)) "group"),
 plyr::summarise, count = max(y))
@mkcormkcorMay 19, 2015

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Why not? I know this is not native R/ggplot2, as it won't render in the static ggplot version, but let's make use of this field for interesting hover info in the interactive plotly version! (Remember this email where I replied to a user with a link to your https://cpsievert.shinyapps.io/ggtree/?)
@cpsievertcpsievertMay 19, 2015

Copy link


Copy Markdown

CollaboratorAuthor
Choose a reason for hiding this comment

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

I was being overly paranoid since it won't make sense unless stat="identity", but it looks as though data$text is NULL whenever the stat is not the identity (my bad).
However, even when stat="identity", a text aesthetic still might not make much sense (for example, the bar-category-names test), so in a026b9b, I added an extra check.
(BTW, this link should be more stable -- https://gallery.shinyapps.io/ggtree/ )
 L <- list(x = dat$x,
 y = dat$count,
 type = "bar",
 # text only makes sense if no dimension reduction occurred
 text = if (nrow(dat) == nrow(data)) data$text else NULL,
 name = params$name,
 marker = list(color = toRGB(params$fill)))
 if (!is.null(params$colour)) {
 L$marker$line <- list(color=toRGB(params$colour))
 L$marker$line <- list(color = toRGB(params$colour))
 L$marker$line$width <- if (is.null(params$size)) 1 else params$size
 }
 if (!is.null(params$alpha)) L$opacity <- params$alpha
Expand Down

2 changes: 1 addition & 1 deletion
man/plotly-package.Rd

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,7 @@ An example of an interactive graph made from the R API: https://plot.ly/~chris/4
\itemize{
 \item Package: plotly
 \item Type: Package
 \item Version: 0.6.1
 \item Version: 0.6.2
 \item Date: 2014-03-07
 \item License: MIT
}
Expand Down

11 changes: 11 additions & 0 deletions
tests/testthat/test-ggplot-bar.R

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -191,3 +191,14 @@ test_that("geom_bar(position = 'fill') stacks proportions", {
 expect_identical(prop, 1)
})

d <- head(diamonds, 50)
gbar <- ggplot(d, aes(cut, price)) + geom_bar(stat = "identity")

test_that("For a given x value, if multiple y exist, sum them. ", {
 info <- expect_traces(gbar, 1, "category-names")
 expect_identical(info$traces[[1]]$type, "bar")
 y <- with(d, tapply(price, cut, sum))
 # make sure order of counts match
 y <- y[info$traces[[1]]$x]
 expect_equal(info$traces[[1]]$y, as.numeric(y))
})

14 changes: 0 additions & 14 deletions
tests/testthat/test-ggplot-categorical.R

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,17 +11,3 @@ test_that("axis type=category when we plot factors", {

 save_outputs(gg, "bar-factor-category")
})

test_that("Bar charts of type=category show category names", {
 gbar <- ggplot(d, aes(cut, price)) + geom_bar(stat="identity")
 info <- gg2list(gbar)

 expect_equal(length(info$data), 1) # 1 trace
 expect_identical(info$layout$xaxis$type, "category")
 expect_identical(info$layout$xaxis$title, "cut")
 expect_identical(info$layout$yaxis$type, "linear")
 expect_true(all(c("Fair", "Good", "Very Good", "Premium", "Ideal") %in%
 info$data[[1]]$x))

 save_outputs(gbar, "bar-category-names")
})

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} 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
Avoid layering multiple bars when there should be one#213

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

cpsievert
merged 7 commits into

from

May 21, 2015
 Merged


Avoid layering multiple bars when there should be one
#213
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
e32273a

Avoid layering multiple bars when there should be one


cpsievert Apr 30, 2015
3362a6b

whoops; don't add cookbook tests


cpsievert Apr 30, 2015
c00b5b8

merge with master


cpsievert May 7, 2015
a026b9b

Map text if no data reduction occurred


cpsievert May 19, 2015
4e00343

moar space


cpsievert May 19, 2015
d861518

Remove 2 extra lines at end of file


mkcor May 20, 2015
edf055b

Increment version number


mkcor May 20, 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.6.1
Version: 0.6.2
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.6.2 -- 19 May 2015

In geom_bar(stat = "identity"), sum y values if multiple for a given x.

0.6.1 -- 5 May 2015

Add test-cookbook-lines.R and fix bugs that showed up in those tests.
Expand Down

2 changes: 1 addition & 1 deletion
R/plotly-package.r

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,7 @@
#' \itemize{
#' \item Package: plotly
#' \item Type: Package
#' \item Version: 0.6.1
#' \item Version: 0.6.2
#' \item Date: 2014-03-07
#' \item License: MIT
#' }
Expand Down

2 changes: 1 addition & 1 deletion
R/plotly.R

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -82,7 +82,7 @@ For more help, see https://plot.ly/R or contact <chris@plot.ly>.")

 # public attributes/methods that the user has access to
 pub <- list(username=username, key=key, filename="from api", fileopt=NULL,
 version="0.6.1")
 version="0.6.2")
 priv <- list()

 pub$makecall <- function(args, kwargs, origin) {
Expand Down

20 changes: 13 additions & 7 deletions
R/trace_generation.R

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -579,14 +579,20 @@ geom2trace <- list(
 # Convert days into milliseconds
 x <- as.numeric(x) * 24 * 60 * 60 * 1000
 }
 L <- list(x=x,
 y=data$y,
 type="bar",
 name=params$name,
 text=data$text,
 marker=list(color=toRGB(params$fill)))
 # if there is more than one y-value for a particular combination of
 # x, PANEL, and group; then take the _max_ y.
 data$x <- x
 dat <- plyr::ddply(data, c("x", "PANEL", if ("group" %in% names(data)) "group"),
 plyr::summarise, count = max(y))
@mkcormkcorMay 19, 2015

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Why not? I know this is not native R/ggplot2, as it won't render in the static ggplot version, but let's make use of this field for interesting hover info in the interactive plotly version! (Remember this email where I replied to a user with a link to your https://cpsievert.shinyapps.io/ggtree/?)
@cpsievertcpsievertMay 19, 2015

Copy link


Copy Markdown

CollaboratorAuthor
Choose a reason for hiding this comment

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

I was being overly paranoid since it won't make sense unless stat="identity", but it looks as though data$text is NULL whenever the stat is not the identity (my bad).
However, even when stat="identity", a text aesthetic still might not make much sense (for example, the bar-category-names test), so in a026b9b, I added an extra check.
(BTW, this link should be more stable -- https://gallery.shinyapps.io/ggtree/ )
 L <- list(x = dat$x,
 y = dat$count,
 type = "bar",
 # text only makes sense if no dimension reduction occurred
 text = if (nrow(dat) == nrow(data)) data$text else NULL,
 name = params$name,
 marker = list(color = toRGB(params$fill)))
 if (!is.null(params$colour)) {
 L$marker$line <- list(color=toRGB(params$colour))
 L$marker$line <- list(color = toRGB(params$colour))
 L$marker$line$width <- if (is.null(params$size)) 1 else params$size
 }
 if (!is.null(params$alpha)) L$opacity <- params$alpha
Expand Down

2 changes: 1 addition & 1 deletion
man/plotly-package.Rd

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,7 @@ An example of an interactive graph made from the R API: https://plot.ly/~chris/4
\itemize{
 \item Package: plotly
 \item Type: Package
 \item Version: 0.6.1
 \item Version: 0.6.2
 \item Date: 2014-03-07
 \item License: MIT
}
Expand Down

11 changes: 11 additions & 0 deletions
tests/testthat/test-ggplot-bar.R

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -191,3 +191,14 @@ test_that("geom_bar(position = 'fill') stacks proportions", {
 expect_identical(prop, 1)
})

d <- head(diamonds, 50)
gbar <- ggplot(d, aes(cut, price)) + geom_bar(stat = "identity")

test_that("For a given x value, if multiple y exist, sum them. ", {
 info <- expect_traces(gbar, 1, "category-names")
 expect_identical(info$traces[[1]]$type, "bar")
 y <- with(d, tapply(price, cut, sum))
 # make sure order of counts match
 y <- y[info$traces[[1]]$x]
 expect_equal(info$traces[[1]]$y, as.numeric(y))
})

14 changes: 0 additions & 14 deletions
tests/testthat/test-ggplot-categorical.R

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,17 +11,3 @@ test_that("axis type=category when we plot factors", {

 save_outputs(gg, "bar-factor-category")
})

test_that("Bar charts of type=category show category names", {
 gbar <- ggplot(d, aes(cut, price)) + geom_bar(stat="identity")
 info <- gg2list(gbar)

 expect_equal(length(info$data), 1) # 1 trace
 expect_identical(info$layout$xaxis$type, "category")
 expect_identical(info$layout$xaxis$title, "cut")
 expect_identical(info$layout$yaxis$type, "linear")
 expect_true(all(c("Fair", "Good", "Very Good", "Premium", "Ideal") %in%
 info$data[[1]]$x))

 save_outputs(gbar, "bar-category-names")
})

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

Skip to content
Avoid layering multiple bars when there should be one#213

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

cpsievert
merged 7 commits into

from

May 21, 2015
 Merged


Avoid layering multiple bars when there should be one
#213
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
e32273a

Avoid layering multiple bars when there should be one


cpsievert Apr 30, 2015
3362a6b

whoops; don't add cookbook tests


cpsievert Apr 30, 2015
c00b5b8

merge with master


cpsievert May 7, 2015
a026b9b

Map text if no data reduction occurred


cpsievert May 19, 2015
4e00343

moar space


cpsievert May 19, 2015
d861518

Remove 2 extra lines at end of file


mkcor May 20, 2015
edf055b

Increment version number


mkcor May 20, 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.6.1
Version: 0.6.2
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.6.2 -- 19 May 2015

In geom_bar(stat = "identity"), sum y values if multiple for a given x.

0.6.1 -- 5 May 2015

Add test-cookbook-lines.R and fix bugs that showed up in those tests.
Expand Down

2 changes: 1 addition & 1 deletion
R/plotly-package.r

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,7 @@
#' \itemize{
#' \item Package: plotly
#' \item Type: Package
#' \item Version: 0.6.1
#' \item Version: 0.6.2
#' \item Date: 2014-03-07
#' \item License: MIT
#' }
Expand Down

2 changes: 1 addition & 1 deletion
R/plotly.R

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -82,7 +82,7 @@ For more help, see https://plot.ly/R or contact <chris@plot.ly>.")

 # public attributes/methods that the user has access to
 pub <- list(username=username, key=key, filename="from api", fileopt=NULL,
 version="0.6.1")
 version="0.6.2")
 priv <- list()

 pub$makecall <- function(args, kwargs, origin) {
Expand Down

20 changes: 13 additions & 7 deletions
R/trace_generation.R

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -579,14 +579,20 @@ geom2trace <- list(
 # Convert days into milliseconds
 x <- as.numeric(x) * 24 * 60 * 60 * 1000
 }
 L <- list(x=x,
 y=data$y,
 type="bar",
 name=params$name,
 text=data$text,
 marker=list(color=toRGB(params$fill)))
 # if there is more than one y-value for a particular combination of
 # x, PANEL, and group; then take the _max_ y.
 data$x <- x
 dat <- plyr::ddply(data, c("x", "PANEL", if ("group" %in% names(data)) "group"),
 plyr::summarise, count = max(y))
@mkcormkcorMay 19, 2015

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Why not? I know this is not native R/ggplot2, as it won't render in the static ggplot version, but let's make use of this field for interesting hover info in the interactive plotly version! (Remember this email where I replied to a user with a link to your https://cpsievert.shinyapps.io/ggtree/?)
@cpsievertcpsievertMay 19, 2015

Copy link


Copy Markdown

CollaboratorAuthor
Choose a reason for hiding this comment

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

I was being overly paranoid since it won't make sense unless stat="identity", but it looks as though data$text is NULL whenever the stat is not the identity (my bad).
However, even when stat="identity", a text aesthetic still might not make much sense (for example, the bar-category-names test), so in a026b9b, I added an extra check.
(BTW, this link should be more stable -- https://gallery.shinyapps.io/ggtree/ )
 L <- list(x = dat$x,
 y = dat$count,
 type = "bar",
 # text only makes sense if no dimension reduction occurred
 text = if (nrow(dat) == nrow(data)) data$text else NULL,
 name = params$name,
 marker = list(color = toRGB(params$fill)))
 if (!is.null(params$colour)) {
 L$marker$line <- list(color=toRGB(params$colour))
 L$marker$line <- list(color = toRGB(params$colour))
 L$marker$line$width <- if (is.null(params$size)) 1 else params$size
 }
 if (!is.null(params$alpha)) L$opacity <- params$alpha
Expand Down

2 changes: 1 addition & 1 deletion
man/plotly-package.Rd

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,7 @@ An example of an interactive graph made from the R API: https://plot.ly/~chris/4
\itemize{
 \item Package: plotly
 \item Type: Package
 \item Version: 0.6.1
 \item Version: 0.6.2
 \item Date: 2014-03-07
 \item License: MIT
}
Expand Down

11 changes: 11 additions & 0 deletions
tests/testthat/test-ggplot-bar.R

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -191,3 +191,14 @@ test_that("geom_bar(position = 'fill') stacks proportions", {
 expect_identical(prop, 1)
})

d <- head(diamonds, 50)
gbar <- ggplot(d, aes(cut, price)) + geom_bar(stat = "identity")

test_that("For a given x value, if multiple y exist, sum them. ", {
 info <- expect_traces(gbar, 1, "category-names")
 expect_identical(info$traces[[1]]$type, "bar")
 y <- with(d, tapply(price, cut, sum))
 # make sure order of counts match
 y <- y[info$traces[[1]]$x]
 expect_equal(info$traces[[1]]$y, as.numeric(y))
})

14 changes: 0 additions & 14 deletions
tests/testthat/test-ggplot-categorical.R

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,17 +11,3 @@ test_that("axis type=category when we plot factors", {

 save_outputs(gg, "bar-factor-category")
})

test_that("Bar charts of type=category show category names", {
 gbar <- ggplot(d, aes(cut, price)) + geom_bar(stat="identity")
 info <- gg2list(gbar)

 expect_equal(length(info$data), 1) # 1 trace
 expect_identical(info$layout$xaxis$type, "category")
 expect_identical(info$layout$xaxis$title, "cut")
 expect_identical(info$layout$yaxis$type, "linear")
 expect_true(all(c("Fair", "Good", "Very Good", "Premium", "Ideal") %in%
 info$data[[1]]$x))

 save_outputs(gbar, "bar-category-names")
})

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

Skip to content
Avoid layering multiple bars when there should be one#213

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

cpsievert
merged 7 commits into

from

May 21, 2015
 Merged


Avoid layering multiple bars when there should be one
#213
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
e32273a

Avoid layering multiple bars when there should be one


cpsievert Apr 30, 2015
3362a6b

whoops; don't add cookbook tests


cpsievert Apr 30, 2015
c00b5b8

merge with master


cpsievert May 7, 2015
a026b9b

Map text if no data reduction occurred


cpsievert May 19, 2015
4e00343

moar space


cpsievert May 19, 2015
d861518

Remove 2 extra lines at end of file


mkcor May 20, 2015
edf055b

Increment version number


mkcor May 20, 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.6.1
Version: 0.6.2
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.6.2 -- 19 May 2015

In geom_bar(stat = "identity"), sum y values if multiple for a given x.

0.6.1 -- 5 May 2015

Add test-cookbook-lines.R and fix bugs that showed up in those tests.
Expand Down

2 changes: 1 addition & 1 deletion
R/plotly-package.r

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,7 @@
#' \itemize{
#' \item Package: plotly
#' \item Type: Package
#' \item Version: 0.6.1
#' \item Version: 0.6.2
#' \item Date: 2014-03-07
#' \item License: MIT
#' }
Expand Down

2 changes: 1 addition & 1 deletion
R/plotly.R

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -82,7 +82,7 @@ For more help, see https://plot.ly/R or contact <chris@plot.ly>.")

 # public attributes/methods that the user has access to
 pub <- list(username=username, key=key, filename="from api", fileopt=NULL,
 version="0.6.1")
 version="0.6.2")
 priv <- list()

 pub$makecall <- function(args, kwargs, origin) {
Expand Down

20 changes: 13 additions & 7 deletions
R/trace_generation.R

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -579,14 +579,20 @@ geom2trace <- list(
 # Convert days into milliseconds
 x <- as.numeric(x) * 24 * 60 * 60 * 1000
 }
 L <- list(x=x,
 y=data$y,
 type="bar",
 name=params$name,
 text=data$text,
 marker=list(color=toRGB(params$fill)))
 # if there is more than one y-value for a particular combination of
 # x, PANEL, and group; then take the _max_ y.
 data$x <- x
 dat <- plyr::ddply(data, c("x", "PANEL", if ("group" %in% names(data)) "group"),
 plyr::summarise, count = max(y))
@mkcormkcorMay 19, 2015

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Why not? I know this is not native R/ggplot2, as it won't render in the static ggplot version, but let's make use of this field for interesting hover info in the interactive plotly version! (Remember this email where I replied to a user with a link to your https://cpsievert.shinyapps.io/ggtree/?)
@cpsievertcpsievertMay 19, 2015

Copy link


Copy Markdown

CollaboratorAuthor
Choose a reason for hiding this comment

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

I was being overly paranoid since it won't make sense unless stat="identity", but it looks as though data$text is NULL whenever the stat is not the identity (my bad).
However, even when stat="identity", a text aesthetic still might not make much sense (for example, the bar-category-names test), so in a026b9b, I added an extra check.
(BTW, this link should be more stable -- https://gallery.shinyapps.io/ggtree/ )
 L <- list(x = dat$x,
 y = dat$count,
 type = "bar",
 # text only makes sense if no dimension reduction occurred
 text = if (nrow(dat) == nrow(data)) data$text else NULL,
 name = params$name,
 marker = list(color = toRGB(params$fill)))
 if (!is.null(params$colour)) {
 L$marker$line <- list(color=toRGB(params$colour))
 L$marker$line <- list(color = toRGB(params$colour))
 L$marker$line$width <- if (is.null(params$size)) 1 else params$size
 }
 if (!is.null(params$alpha)) L$opacity <- params$alpha
Expand Down

2 changes: 1 addition & 1 deletion
man/plotly-package.Rd

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,7 @@ An example of an interactive graph made from the R API: https://plot.ly/~chris/4
\itemize{
 \item Package: plotly
 \item Type: Package
 \item Version: 0.6.1
 \item Version: 0.6.2
 \item Date: 2014-03-07
 \item License: MIT
}
Expand Down

11 changes: 11 additions & 0 deletions
tests/testthat/test-ggplot-bar.R

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -191,3 +191,14 @@ test_that("geom_bar(position = 'fill') stacks proportions", {
 expect_identical(prop, 1)
})

d <- head(diamonds, 50)
gbar <- ggplot(d, aes(cut, price)) + geom_bar(stat = "identity")

test_that("For a given x value, if multiple y exist, sum them. ", {
 info <- expect_traces(gbar, 1, "category-names")
 expect_identical(info$traces[[1]]$type, "bar")
 y <- with(d, tapply(price, cut, sum))
 # make sure order of counts match
 y <- y[info$traces[[1]]$x]
 expect_equal(info$traces[[1]]$y, as.numeric(y))
})

14 changes: 0 additions & 14 deletions
tests/testthat/test-ggplot-categorical.R

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,17 +11,3 @@ test_that("axis type=category when we plot factors", {

 save_outputs(gg, "bar-factor-category")
})

test_that("Bar charts of type=category show category names", {
 gbar <- ggplot(d, aes(cut, price)) + geom_bar(stat="identity")
 info <- gg2list(gbar)

 expect_equal(length(info$data), 1) # 1 trace
 expect_identical(info$layout$xaxis$type, "category")
 expect_identical(info$layout$xaxis$title, "cut")
 expect_identical(info$layout$yaxis$type, "linear")
 expect_true(all(c("Fair", "Good", "Very Good", "Premium", "Ideal") %in%
 info$data[[1]]$x))

 save_outputs(gbar, "bar-category-names")
})

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

Skip to content
Avoid layering multiple bars when there should be one#213

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

cpsievert
merged 7 commits into

from

May 21, 2015
 Merged


Avoid layering multiple bars when there should be one
#213
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
e32273a

Avoid layering multiple bars when there should be one


cpsievert Apr 30, 2015
3362a6b

whoops; don't add cookbook tests


cpsievert Apr 30, 2015
c00b5b8

merge with master


cpsievert May 7, 2015
a026b9b

Map text if no data reduction occurred


cpsievert May 19, 2015
4e00343

moar space


cpsievert May 19, 2015
d861518

Remove 2 extra lines at end of file


mkcor May 20, 2015
edf055b

Increment version number


mkcor May 20, 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.6.1
Version: 0.6.2
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.6.2 -- 19 May 2015

In geom_bar(stat = "identity"), sum y values if multiple for a given x.

0.6.1 -- 5 May 2015

Add test-cookbook-lines.R and fix bugs that showed up in those tests.
Expand Down

2 changes: 1 addition & 1 deletion
R/plotly-package.r

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,7 @@
#' \itemize{
#' \item Package: plotly
#' \item Type: Package
#' \item Version: 0.6.1
#' \item Version: 0.6.2
#' \item Date: 2014-03-07
#' \item License: MIT
#' }
Expand Down

2 changes: 1 addition & 1 deletion
R/plotly.R

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -82,7 +82,7 @@ For more help, see https://plot.ly/R or contact <chris@plot.ly>.")

 # public attributes/methods that the user has access to
 pub <- list(username=username, key=key, filename="from api", fileopt=NULL,
 version="0.6.1")
 version="0.6.2")
 priv <- list()

 pub$makecall <- function(args, kwargs, origin) {
Expand Down

20 changes: 13 additions & 7 deletions
R/trace_generation.R

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -579,14 +579,20 @@ geom2trace <- list(
 # Convert days into milliseconds
 x <- as.numeric(x) * 24 * 60 * 60 * 1000
 }
 L <- list(x=x,
 y=data$y,
 type="bar",
 name=params$name,
 text=data$text,
 marker=list(color=toRGB(params$fill)))
 # if there is more than one y-value for a particular combination of
 # x, PANEL, and group; then take the _max_ y.
 data$x <- x
 dat <- plyr::ddply(data, c("x", "PANEL", if ("group" %in% names(data)) "group"),
 plyr::summarise, count = max(y))
@mkcormkcorMay 19, 2015

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Why not? I know this is not native R/ggplot2, as it won't render in the static ggplot version, but let's make use of this field for interesting hover info in the interactive plotly version! (Remember this email where I replied to a user with a link to your https://cpsievert.shinyapps.io/ggtree/?)
@cpsievertcpsievertMay 19, 2015

Copy link


Copy Markdown

CollaboratorAuthor
Choose a reason for hiding this comment

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

I was being overly paranoid since it won't make sense unless stat="identity", but it looks as though data$text is NULL whenever the stat is not the identity (my bad).
However, even when stat="identity", a text aesthetic still might not make much sense (for example, the bar-category-names test), so in a026b9b, I added an extra check.
(BTW, this link should be more stable -- https://gallery.shinyapps.io/ggtree/ )
 L <- list(x = dat$x,
 y = dat$count,
 type = "bar",
 # text only makes sense if no dimension reduction occurred
 text = if (nrow(dat) == nrow(data)) data$text else NULL,
 name = params$name,
 marker = list(color = toRGB(params$fill)))
 if (!is.null(params$colour)) {
 L$marker$line <- list(color=toRGB(params$colour))
 L$marker$line <- list(color = toRGB(params$colour))
 L$marker$line$width <- if (is.null(params$size)) 1 else params$size
 }
 if (!is.null(params$alpha)) L$opacity <- params$alpha
Expand Down

2 changes: 1 addition & 1 deletion
man/plotly-package.Rd

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,7 @@ An example of an interactive graph made from the R API: https://plot.ly/~chris/4
\itemize{
 \item Package: plotly
 \item Type: Package
 \item Version: 0.6.1
 \item Version: 0.6.2
 \item Date: 2014-03-07
 \item License: MIT
}
Expand Down

11 changes: 11 additions & 0 deletions
tests/testthat/test-ggplot-bar.R

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -191,3 +191,14 @@ test_that("geom_bar(position = 'fill') stacks proportions", {
 expect_identical(prop, 1)
})

d <- head(diamonds, 50)
gbar <- ggplot(d, aes(cut, price)) + geom_bar(stat = "identity")

test_that("For a given x value, if multiple y exist, sum them. ", {
 info <- expect_traces(gbar, 1, "category-names")
 expect_identical(info$traces[[1]]$type, "bar")
 y <- with(d, tapply(price, cut, sum))
 # make sure order of counts match
 y <- y[info$traces[[1]]$x]
 expect_equal(info$traces[[1]]$y, as.numeric(y))
})

14 changes: 0 additions & 14 deletions
tests/testthat/test-ggplot-categorical.R

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,17 +11,3 @@ test_that("axis type=category when we plot factors", {

 save_outputs(gg, "bar-factor-category")
})

test_that("Bar charts of type=category show category names", {
 gbar <- ggplot(d, aes(cut, price)) + geom_bar(stat="identity")
 info <- gg2list(gbar)

 expect_equal(length(info$data), 1) # 1 trace
 expect_identical(info$layout$xaxis$type, "category")
 expect_identical(info$layout$xaxis$title, "cut")
 expect_identical(info$layout$yaxis$type, "linear")
 expect_true(all(c("Fair", "Good", "Very Good", "Premium", "Ideal") %in%
 info$data[[1]]$x))

 save_outputs(gbar, "bar-category-names")
})