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

v1.25.13 

-- Fix 2 more issues found by Christian:
a) db2.mat file not being found by hmrR_MotionCorrectWavelet when running in deployed mode
b) hmrR_tCCA.m file not being found by registry in deployed mode.
parent 6575bb07

Docs/Notes.txt

+10 −0
Original line number Diff line number Diff line
@@ -259,3 +259,13 @@ H5D.set_extent(dset_id, size(data)) 
https://www.mathworks.com/matlabcentral/answers/415137-how-do-i-replace-a-dataset-in-an-hdf5-file-with-a-smaller-dataset-without-leaving-some-values-of-th

https://portal.hdfgroup.org/display/HDF5/H5D_SET_EXTENT









==================================

Oct 9, 2020



Christian found issue when opening Homer3 in random folder that it cannot tell if its a valid group folder or group of groups folder and unconditionally 

generates a groupResults.mat file. We have to add feature where Homer3 decides if a group folder is valid. A group folder is valid if it has acquistion files

that are consiStent with each other in terms of having the same probe.

FuncRegistry/FindUserFuncDir.m

+4 −1
Original line number Diff line number Diff line
@@ -10,6 +10,9 @@ for ii = 1:length(dirs) 
    elseif strcmp(dirs(ii).name, '..') || strcmp(dirs(ii).name, '.')

        continue

    elseif strcmp(dirs(ii).name, 'Archive')

        obj.config = struct('InclArchivedFunctions','');

        cfg = ConfigFileClass();

        obj.config.InclArchivedFunctions = cfg.GetValue('Include Archived User Functions');        

        if strcmp(obj.config.InclArchivedFunctions, 'Yes')

            userfuncdir{end+1} = fullpath([userfuncdir{1}, 'Archive/']);

        end

FuncRegistry/FuncHelpClass.m

+35 −11
Original line number Diff line number Diff line
@@ -4,6 +4,8 @@ classdef FuncHelpClass < matlab.mixin.Copyable 
        funcname;

        helpstr;

        sections;

        userfuncdir;

        config;

    end

    

    %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -19,12 +21,19 @@ classdef FuncHelpClass < matlab.mixin.Copyable 
            % Examples:

            %       fhelp = FuncHelpClass('hmrR_DeconvHRF_DriftSS');

            %

            obj.userfuncdir = {};

            obj.config = [];

            

            if nargin==0

                return;

            end

            obj.funcname = funcname;

            if isdeployed()

                obj.userfuncdir = obj.UserFuncDirs(obj);

            end

            obj.Help();

            obj.ParseSections();

            

        end
@@ -124,7 +133,6 @@ classdef FuncHelpClass < matlab.mixin.Copyable 
            %    . . . . . . . . . .

            % pL: [vL1,...,vLJ]

            %

            %

            if isempty(obj.helpstr)

                return;

            end
@@ -471,7 +479,7 @@ classdef FuncHelpClass < matlab.mixin.Copyable 
        

        

        % -----------------------------------------------------------------

        function EndPrevSection(obj, iLine)

        function EndPrevSection(obj, iLine) %#ok<INUSD>

            fields = propnames(obj.sections);

            for ii=1:length(fields)

                if eval( sprintf('obj.sections.%s.lines(1)>0 && obj.sections.%s.lines(2)==0', fields{ii}, fields{ii}) )
@@ -522,24 +530,40 @@ classdef FuncHelpClass < matlab.mixin.Copyable 
        end

        

        

        

        % ---------------------------------------------------------------------------------

        function Help(obj)

            

            funcname = '';

            if ~isdeployed()

                func = obj.funcname;

                funcname = [obj.funcname, '.m'];

            else

                func = [getAppDir(), 'FuncRegistry/UserFunctions/', obj.funcname];

                for ii = 1:length(obj.userfuncdir)

                    if exist([obj.userfuncdir{ii}, obj.funcname, '.m'], 'file')

                        funcname = [obj.userfuncdir{ii}, obj.funcname, '.m'];

                    end

                end

            end

            if isempty(func)

            if isempty(funcname)

                return

            end

            [~,~,ext] = fileparts(func);            

            if ~strcmp(ext,'.m')

                func = [func, '.m'];

            obj.helpstr = str2cell_fast(help_local(funcname), [], 'keepblanks');

        end

            obj.helpstr = str2cell_fast(help_local(func), [], 'keepblanks');

               

    end

    

    

    methods (Static)

                

        % ----------------------------------------------------------------------------------

        function out = UserFuncDirs(arg)

            persistent userfuncdir;            

            if isempty(userfuncdir)

                userfuncdir = FindUserFuncDir(arg);

            end

            out = userfuncdir;

        end

   

    end

    

end

FuncRegistry/FuncRegClass.m

+0 −4
Original line number Diff line number Diff line
@@ -62,10 +62,6 @@ classdef FuncRegClass < matlab.mixin.Copyable 
            obj.type = type;            

            

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

            obj.config = struct('InclArchivedFunctions','');

            cfg = ConfigFileClass();

            obj.config.InclArchivedFunctions = cfg.GetValue('Include Archived User Functions');



            obj.userfuncdir = FindUserFuncDir(obj);

            obj.userfuncfiles = [];

            obj.Load();

FuncRegistry/RegistriesClass.m

+0 −3
Original line number Diff line number Diff line
@@ -39,9 +39,6 @@ classdef RegistriesClass < handle 
            obj.filename = '';



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

            obj.config = struct('InclArchivedFunctions','');

            cfg = ConfigFileClass();

            obj.config.InclArchivedFunctions = cfg.GetValue('Include Archived User Functions');

            obj.userfuncdir = FindUserFuncDir(obj);

            

            if strcmp(mode, 'empty')

CRA Git | Maintained and supported by SUSTech CRA and CCSE