In order to mitigate against the brute force attacks against Gitlab accounts, we are moving to all edu-ID Logins. We would like to remind you to link your account with your edu-id. Login will be possible only by edu-ID after November 30, 2021. Here you can find the instructions for linking your account.

If you don't have a SWITCH edu-ID, you can create one with this guide here

kind regards

This Server has been upgraded to GitLab release 14.2.6

Commit a8f6e87c authored by Maciej Dobrzynski's avatar Maciej Dobrzynski
Browse files

Bug fixes

parent 602f8b92
......@@ -19,14 +19,21 @@ require(Hmisc) # for CI calculation
DEB = T
# font sizes in pts for plots
PLOTFONTBASE = 8
PLOTFONTAXISTEXT = 8
PLOTFONTAXISTITLE = 8
PLOTFONTFACETSTRIP = 10
PLOTFONTLEGEND = 8
# PLOTFONTBASE = 8
# PLOTFONTAXISTEXT = 8
# PLOTFONTAXISTITLE = 8
# PLOTFONTFACETSTRIP = 10
# PLOTFONTLEGEND = 8
PLOTFONTBASE = 12
PLOTFONTAXISTEXT = 12
PLOTFONTAXISTITLE = 12
PLOTFONTFACETSTRIP = 16
PLOTFONTLEGEND = 12
# default number of facets in plots
PLOTNFACETDEFAULT = 3
PLOTNFACETDEFAULT = 2
# internal column names
COLRT = 'realtime'
......@@ -229,20 +236,20 @@ LOCgenTraj <- function(in.ntpts = 60, in.ntracks = 10, in.nfov = 6, in.nwells =
# add outliers for testing
if (!is.null(in.addout)) {
locTabLen = length(x.rand.1)
x.rand.1[round(runif(in.addout) * locTabLen)] = 10
x.rand.2[round(runif(in.addout) * locTabLen)] = 10
x.rand.1[round(runif(in.addout) * locTabLen)] = 5
x.rand.2[round(runif(in.addout) * locTabLen)] = 5
}
x.arg = rep(seq(1, in.ntpts), in.ntracks * in.nfov)
dt.nuc = data.table(Metadata_Well = rep(LETTERS[1:in.nwells], each = in.ntpts * in.nfov * in.ntracks / in.nwells),
Metadata_Site = rep(1:in.nfov, each = in.ntpts * in.ntracks),
Metadata_RealTime = x.arg,
objCyto_Intensity_MeanIntensity_imErkCor = x.rand.1,
objNuc_Intensity_MeanIntensity_imErkCor = x.rand.2,
objNuc_Location_X = runif(in.ntpts * in.ntracks * in.nfov, min = 0, max = 1),
objNuc_Location_Y = runif(in.ntpts * in.ntracks * in.nfov, min = 0, max = 1),
TrackLabel = rep(1:(in.ntracks*in.nfov), each = in.ntpts))
dt.nuc = data.table(well = rep(LETTERS[1:in.nwells], each = in.ntpts * in.nfov * in.ntracks / in.nwells),
group = rep(1:in.nfov, each = in.ntpts * in.ntracks),
time = x.arg,
y1 = x.rand.1,
y2 = x.rand.2,
posx = runif(in.ntpts * in.ntracks * in.nfov, min = 0, max = 1),
posy = runif(in.ntpts * in.ntracks * in.nfov, min = 0, max = 1),
id = rep(1:(in.ntracks*in.nfov), each = in.ntpts))
return(dt.nuc)
}
......
......@@ -241,7 +241,7 @@ shinyServer(function(input, output, session) {
if (input$chBtrackUni) {
locCols = getDataNucCols()
locColSel = locCols[grep('(S|s)ite|(S|s)eries|(F|f)ov', locCols)[1]] # index 1 at the end in case more matches; select 1st
locColSel = locCols[grep('(S|s)ite|(S|s)eries|(F|f)ov|(G|g)roup', locCols)[1]] # index 1 at the end in case more matches; select 1st
selectInput(
'inSelSite',
......@@ -261,7 +261,7 @@ shinyServer(function(input, output, session) {
locCols = getDataNucCols()
if (!is.null(locCols)) {
locColSel = locCols[grep('(R|r)atio|(I|i)ntensity|y|Meas', locCols)[1]] # index 1 at the end in case more matches; select 1st
locColSel = locCols[grep('(R|r)atio|(I|i)ntensity|(Y|y)|(M|m)eas', locCols)[1]] # index 1 at the end in case more matches; select 1st
selectInput(
'inSelMeas1',
......@@ -282,7 +282,7 @@ shinyServer(function(input, output, session) {
if (!is.null(locCols) &&
!(input$inSelMath %in% c('', '1 / '))) {
locColSel = locCols[grep('(R|r)atio|(I|i)ntensity|y|Meas', locCols)[1]] # index 1 at the end in case more matches; select 1st
locColSel = locCols[grep('(R|r)atio|(I|i)ntensity|(Y|y)|(M|m)eas', locCols)[1]] # index 1 at the end in case more matches; select 1st
selectInput(
'inSelMeas2',
......
......@@ -64,7 +64,7 @@ shinyUI(fluidPage(
uiOutput('varSelTime'),
uiOutput('varSelMeas1'),
radioButtons(
'inSelMath', width = '25%',
'inSelMath', width = '50%',
'Math on 1st and 2nd meas.:',
c(
'None' = '',
......
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