Commit a362d936 authored by dmattek's avatar dmattek

New clValid tab

parent aace7b66
...@@ -34,18 +34,18 @@ shinyUI(fluidPage( ...@@ -34,18 +34,18 @@ shinyUI(fluidPage(
actionButton("butReset", "Reset file input"), actionButton("butReset", "Reset file input"),
actionButton('inDataGen1', 'Synthetic data'), actionButton('inDataGen1', 'Synthetic data'),
bsTooltip('inDataGen1', helpText.server[3], placement = "top", trigger = "hover", options = NULL), bsTooltip('inDataGen1', helpText.server[["inDataGen1"]], placement = "top", trigger = "hover", options = NULL),
tags$hr(), tags$hr(),
checkboxInput('chBtrajRem', 'Upload tracks to remove'), checkboxInput('chBtrajRem', 'Upload tracks to remove'),
bsTooltip('chBtrajRem', helpText.server[4], placement = "top", trigger = "hover", options = NULL), bsTooltip('chBtrajRem', helpText.server[["chBtrajRem"]], placement = "top", trigger = "hover", options = NULL),
uiOutput('uiFileLoadTrajRem'), uiOutput('uiFileLoadTrajRem'),
uiOutput('uiButLoadTrajRem'), uiOutput('uiButLoadTrajRem'),
#tags$hr(), #tags$hr(),
checkboxInput('chBstim', 'Upload stimulation pattern'), checkboxInput('chBstim', 'Upload stimulation pattern'),
bsTooltip('chBstim', helpText.server[5], placement = "top", trigger = "hover", options = NULL), bsTooltip('chBstim', helpText.server[["chBstim"]], placement = "top", trigger = "hover", options = NULL),
uiOutput('uiFileLoadStim'), uiOutput('uiFileLoadStim'),
uiOutput('uiButLoadStim'), uiOutput('uiButLoadStim'),
...@@ -57,7 +57,7 @@ shinyUI(fluidPage( ...@@ -57,7 +57,7 @@ shinyUI(fluidPage(
uiOutput('varSelTimeFreq'), uiOutput('varSelTimeFreq'),
checkboxInput('chBtrackUni', 'Create unique track ID', F), checkboxInput('chBtrackUni', 'Create unique track ID', F),
bsTooltip('chBtrackUni', helpText.server[7], placement = "top", trigger = "hover", options = NULL), bsTooltip('chBtrackUni', helpText.server[["chBtrackUni"]], placement = "top", trigger = "hover", options = NULL),
uiOutput('varSelSite'), uiOutput('varSelSite'),
tags$hr(), tags$hr(),
...@@ -152,15 +152,22 @@ shinyUI(fluidPage( ...@@ -152,15 +152,22 @@ shinyUI(fluidPage(
tabScatterPlotUI('tabScatter') tabScatterPlotUI('tabScatter')
), ),
# hierarchical clustering
tabPanel( tabPanel(
'Hierarchical', 'Hierarchical',
clustHierUI('tabClHier') clustHierUI('tabClHier')
), ),
# sparse hierarchical clustering package sparcl temporarily unavailable from CRAN # sparse hierarchical clustering package sparcl temporarily unavailable from CRAN
tabPanel( tabPanel(
'Hierarchical Sparse', 'Hierarchical Sparse',
clustHierSparUI('tabClHierSpar') clustHierSparUI('tabClHierSpar')
),
# cluster validation
tabPanel(
'Validation',
clustValidUI('tabClValid')
) )
)) ))
) )
......
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