strcat to sprintf
Dieser Commit ist enthalten in:
@@ -7,7 +7,7 @@ global matDir
|
||||
|
||||
% If we already have mpdmFile, don't recreate
|
||||
if (exist(mpdmFile, 'file') && ~isempty(mpdmFile))
|
||||
disp(strcat('The Drug Media/MasterPlate Annotation File: ', mpdmFile, ' exists, skipping DMPexcel2mat.m'));
|
||||
disp(sprintf('The Drug Media/MasterPlate Annotation File: %s exists, skipping DMPexcel2mat.m\n', mpdmFile));
|
||||
return
|
||||
end
|
||||
|
||||
@@ -82,7 +82,7 @@ if ~exist(masterPlateFile, 'file') || isempty(masterPlateFile)
|
||||
end
|
||||
end
|
||||
else
|
||||
disp(strcat('Using MasterPlate file: ', masterPlateFile, ', skipping directory selection'));
|
||||
disp(sprintf('Using MasterPlate file: %s skipping directory selection\n', masterPlateFile));
|
||||
end
|
||||
|
||||
% fid=fopen(masterPlateFile)%('exp23PrintTimes.xls'); % textread puts date and time sequentially into vector
|
||||
@@ -183,7 +183,7 @@ if ~exist(drugMediaFile, 'file') || isempty(drugMediaFile)
|
||||
dmFileToTest=fullfile(mpPath, 'DrugMedia_', mpBareFileName, '.xlsx');
|
||||
if exist(dmFileToTest, 'file') % Try to find a matching drug media file
|
||||
drugMediaFile=dmFileToTest;
|
||||
disp(strcat('Using matching DrugMedia file: ', drugMediaFile, ', skipping directory selection'));
|
||||
disp(sprintf('Using matching DrugMedia file: %s, skipping directory selection\n', drugMediaFile));
|
||||
else
|
||||
% Try to find the DrugMedia file automatically (newest created first)
|
||||
files=dir(matDir);
|
||||
@@ -195,7 +195,8 @@ if ~exist(drugMediaFile, 'file') || isempty(drugMediaFile)
|
||||
[~, sortedIndices]=sort(datenum({files(strncmp(dmFiles.name, 'DrugMedia_', 10)).date}), 'descend');
|
||||
sortedFiles=dmFiles{sortedIndices};
|
||||
drugMediaFile=sortedFiles{1};
|
||||
disp(strcat('Using newest DrugMedia file: ', drugMediaFile, ', skipping directory selection'));
|
||||
disp(sprintf('Using newest DrugMedia file: %s, skipping directory selection\n', drugMediaFile));
|
||||
|
||||
end
|
||||
catch Me
|
||||
% This can be silent, not really an error
|
||||
@@ -228,7 +229,7 @@ if ~exist(drugMediaFile, 'file') || isempty(drugMediaFile)
|
||||
end
|
||||
end
|
||||
else
|
||||
disp(strcat('Using drugMediaFile: ', drugMediaFile, ', skipping directory selection'));
|
||||
disp(sprintf('Using drugMediaFile: %s, skipping directory selection\n', drugMediaFile));
|
||||
end
|
||||
|
||||
% Drug and Media Plate setup
|
||||
@@ -325,4 +326,4 @@ if isequal(Linked,0) % 0 indicates Drugs and Media are combinatorial
|
||||
end
|
||||
|
||||
save(mpdmFile, 'fields','MP','DM','Linked');
|
||||
msgbox([strcat('Drug-Media-MasterPlate Annotation File', mpdmFile,'Generation Complete')])
|
||||
msgbox(sprintf('Drug-Media-MasterPlate Annotation File %s Generation Complete', mpdmFile))
|
||||
|
||||
In neuem Issue referenzieren
Einen Benutzer sperren