Commit edae527e authored by dmattek's avatar dmattek
Browse files

Mod:

- recognize "*.os.x" and "*.os.y" as valid column names with X and Y positions
- increase fixed plot with of clustered time series
parent 6af1a330
...@@ -499,8 +499,8 @@ shinyServer(function(input, output, session) { ...@@ -499,8 +499,8 @@ shinyServer(function(input, output, session) {
# Find column names with position # Find column names with position
loc.s.pos.x = names(loc.dt)[names(loc.dt) %like% 'Location.*X'] loc.s.pos.x = names(loc.dt)[names(loc.dt) %like% c('.*ocation.*X') | names(loc.dt) %like% c('.*os.x')]
loc.s.pos.y = names(loc.dt)[names(loc.dt) %like% 'Location.*Y'] loc.s.pos.y = names(loc.dt)[names(loc.dt) %like% c('.*ocation.*Y') | names(loc.dt) %like% c('.*os.y')]
if (length(loc.s.pos.x) == 1 & length(loc.s.pos.y) == 1) if (length(loc.s.pos.x) == 1 & length(loc.s.pos.y) == 1)
locPos = TRUE locPos = TRUE
......
...@@ -271,13 +271,13 @@ shinyUI(fluidPage( ...@@ -271,13 +271,13 @@ shinyUI(fluidPage(
# tabPanel('Heat-map int.', # tabPanel('Heat-map int.',
# helpText("Choose your settings 2")), # helpText("Choose your settings 2")),
tabPanel('Time-courses', tabPanel('Time-courses',
downPlotUI('downPlotHierTraj', "Download PDF"),
actionButton('butPlotHierTraj', 'Plot!'), actionButton('butPlotHierTraj', 'Plot!'),
plotOutput('outPlotHierTraj')), plotOutput('outPlotHierTraj' , height = '800px', width = 'auto'),
downPlotUI('downPlotHierTraj', "Download PDF")),
tabPanel('Cluster dist.', tabPanel('Cluster dist.',
downPlotUI('downPlotHierClDist', "Download PDF"),
actionButton('butPlotHierClDist', 'Plot!'), actionButton('butPlotHierClDist', 'Plot!'),
plotOutput('outPlotHierClDist')) plotOutput('outPlotHierClDist', height = '800px', width = 'auto'),
downPlotUI('downPlotHierClDist', "Download PDF"))
) )
), ),
...@@ -451,13 +451,13 @@ shinyUI(fluidPage( ...@@ -451,13 +451,13 @@ shinyUI(fluidPage(
# tabPanel('Heat-map int.', # tabPanel('Heat-map int.',
# helpText("Choose your settings 2")), # helpText("Choose your settings 2")),
tabPanel('Time-courses', tabPanel('Time-courses',
downPlotUI('downPlotHierSparTraj', "Download PDF"),
actionButton('butPlotHierSparTraj', 'Plot!'), actionButton('butPlotHierSparTraj', 'Plot!'),
plotOutput('outPlotHierSparTraj')), plotOutput('outPlotHierSparTraj', height = '800px', width = 'auto'),
downPlotUI('downPlotHierSparTraj', "Download PDF")),
tabPanel('Cluster dist.', tabPanel('Cluster dist.',
downPlotUI('downPlotHierSparClDist', "Download PDF"),
actionButton('butPlotHierSparClDist', 'Plot!'), actionButton('butPlotHierSparClDist', 'Plot!'),
plotOutput('outPlotHierSparClDist')) plotOutput('outPlotHierSparClDist', height = '800px', width = 'auto'),
downPlotUI('downPlotHierSparClDist', "Download PDF"))
) )
) )
# #
......
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