Commit 425d1f5e authored by Maciej Dobrzynski's avatar Maciej Dobrzynski Committed by GitHub

Merge pull request #7 from majpark21/master

Update file names for download
parents e20b40eb 37288eb4
...@@ -66,12 +66,12 @@ COLNTRAJ = "nCells" ...@@ -66,12 +66,12 @@ COLNTRAJ = "nCells"
# file names # file names
FCSVOUTLIERS = 'outliers.csv' FCSVOUTLIERS = 'outliers.csv'
FCSVTCCLEAN = 'tCoursesSelected_clean.csv' FCSVTCCLEAN = 'tCoursesProcessed.csv'
FPDFTCMEAN = "tCoursesMeans.pdf" FPDFTCMEAN = "tCoursesMeans.pdf"
FPDFTCSINGLE = "tCourses.pdf" FPDFTCSINGLE = "tCourses.pdf"
FPDFTCPSD = 'tCoursesPsd.pdf' FPDFTCPSD = 'tCoursesPsd.pdf'
FPDFBOXAUC = 'boxplotAUC.pdf' FPDFBOXAUC = 'distributionAUC.pdf'
FPDFBOXTP = 'boxplotTP.pdf' FPDFBOXTP = 'distributionTP.pdf'
FPDFSCATTER = 'scatter.pdf' FPDFSCATTER = 'scatter.pdf'
# Colour definitions ---- # Colour definitions ----
......
...@@ -36,7 +36,7 @@ downPlotUI <- function(id, label = "Download Plot") { ...@@ -36,7 +36,7 @@ downPlotUI <- function(id, label = "Download Plot") {
numericInput( numericInput(
ns('inPlotWidth'), ns('inPlotWidth'),
"Width [in]", "Width [in]",
8.5, 11,
min = 1, min = 1,
width = 100 width = 100
) )
...@@ -48,7 +48,7 @@ downPlotUI <- function(id, label = "Download Plot") { ...@@ -48,7 +48,7 @@ downPlotUI <- function(id, label = "Download Plot") {
numericInput( numericInput(
ns('inPlotHeight'), ns('inPlotHeight'),
"Height [in]", "Height [in]",
11, 8.5,
min = 1, min = 1,
width = 100 width = 100
) )
......
...@@ -88,7 +88,7 @@ tabAUCplot = function(input, output, session, in.data, in.fname) { ...@@ -88,7 +88,7 @@ tabAUCplot = function(input, output, session, in.data, in.fname) {
in.data = AUCcells, in.data = AUCcells,
in.meascol = 'AUC', in.meascol = 'AUC',
in.bycols = COLGR, in.bycols = COLGR,
in.fname = 'data4boxplotAUC.csv') in.fname = 'individualsAUC.csv')
callModule(modAUCplot, 'aucPlot', callModule(modAUCplot, 'aucPlot',
in.data = AUCcells, in.data = AUCcells,
......
...@@ -447,7 +447,7 @@ clustHierSpar <- function(input, output, session, ...@@ -447,7 +447,7 @@ clustHierSpar <- function(input, output, session,
output$downCellClSpar <- downloadHandler( output$downCellClSpar <- downloadHandler(
filename = function() { filename = function() {
paste0('clust_hierchSpar_data_', paste0('clust_hierchSpar_data_',
input$selectPlotHierSparDiss, ifelse(input$selectPlotHierSparDiss == "squared.distance", "euclidean", "manhattan"),
'_', '_',
input$selectPlotHierSparLinkage, '.csv') input$selectPlotHierSparLinkage, '.csv')
}, },
...@@ -574,7 +574,7 @@ clustHierSpar <- function(input, output, session, ...@@ -574,7 +574,7 @@ clustHierSpar <- function(input, output, session,
createFnameHeatMap = reactive({ createFnameHeatMap = reactive({
paste0('clust_hierchSparse_heatMap_', paste0('clust_hierchSparse_heatMap_',
input$selectPlotHierSparDiss, ifelse(input$selectPlotHierSparDiss == "squared.distance", "euclidean", "manhattan"),
'_', '_',
input$selectPlotHierSparLinkage, input$selectPlotHierSparLinkage,
'.png') '.png')
...@@ -583,7 +583,7 @@ clustHierSpar <- function(input, output, session, ...@@ -583,7 +583,7 @@ clustHierSpar <- function(input, output, session,
createFnameTrajPlot = reactive({ createFnameTrajPlot = reactive({
paste0('clust_hierchSparse_tCourses_', paste0('clust_hierchSparse_tCourses_',
input$selectPlotHierSparDiss, ifelse(input$selectPlotHierSparDiss == "squared.distance", "euclidean", "manhattan"),
'_', '_',
input$selectPlotHierSparLinkage, input$selectPlotHierSparLinkage,
'.pdf') '.pdf')
...@@ -592,7 +592,7 @@ clustHierSpar <- function(input, output, session, ...@@ -592,7 +592,7 @@ clustHierSpar <- function(input, output, session,
createFnameRibbonPlot = reactive({ createFnameRibbonPlot = reactive({
paste0('clust_hierchSparse_tCoursesMeans_', paste0('clust_hierchSparse_tCoursesMeans_',
input$selectPlotHierSparDiss, ifelse(input$selectPlotHierSparDiss == "squared.distance", "euclidean", "manhattan"),
'_', '_',
input$selectPlotHierSparLinkage, input$selectPlotHierSparLinkage,
'.pdf') '.pdf')
...@@ -601,7 +601,7 @@ clustHierSpar <- function(input, output, session, ...@@ -601,7 +601,7 @@ clustHierSpar <- function(input, output, session,
createFnamePsdPlot = reactive({ createFnamePsdPlot = reactive({
paste0('clust_hierchSparse_tCoursesPsd_', paste0('clust_hierchSparse_tCoursesPsd_',
input$selectPlotHierSparDiss, ifelse(input$selectPlotHierSparDiss == "squared.distance", "euclidean", "manhattan"),
'_', '_',
input$selectPlotHierSparLinkage, input$selectPlotHierSparLinkage,
'.pdf') '.pdf')
...@@ -610,7 +610,7 @@ clustHierSpar <- function(input, output, session, ...@@ -610,7 +610,7 @@ clustHierSpar <- function(input, output, session,
createFnameDistPlot = reactive({ createFnameDistPlot = reactive({
paste0('clust_hierchSparse_clDist_', paste0('clust_hierchSparse_clDist_',
input$selectPlotHierSparDiss, ifelse(input$selectPlotHierSparDiss == "squared.distance", "euclidean", "manhattan"),
'_', '_',
input$selectPlotHierSparLinkage, '.pdf') }) input$selectPlotHierSparLinkage, '.pdf') })
......
...@@ -37,7 +37,7 @@ tabDistPlot = function(input, output, session, in.data, in.fname) { ...@@ -37,7 +37,7 @@ tabDistPlot = function(input, output, session, in.data, in.fname) {
in.data = data4boxPlot, in.data = data4boxPlot,
in.meascol = 'y', in.meascol = 'y',
in.bycols = c(COLRT, COLGR), in.bycols = c(COLRT, COLGR),
in.fname = 'data4boxplotTP.csv') in.fname = 'individualsTP.csv')
callModule(modDistPlot, 'distPlot', callModule(modDistPlot, 'distPlot',
in.data = data4boxPlot, in.data = data4boxPlot,
......
...@@ -27,7 +27,7 @@ helpText.tabScatter = c( ...@@ -27,7 +27,7 @@ helpText.tabScatter = c(
chBregression = 'Add a line with linear regression and regions of 95% confidence interval.', chBregression = 'Add a line with linear regression and regions of 95% confidence interval.',
inAvgWin = paste0( inAvgWin = paste0(
"Length of the averaging window to smooth data before plotting. ", "Length of the averaging window to smooth data before plotting. ",
"Useful to avoid artefacts in due to spurious variations at specific time points." "Useful to avoid artefacts due to spurious variations at specific time points."
), ),
inPlotHeight = 'Height in pixels of the displayed plot', inPlotHeight = 'Height in pixels of the displayed plot',
inPlotNcolFacet = 'Number of facets in a row. Each facet displayes a scatter plot for a single group.', inPlotNcolFacet = 'Number of facets in a row. Each facet displayes a scatter plot for a single group.',
......
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