Commit a4b3c030 authored by jayd1860's avatar jayd1860
Browse files

v1.14

-- Add viewing of time excluded automatically by channel
-- Add checkboxes to MainGUI to view the 3 kind of time exclusion manual, auto and auto-by-channel to Motion Artifacts panel
parent b99ed7fd
Loading
Loading
Loading
Loading
+16 −0
Original line number Diff line number Diff line
@@ -394,6 +394,22 @@ classdef ProcResultClass < handle
        end
       
        
        % ----------------------------------------------------------------------------------
        function val = GetTincAutoCh(obj, iBlk)
            val = {};
            if ~exist('iBlk','var') || isempty(iBlk)
                iBlk=1;
            end
            if isproperty(obj.misc, 'tIncAutoCh')
                if iscell(obj.misc.tIncAutoCh)
                    val = obj.misc.tIncAutoCh{iBlk};
                else
                    val = obj.misc.tIncAutoCh;
                end
            end
        end
       
        
        % ----------------------------------------------------------------------------------
        function mlActAuto = GetMeasListActAuto(obj, iBlk)
            mlActAuto = {};
+9 −0
Original line number Diff line number Diff line
@@ -1227,6 +1227,15 @@ classdef ProcStreamClass < handle
        end
        

        % ----------------------------------------------------------------------------------
        function tIncAutoCh = GetTincAutoCh(obj, iBlk)
            if ~exist('iBlk','var')
                iBlk = [];
            end
            tIncAutoCh = obj.output.GetVar('tIncAutoCh', iBlk);
        end
        

        % ----------------------------------------------------------------------------------
        function mlActMan = GetMeasListActMan(obj, iBlk)
            if ~exist('iBlk','var')
+9 −0
Original line number Diff line number Diff line
@@ -421,6 +421,15 @@ classdef RunClass < TreeNodeClass
        end
        
        
        % ----------------------------------------------------------------------------------
        function tIncAutoCh = GetTincAutoCh(obj, iBlk)
            if nargin<2
                iBlk = 1;
            end
            tIncAutoCh = obj.procStream.output.GetTincAutoCh(iBlk);
        end
        
        
        % ----------------------------------------------------------------------------------
        function tIncMan = GetTincMan(obj, iBlk)
            if nargin<2
+6 −0
Original line number Diff line number Diff line
@@ -561,6 +561,12 @@ classdef TreeNodeClass < handle
        end
        
        
        % ----------------------------------------------------------------------------------
        function t = GetTincAutoCh(obj, iBlk)
            t = [];
        end
        
        
        % ----------------------------------------------------------------------------------
        function t = GetTincMan(obj, iBlk)
            t = [];
+3 −0
Original line number Diff line number Diff line
@@ -61,6 +61,9 @@

function [tInc, tIncCh] = hmrR_MotionArtifactByChannel(data, probe, mlActMan, tIncMan, tMotion, tMask, std_thresh, amp_thresh)

tInc   = cell(length(data), 1);
tIncCh = cell(length(data), 1);

% Input processing.  Check required inputs, throw errors if necessary.
if nargin<3
    error('First and second inputs must be data and probe SNIRF objects of type DataClass and ProbeClass.')
Loading