Commit 14bb24f6 authored by Midoux Cedric's avatar Midoux Cedric
Browse files

SampleID

parent 1a144e0a
...@@ -27,7 +27,7 @@ shinyServer ...@@ -27,7 +27,7 @@ shinyServer
options = list( options = list(
dom = "lBtip", dom = "lBtip",
pageLength = 10, 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( buttons = list(
'colvis', 'colvis',
list( list(
...@@ -100,10 +100,11 @@ shinyServer ...@@ -100,10 +100,11 @@ shinyServer
row.names = 1, row.names = 1,
na.strings = NA na.strings = NA
) )
sample_data(d)$SampleID <- rownames(sample_data(d))
} }
} else { } else {
n <- data.frame(sample_names(d) , row.names = sample_names(d)) n <- data.frame(sample_names(d) , row.names = sample_names(d))
names(n) <- "sample_names" names(n) <- "SampleID"
sample_data(d) <- n sample_data(d) <- n
} }
if (input$rareData) { if (input$rareData) {
...@@ -119,13 +120,9 @@ shinyServer ...@@ -119,13 +120,9 @@ shinyServer
}) })
output$rarefactionMin <- renderText({ output$rarefactionMin <- renderText({
if (!is.null(input$fileBiom)) { validate(need(input$fileBiom, ""), need(input$demo == "input", ""))
paste("(min sample =", format(min(sample_sums(data16S( paste("(min sample =", format(min(sample_sums(data16S(
))), big.mark = " "), "reads)") ))), big.mark = " "), "reads)")
} else {
paste("(min sample =", 0, "reads)")
}
}) })
output$phyloseqPrint <- renderPrint({ output$phyloseqPrint <- renderPrint({
...@@ -743,10 +740,7 @@ shinyServer ...@@ -743,10 +740,7 @@ shinyServer
selectInput( selectInput(
"acpLabel", "acpLabel",
label = "Label :", label = "Label :",
choices = c( choices = c("..." = 0, sample_variables(data16S()))
"..." = 0,
sample_variables(data16S())
)
), ),
selectInput( selectInput(
"acpCol", "acpCol",
......
...@@ -7,15 +7,13 @@ shinyUI(dashboardPage( ...@@ -7,15 +7,13 @@ shinyUI(dashboardPage(
selectInput( selectInput(
"demo", "demo",
label = "Select demo data", label = "Select demo data",
choices = list( choices = list("Input data" = "input",
"Input data" = "input",
"Chaillou et al., 2015" = "food"#, "Chaillou et al., 2015" = "food"#,
# "Mach et al., 2015" = "kinetic", # "Mach et al., 2015" = "kinetic",
# "Morton et al., 2017" = "soil", # "Morton et al., 2017" = "soil",
# "Ravel et al., 2011" = "ravel", # "Ravel et al., 2011" = "ravel",
#"GlobalPatterns" = "GlobalPatterns", #"GlobalPatterns" = "GlobalPatterns",
#"biorare" #"biorare"),
),
selected = 1 selected = 1
) )
), ),
...@@ -177,4 +175,5 @@ shinyUI(dashboardPage( ...@@ -177,4 +175,5 @@ shinyUI(dashboardPage(
) )
) )
) )
)) ))
\ No newline at end of file
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment