Commit 34cabca0 authored by jayd1860's avatar jayd1860
Browse files

v1.16.4 

-- Add ExportDataGUI for setting  all the different export related parameters in one place.
-- Add support for exporting to Excel spreadsheet file
-- Clean up a little remove garbage files which mistakenly were committed to repo.
parent 04a8d3ab

DataTree/GroupClass.m

+22 −17
Original line number Diff line number Diff line
@@ -600,34 +600,43 @@ classdef GroupClass < TreeNodeClass 
        

        

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

        function ExportHRF(obj, options, iBlk)

            if nargin<2 || isempty(options)

        function ExportHRF(obj, format, procElemSelect, iBlk)

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

                format = 'text';

            end

            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'});

                if q==1

                    options  = 'current';

                    procElemSelect  = 'current';

                elseif q==2

                    options  = 'all';

                    procElemSelect  = 'all';

                else

                    return

                end

            end

            if nargin<3

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

                iBlk = 1;

            end

            

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

            if strcmp(options, 'all')

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

            if strcmp(procElemSelect, 'all')

                for ii=1:length(obj.subjs)

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

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

                end

            end

        end



        

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

        function tblcells = ExportMeanHRF(obj, iBlk)

            if nargin<2

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

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

                format = 'text';

            end

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

                trange = [];

            end

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

                iBlk = 1;

            end
@@ -659,16 +668,12 @@ classdef GroupClass < TreeNodeClass 
                rowIdxEnd   = rowIdxStart + nCond - 1;

                

                tblcells(rowIdxStart:rowIdxEnd, 1:2)        = obj.subjs(iSubj).GenerateTableCellsHeader_MeanHRF(cellwidthCond, cellwidthSubj);

                tblcells(rowIdxStart:rowIdxEnd, 3:nTblCols) = obj.subjs(iSubj).GenerateTableCells_MeanHRF(cellwidthData, iBlk);

                tblcells(rowIdxStart:rowIdxEnd, 3:nTblCols) = obj.subjs(iSubj).GenerateTableCells_MeanHRF(trange, cellwidthData, iBlk);

            end

            

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

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

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

            tbl.Open()

            tbl.Save();

            tbl.Close();

            

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

        end

        

    end  % Public Save/Load methods

DataTree/ProcStream/ProcResultClass.m

+14 −7
Original line number Diff line number Diff line
@@ -545,11 +545,14 @@ classdef ProcResultClass < handle 
        

        

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

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

            if nargin<4

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

            if ~exist('trange','var') || isempty(trange) || all(trange==0)

                trange = [obj.tHRF(1), obj.tHRF(end)];

            end

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

                width = 12;

            end

            if nargin<5

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

                iBlk = 1;

            end

            tblcells = TableCell.empty();
@@ -560,7 +563,8 @@ classdef ProcResultClass < handle 
                for iCond = 1:length(CondNames)

                    measListIdxs = obj.dcAvg(iBlk).GetMeasurementListIdxs(iCond);

                    for iCh = measListIdxs

                        meanData = mean(dataTimeSeries(:,iCh));                        

                        iT = (obj.dcAvg.time >= trange(1)) & (obj.dcAvg.time <= trange(2));

                        meanData = mean(dataTimeSeries(iT,iCh));

                        if isnan(meanData)

                            cname  = 'N/A';

                        else
@@ -611,8 +615,11 @@ classdef ProcResultClass < handle 
                

        

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

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

            if nargin<3

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

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

                format = 'text';

            end

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

                iBlk = 1;

            end
@@ -622,7 +629,7 @@ classdef ProcResultClass < handle 
            % Create table and save it to a file

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

            tbl.Open()

            tbl.Save();

            tbl.Save(format);

            tbl.Close();

        end

DataTree/ProcStream/ProcStreamClass.m

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

        

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

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

            if nargin<4

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

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

                trange = [0,0];

            end

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

                width = 12;

            end

            if nargin<5

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

                iBlk = 1;

            end

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

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

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

        

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

        function ExportHRF(obj, filename, CondNames, iBlk)

            if nargin<3

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

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

                format = 'text';

            end

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

                iBlk = 1;

            end

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

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

        end

        

    end

DataTree/RunClass.m

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

    

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

        function ExportHRF(obj, iBlk)

            if nargin<2

        function ExportHRF(obj, format, iBlk)

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

                format = 'text';

            end

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

                iBlk = 1;

            end

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

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

        end

         

    end

DataTree/SubjClass.m

+18 −12
Original line number Diff line number Diff line
@@ -426,14 +426,17 @@ classdef SubjClass < TreeNodeClass 


        

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

        function tblcells = GenerateTableCells_MeanHRF(obj, width, iBlk)

            if nargin<2

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

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

                trange = [0,0];

            end

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

                width = 12;

            end

            if nargin<3

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

                iBlk = 1;

            end

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

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

        end
@@ -449,26 +452,29 @@ classdef SubjClass < TreeNodeClass 
        

        

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

        function ExportHRF(obj, options, iBlk)

            if nargin<2 || isempty(options)

        function ExportHRF(obj, format, procElemSelect, iBlk)

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

                format = 'text';

            end

            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'});

                if q==1

                    options  = 'current';

                    procElemSelect  = 'current';

                elseif q==2

                    options  = 'all';

                    procElemSelect  = 'all';

                else

                    return

                end

            end

            if nargin<3

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

                iBlk = 1;

            end



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

            if strcmp(options, 'all')

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

            if strcmp(procElemSelect, 'all')

                for ii=1:length(obj.runs)

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

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

                end

            end

        end

CRA Git | Maintained and supported by SUSTech CRA and CCSE