github/shiny
1
1
Fork 0
mirror of https://github.com/rstudio/shiny.git synced 2026-04-07 03:00:20 -04:00
Code Issues Packages Projects Releases Wiki Activity

Allow selectBrush to operate in just x or y direction

Browse Source
This commit is contained in:
Winston Chang
2015-05-01 11:27:53 -05:00
parent 4fa6e9dafe
commit a2841f7cf2
4 changed files with 52 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
R/image-interact.R
View File

@@ -14,8 +14,8 @@
#' column names; that information will already be contained in the brush,
#' provided that variables are in the original data, and not computed. For
#' example, with \code{ggplot(cars, aes(x=speed, y=dist)) + geom_point()}, you
#' could use \code{brushedPoints(cars, input$cars_brush)}. If, however, you use a
#' computed column, like \code{ggplot(cars, aes(x=speed/2, y=dist)) +
#' could use \code{brushedPoints(cars, input$cars_brush)}. If, however, you use
#' a computed column, like \code{ggplot(cars, aes(x=speed/2, y=dist)) +
#' geom_point()}, then it will not be able to automatically extract column names
#' and filter on them. If you want to use this function to filter data, it is
#' recommended that you not use computed columns; instead, modify the data
@@ -26,12 +26,16 @@
#' factor and then integer vector. This means that the brush will be considered
#' to cover a given character/factor value when it covers the center value.
#'
#' If the brush is operating in just the x or y directions (e.g., with
#' \code{brushOpts(direction = "x")}, then this function will filter out points
#' using just the x or y variable, whichever is appropriate.
#'
#' @param brush The data from a brush, such as \code{input$plot_brush}.
#' @param df A data frame from which to select rows.
#' @param xvar,yvar A string with the name of the variable on the x or y axis. This must
#' also be the name of a column in \code{df}. If absent, then
#' this function will try to infer the variable from the brush (only
#' works for ggplot2).
#' @param xvar,yvar A string with the name of the variable on the x or y axis.
#' This must also be the name of a column in \code{df}. If absent, then this
#' function will try to infer the variable from the brush (only works for
#' ggplot2).
#' @param panelvar1,panelvar2 Each of these is a string with the name of a panel
#' variable. For example, if with ggplot2, you facet on a variable called
#' \code{cyl}, then you can use \code{"cyl"} here. However, specifying the
@@ -41,7 +45,7 @@
#' @seealso \code{\link{plotOutput}} for example usage.
#' @export
brushedPoints <- function(df, brush, xvar = NULL, yvar = NULL,
panelvar1 = NULL, panelvar2 = NULL) {
panelvar1 = NULL, panelvar2 = NULL) {
if (is.null(brush)) {
return(df[0, , drop = FALSE])
}
@@ -50,24 +54,32 @@ brushedPoints <- function(df, brush, xvar = NULL, yvar = NULL,
stop("brushedPoints requires a brush object with xmin, xmax, ymin, and ymax.")
}
# Which direction(s) the brush is selecting over. Direction can be 'x', 'y',
# or 'xy'.
use_x <- grepl("x", brush$direction)
use_y <- grepl("y", brush$direction)
# Try to extract vars from brush object
xvar <- xvar %OR% brush$mapping$x
yvar <- yvar %OR% brush$mapping$y
panelvar1 <- panelvar1 %OR% brush$mapping$panelvar1
panelvar2 <- panelvar2 %OR% brush$mapping$panelvar2
if (is.null(xvar))
stop("brushedPoints: not able to automatically infer `xvar` from brush")
if (is.null(yvar))
stop("brushedPoints: not able to automatically infer `yvar` from brush")
# Extract data values from the data frame
x <- asNumber(df[[xvar]])
y <- asNumber(df[[yvar]])
# Filter out x and y values
keep_rows <- (x >= brush$xmin & x <= brush$xmax &
y >= brush$ymin & y <= brush$ymax)
keep_rows <- rep(TRUE, nrow(df))
if (use_x) {
if (is.null(xvar))
stop("brushedPoints: not able to automatically infer `xvar` from brush")
# Extract data values from the data frame
x <- asNumber(df[[xvar]])
keep_rows <- keep_rows & (x >= brush$xmin & x <= brush$xmax)
}
if (use_y) {
if (is.null(yvar))
stop("brushedPoints: not able to automatically infer `yvar` from brush")
y <- asNumber(df[[yvar]])
keep_rows <- keep_rows & (y >= brush$ymin & y <= brush$ymax)
}
# Find which rows are matches for the panel vars (if present)
if (!is.null(panelvar1))
@@ -99,6 +111,7 @@ brushedPoints <- function(df, brush, xvar = NULL, yvar = NULL,
# $ log :List of 2
# ..$ x: NULL
# ..$ y: NULL
# $ direction: chr "y"
#
# For ggplot2, the mapping vars usually will be included, and if faceting is
# used, they will be listed as panelvars:
@@ -127,6 +140,7 @@ brushedPoints <- function(df, brush, xvar = NULL, yvar = NULL,
# $ log :List of 2
# ..$ x: NULL
# ..$ y: NULL
# $ direction: chr "y"
#' Find rows of data that are near a click/hover/double-click

16
man/brushedPoints.Rd
View File

@@ -12,10 +12,10 @@ brushedPoints(df, brush, xvar = NULL, yvar = NULL, panelvar1 = NULL,
\item{brush}{The data from a brush, such as \code{input$plot_brush}.}
\item{xvar,yvar}{A string with the name of the variable on the x or y axis. This must
also be the name of a column in \code{df}. If absent, then
this function will try to infer the variable from the brush (only
works for ggplot2).}
\item{xvar,yvar}{A string with the name of the variable on the x or y axis.
This must also be the name of a column in \code{df}. If absent, then this
function will try to infer the variable from the brush (only works for
ggplot2).}
\item{panelvar1,panelvar2}{Each of these is a string with the name of a panel
variable. For example, if with ggplot2, you facet on a variable called
@@ -39,8 +39,8 @@ For plots created with ggplot2, it should not be necessary to specify the
column names; that information will already be contained in the brush,
provided that variables are in the original data, and not computed. For
example, with \code{ggplot(cars, aes(x=speed, y=dist)) + geom_point()}, you
could use \code{brushedPoints(cars, input$cars_brush)}. If, however, you use a
computed column, like \code{ggplot(cars, aes(x=speed/2, y=dist)) +
could use \code{brushedPoints(cars, input$cars_brush)}. If, however, you use
a computed column, like \code{ggplot(cars, aes(x=speed/2, y=dist)) +
geom_point()}, then it will not be able to automatically extract column names
and filter on them. If you want to use this function to filter data, it is
recommended that you not use computed columns; instead, modify the data
@@ -50,6 +50,10 @@ If a specified x or y column is a factor, then it will be coerced to an
integer vector. If it is a character vector, then it will be coerced to a
factor and then integer vector. This means that the brush will be considered
to cover a given character/factor value when it covers the center value.
If the brush is operating in just the x or y directions (e.g., with
\code{brushOpts(direction = "x")}, then this function will filter out points
using just the x or y variable, whichever is appropriate.
}
\seealso{
\code{\link{plotOutput}} for example usage.

16
man/nearPoints.Rd
View File

@@ -12,15 +12,15 @@ nearPoints(df, coordinfo, xvar = NULL, yvar = NULL, panelvar1 = NULL,
\item{coordinfo}{The data from a mouse event, such as \code{input$plot_click}.}
\item{xvar}{A string with the name of the variable on the x or y axis. This must
also be the name of a column in \code{df}. If absent, then
this function will try to infer the variable from the brush (only
works for ggplot2).}
\item{xvar}{A string with the name of the variable on the x or y axis.
This must also be the name of a column in \code{df}. If absent, then this
function will try to infer the variable from the brush (only works for
ggplot2).}
\item{yvar}{A string with the name of the variable on the x or y axis. This must
also be the name of a column in \code{df}. If absent, then
this function will try to infer the variable from the brush (only
works for ggplot2).}
\item{yvar}{A string with the name of the variable on the x or y axis.
This must also be the name of a column in \code{df}. If absent, then this
function will try to infer the variable from the brush (only works for
ggplot2).}
\item{panelvar1}{Each of these is a string with the name of a panel
variable. For example, if with ggplot2, you facet on a variable called

2
srcjs/output_binding_image.js
View File

@@ -608,6 +608,8 @@ imageutils.createBrushHandler = function(inputId, $el, opts, coordmap) {
coords.range = panel.range;
coords.log = panel.log;
coords.direction = opts.brushDirection;
// Send data to server
exports.onInputChange(inputId, coords);
}