v1.19.2 (590e8c93) · Commits · github_fork / Homer3

DataTree/AcquiredData/AcqDataClass.m

+1 −1

Original line number	Diff line number	Diff line
		@@ -15,7 +15,7 @@ classdef AcqDataClass < matlab.mixin.Copyable
		t = GetTime(obj, iBlk)

		% ---------------------------------------------------------
		datamat = GetDataMatrix(obj, iBlk)
		datamat = GetDataTimeSeries(obj, options, iBlk)

		% ---------------------------------------------------------
		SD = GetSDG(obj)

+0 −6

Original line number	Diff line number	Diff line
		@@ -333,12 +333,6 @@ classdef NirsClass < AcqDataClass & FileLoadSaveClass
		end


		% ---------------------------------------------------------
		function datamat = GetDataMatrix(obj, iBlk)
		datamat = obj.d;
		end


		% ---------------------------------------------------------
		function SD = GetSDG(obj)
		SD = obj.SD;

+8 −7

Original line number	Diff line number	Diff line
		@@ -200,12 +200,6 @@ classdef DataClass < FileLoadSaveClass
		end


		% ---------------------------------------------------------
		function val = GetDataTimeSeries(obj)
		val = obj.dataTimeSeries;
		end


		% ---------------------------------------------------------
		function val = GetT(obj)
		val = obj.time;
		@@ -271,11 +265,18 @@ classdef DataClass < FileLoadSaveClass


		% ---------------------------------------------------------
		function d = GetDataMatrix(obj)
		function d = GetDataTimeSeries(obj, options)
		d = [];
		if ~exist('options','var') \|\| isempty(options)
		options = '';
		end
		if isempty(obj.dataTimeSeries)
		return;
		end
		if ~strcmp(options, 'reshape')
		d = obj.dataTimeSeries;
		return
		end

		% Get information for each ch in d matrix
		dataTypeLabels = {};

+1 −1

Original line number	Diff line number	Diff line
		@@ -83,7 +83,7 @@ else
		for ii=1:length(snirf.data)

		% Display data matrix dimensions and data type
		d = snirf.data(ii).GetDataMatrix();
		d = snirf.data(ii).GetDataTimeSeries();
		pretty_print_struct(d, 8, 1);

		% Display meas list dimensions and data type

+7 −4

Original line number	Diff line number	Diff line
		@@ -626,15 +626,18 @@ classdef SnirfClass < AcqDataClass & FileLoadSaveClass


		% ---------------------------------------------------------
		function datamat = GetDataMatrix(obj, iBlk)
		function datamat = GetDataTimeSeries(obj, options, iBlk)
		datamat = [];
		if ~exist('options','var')
		options = '';
		end
		if ~exist('iBlk','var') \|\| isempty(iBlk)
		iBlk=1;
		end
		if iBlk>length(obj.data)
		return;
		end
		datamat = obj.data(iBlk).GetDataMatrix();
		datamat = obj.data(iBlk).GetDataTimeSeries(options);
		end


		@@ -841,7 +844,7 @@ classdef SnirfClass < AcqDataClass & FileLoadSaveClass
		if iBlk>length(obj.data)
		return;
		end
		d = obj.data(iBlk).GetDataMatrix();
		d = obj.data(iBlk).GetDataTimeSeries();
		end


		@@ -1158,7 +1161,7 @@ classdef SnirfClass < AcqDataClass & FileLoadSaveClass
		for ii=1:length(obj.data)

		% Display data matrix dimensions and data type
		d = obj.data(ii).GetDataMatrix();
		d = obj.data(ii).GetDataTimeSeries();
		pretty_print_struct(d, 8, 1);

		% Display meas list dimensions and data type