Merge remote-tracking branch 'origin/master'

Conflicts:
	shiny-app/server.R
master
Aron Lindberg 2015-11-07 15:18:52 -05:00
commit 0de802cbac
2 changed files with 5 additions and 1 deletions

View File

@ -21,5 +21,8 @@ shinyServer(function(input, output) {
library(ggplot2) library(ggplot2)
library(corrplot) library(corrplot)
pairs(emergency2013[, input$show_vars, drop = FALSE]) pairs(emergency2013[, input$show_vars, drop = FALSE])
emergency2013[, input$show_vars, drop = FALSE]
}) })
}) })

View File

@ -16,7 +16,8 @@ shinyUI(fluidPage(
id = 'dataset', id = 'dataset',
tabPanel('emergency2013', dataTableOutput('mytable1')), tabPanel('emergency2013', dataTableOutput('mytable1')),
tabPanel('emergency2013', dataTableOutput('mytable2')), tabPanel('emergency2013', dataTableOutput('mytable2')),
tabPanel('emergency2013', plotOutput('myplot')))) tabPanel('emergency2013', plotOutput('myplot')))
) )
) )
)
) )