Commit db6ccd7c authored by svolant's avatar svolant
Browse files

correction bug

parent 9b70ee7c
options(download.file.method = 'wget') options(download.file.method = 'wget')
if (!require("backports")){
install.packages("backports")
}
if (!require("readr")){ if (!require("readr")){
install.packages("readr") install.packages("readr")
} }
......
...@@ -318,8 +318,8 @@ SamplesMasque <- function(input,values) ...@@ -318,8 +318,8 @@ SamplesMasque <- function(input,values)
CreateJSON <- function(input){ CreateJSON <- function(input){
tmpjson = tempfile(pattern = "file", tmpdir = "/Volumes/@home/Projets Hub/Metagenomique/meta16s/www/masque/todo", fileext = ".json") curdir = getwd()
file.create(tmpjson,showWarnings=FALSE) tmpjson = tempfile(pattern = "file", tmpdir = paste(curdir,"www","masque","todo",sep= .Platform$file.sep), fileext = ".json")
if(input$PairedOrNot=='n') if(input$PairedOrNot=='n')
{ {
......
...@@ -16,11 +16,16 @@ shinyServer(function(input, output,session) { ...@@ -16,11 +16,16 @@ shinyServer(function(input, output,session) {
file.create(namesfile,showWarnings=FALSE) file.create(namesfile,showWarnings=FALSE)
target = NULL target = NULL
## JSON name for masque
curdir = getwd()
json_name = tempfile(pattern = "file", tmpdir = paste(curdir,"www","masque","todo",sep= .Platform$file.sep), fileext = ".json")
## Popup messages ## Popup messages
observe(if(input$AddRegScatter) info("By adding the regression line, you will lose interactivity.")) observe(if(input$AddRegScatter) info("By adding the regression line, you will lose interactivity."))
## Reactive target ## Reactive target
values <- reactiveValues(TargetWorking = target,labeled=NULL,fastq_names_only=NULL,R1fastQ=NULL,R2fastQ=NULL) values <- reactiveValues(TargetWorking = target,labeled=NULL,fastq_names_only=NULL,R1fastQ=NULL,R2fastQ=NULL,json_name=json_name)
## Counts file ## Counts file
dataInputCounts <-reactive({ dataInputCounts <-reactive({
...@@ -707,7 +712,7 @@ shinyServer(function(input, output,session) { ...@@ -707,7 +712,7 @@ shinyServer(function(input, output,session) {
} }
## Create JSON file ## Create JSON file
withProgress(message = 'Creating JSON file...',{CreateJSON(input)}) withProgress(message = 'Creating JSON file...',{CreateJSON(input,values$json_name)})
} }
}) })
...@@ -876,6 +881,17 @@ shinyServer(function(input, output,session) { ...@@ -876,6 +881,17 @@ shinyServer(function(input, output,session) {
}) })
output$gaugeMasque <-renderGauge({
values$json_name
num = 0
gauge(num, 0,100,symbol = '%')
})
######################## END MASQUE ################################# ######################## END MASQUE #################################
......
...@@ -258,7 +258,12 @@ body <- dashboardBody( ...@@ -258,7 +258,12 @@ body <- dashboardBody(
# <\ui> to analyse 16S/18S/23S/28S/ITS data. It builds a count matrix, an annotation table and a phylogeny of the OTU. # <\ui> to analyse 16S/18S/23S/28S/ITS data. It builds a count matrix, an annotation table and a phylogeny of the OTU.
# to perform to use a set of parameters already tested on serveral projects for the numerous software used to perform the clustering and the annotation. # to perform to use a set of parameters already tested on serveral projects for the numerous software used to perform the clustering and the annotation.
# to perform an uptodate analysis considering the scientific litterature." # to perform an uptodate analysis considering the scientific litterature."
))), )),
column(width=4,
gaugeOutput("gaugeMasque", width = "100%", height = "100%")
)
),
hr(), hr(),
HTML('<center><h2 style="color:#053383;"><b>Start your analysis</b></h2></center>'), HTML('<center><h2 style="color:#053383;"><b>Start your analysis</b></h2></center>'),
......
Supports Markdown
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