Commit 631d1db7 authored by actb's avatar actb

Merge branch 'msLoG' of https://git-bioimage.coe.drexel.edu/bioimage/leverjs into msLoG

parents 8a68df9f 88a31bd5
......@@ -5,7 +5,7 @@ function rgDistance=ccDistance(CONSTANTS,srcCells,dstCells,newCellIDs)
rgDistance=[];
VMAX = 3; % fraction of RMAX moved in one time frame
NDISTANCES=5; % max # out edges per node
NDISTANCES=3; % max # out edges per node
if ~exist('newCellIDs','var')
newCellIDs=[];
else
......
......@@ -30,7 +30,7 @@ end
nsz=4*floor(size(im)/16)+1;
T=adaptthresh(imLog,0.5,'NeighborhoodSize',nsz,'statistic','gaussian');
bwLog=imbinarize(imLog,T);
bwLog=Segment.aiAreaOpen(bwLog,min_radius_pixels);
bwLog=Segment.aiAreaOpen(bwLog,2*min_radius_pixels);
nsz=4*floor(size(im)/16)+1;
T=adaptthresh(im,sensitivity,'NeighborhoodSize',nsz,'statistic','gaussian');
......
function ljsPath=getLeverjsPath(file)
thisFile=mfilename('fullpath');
[thisFolder,~,~]=fileparts(thisFile);
if isdeployed()
thisFolder=fullfile(pwd(),'matlab');
else
thisFile=mfilename('fullpath');
[thisFolder,~,~]=fileparts(thisFile);
end
ljsPath=fullfile(thisFolder,'..','leverjs',file);
if ~exist(ljsPath,'file')
ljsPath=fullfile(thisFolder,'..',file);
end
if ~exist(ljsPath,'file')
fprintf(2,'getLeverjsPath:: could not locate %s\n',file);
end
\ No newline at end of file
ljsPath=fullfile(thisFolder,file);
end
if ~exist(ljsPath,'file')
fprintf(2,'getLeverjsPath:: could not locate file in %s in folder %s\n',file,thisFolder);
ljsPath=[];
end
......@@ -14,12 +14,14 @@ if isempty(timerVal) || isempty(configLevel) || elapsedTime>10
fname=getLeverjsPath('config.js');
configLevel=1;
if ~isempty(fname)
fid=fopen(fname,'r');
jsConfig=fscanf(fid,'%s\n');
fclose(fid);
jsConfigLevel=regexp(jsConfig,'logLevel=\d*[^;]','match');
if ~isempty(jsConfigLevel)
configLevel=str2double(jsConfigLevel{1}(length('logLevel=')+1));
fid=fopen(fname,'r');
if fid~=-1
jsConfig=fscanf(fid,'%s\n');
fclose(fid);
jsConfigLevel=regexp(jsConfig,'logLevel=\d*[^;]','match');
if ~isempty(jsConfigLevel)
configLevel=str2double(jsConfigLevel{1}(length('logLevel=')+1));
end
end
end
end
......
......@@ -13,6 +13,8 @@ fprintf(1,'matlabPollDB pid=%d\n',pid);
AddSQLiteToPath();
hipCheckSetRegistry();
ljsLog(['matlabPollDB:: HIP mutex from OS: ' getenv('HYDRA_ENABLE_MUTEX')],1);
warning('off','all');
if nargin>1
......
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