Commit b694d08b authored by jayd1860's avatar jayd1860
Browse files

v1.16.6 

-- Remove output format as a user option to export data.  Per David's argument against exporting to Excel on basecamp: "I am nervous about excel exporting… this will always break for us because of Microsoft and matlab always changing. And we can’t test all of the scenarios. ... I feel that we should not support that sort of exporting. " -- Mar 17, 2020.
-- Changes to exporting code to avoid generating error when there's no HRF. It should instead either generate empty file or not generate a file at all and display a message box saying there's no HRF
-- Reposition/resize some ExportDataGUI.fig objects
-- Update README file to more wiki-friendly text
parent e04fd2c9

DataTree/GroupClass.m

+5 −11
Original line number Diff line number Diff line
@@ -600,10 +600,7 @@ classdef GroupClass < TreeNodeClass 
        

        

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

        function ExportHRF(obj, format, procElemSelect, iBlk)

            if ~exist('format','var') || isempty(format)

                format = 'text';

            end

        function ExportHRF(obj, procElemSelect, iBlk)

            if ~exist('procElemSelect','var') || isempty(procElemSelect)

                q = MenuBox('Export only current group data OR current group data and all it''s subject data?', ...

                            {'Current group data only','Current group data and all it''s subject data','Cancel'});
@@ -619,20 +616,17 @@ classdef GroupClass < TreeNodeClass 
                iBlk = 1;

            end

            

            obj.procStream.ExportHRF(obj.name, obj.CondNames, format, iBlk);

            obj.procStream.ExportHRF(obj.name, obj.CondNames, iBlk);

            if strcmp(procElemSelect, 'all')

                for ii=1:length(obj.subjs)

                    obj.subjs(ii).ExportHRF(format, 'all', iBlk);

                    obj.subjs(ii).ExportHRF('all', iBlk);

                end

            end

        end



        

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

        function tblcells = ExportMeanHRF(obj, trange, format, iBlk)

            if ~exist('format','var') || isempty(format)

                format = 'text';

            end

        function tblcells = ExportMeanHRF(obj, trange, iBlk)

            if ~exist('trange','var') || isempty(trange)

                trange = [];

            end
@@ -673,7 +667,7 @@ classdef GroupClass < TreeNodeClass 
            

            % Create ExportTable initialized with the filled in 2D TableCell array. 

            % ExportTable object is what actually does the exporting to a file. 

            ExportTable(obj.name, 'HRF mean', tblcells, format);            

            ExportTable(obj.name, 'HRF mean', tblcells);

        end

        

    end  % Public Save/Load methods

DataTree/ProcStream/ProcResultClass.m

+2 −5
Original line number Diff line number Diff line
@@ -615,10 +615,7 @@ classdef ProcResultClass < handle 
                

        

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

        function tbl = ExportHRF(obj, filename, CondNames, format, iBlk)

            if ~exist('format','var') || isempty(format)

                format = 'text';

            end

        function tbl = ExportHRF(obj, filename, CondNames, iBlk)

            if ~exist('iBlk','var') || isempty(iBlk)

                iBlk = 1;

            end
@@ -627,7 +624,7 @@ classdef ProcResultClass < handle 
            tblcells = obj.GenerateTableCells_HRF(CondNames, iBlk);

            

            % Create table export data to file

            tbl = ExportTable(filename, 'HRF', tblcells, format);

            tbl = ExportTable(filename, 'HRF', tblcells);

        end

        

    end

DataTree/ProcStream/ProcStreamClass.m

+4 −7
Original line number Diff line number Diff line
@@ -1471,14 +1471,14 @@ classdef ProcStreamClass < handle 
        

        

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

        function tblcells = GenerateTableCells_MeanHRF(obj, name, CondNames, width, iBlk)

        function tblcells = GenerateTableCells_MeanHRF(obj, name, CondNames, trange, width, iBlk)

            if nargin<4

                width = 12;

            end

            if nargin<5

                iBlk = 1;

            end

            tblcells = obj.output.GenerateTableCells_MeanHRF(name, CondNames, width, iBlk);

            tblcells = obj.output.GenerateTableCells_MeanHRF(name, CondNames, trange, width, iBlk);

        end
@@ -1492,14 +1492,11 @@ classdef ProcStreamClass < handle 
                

        

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

        function ExportHRF(obj, filename, CondNames, format, iBlk)

            if ~exist('format','var') || isempty(format)

                format = 'text';

            end

        function ExportHRF(obj, filename, CondNames, iBlk)

            if ~exist('iBlk','var') || isempty(iBlk)

                iBlk = 1;

            end

            obj.output.ExportHRF(filename, CondNames, format, iBlk);

            obj.output.ExportHRF(filename, CondNames, iBlk);

        end

        

    end

DataTree/RunClass.m

+2 −5
Original line number Diff line number Diff line
@@ -643,14 +643,11 @@ classdef RunClass < TreeNodeClass 
    

    

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

        function ExportHRF(obj, format, iBlk)

            if ~exist('format','var') || isempty(format)

                format = 'text';

            end

        function ExportHRF(obj, ~, iBlk)

            if ~exist('iBlk','var') || isempty(iBlk)

                iBlk = 1;

            end

            obj.procStream.ExportHRF(obj.name, obj.CondNames, format, iBlk);

            obj.procStream.ExportHRF(obj.name, obj.CondNames, iBlk);

        end

         

    end

DataTree/SubjClass.m

+3 −6
Original line number Diff line number Diff line
@@ -452,10 +452,7 @@ classdef SubjClass < TreeNodeClass 
        

        

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

        function ExportHRF(obj, format, procElemSelect, iBlk)

            if ~exist('format','var') || isempty(format)

                format = 'text';

            end

        function ExportHRF(obj, procElemSelect, iBlk)

            if ~exist('procElemSelect','var') || isempty(procElemSelect)

                q = MenuBox('Export only current subject data OR current subject data and all it''s run data?', ...

                            {'Current subject data only','Current subject data and all it''s run data','Cancel'});
@@ -471,10 +468,10 @@ classdef SubjClass < TreeNodeClass 
                iBlk = 1;

            end



            obj.procStream.ExportHRF(obj.name, obj.CondNames, format, iBlk);

            obj.procStream.ExportHRF(obj.name, obj.CondNames, iBlk);

            if strcmp(procElemSelect, 'all')

                for ii=1:length(obj.runs)

                    obj.runs(ii).ExportHRF(format, iBlk);

                    obj.runs(ii).ExportHRF(iBlk);

                end

            end

        end

CRA Git | Maintained and supported by SUSTech CRA and CCSE