Commit e8e56ea9 authored by Jay Dubb's avatar Jay Dubb
Browse files

v1.31.12 

-- Step 2 changes to make AV and homer3 coexist in same matlab session
-- Make FuncRegistry code common (except for FindUserFuncDir.m) for AV and Homer3 by adding a check of user function folder. If it does not exist RegistriesClass.m is empty.
-- Make nearest_point.m same for homer3 and AV
-- Make waitbar_improved.m common
-- Remove context specific MainGUIVersion from DataTree
parent dae748d7

DataTree/GroupClass.m

+1 −1
Original line number Diff line number Diff line
@@ -125,7 +125,7 @@ classdef GroupClass < TreeNodeClass 
                return;

            end

            verstr = version2string(obj.version);

            obj.versionStr = sprintf('%s: GroupClass v%s',  MainGUIVersion('exclpath'), verstr);

            obj.versionStr = sprintf('GroupClass v%s', verstr);

        end

DataTree/ProcStream/ProcStreamClass.m

+4 −4
Original line number Diff line number Diff line
@@ -715,7 +715,7 @@ classdef ProcStreamClass < handle 
            if ~exist('type', 'var') || isempty(type)

                type = 'run';

            end

            versionstamp = sprintf('%% %s\n', MainGUIVersion('exclpath'));

            versionstamp = sprintf('%% \n');



            % First read in and parse existing file contents

            if ~exist(fname, 'file')
@@ -1159,7 +1159,7 @@ classdef ProcStreamClass < handle 
        % ----------------------------------------------------------------------------------

        function val = fcallStrEncodedGroup(obj, init)

            persistent v;

            if exist('init','var') && strcmp(init,'init')

            if exist('init','var') && strcmp(init,'init') && ~obj.reg.IsEmpty

                iG = obj.reg.igroup;

                suffix = obj.getDefaultProcStream();

                tmp = {...
@@ -1185,7 +1185,7 @@ classdef ProcStreamClass < handle 
        % ----------------------------------------------------------------------------------

        function val = fcallStrEncodedSubj(obj, init)

            persistent v;

            if exist('init','var') && strcmp(init,'init')

            if exist('init','var') && strcmp(init,'init') && ~obj.reg.IsEmpty

                iS = obj.reg.isubj;

                suffix = obj.getDefaultProcStream();

                tmp = {...
@@ -1211,7 +1211,7 @@ classdef ProcStreamClass < handle 
        % ----------------------------------------------------------------------------------

        function val = fcallStrEncodedRun(obj, init)

            persistent v;

            if exist('init','var') && strcmp(init,'init')

            if exist('init','var') && strcmp(init,'init') && ~obj.reg.IsEmpty

                iR = obj.reg.irun;

                suffix = obj.getDefaultProcStream();

                tmp = {...

FuncRegistry/FindUserFuncDir.m

+3 −0
Original line number Diff line number Diff line
@@ -2,6 +2,9 @@ function userfuncdir = FindUserFuncDir(obj) 
userfuncdir = {};

dirnameApp = getAppDir();



if ~ispathvalid([dirnameApp, 'FuncRegistry/UserFunctions/'])

    return;

end

userfuncdir{1} = [dirnameApp, 'FuncRegistry/UserFunctions/'];

dirs = dir([userfuncdir{1}, '*']);

for ii = 1:length(dirs)

FuncRegistry/RegistriesClass.m

+3 −1
Original line number Diff line number Diff line
@@ -40,7 +40,9 @@ classdef RegistriesClass < handle 


            % Get the parameter items from config file relevant to this class

            obj.userfuncdir = FindUserFuncDir(obj);

            

            if isempty(obj.userfuncdir)

                return

            end

            if strcmp(mode, 'empty')

                return;

            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} = '31';  % Major sub-version #

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

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

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

CRA Git | Maintained and supported by SUSTech CRA and CCSE