Commit 00046c1b authored by dmattek's avatar dmattek

Merge branch 'master' of https://github.com/dmattek/shiny-timecourse-inspector

# Conflicts:
#	modules/auxfunc.R
#	modules/tabScatter.R
#	ui.R
parents 7cabe42f d1546608
......@@ -191,16 +191,22 @@ helpText.server = c(
"<li>A column with a time point. Headers of columns with time points need to be numeric</li>"), #2
'Generate 60 random synthetic time series distributed evenly among 6 groups. Every time series has 60 time points.', #3
'Load CSV file with a column of track IDs for removal. IDs should correspond to those used for plotting.', #4
<<<<<<< HEAD
'Load CSV file with 5 columns: grouping, start and end tpts of stimulation, start and end of y-position, dummy column with ID.', #5
chBtrajInter = 'Interpolate missing time points and pre-existing NAs. Missing time points are rows entirely missing from the dataset. To interpolate, the interval of the time column must be provided.', #6
'If the track ID is unique only within a group, make it unique globally by combining with grouping columns.', #7
=======
'Load CSV file with 5 columns: grouping, start and end time points of stimulation, start and end of y-position, dummy column with ID.', #5
'Interpolate missing time points indicated with NAs. In addition, add NA if a row with a time point is completely missing. The interval of the time column must be provided to know which rows are missing.', #6
'If the track ID is not globally unique, try to make it unique by prepending another column to the track ID (typically the group column).', #7
>>>>>>> d154660843617744aa265b8e65e9abb9bbf8b1ce
'Select columns to group data according to treatment, condition, etc.', #8
'Select math operation to perform on a single or two columns,', #9
'Select range of time for further processing.', #10
'Divide measurments by the mean/median or calculate z-score with respect to selected time span.', #11
'Divide measurements by the mean/median or calculate z-score with respect to selected time span.', #11
'Fold-change or z-score with respect to selected time span.', #12
'Normalise with respect to this time span.', #13
'Calculate fold-change and z-score using the median and Median Absolute Deviation, instead of the mean and sd.', #14
'Calculate fold-change and z-score using the median and Median Absolute Deviation, instead of the mean and standard deviation.', #14
'Normalise to mean/median of selected time calculated globally, per group, or for individual time series.', #15
'Download time series after modification in this section.', #16
alertNAsPresent = "NAs present in the measurement column. Consider interpolation.",
......
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