Commit b1a56af6 authored by Jay's avatar Jay
Browse files

v1.24.2 

-- Fix for export HRF incorrectly labeling data time series with the wrong channel. Problem was in user function hmrR_GLM.m where measurementList channels were assigned to the wrong data.
-- Make checkForHomerUpdates backwards compatible with older matlab versions by replacing the new Matab function split with str2cell
-- Get rid of warning when calling ExportDataGUI with arguments by supplying the argument 'userargs'
parent e1b77792

AppSettings.cfg

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ SNIRF 
On



% Last Checked For Update

13-Aug-2020 18:41:27

18-Aug-2020 16:47:29



% Check For Updates

on

FuncRegistry/UserFunctions/hmrR_GLM.m

+5 −5
Original line number Diff line number Diff line
@@ -626,10 +626,10 @@ for iBlk=1:length(data_y) 
    tb = permute(tb,[1 3 2 4]);

    

    if nPre<0

        for iConc = 1:size(yavg,2)

            for iCh = 1:size(yavg,3)

        for iCond = 1:size(yavg,4)

                    yavg(:,iConc,iCh,iCond) = yavg(:,iConc,iCh,iCond) - ones(size(yavg,1),1)*mean(yavg(1:(-nPre),iConc,iCh,iCond),1);

            for iCh = 1:size(yavg,3)

                for iHb = 1:size(yavg,2)

                    yavg(:,iHb,iCh,iCond) = yavg(:,iHb,iCh,iCond) - ones(size(yavg,1),1)*mean(yavg(1:(-nPre),iHb,iCh,iCond),1);

                end

            end

        end
@@ -660,9 +660,9 @@ for iBlk=1:length(data_y) 
    %%%%%%%%%%%%%%%%%%%%%%%%%

    

    % Add the channels describing the data

    for iHb = 1:size(yavg,2)

        for iCh = 1:size(yavg,3)

	for iCond = 1:size(yavg,4)

        for iCh = 1:size(yavg,3)

            for iHb = 1:size(yavg,2)

                data_yavg(iBlk).AddChannelHb(ml(iCh,1), ml(iCh,2), iHb, iCond);

                data_yavgstd(iBlk).AddChannelHb(ml(iCh,1), ml(iCh,2), iHb, iCond);

                data_ysum2(iBlk).AddChannelHb(ml(iCh,1), ml(iCh,2), iHb, iCond);

MainGUI/ExportDataGUI.m

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ gui_State = struct('gui_Name', mfilename, ... 
                   'gui_OutputFcn',  @ExportDataGUI_OutputFcn, ...

                   'gui_LayoutFcn',  [] , ...

                   'gui_Callback',   []);

if nargin && ischar(varargin{1})

if nargin && ischar(varargin{1}) && ~strcmp(varargin{end},'userargs')

    gui_State.gui_Callback = str2func(varargin{1});

end

MainGUI/MainGUI.m

+1 −1
Original line number Diff line number Diff line
@@ -1533,7 +1533,7 @@ Display(handles, hObject); 
function menuItemExportHRF_Callback(hObject, eventdata, handles)

global maingui



out = ExportDataGUI(maingui.dataTree.currElem.name,'.txt','HRF');

out = ExportDataGUI(maingui.dataTree.currElem.name,'.txt','HRF', 'userargs');

if isempty(out.format) && isempty(out.datatype)

    return;

end

Utils/checkForHomerUpdates.m

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ function checkForHomerUpdates() 
            catch

                updateTxt = version{1}{1};

            end

            web_vrnum = split(version{1}{1},'.');

            web_vrnum = str2cell(version{1}{1},'.');

            this_vrnum = getVernum();

            promptFlag = compareVernum(web_vrnum, this_vrnum);  % If fetched vernum is greater

            if (promptFlag)

CRA Git | Maintained and supported by SUSTech CRA and CCSE