Commit 027eabd6 authored by Jay Dubb's avatar Jay Dubb
Browse files

v1.25.7

-- Changes adding to Christian Arthur's changes to try to resolve consistency issues when editing and saving stims in StimEditGUI.
parent c26ab5cc
Loading
Loading
Loading
Loading
+4 −0
Original line number Diff line number Diff line
@@ -577,6 +577,10 @@ classdef DataClass < FileLoadSaveClass
            if isempty(obj)
                obj = DataClass();
            end
            if isempty(obj2)
                obj = DataClass();
                return;
            end
            if ~isa(obj2, 'DataClass')
                return;
            end
+17 −1
Original line number Diff line number Diff line
@@ -264,6 +264,10 @@ classdef SnirfClass < AcqDataClass & FileLoadSaveClass
                obj.stim0     = CopyHandles(obj2.stim0);
            catch
            end
            
            if ~isempty(obj2.filename)
                obj.filename = obj2.filename;
            end
        end
        
        
@@ -653,6 +657,18 @@ classdef SnirfClass < AcqDataClass & FileLoadSaveClass
        
        
        
        % -------------------------------------------------------
        function CopyStim(obj, obj2)
            for ii = 1:length(obj2.stim)
                if ii > length(obj.stim)
                    obj.stim(ii) = StimClass(obj2.stim(ii));
                else
                    obj.stim(ii).Copy(obj2.stim(ii));
                end
            end
        end        
        
        
        % -------------------------------------------------------
        function changes = StimChangesMade(obj)
            
@@ -984,7 +1000,7 @@ classdef SnirfClass < AcqDataClass & FileLoadSaveClass
                    stimnew(ii) = StimClass(CondNames{ii});
                end
            end
            obj.stim = stimnew;
            obj.stim = stimnew.copy;
        end
        
        
+17 −4
Original line number Diff line number Diff line
@@ -94,18 +94,31 @@ classdef DataTreeClass < handle
            end
        end
        
        
        % --------------------------------------------------------------
        function Copy(obj, obj2)
            idx = obj2.currElem.GetIndexID();
            iG = idx(1);
            iS = idx(2);
            iR = idx(3);
            obj.groups = GroupClass();
            obj.groups.Copy(obj2.groups(iG))
            obj.groups.CondNames = obj2.groups(iG).CondNames;
            obj.currElem = obj.groups(iG).subjs(iS).runs(iR);
            if isempty(obj.groups) 
                obj.groups = GroupClass(obj2.groups(iG));
            else
                obj.groups(iG).Copy(obj.groups(iG))
            end
            obj.SetCurrElem(iG, iS, iR);
            obj.groups(iG).SetConditions();
        end
        
        
        % --------------------------------------------------------------
        function CopyStims(obj, obj2)
            idx = obj2.currElem.GetIndexID();
            iG = idx(1);
            obj.groups(iG).CopyStims(obj2.groups(iG));            
        end
        
        
        % --------------------------------------------------------------
        function status = FoundDataFilesInOtherFormat(obj, dataInit, kk)            
            global supportedFormats
+9 −0
Original line number Diff line number Diff line
@@ -225,6 +225,15 @@ classdef GroupClass < TreeNodeClass
        end

        
        % --------------------------------------------------------------
        function CopyStims(obj, obj2)
            obj.CondNames = obj2.CondNames;
            for ii = 1:length(obj.subjs)
                obj.subjs(ii).CopyStims(obj2.subjs(ii));
            end
        end
        
        
        
        % ----------------------------------------------------------------------------------
        function CopyFcalls(obj, varargin)
+7 −0
Original line number Diff line number Diff line
@@ -71,6 +71,13 @@ classdef ProcInputClass < handle
        end
        
        
        % --------------------------------------------------------------
        function CopyStims(obj, obj2)
            obj.acquired.CopyStim(obj2.acquired);
        end
        
        
        
        % ----------------------------------------------------------------------------------
        function b = IsEmpty(obj)
            b=0;
Loading