Commit 3ad0101a authored by Jay Dubb's avatar Jay Dubb
Browse files

v1.28.6 

-- Modify saving of processing output (in distributed file storage scheme) for subject data in subject folders rather than group folder.

-- Since the change to error check proc stream function call loaded from groupResults, it now forces loading user function calls from a proc stream config file. But this doesn't work for AtlasViewer which has no need for function call chain, only the proc stream output. Therefore, create an alternative constructor call for DataTreeClass, with 'noloadconfig' option which means do not prompt user to load processing stream function (and implicitly allow an empty proc stream function call chain).

-- Fixed small type in ProcStreamClass which would generate an error if executed.

-- Fix minor appearance issue in MainGUI.fig, in the Plot Window panel where buttons, checkboxes and edit boxes for pan left/right and the range fixing controls changed location to being bunched up at the botton and their units have been changed from 'normalized' to 'characters'. Reversed this.
parent baef6691

DataTree/DataTreeClass.m

+8 −4
Original line number Diff line number Diff line
@@ -228,7 +228,7 @@ classdef DataTreeClass < handle 
                    end

                    obj.files = dataInit.files;

                    

                    obj.LoadGroup(iGnew, procStreamCfgFile);

                    obj.LoadGroup(iGnew, procStreamCfgFile, options);

                    if length(obj.groups) < iGnew

                        if obj.FoundDataFilesInOtherFormat(dataInit, kk)

                            continue;
@@ -298,11 +298,14 @@ classdef DataTreeClass < handle 
        

        

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

        function LoadGroup(obj, iG, procStreamCfgFile)

        function LoadGroup(obj, iG, procStreamCfgFile, options)

            

            if ~exist('procStreamCfgFile','var')

                procStreamCfgFile = '';

            end

            if ~exist('options','var')

                options = '';

            end

            

            %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%

            % Load acquisition data from the data files
@@ -324,14 +327,15 @@ classdef DataTreeClass < handle 
            %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%

            % Initialize procStream for all tree nodes

            %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%

            if ~optionExists(options, 'noloadconfig')

            	obj.groups(iG).InitProcStream(procStreamCfgFile);

            end

            

            %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%

            % Generate the stimulus conditions for the group tree

            %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%

            obj.groups(iG).SetConditions();



            

        end

DataTree/ProcStream/ProcResultClass.m

+36 −15
Original line number Diff line number Diff line
@@ -161,13 +161,32 @@ classdef ProcResultClass < handle 
                return;

            end

            [pname, fname] = fileparts(filename);



            % Set the containing folder name 

            if isempty(pname)

                % See if folder corresponding to saved output exists. If it

                % does then set it to be same as the .mat filename (without

                % the extension)

                rootdir = '';

                if exist(['./', fname], 'dir')==7

                    rootdir = fname;

                    

                    % Next 3 lines are for backwards compatibility: if the saved output 

                    % for subject is stored in the group instead of subject folder as was 

                    % done in previous versions of this code, then move saved file to 

                    % subject folder

                    if exist(['./', fname, '.mat'], 'file')==2

                    pname = '.';

                elseif exist(['../', fname, '.mat'], 'file')==2

                    pname = '..';

                        movefile(['./', fname, '.mat'], ['./', rootdir, '/', fname, '.mat']);

                    end

                end

                

                % Set the containing folder name 

                if exist(['./', rootdir, '/', fname, '.mat'], 'file')==2

                    pname = ['./', rootdir];

                elseif exist(['../', rootdir, '/', fname, '.mat'], 'file')==2

                    pname = ['../', rootdir];

                else

                pname = '.';

                    pname = ['./', rootdir]; 

                end

            end

            obj.filename = [pname, '/', fname, '.mat'];
@@ -198,7 +217,10 @@ classdef ProcResultClass < handle 
            

            % If file name is not an empty string, save results to file and free memory

            % to save memory space

            if ~isempty(obj.filename)

            if isempty(obj.filename)

                return;

            end

            

            save(obj.filename, '-mat', 'output');

            

            % Free memory for this object
@@ -206,7 +228,6 @@ classdef ProcResultClass < handle 
                obj.FreeMemory();

            end

        end

        end

DataTree/ProcStream/ProcStreamClass.m

+1 −1
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ classdef ProcStreamClass < handle 
                        obj.fcalls(kk) = FuncCallClass(temp, obj.reg);

                        kk = kk+1;

                    else

                        fprintf('  Found no similar entries. Discarding %s\n', section{ii})

                        fprintf('  Found no similar entries. Discarding %s\n', obj2.fcalls(ii).GetName())

                    end

                end            

            end

MainGUI/MainGUI.fig

+16 B (83.9 KiB)

File changed.

No diff preview for this file type.

View original file
View changed file

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

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

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

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

CRA Git | Maintained and supported by SUSTech CRA and CCSE