Commit 01bebb55 authored by Jay Dubb's avatar Jay Dubb
Browse files

v1.28.1 

-- Fix error in caused by incomplete change in last few commits to make FileLoadSaveClass variables used by SnirfClass and NirsClass private.
-- Also finish removing confusing Reset Group Folder option in MainGUI File menu and renaming Reset Current Element to Reset Processing Results. It was also started but not completed in last commit.
parent 09702016

DataTree/AcquiredData/DataFiles/FileLoadSaveClass.m

+13 −1
Original line number Diff line number Diff line
@@ -105,6 +105,12 @@ classdef FileLoadSaveClass < matlab.mixin.Copyable 
        end

        

        

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

        function fmt = GetFileFormat(obj)

            fmt = obj.fileformat;

        end

        

        

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

        function SetFilename(obj, fname)

            obj.filename = fname;
@@ -139,6 +145,12 @@ classdef FileLoadSaveClass < matlab.mixin.Copyable 
            err = obj.err;

        end

        

        

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

        function supportedFomats = GetSupportedFormats(obj)

            supportedFomats = obj.supportedFomats;

        end

        

    end

    

end
 
 No newline at end of file

DataTree/AcquiredData/Snirf/AuxClass.m

+3 −3
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ classdef AuxClass < FileLoadSaveClass 
                if isa(varargin{1}, 'AuxClass')

                    obj = varargin{1}.copy();

                elseif ischar(varargin{1})

                    obj.filename = varargin{1};

                    obj.SetFilename(varargin{1});

                    obj.Load();

                end

            elseif nargin==3
@@ -53,9 +53,9 @@ classdef AuxClass < FileLoadSaveClass 
            

            % Error checking            

            if ~isempty(fileobj) && ischar(fileobj)

                obj.filename = fileobj;

                obj.SetFilename(fileobj);

            elseif isempty(fileobj)

                fileobj = obj.filename;

                fileobj = obj.GetFilename();

            end 

            if isempty(fileobj)

               err = -1;

DataTree/AcquiredData/Snirf/DataClass.m

+4 −4
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ classdef DataClass < FileLoadSaveClass 
                        obj.measurementList(end+1) = MeasListClass(varargin{1}.ml(ii,:));

                    end

                elseif isa(varargin{1}, 'char')

                    obj.filename = varargin{1};

                    obj.SetFilename(varargin{1});

                    obj.Load();

                end

            elseif nargin==3
@@ -117,9 +117,9 @@ classdef DataClass < FileLoadSaveClass 
            

            % Error checking            

            if ~isempty(fileobj) && ischar(fileobj)

                obj.filename = fileobj;

                obj.SetFilename(fileobj);

            elseif isempty(fileobj)

                fileobj = obj.filename;

                fileobj = obj.GetFilename();

            end

            if isempty(fileobj)

               err = -1;

DataTree/AcquiredData/Snirf/MeasListClass.m

+3 −3
Original line number Diff line number Diff line
@@ -100,9 +100,9 @@ classdef MeasListClass < FileLoadSaveClass 
            

            % Error checking            

            if ~isempty(fileobj) && ischar(fileobj)

                obj.filename = fileobj;

                obj.SetFilename(fileobj);

            elseif isempty(fileobj)

                fileobj = obj.filename;

                fileobj = obj.GetFilename();

            end

            if isempty(fileobj)

               err = -1;

DataTree/AcquiredData/Snirf/MetaDataTagsClass.m

+4 −4
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ classdef MetaDataTagsClass < FileLoadSaveClass 
            obj.tags.SnirfDraft = '3';

            

            if nargin==1

                obj.filename = varargin{1};

                obj.SetFilename(varargin{1});

                obj.Load();

            end

        end
@@ -46,9 +46,9 @@ classdef MetaDataTagsClass < FileLoadSaveClass 
                       

            % Error checking

            if ~isempty(fileobj) && ischar(fileobj)

                obj.filename = fileobj;

                obj.SetFilename(fileobj);

            elseif isempty(fileobj)

                fileobj = obj.filename;

                fileobj = obj.GetFilename();

            end

            if isempty(fileobj)

               err = -1;

CRA Git | Maintained and supported by SUSTech CRA and CCSE