Unverified Commit 0f5428e7 authored by jayd1860's avatar jayd1860 Committed by GitHub
Browse files

v1.76.0 -- Update DataTree shared lib submodule (#168) 

* v1.75.4

* DataTree, v1.11.1
-- Fix error when loading some probes in NirsClass check that NirsClass.GetChannelsMeanDistance() is error checking size of SrcPos3D and DetPos3D against meas list indices.

* Utils, v1.4.4
-- Change font size in MenuBox.
-- Adjust button width to slightly wider.

* v1.75.5 -- Fix font size for MAC for MenuBox.m and configSettingsGUI.m

* v1.75.6 -- Utils, 1.4.6 -- Tweak size of MenuBox text gap.

* v1.76.0

-- Update DataTree shared lib submodule

* DataTree, 1.12.0
-- Change AcqDataClass GetSrcPos and GetDetPos methods to ignore '2D' and instead automatically try to retrieve 3D optodes if available otherwise it retrieves 2D. This fixes the problem of retrieving non existent or artificially generated 2D optodes that do not agree with the 'LengthUnit' which is a problem when doing image reconstruction and using a non-zero SD separation to exclude channels (possibbly end up exluding ALL chaqnnels if units apply to the wrong optodes).
-- Update NirsClass so SDgui matches GrommetRot being changed back to cell array type instead of numeric array.
parent 4974adb8

DataTree/AcquiredData/Nirs/NirsClass.m

+30 −6
Original line number Diff line number Diff line
@@ -1057,12 +1057,15 @@ classdef NirsClass < AcqDataClass & FileLoadSaveClass 
                'SrcPos3D',[], ...

                'DetPos3D',[], ...

                'DummyPos3D',[], ...

                'nSrcs',0,...

                'nDets',0,...

                'nDummys',0,...

                'SrcGrommetType',{{}}, ...

                'DetGrommetType',{{}}, ...

                'DummyGrommetType',{{}}, ...

                'SrcGrommetRot',[], ...

                'DetGrommetRot',[], ...

                'DummyGrommetRot',[], ...

                'SrcGrommetRot',{{}}, ...

                'DetGrommetRot',{{}}, ...

                'DummyGrommetRot',{{}}, ...

                'Landmarks',obj.InitLandmarks(), ...

                'Landmarks2D',obj.InitLandmarks(), ...

                'Landmarks3D',obj.InitLandmarks(), ...
@@ -1237,7 +1240,13 @@ classdef NirsClass < AcqDataClass & FileLoadSaveClass 
            % SrcGrommetRot

            d2 = size(obj.SD.SrcPos,1) - length(obj.SD.SrcGrommetRot);

            if d2 > 0

                obj.SD.SrcGrommetRot(end+1:end+d2) = zeros(d2,1);

                for ii = length(obj.SD.SrcGrommetRot)+1:length(obj.SD.SrcGrommetRot)+d2

                    if iscell(obj.SD.SrcGrommetRot)

                        obj.SD.SrcGrommetRot{ii} = 0;

                    else

                        obj.SD.SrcGrommetRot(ii) = 0;

                    end

                end

            end

            

            % DetGrommetType
@@ -1249,7 +1258,13 @@ classdef NirsClass < AcqDataClass & FileLoadSaveClass 
            % DetGrommetRot

            d2 = size(obj.SD.DetPos,1) - length(obj.SD.DetGrommetRot);

            if d2 > 0

                obj.SD.DetGrommetRot(end+1:end+d2) = zeros(d2,1);

                for ii = length(obj.SD.SrcGrommetRot)+1:length(obj.SD.SrcGrommetRot)+d2

                    if iscell(obj.SD.DetGrommetRot)

                        obj.SD.DetGrommetRot{ii} = 0;

                    else

                        obj.SD.DetGrommetRot(ii) = 0;

                    end

                end

            end



            % DummyGrommetType
@@ -1261,7 +1276,13 @@ classdef NirsClass < AcqDataClass & FileLoadSaveClass 
            % DummyGrommetRot

            d2 = size(obj.SD.DummyPos,1) - length(obj.SD.DummyGrommetRot);

            if d2 > 0

                obj.SD.DummyGrommetRot(end+1:end+d2) = zeros(d2,1);

                for ii = length(obj.SD.DummyGrommetRot)+1:length(obj.SD.DummyGrommetRot)+d2

                    if iscell(obj.SD.DummyGrommetRot)

                        obj.SD.DummyGrommetRot{ii} = 0;

                    else

                        obj.SD.DummyGrommetRot(ii) = 0;

                    end

                end

            end 

                                    

            % MesListAct
@@ -1274,6 +1295,9 @@ classdef NirsClass < AcqDataClass & FileLoadSaveClass 
                end

            end

            

            obj.SD.nSrcs = size(obj.SD.SrcPos,1);

            obj.SD.nDets = size(obj.SD.DetPos,1);

            obj.SD.nDummys = size(obj.SD.DummyPos,1);

        end

DataTree/AcquiredData/Snirf/ProbeClass.m

+4 −10
Original line number Diff line number Diff line
@@ -382,11 +382,8 @@ classdef ProbeClass < FileLoadSaveClass 
        

        

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

        function srcpos = GetSrcPos(obj,flag2d)

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

                flag2d = 0;

            end

            if flag2d==0

        function srcpos = GetSrcPos(obj, ~)

            if ~isempty(obj.sourcePos3D)

                srcpos = obj.sourcePos3D;

            else

                srcpos = obj.sourcePos2D;
@@ -395,11 +392,8 @@ classdef ProbeClass < FileLoadSaveClass 
        

        

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

        function detpos = GetDetPos(obj,flag2d)

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

                flag2d = 0;

            end

            if flag2d==0

        function detpos = GetDetPos(obj, ~)

            if ~isempty(obj.detectorPos3D)

                detpos = obj.detectorPos3D;

            else

                detpos = obj.detectorPos2D;

DataTree/Version.txt

+1 −1
Original line number Diff line number Diff line 
1.11.1
 
 No newline at end of file
 
1.12.0
 
 No newline at end of file

Version.txt

+1 −1
Original line number Diff line number Diff line 
1.75.6
 
 No newline at end of file
 
1.76.0
 
 No newline at end of file

CRA Git | Maintained and supported by SUSTech CRA and CCSE