Commit 9cce6bff authored by jayd1860's avatar jayd1860
Browse files

v1.54.0 

-- Fix another channel order issue in DataClass.GetDataTimeSeries() found by Yuanyuan whenm running processing stream with hmrR_MotionCorrectSplineSG
-- Minor addition to OpenFileGUI.m of keys to ignore ('home' and 'end') when navigating folders on MAC
parent 3c514bb1

DataTree/AcquiredData/Snirf/DataClass.m

+12 −12
Original line number Diff line number Diff line
@@ -622,10 +622,10 @@ classdef DataClass < FileLoadSaveClass 
                    

                elseif nWavelengths > 0 && nCond > 0

                    

                    for iCond = 1:nCond

                        for iS = 1:length(srcs)

                            for iD = 1:length(dets)

                                for iWl = 1:nWavelengths

                                for iCond = 1:nCond

                                    

                                    k = find(measurementListFull(:,1)==srcs(iS) & measurementListFull(:,2)==dets(iD) & measurementListFull(:,3)==iCond &  measurementListFull(:,4)==wavelengths(iWl));

                                    if ~isempty(k)
@@ -660,10 +660,10 @@ classdef DataClass < FileLoadSaveClass 
                    

                elseif nDataTypeLabels > 0 && nCond > 0

                    

                    for iCond = 1:nCond

                        for iS = 1:length(srcs)

                            for iD = 1:length(dets)

                                for iHbType = 1:length(hbTypes)

                                for iCond = 1:nCond

                                    

                                    k = find(measurementListFull(:,1)==srcs(iS) & measurementListFull(:,2)==dets(iD) & measurementListFull(:,3)==iCond &  measurementListFull(:,4)==iHbType);

                                    if ~isempty(k)
@@ -690,7 +690,7 @@ classdef DataClass < FileLoadSaveClass 
                                k = find(measurementListFull(:,1)==srcs(iS) & measurementListFull(:,2)==dets(iD) & measurementListFull(:,4)==wavelengths(iWl));

                                if ~isempty(k)

                                    iSDPair = find(measurementListSDpairs(:,1)==srcs(iS) & measurementListSDpairs(:,2)==dets(iD));

                                    d(:, iWl, iSDPair) = obj.dataTimeSeries(:,k); %#ok<*FNDSB>

                                    d(:, iSDPair, iWl) = obj.dataTimeSeries(:,k); %#ok<*FNDSB>

                                    order(kk) = k;

                                    kk = kk+1;

                                end
@@ -709,7 +709,7 @@ classdef DataClass < FileLoadSaveClass 
                                    k = find(measurementListFull(:,1)==srcs(iS) & measurementListFull(:,2)==dets(iD) & measurementListFull(:,3)==iCond &  measurementListFull(:,4)==wavelengths(iWl));

                                    if ~isempty(k)

                                        iSDPair = find(measurementListSDpairs(:,1)==srcs(iS) & measurementListSDpairs(:,2)==dets(iD));

                                        d(:, iWl, iSDPair, iCond) = obj.dataTimeSeries(:,k);

                                        d(:, iSDPair, iWl, iCond) = obj.dataTimeSeries(:,k);

                                        order(kk) = k;

                                        kk = kk+1;

                                    end
@@ -728,7 +728,7 @@ classdef DataClass < FileLoadSaveClass 
                                k = find(measurementListFull(:,1)==srcs(iS) & measurementListFull(:,2)==dets(iD) & measurementListFull(:,4)==iHbType);

                                if ~isempty(k)

                                    iSDPair = find(measurementListSDpairs(:,1)==srcs(iS) & measurementListSDpairs(:,2)==dets(iD));

                                    d(:, iHbType, iSDPair) = obj.dataTimeSeries(:,k);

                                    d(:, iSDPair, iHbType) = obj.dataTimeSeries(:,k);

                                    order(kk) = k;

                                    kk = kk+1;

                                end
@@ -747,7 +747,7 @@ classdef DataClass < FileLoadSaveClass 
                                    k = find(measurementListFull(:,1)==srcs(iS) & measurementListFull(:,2)==dets(iD) & measurementListFull(:,3)==iCond &  measurementListFull(:,4)==iHbType);

                                    if ~isempty(k)

                                        iSDPair = find(measurementListSDpairs(:,1)==srcs(iS) & measurementListSDpairs(:,2)==dets(iD));

                                        d(:, iHbType, iSDPair, iCond) = obj.dataTimeSeries(:,k);

                                        d(:, iSDPair, iHbType, iCond) = obj.dataTimeSeries(:,k);

                                        order(kk) = k;

                                        kk = kk+1;

                                    end

Utils/Shared/OpenFileGUI.m

+2 −0
Original line number Diff line number Diff line
@@ -315,6 +315,8 @@ function dummyfunc(~, ~, ~) 
function listboxFilesFolders_KeyPressFcn(hObject, eventdata, handles)

if strcmp(eventdata.Key, 'downarrow') || strcmp(eventdata.Key, 'uparrow')

    setappdata(hObject, 'keypress',1)

elseif strcmp(eventdata.Key, 'home') || strcmp(eventdata.Key, 'end')

    setappdata(hObject, 'keypress',1)

elseif strcmp(eventdata.Key, 'return')

    editFilename_Callback(handles.editFilename, 1, handles);

end

Version.txt

+1 −1
Original line number Diff line number Diff line 
1.53.0

1.54.0

CRA Git | Maintained and supported by SUSTech CRA and CCSE