v1.27.0 (e9cf0eb9) · Commits · github_fork / Homer3

DataTree/AcquiredData/AcqDataClass.m

+2 −2

Original line number	Diff line number	Diff line
		@@ -71,9 +71,9 @@ classdef AcqDataClass < matlab.mixin.Copyable

		% -------------------------------------------------------
		function b = Error(obj)
		if obj.err<0
		if obj.GetError()<0
		b = true;
		elseif obj.err==0
		elseif obj.GetError()==0
		b = false;
		else
		b = true;

+44 −2

Original line number	Diff line number	Diff line
		classdef FileLoadSaveClass < matlab.mixin.Copyable

		properties
		properties (Access = private)
		filename;
		fileformat;
		supportedFomats;
		@@ -98,5 +98,47 @@ classdef FileLoadSaveClass < matlab.mixin.Copyable
		end
		end


		% -------------------------------------------------------
		function SetFileFormat(obj, fmt)
		obj.fileformat = fmt;
		end


		% -------------------------------------------------------
		function SetFilename(obj, fname)
		obj.filename = fname;
		end


		% -------------------------------------------------------
		function fname = GetFilename(obj)
		fname = obj.filename;
		end


		% -------------------------------------------------------
		function SetDataStorageScheme(obj, scheme)
		obj.dataStorageScheme = scheme;
		end


		% -------------------------------------------------------
		function scheme = GetDataStorageScheme(obj)
		scheme = obj.dataStorageScheme;
		end


		% -------------------------------------------------------
		function SetError(obj, err)
		obj.err = err;
		end

		% -------------------------------------------------------
		function err = GetError(obj)
		err = obj.err;
		end

		end

		end
		No newline at end of file

+8 −8

Original line number	Diff line number	Diff line
		@@ -50,15 +50,15 @@ classdef NirsClass < AcqDataClass & FileLoadSaveClass
		obj.Initialize();

		% Set base class properties not part of NIRS format
		obj.filename = '';
		obj.fileformat = 'mat';
		obj.SetFilename('');
		obj.SetFileFormat('mat');
		obj.errmargin = 1e-3;

		if nargin==0
		return;
		end
		if nargin==2
		obj.dataStorageScheme = varargin{2};
		obj.SetDataStorageScheme(varargin{2});
		end

		if isa(varargin{1}, 'NirsClass')
		@@ -70,10 +70,10 @@ classdef NirsClass < AcqDataClass & FileLoadSaveClass
		obj = NirsClass.empty();
		return;
		end
		obj.filename = filename;
		obj.SetFilename('filename');

		% Conditional loading of snirf file data
		if strcmpi(obj.dataStorageScheme, 'memory')
		if strcmpi(obj.GetDataStorageScheme(), 'memory')
		obj.Load(filename);
		end
		end
		@@ -109,9 +109,9 @@ classdef NirsClass < AcqDataClass & FileLoadSaveClass

		% Do some error checking
		if ~isempty(fname)
		obj.filename = fname;
		obj.SetFilename(fname);
		else
		fname = obj.filename;
		fname = obj.GetFilename();
		end
		if exist(fname, 'file') ~= 2
		err = -1;
		@@ -255,7 +255,7 @@ classdef NirsClass < AcqDataClass & FileLoadSaveClass

		% If we're working off the snirf file instead of loading everything into memory
		% then we have to load stim here from file before accessing it.
		if strcmpi(obj.dataStorageScheme, 'files')
		if strcmpi(obj.GetDataStorageScheme(), 'files')
		obj.LoadStims(obj.filename);
		end

+1 −1

Original line number	Diff line number	Diff line
		@@ -12,7 +12,7 @@ classdef AuxClass < FileLoadSaveClass
		% -------------------------------------------------------
		function obj = AuxClass(varargin)
		% Set class properties not part of the SNIRF format
		obj.fileformat = 'hdf5';
		obj.SetFileFormat('hdf5');

		obj.timeOffset = 0;
		if nargin==1

+1 −1

Original line number	Diff line number	Diff line
		@@ -42,7 +42,7 @@ classdef DataClass < FileLoadSaveClass
		% nirs = NirsClass('./s1/neuro_run01.nirs')
		% data = DataClass(nirs.d, nirs.t)
		%
		obj.fileformat = 'hdf5';
		obj.SetFileFormat('hdf5');

		% Set SNIRF fomat properties
		obj.measurementList = MeasListClass().empty();