Added multiple columns for facetting

auxfunc.R

@@ -36,9 +36,7 @@ myGgplotTraj = function(dt.arg,
                         plotlab.arg = NULL,
                         dt.stim.arg = NULL,
                         tfreq.arg = 1,
-                        maxrt.arg = 60,
-                        xaxisbreaks.arg = 10,
-                        ylim.arg = c(0,1),
+                        ylim.arg = NULL,
                         stim.bar.height.arg = 0.1,
                         stim.bar.width.arg = 0.5) {
   p.tmp = ggplot(dt.arg,
@@ -75,9 +73,10 @@ myGgplotTraj = function(dt.arg,
                                  group = 1) 
   }
   
+  if (!is.null(ylim.arg)) 
+    p.tmp = p.tmp + coord_cartesian(ylim = ylim.arg)
+  
   p.tmp = p.tmp + 
-    scale_x_continuous(breaks = seq(0, maxrt.arg, xaxisbreaks.arg)) +
-    coord_cartesian(ylim = ylim.arg) +
     xlab(paste0(xlab.arg, "\n")) +
     ylab(paste0("\n", ylab.arg)) +
     ggtitle(plotlab.arg) +

ui.R

@@ -31,23 +31,40 @@ shinyUI(fluidPage(
              accept = c('text/csv', 'text/comma-separated-values,text/plain')
            ),
            
+           h4("Plot format"),
+           fluidRow(
+             column(4, 
+                    numericInput('inFacetNcol', '#Columns:', value = 4, min = 1, width = '100px', step = 1)),
+             column(4, 
+                    numericInput('inPlotHeight', 'Height [px]:', value = 800, min = 100, width = '100px', step = 50)),
+             column(4, 
+                    numericInput('inPlotWidth', 'Width [%]:', value = 100, min = 10, max = 100, width = '100px', step = 10))
+           ),
+           
            actionButton("butReset", "Reset file input"),
            actionButton('butDataGen', 'Generate artificial dataset'),
            actionButton('butGo', 'Go!')),
     
-    column(4, offset = 1,
+    column(3, offset = 1,
            uiOutput('varSelSite'),
            uiOutput('varSelTrackLabel'),
            uiOutput('varSelTime'),
            uiOutput('varSelMeas1'),
            uiOutput('varSelRatio'),
+           radioButtons('inSelMath', 'Math operation 1st and 2nd meas.:', c('None' = '', 
+                                                                            'Divide' = " / ", 
+                                                                            'Sum' = " + ", 
+                                                                            'Multiply' = " * ", 
+                                                                            'Subtract' = ' - ')),
            uiOutput('varSelMeas2')),
   
-    column(2, offset = 1,
-           numericInput('inFacetNcol', 'No. of plot columns:', value = 4, min = 1, width = '150px', step = 1),
-           numericInput('inPlotHeight', 'Plot Height [px]:', value = 400, min = 100, width = '150px', step = 50),
-           numericInput('inPlotWidth', 'Plot Width [%]:', value = 100, min = 10, max = 100, width = '150px', step = 10))
-  ),
+    column(3, offset = 1,
+           uiOutput('varSelGroup'),
+           checkboxInput('inGroupMore1', 'More grouping?'),
+           uiOutput('varSelGroup2'),
+           checkboxInput('inGroupMore2', 'More grouping?'),
+           uiOutput('varSelGroup3'))
+),
   br(),
   uiOutput('outPlot')
 ))