Commit e1b77792 authored by Jay's avatar Jay
Browse files

v1.24.1 

-- Fix error thrown in older Matlab because of use of string literals instead of char literals. This broke setpaths when launching Homer3 in older versions of Matlab. String type did not exist in Matlab prior to version R2017a
parent fac62b5d

ProcStreamEditGUI/ProcStreamEditGUI.m

+3 −3
Original line number Diff line number Diff line
@@ -540,21 +540,21 @@ for iPanel=1:length(procElem) 
                        fcall2 = procStreamEdit.dataTree.groups(ig).procStream.fcalls(jj);

                        fcall.paramIn = fcall2.paramIn;

                    catch

                        fprintf("Saving newly-added function %s to stream with default parameters.\n", fcall.name);

                        fprintf('Saving newly-added function %s to stream with default parameters.\n', fcall.name);

                    end

                case iSubjPanel

                    try

                        fcall2 = procStreamEdit.dataTree.groups(ig).subjs(is).procStream.fcalls(jj);

                        fcall.paramIn = fcall2.paramIn;

                    catch

                        fprintf("Saving newly-added function %s to stream with default parameters.\n", fcall.name);

                        fprintf('Saving newly-added function %s to stream with default parameters.\n', fcall.name);

                    end

                case iRunPanel

                    try

                        fcall2 = procStreamEdit.dataTree.groups(ig).subjs(is).runs(ir).procStream.fcalls(jj);

                        fcall.paramIn = fcall2.paramIn;

                    catch

                        fprintf("Saving newly-added function %s to stream with default parameters.\n", fcall.name);

                        fprintf('Saving newly-added function %s to stream with default parameters.\n', fcall.name);

                    end

            end

        end

Utils/getVernum.m

+1 −1
Original line number Diff line number Diff line
@@ -2,5 +2,5 @@ function vrnnum = getVernum() 


vrnnum{1} = '1';   % Major version #

vrnnum{2} = '24';  % Major sub-version #

vrnnum{3} = '0';   % Minor version #

vrnnum{3} = '1';   % Minor version #

vrnnum{4} = '0';   % Minor sub-version # or patch #: 'p1', 'p2', etc

setpaths.m

+4 −4
Original line number Diff line number Diff line
@@ -100,16 +100,16 @@ for ii=1:length(paths) 
            % When exists returns 2 but excluding the working dir

            if ( (exist(files(f).name(1:end-2),'file') == 2) & (~isequal(files(f).folder,pwd())))

                if options.verbose

                    fprintf("This file shadows one already on the path: %s\n",[files(f).folder '\' files(f).name(1:end-2)]);

                    fprintf("Here is the original: %s\n", which(files(f).name(1:end-2)));

                    fprintf('This file shadows one already on the path: %s\n',[files(f).folder '\' files(f).name(1:end-2)]);

                    fprintf('Here is the original: %s\n', which(files(f).name(1:end-2)));

                end

                if (strcmp( fileread([files(f).folder '\' files(f).name]), fileread(which(files(f).name(1:end-2))) ))

                    if options.verbose

                        fprintf("The files are the same.\n");

                        fprintf('The files are the same.\n');

                    end

                else

                    if options.verbose

                        fprintf("The files have some differences.\n")

                        fprintf('The files have some differences.\n')

                    end

                    dnum = dnum + 1;

                    diffqueue{end+1} = {[files(f).folder '\' files(f).name], which(files(f).name(1:end-2))};

CRA Git | Maintained and supported by SUSTech CRA and CCSE