Commit abb7f116 authored by jayd1860's avatar jayd1860
Browse files

v1.16.5 

-- Fix export to Excel file and greatly improve very slow performance by fixing isnumber.m to be fast
-- Fix typo in ProcResultClass incorrect declaration of GenerateTableCells_MeanHRF causing matlab error.
-- Fix another typo in ProcResultClass.ExportHRF()
parent 34cabca0

DataTree/ProcStream/ProcResultClass.m

+3 −6
Original line number Diff line number Diff line
@@ -510,7 +510,7 @@ classdef ProcResultClass < handle 
        

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

        function n = GetNumChForOneCondition(obj, iBlk)

            n = [];

            n = 0;

            if nargin<2

                iBlk = 1;

            end
@@ -626,11 +626,8 @@ classdef ProcResultClass < handle 
            % Generate table cells

            tblcells = obj.GenerateTableCells_HRF(CondNames, iBlk);

            

            % Create table and save it to a file

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

            tbl.Open()

            tbl.Save(format);

            tbl.Close();

            % Create table export data to file

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

        end

        

    end

DataTree/ProcStream/ProcStreamClass.m

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

        

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

        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)

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

            if nargin<4

                width = 12;

            end

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

            if nargin<5

                iBlk = 1;

            end

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

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

        end

MainGUI/ExportDataGUI.fig

−37 B (19.2 KiB)

File changed.

No diff preview for this file type.

View original file
View changed file

Utils/ExportTable.m

+6 −0
Original line number Diff line number Diff line
@@ -135,7 +135,11 @@ classdef ExportTable < handle 
            for jj=1:size(obj.cells,2)

                headers{jj} = obj.cells(2,jj).name;

            end

            

            % 

            h =  waitbar_improved(0, sprintf('Exporting %s to Excel ... 0%% complete.', obj.filename));

            for ii = idxD:size(obj.cells,1)

                waitbar_improved(ii/size(obj.cells,1), h, sprintf('Exporting %s to Excel ... %d%% complete', obj.filename, uint32(100 * ii/size(obj.cells,1))))

                for jj=1:size(obj.cells,2)

                    if isnumber(obj.cells(ii,jj).name)

                        data{ii-idxD+1,jj} = str2double(obj.cells(ii,jj).name);
@@ -144,6 +148,8 @@ classdef ExportTable < handle 
                    end

                end

            end

            close(h);

            

            if isfile_private([obj.pathname, obj.filename, '.xls'])

                delete([obj.pathname, obj.filename, '.xls']);

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

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

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

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

CRA Git | Maintained and supported by SUSTech CRA and CCSE