bryan/hartman-server
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

EASY passing linter checks

Browse Source
This commit is contained in:
Bryan Roessler
2024-07-27 12:09:09 -04:00
parent d77711acb7
commit 78d5e26d71
10 changed files with 810 additions and 772 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
workflow/templates/easy/EASYconsole.m
View File

@@ -20,6 +20,7 @@ function varargout = EASYconsole(varargin)
global mpdmFile
global userName
global srchRange
global searchRangeFile
% Initialize some variables from matlab
easyPath=which(mfilename);
@@ -115,7 +116,7 @@ function varargout = EASYconsole(varargin)
else
% Try to find MasterPlate_ file on our own
mp=fullfile(scansDir,'MasterPlateFiles',strcat('MasterPlate_', easySuffix,'.xlsx'));
if exist(mp, 'file'))
if exist(mp, 'file')
masterPlateFile=mp;
disp(strcat('Using drug media file: ', masterPlateFile, ' from internal logic'))
else
@@ -129,7 +130,7 @@ function varargout = EASYconsole(varargin)
else
% Try to find MasterPlate_ file on our own
dm=fullfile(scansDir,'MasterPlateFiles',strcat('DrugMedia_', easySuffix,'.xlsx'));
if exist(mp, 'file'))
if exist(mp, 'file')
drugMediaFile=dm;
disp(strcat('Using drug media file: ', drugMediaFile, ' from internal logic'))
else
@@ -147,16 +148,16 @@ function varargout = EASYconsole(varargin)
fotosResultsDir=fullfile(easyResultsDir,'Fotos');
figsResultsDir=fullfile(easyResultsDir,'figs');
pointMapsResultsDir=fullfile(easyResultsDir,'PTmats');
pointMapsFile=fullfile(pointMapsResultsDir,'NImParameters.mat')
oldPointMapsFile=fullfile(pointMapsResultsDir,'ImParameters.mat')
CSearchRangeFile=fullfile(fotosResultsDir,'CSearchRange.mat');
pointMapsFile=fullfile(pointMapsResultsDir,'NImParameters.mat');
oldPointMapsFile=fullfile(pointMapsResultsDir,'ImParameters.mat');
searchRangeFile=fullfile(fotosResultsDir,'CSearchRange.mat');
mpdmFile=fullfile(matDir,'MPDM.mat');
% This can be removed, I think it should add the previous search range?
% Might be nice feature but can remove if it causes issues
% We are using searchRangeNum to hold old CSrchRange value(s)
if exist(CSearchRangeFile, 'file')
searchRangeNum=load(CSearchRangeFile);
if exist(searchRangeFile, 'file')
searchRangeNum=load(searchRangeFile);
end
% Add easyDir to the MATLAB path
% I have not idea if this is necessary or works but theoretically should
@@ -212,7 +213,6 @@ end
% varargin--input arguments to EASYconsole (see VARARGIN)
function EASYconsole_OpeningFcn(hObject, ~, handles, varargin)
global fhconsole
global easyResultsDir
% Choose default command line output for EASYconsole
handles.output=hObject;
@@ -371,7 +371,7 @@ function LoadDatFile_Callback(~, ~, ~)
end
% Create supporting dirs
dirs={'PrintResults', 'figs', 'CFfigs', 'PTmats', 'Fotos'}
dirs={'PrintResults', 'figs', 'CFfigs', 'PTmats', 'Fotos'};
for i=1:length(dirs)
d=dirs{i};
if ~exist(fullfile(easyResultsDir, d), 'dir')