Commit 5179b23b authored by Jay Dubb's avatar Jay Dubb
Browse files

v1.29.1 

-- Simplify DataTreeClass.AutoSetDataStorageScheme to default to 'files' since in AtlasViewer it doesn't matter what the save scheme was that Homer3 used. Defaulting to 'files' means that whether the save scheme was 'memory' or 'files' AV is sure to find the output as opposed to a 'memory' setting if the output is not found in memory it'll give up looking. This change was propagated from AV.
parent a26b5d1e

DataTree/DataTreeClass.m

+2 −19
Original line number Diff line number Diff line
@@ -279,25 +279,8 @@ classdef DataTreeClass < handle 
        

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

        function AutoSetDataStorageScheme(obj)

            g.group = GroupClass();

            if isvalidfile('./groupResults.mat')

                g = load('./groupResults.mat');

                if isa(g.group, 'GroupClass') && g.group.IsEmpty()

                    if isvalidfile('../groupResults.mat')

                        g = load('../groupResults.mat');

                    end

                end

            elseif isvalidfile('../groupResults.mat')

                g = load('../groupResults.mat');

            end

            if isa(g.group, 'GroupClass') && g.group.IsEmpty()

                if g.group.subjs(1).runs(1).acquired.IsEmpty()

            if isempty(obj.dataStorageScheme)

                obj.dataStorageScheme = 'files';

                else

                    obj.dataStorageScheme = 'memory';

                end

            else

                obj.dataStorageScheme = 'memory';

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

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

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

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

CRA Git | Maintained and supported by SUSTech CRA and CCSE