Unverified Commit 3021b497 authored by jayd1860's avatar jayd1860 Committed by GitHub
Browse files

v1.38.5 -- Fix incorrect display of manually excluded channels (mlActMan) at... 

v1.38.5  -- Fix incorrect display of manually excluded channels (mlActMan) at the session, subject and group levels. Fix typo in exported JSON data. (#139)

* v1.38.3

-- Fix typo causing matlab exception in ProbeClass.m 3d-to-2d optode projection code
-- Change output folder name in AppSettings.cfg to be derivatives/homer to be BIDS compliant
-- Add backward compatibility code to detect and move derived output in old folders to new BIDS compliant folder derivatives/homer

* v1.38.4

-- Convert export of processing stream functions from .txt to JSON .json format in compliance with BIDS.
-- Add Qianqian's JSON library jsonlab to support the exporting of processing stream functions
-- Add fields ExcludedTime and ExcludedChannels to exported proc stream functions

* v1.38.5

-- Fix incorrect display of manually excluded channels (mlActMan) at the session, subject and group levels.
-- Fix typo "ApplicationNsme" in exported JSON file, and change variables for excluded channels and time from 'ExcludedTime' and'ExcludedChannels' to 'tIncMan' and 'mlActMan'
parent f860f7bb

DataTree/GroupClass.m

+0 −9
Original line number Diff line number Diff line
@@ -869,15 +869,6 @@ classdef GroupClass < TreeNodeClass 
        end

        

        

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

        function ch = GetMeasList(obj, iBlk)

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

                iBlk=1;

            end

            ch = obj.subjs(1).GetMeasList(iBlk);

        end



        

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

        function wls = GetWls(obj)

            wls = obj.subjs(1).GetWls();

DataTree/ProcStream/ProcInputClass.m

+11 −8
Original line number Diff line number Diff line
@@ -233,11 +233,14 @@ classdef ProcInputClass < handle 
            end

            if isempty(obj.mlActMan)

                obj.mlActMan{iBlk} = ml;

            elseif isempty(obj.mlActMan{iBlk})

               obj.mlActMan{iBlk} = ml; 

            elseif length(obj.mlActMan{iBlk}) == length(ml)

               obj.mlActMan{iBlk} = ml; 

            end

        end



        

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

        function ml = GetMeasListVis(obj, iBlk)

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

DataTree/ProcStream/ProcStreamClass.m

+2 −2
Original line number Diff line number Diff line
@@ -391,7 +391,7 @@ classdef ProcStreamClass < handle 
                dt      = sprintf('%s', char(datetime(datetime, 'Format','MMMM d, yyyy,   HH:mm:ss')));

                mlActManCompressed = obj.CompressMlActMan();

                tIncManCompressed = obj.CompresstIncMan();

                jsonstruct = struct('ApplicationNsme',appname, 'DateTime',dt, 'ExcludedTime',tIncManCompressed, 'ExcludedChannels',mlActManCompressed, 'FunctionsCalls',{fcalls});

                jsonstruct = struct('ApplicationName',appname, 'DateTime',dt, 'tIncMan',tIncManCompressed, 'mlActMan',mlActManCompressed, 'FunctionsCalls',{fcalls});

                jsonStr = savejson('Processing', jsonstruct);

                fid = fopen(fname, 'w');

                fwrite(fid, jsonStr, 'uint8');

DataTree/SessClass.m

+0 −9
Original line number Diff line number Diff line
@@ -499,15 +499,6 @@ classdef SessClass < TreeNodeClass 
        end

        

        

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

        function ch = GetMeasList(obj, iBlk)

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

                iBlk=1;

            end

            ch = obj.runs(1).GetMeasList(iBlk);

        end

                

        

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

        function wls = GetWls(obj)

            wls = obj.runs(1).GetWls();

DataTree/SubjClass.m

+0 −9
Original line number Diff line number Diff line
@@ -550,15 +550,6 @@ classdef SubjClass < TreeNodeClass 
        end

        

        

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

        function ch = GetMeasList(obj, iBlk)

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

                iBlk=1;

            end

            ch = obj.sess(1).GetMeasList(iBlk);

        end

                

        

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

        function wls = GetWls(obj)

            wls = obj.sess(1).GetWls();

CRA Git | Maintained and supported by SUSTech CRA and CCSE