Skip to content

Commit

Permalink
v2.43.2
Browse files Browse the repository at this point in the history
-- Fix executable installation issues - version number not being displayed in executable version. Plus error when getting version number during executable installation in setup - getVernum getting wrong input. Thought this was fixed in previous versions but I guess not.

* DataTree, v1.15.2
Error when launching AV in folder with no snirf acquisition files. Fix in DataTreeClass.
  • Loading branch information
jayd1860 committed May 25, 2023
1 parent da6439f commit 120adaa
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 10 deletions.
4 changes: 3 additions & 1 deletion Group/DataTree/DataTreeClass.m
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,9 @@ function FindAndLoadGroups(obj, groupDirs, fmt, procStreamCfgFile, options)
while dataInit.GetError() < 0
dataInit = FindFiles(obj.dirnameGroups{kk}, fmt, options);
if isempty(dataInit) || dataInit.IsEmpty()
obj.filesErr = dataInit.filesErr;
if ~isempty(dataInit)
obj.filesErr = dataInit.filesErr;
end
ErrorCheckLoadedFiles(obj);
return;
end
Expand Down
2 changes: 1 addition & 1 deletion Group/DataTree/Version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.15.1
1.15.2
2 changes: 2 additions & 0 deletions Install/createInstallFile.m
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,8 @@ function createInstallFile(options)
myCopyFile([dirnameInstall, 'README.txt'], [dirnameInstall, installfilename]);
myCopyFile([dirnameInstall, 'uninstall.bat'], [dirnameInstall, installfilename]);
myCopyFile([dirnameApp, 'LastCheckForUpdates.dat'], [dirnameInstall, installfilename]);
myCopyFile([dirnameApp, 'Version.txt'], [dirnameInstall, installfilename]);

for ii = 1:length(platform.iso2meshmex)
myCopyFile([platform.iso2meshbin, platform.iso2meshmex{ii}], [dirnameInstall, installfilename]);
end
Expand Down
16 changes: 9 additions & 7 deletions Install/setup.m
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@ function setup()

try

setNamespace('AtlasViewerGUI');

currdir = filesepStandard(pwd);

h = waitbar(0,'Installation Progress ...');
Expand Down Expand Up @@ -63,9 +61,9 @@ function main()

[~, exename] = getAppname();

v = getVernum('AtlasViewerGUI');
v = getVernum(exename);
logger.Write('==========================================\n');
logger.Write('Setup script for %s v%s.%s.%s:\n', exename, v{1}, v{2}, v{3});
logger.Write('Setup script for %s v%s:\n', exename, v);
logger.Write('==========================================\n\n');

logger.Write('Platform params:\n');
Expand All @@ -90,7 +88,7 @@ function main()
msg{1} = sprintf('Error: Could not create installation folder. It might be in use by other applications.\n');
msg{2} = sprintf('Try closing and reopening file browsers or any other applications that might be using the\n');
msg{3} = sprintf('installation folder and then retry installation.');
MenuBox([msg{:}], 'OK');
MenuBox(msg, 'OK');
close(h);
rethrow(ME)
end
Expand All @@ -114,6 +112,7 @@ function main()
myCopyFile([dirnameSrc, platform.mc_exe_name], [dirnameDst, platform.mc_exe_name]);
myCopyFile([dirnameSrc, 'Group'], [dirnameDst, 'Group']);
myCopyFile([dirnameSrc, 'LastCheckForUpdates.dat'], dirnameDst);
myCopyFile([dirnameSrc, 'Version.txt'], dirnameDst);

for ii = 1:length(platform.iso2meshmex)
% Use dir instead of exist for mex files because of an annoying matlab bug, where a
Expand Down Expand Up @@ -157,7 +156,7 @@ function main()
msg{1} = sprintf('Error: Could not remove old installation folder %s. It might be in use by other applications.\n', dirnameDst);
msg{2} = sprintf('Try closing and reopening file browsers or any other applications that might be using the\n');
msg{3} = sprintf('installation folder and then retry installation.');
MenuBox([msg{:}], 'OK');
MenuBox(msg, 'OK');
pause(5);
rethrow(ME)
end
Expand Down Expand Up @@ -236,8 +235,11 @@ function createDesktopShortcuts(dirnameSrc, dirnameDst)
end
catch ME
msg{1} = sprintf('Error: Could not create %s shortcuts on Desktop. Exiting installation.', exename);
MenuBox([msg{:}], 'OK');
MenuBox(msg, 'OK');
printStack(ME)
return;
end




2 changes: 1 addition & 1 deletion Version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.43.1
2.43.2

0 comments on commit 120adaa

Please sign in to comment.