diff --git a/server.R b/server.R index 501af28dbb54100eae23be74af4532a572def15c..acf80d0eb23573ffe535305472871ea6bfb2e73c 100644 --- a/server.R +++ b/server.R @@ -27,7 +27,7 @@ shinyServer options = list( dom = "lBtip", pageLength = 10, - lengthMenu = list(c(10, 25, 50, 100, -1), list('10', '25', '50', '100', 'All')), + lengthMenu = list(c(10, 25, 50, 100,-1), list('10', '25', '50', '100', 'All')), buttons = list( 'colvis', list( @@ -50,12 +50,8 @@ shinyServer }) data16S <- reactive({ - if (input$demo != "input") + if (input$dataset == "input") { - load("demo/demo.RData") - return(get(input$demo)) - } - else { if (is.null(input$fileBiom)) { return() @@ -116,11 +112,19 @@ shinyServer ) } return(d) + } else if (input$dataset == "rdata") + { + load(input$fileRData$datapath) + return(data) + } else { + load("demo/demo.RData") + return(get(input$dataset)) } }) output$rarefactionMin <- renderText({ - validate(need(input$fileBiom, ""), need(input$demo == "input", "")) + validate(need(input$fileBiom, ""), + need(input$dataset == "input", "")) paste("(min sample =", format(min(sample_sums(data16S( ))), big.mark = " "), "reads)") diff --git a/ui.R b/ui.R index 8782935e6a5647f3e89e24837b944f1a85dcaa0a..847ed345dbf56978e1c939440ed3a1a5c71f3790 100644 --- a/ui.R +++ b/ui.R @@ -6,15 +6,25 @@ shinyUI(dashboardPage( tags$div( title = "Select dataset for demonstration", selectInput( - "demo", - label = "Select demo dataset : ", - choices = list("Input data" = "input", - "Chaillou et al., 2015" = "food"), + "dataset", + label = "Select dataset : ", + choices = list( + "Input data" = "input", + "Rdata" = "rdata", + "Demo : Chaillou et al., 2015" = "food" + ), # "Mach et al., 2015" = "kinetic", "Morton et al., 2017" = "soil", "Ravel et al., 2011" = "ravel", "biorare" = "biorare", "GlobalPatterns" = "GlobalPatterns" selected = 1 ) ), - hr(width = "90%"), + hr(), + tags$div( + title = "RData where 'data' is a phyloseq object.", + fileInput("fileRData", + label = "RData : ", + placeholder = "data.RData") + ), + hr(), tags$div( title = "Abundance BIOM file come from FROGS with 'FROGS BIOM to std BIOM', Qiime or another metagenomic tool.", fileInput("fileBiom",