Commit f9a1441a authored by jayd1860's avatar jayd1860
Browse files

v1.12.20.2 

-- Fix Homer3 deployed version not working with R2018b because it's not finding AppSettings.cfg file.
-- Add sample subject data folder to Homer3 and deployed version SubjDataSample and make deployed version open in this subject folder.
-- Make another improvement in displaying aux signal
-- Fix matlab exception when displaying 1-D probe from the SubjDataSample folder (just one src, one det, therefore no height).
parent 938519cd

DataTree/AcquiredData/AcqDataClass.m

+10 −2
Original line number Diff line number Diff line
@@ -73,14 +73,22 @@ classdef AcqDataClass < matlab.mixin.Copyable 
        function bbox = GetSdgBbox(obj)

            optpos = [obj.GetSrcPos(); obj.GetDetPos()];

            

            xmin = min(optpos(:,1));

            xmax = max(optpos(:,1));

            ymin = min(optpos(:,2));

            ymax = max(optpos(:,2));



            xmin = min(optpos(:,1));

            ymin = min(optpos(:,2));

            

            width = xmax-xmin;

            height = ymax-ymin;

            

            if width==0

                width = 1;

            end

            if height==0

                height = 1;

            end

            

            px = width * 0.10; 

            py = height * 0.10;

Homer3.m

+15 −0
Original line number Diff line number Diff line 
function Homer3(fmt)

if nargin==0

    fmt='snirf';

elseif nargin==1 && isempty(fmt)

    fmt='snirf';

end

cfg = ConfigFileClass();

fprintf('Opened application config file %s\n', cfg.filename)

subjDir = cfg.GetValue('Last Subject Folder');

if isempty(subjDir)

    if isdeployed()

        subjDir = [getAppDir(), 'SubjDataSample'];

    else

        subjDir = pwd;

    end

end

cd(subjDir);

fprintf('Current working directory: %s\n', pwd)



MainGUI(fmt);
 
 No newline at end of file

Install/createInstallFile.m

+3 −2
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ end 
mkdir([dirnameInstall, 'homer3_install']);

mkdir([dirnameInstall, 'homer3_install/FuncRegistry']);

mkdir([dirnameInstall, 'homer3_install/FuncRegistry/UserFunctions']);

mkdir([dirnameInstall, 'homer3_install/SubjDataSample']);



% Generate executables

if ~strcmp(options, 'nobuild')
@@ -82,8 +83,8 @@ for ii=1:length(platform.setup_exe) 
	end

end



if exist([dirnameApp, 'Test'],'dir')

    copyfile([dirnameApp, 'Test'], [dirnameInstall, 'homer3_install/Test']);

if exist([dirnameApp, 'SubjDataSample'],'dir')

    copyfile([dirnameApp, 'SubjDataSample'], [dirnameInstall, 'homer3_install/SubjDataSample']);

end



for ii=1:length(platform.createshort_script)

Install/createShortcut.sh

+3 −0
Original line number Diff line number Diff line 
#!sh



rm -rf ~/Desktop/Homer3*

rm -rf ~/Desktop/SubjDataSample



perl ~/Downloads/homer3_install/makefinalapp.pl ~/homer3/run_Homer3.sh ~/Desktop/Homer3.$1

ln -s ~/homer3/SubjDataSample ~/Desktop/SubjDataSample



chmod 755 ~/Desktop/Homer3.$1

chmod 755 ~/Desktop/SubjDataSample



exit

Install/createShortcut.sh~

deleted100644 → 0
+0 −15
Original line number Diff line number Diff line 
#!sh



rm -rf ~/Desktop/Homer2_UI*

rm -rf ~/Desktop/AtlasViewerGUI*

rm -rf ~/Desktop/Test



perl ~/Downloads/homer2_install/makefinalapp.pl ~/homer3/run_Homer2_UI.sh ~/Desktop/Homer2_UI.$1

perl ~/Downloads/homer3_install/makefinalapp.pl ~/homer3/run_AtlasViewerGUI.sh ~/Desktop/AtlasViewerGUI.$1

ln -s ~/homer2/Test ~/Desktop/Test



chmod 755 ~/Desktop/Homer2_UI.$1

chmod 755 ~/Desktop/AtlasViewerGUI.$1

chmod 755 ~/Desktop/Test



exit

CRA Git | Maintained and supported by SUSTech CRA and CCSE