Commit 8af7176b authored by jayd1860's avatar jayd1860
Browse files

v1.39.0

-- Fix matlab generated error displaying measurement list visible channels. Take MeasListVis field out of processing stream input (ProcInputClass) since it does not actually contribute to proc stream processing and move it to TreeNodeClass field chVis.
parent 19566ba4
Loading
Loading
Loading
Loading
+0 −5
Original line number Diff line number Diff line
@@ -328,11 +328,6 @@ classdef SnirfClass < AcqDataClass & FileLoadSaveClass
            % Copy mutable properties to new object instance;
            objnew.stim = CopyHandles(obj.stim);
            objnew.SortStims();
            
            if strcmp(options, 'extended')
                t = obj.GetTimeCombined();
                objnew.data = DataClass([],t,[]);
            end
        end
        
        

DataTree/InitMeasLists.m

deleted100644 → 0
+0 −3
Original line number Diff line number Diff line
function ml_struct = InitMeasLists()

ml_struct = struct('MeasList',[], 'MeasListVis',[], 'MeasListActMan',[], 'MeasListActAuto',[]);
 No newline at end of file
+0 −25
Original line number Diff line number Diff line
@@ -241,31 +241,6 @@ classdef ProcInputClass < handle
        end

        
        % ----------------------------------------------------------------------------------
        function ml = GetMeasListVis(obj, iBlk)
            if ~exist('iBlk','var')
                iBlk = 1;
            end
            if ~isempty(obj.mlVis)
                ml = obj.mlVis{iBlk};
            else
                ml = [];
            end
        end
        
        
        % ----------------------------------------------------------------------------------
        function SetMeasListVis(obj, ml, iBlk)
            if ~exist('iBlk','var')
                iBlk = 1;
            end
            if isempty(obj.mlVis)
                obj.mlVis{iBlk} = ml;
            elseif length(obj.mlVis{iBlk}) == length(ml)
               obj.mlVis{iBlk} = ml; 
            end
        end
        
        % ----------------------------------------------------------------------------------
        function n = GetDataBlocksNum(obj)
            n = length(obj.tIncMan);
+1 −14
Original line number Diff line number Diff line
@@ -25,16 +25,12 @@ classdef ProcStreamClass < handle
            obj.config = struct('procStreamCfgFile','', 'defaultProcStream','','suffix','');
            obj.config.procStreamCfgFile    = cfg.GetValue('Processing Stream Config File');
            obj.config.regressionTestActive = cfg.GetValue('Regression Test Active');
            copyOptions = '';
            if strcmpi(obj.getDefaultProcStream(), '_nirs')
                copyOptions = 'extended';
            end
            
            % By the time this class constructor is called we should already have a saved registry 
            % to load. (Defintiely would not want to be generating the registry for each instance of this class!!)
            obj.reg = RegistriesClass();
            
            obj.input = ProcInputClass(acquired, copyOptions);
            obj.input = ProcInputClass(acquired);
            obj.output = ProcResultClass();
            
            if nargin==0
@@ -1480,15 +1476,6 @@ classdef ProcStreamClass < handle
        end

        
        % ----------------------------------------------------------------------------------
        function mlVis = GetMeasListVis(obj, iBlk)
            if ~exist('iBlk','var')
                iBlk = [];
            end
            mlVis = obj.input.GetVar('mlVis',iBlk);
        end

        
        % ----------------------------------------------------------------------------------
        function pValues = GetPvalues(obj, iBlk)
            if ~exist('iBlk','var')
+0 −5
Original line number Diff line number Diff line
@@ -458,7 +458,6 @@ classdef RunClass < TreeNodeClass
            ch.MeasList        = obj.acquired.GetMeasList(iBlk);
            ch.MeasListActMan  = obj.procStream.GetMeasListActMan(iBlk);
            ch.MeasListActAuto = obj.procStream.GetMeasListActAuto(iBlk);
            ch.MeasListVis     = obj.procStream.GetMeasListVis(iBlk);
            if isempty(ch.MeasListActMan)
                obj.InitMlActMan();  % TODO find a more sensical place to do this
                ch.MeasListActMan  = obj.procStream.GetMeasListActMan(iBlk);
@@ -466,10 +465,6 @@ classdef RunClass < TreeNodeClass
            if isempty(ch.MeasListActAuto)
                ch.MeasListActAuto = ones(size(ch.MeasList,1),1);
            end
            if isempty(ch.MeasListVis)
                obj.InitMlVis();
                ch.MeasListVis = obj.procStream.GetMeasListVis(iBlk);
            end
            ch.MeasListAct     = bitand(ch.MeasListActMan, ch.MeasListActMan);
        end

Loading