From 121a807050bf4e677b654b41157a4f69754199ba Mon Sep 17 00:00:00 2001
From: jzoppi <johanna.zoppi@univ-nantes.fr>
Date: Fri, 3 Apr 2020 10:05:25 +0200
Subject: [PATCH] bug dataset 1 & sampleAnnot loading
---
server_function/SERVER_Data_Upload.R | 17 ++---------------
1 file changed, 2 insertions(+), 15 deletions(-)
diff --git a/server_function/SERVER_Data_Upload.R b/server_function/SERVER_Data_Upload.R
index 35d812d..8a26d87 100644
--- a/server_function/SERVER_Data_Upload.R
+++ b/server_function/SERVER_Data_Upload.R
@@ -31,7 +31,7 @@ sampleAnnot <- reactive({
updateCheckboxInput(session, "Omic3", value= FALSE)
}else{
- print(input$file2$datapath)
+
validate(
need(input$file2$datapath != "", "Please select a data set")
)
@@ -113,7 +113,6 @@ exprDat <- eventReactive(input$goPrevalence, {
exprDat <- read.csv(expressionData, sep = ",", header = TRUE, row.names = 1)
}else{
- print(input$file1$datapath)
validate(
need(input$file1$datapath != "", "Please select a data set")
)
@@ -267,16 +266,13 @@ exprDat <- eventReactive(input$goPrevalence, {
exprDat <- exprDat[order(rownames(exprDat)),]
exprDat
-}, ignoreNULL = FALSE)
+})
exprDat_present <- reactive({
if (input$LoadExample == "Example1" || input$LoadExample == "Example2"){
exprDat_present <- exprDat()
}else{
- validate(
- need(input$file1$datapath != "", "Please select a data set")
- )
exprDat_present <- exprDat()
}
# if (nchar(colnames(exprDat_present)[1]) > 20 ){
@@ -298,7 +294,6 @@ exprDatSec <- eventReactive(input$goPrevalence1, {
expressionData<-"data/data_tara/TARAoceans_proNOGS.csv" #expression file path
exprDatSec <- read.csv(expressionData, sep = ",", header = TRUE, row.names = 1)
}else{
- print(input$file4$datapath)
validate(
need(input$file4$datapath != "", "Please select a data set")
)
@@ -459,9 +454,6 @@ exprDatSec_present <- reactive({
if (input$LoadExample == "Example1" || input$LoadExample == "Example2"){
exprDatSec_present <- exprDatSec()
}else{
- validate(
- need(input$file4$datapath != "", "Please select a data set")
- )
exprDatSec_present <- exprDatSec()
}
# if (nchar(colnames(exprDatSec_present)[5]) > 20 ){
@@ -481,7 +473,6 @@ exprDatTer <- eventReactive(input$goPrevalence2, {
expressionData<-"data/data_breast/protein.csv" #expression file path
exprDat <- read.csv(expressionData, sep = ",", header = TRUE, row.names = 1)
}else{
- print(input$file5$datapath)
validate(
need(input$file5$datapath != "" && (input$Omic3), "Please select a data set")
)
@@ -634,10 +625,6 @@ exprDatTer_present <- reactive({
if (input$LoadExample == "Example1"){
exprDatTer_present <- exprDatTer()
}else{
-
- validate(
- need(input$file5$datapath != "", "Please select a data set")
- )
exprDatTer_present <- exprDatTer()
}
}
--
GitLab