github/shiny
1
1
Fork 0
mirror of https://github.com/rstudio/shiny.git synced 2026-02-08 05:35:07 -05:00
Code Issues Packages Projects Releases Wiki Activity

Convert renderCachedPlot to take expr and cacheKeyExpr

Browse Source
This commit is contained in:
Winston Chang
2018-04-02 22:07:53 -05:00
parent cb476b510d
commit 76b239a6ea
2 changed files with 155 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
R/render-plot.R
View File

@@ -151,7 +151,8 @@ renderPlot <- function(expr, width='auto', height='auto', res=72, ...,
markRenderFunction(outputFunc, renderFunc, outputArgs = outputArgs)
}
resizeSavedPlot <- function(name, session, result, width, height, pixelratio, res, ...) {
resizeSavedPlot <- function(name, session, result, width, height, pixelratio, res,
resultfile = NULL, ...) {
if (result$img$width == width && result$img$height == height &&
result$pixelratio == pixelratio && result$res == res) {
return(result$img)
@@ -171,9 +172,19 @@ resizeSavedPlot <- function(name, session, result, width, height, pixelratio, re
coordmap = coordmap,
error = attr(coordmap, "error", exact = TRUE)
)
if (!is.null(resultfile)) {
result_save <- result
result_save$recordedPlot <- NULL
result_save$img <- img
saveRDS(result_save, resultfile)
}
img
}
drawPlot <- function(name, session, func, width, height, pixelratio, res, ...) {
drawPlot <- function(name, session, func, width, height, pixelratio, res,
resultfile = NULL, ...) {
# 1. Start PNG
# 2. Enable displaylist recording
# 3. Call user-defined func
@@ -247,6 +258,15 @@ drawPlot <- function(name, session, func, width, height, pixelratio, res, ...) {
# Get coordmap error message if present
error = attr(result$coordmap, "error", exact = TRUE)
))
if (!is.null(resultfile)) {
# Save a copy of the result, but without the recorded plot, because it
# can't be saved and restored properly.
result_save <- result
result_save$recordedPlot <- NULL
saveRDS(result_save, resultfile)
}
result
},
finally = function() {