Unverified Commit 5fd7163f authored by jayd1860's avatar jayd1860 Committed by GitHub
Browse files

Merge v1.70.1: Fix menu item "Load Stim from TSV" file. (#154) 

* v1.70.1

-- Fix menu item "Load Stim from TSV" file.
-- Fix ProbeClass converting SD probe data to ProbeClass - instead of SD.refpts it should be SD.Landmarks

* -- Sync with v1.1.1 Utils library: add some diagnostic data simulation scripts to Utils/Shared library which can add data time course to for instance probe.SD for testing AtlasViewer probe registration
parent 67b7c9fd

DataTree/AcquiredData/Nirs/NirsClass.m

+4 −4
Original line number Diff line number Diff line
@@ -220,17 +220,17 @@ classdef NirsClass < AcqDataClass & FileLoadSaveClass 
                err = 0;

            end

            

            if isproperty(fdata,'t')

            if isproperty(fdata,'t') && isproperty(fdata,'d') 

                obj.t = fdata.t;

                if ~isempty(obj.t)

                    obj.errmargin = min(diff(obj.t))/10;

                elseif err == 0

                    err = -3;

                end

            elseif err == 0

                if length(fdata.t) ~= size(fdata.d,1) && err == 0

                    err = -3;

                end

            if length(fdata.t) ~= size(fdata.d,1) && err == 0

            elseif err == 0

                err = -3;

            end

        end

DataTree/AcquiredData/Snirf/ProbeClass.m

+8 −5
Original line number Diff line number Diff line
@@ -55,12 +55,15 @@ classdef ProbeClass < FileLoadSaveClass 
                    else

                        obj.detectorPos3D  = SD.DetPos;

                    end

                    if isfield(SD,'refpts')

                        obj.landmarkPos3D = SD.refpts.pos;

                        obj.landmarkLabels = SD.refpts.labels;

                        if isfield(SD,'refpts2D')

                            obj.landmarkPos2D = SD.refpts2D.pos;

                    if isfield(SD,'Landmarks3D')

                        obj.landmarkPos3D = SD.Landmarks3D.pos;

                        obj.landmarkLabels = SD.Landmarks3D.labels;

                        if isfield(SD,'Landmarks2D')

                            obj.landmarkPos2D = SD.Landmarks2D.pos;

                        end

                    else

                        obj.landmarkPos3D = SD.DummyPos;

                        obj.landmarkLabels = SD.Landmarks3D.labels;

                    end

                    obj.frequencies  = 1;

                    obj.timeDelays  = 0;

DataTree/Version.txt

+1 −1
Original line number Diff line number Diff line 
1.3.0
 
1.3.1

MainGUI/MainGUI.m

+2 −5
Original line number Diff line number Diff line
@@ -2195,11 +2195,8 @@ maingui.dataTree.currElem.ExportStim(); 




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

function menuItemReloadStim_Callback(~, ~, handles)

function menuItemReloadStim_Callback(hObject, ~, handles)

global maingui

[iGroup, iSubj, iSess, iRun] = maingui.dataTree.GetCurrElemIndexID();

maingui.dataTree.ReloadStim();

Update('DataTreeClass',[iGroup, iSubj, iSess, iRun]);

DisplayStim(handles);



DisplayData(handles, hObject);

Utils/Shared/Version.txt

+1 −1
Original line number Diff line number Diff line 
1.1.0
 
1.1.1

CRA Git | Maintained and supported by SUSTech CRA and CCSE