v1.16.7 (fc6f8b01) · Commits · github_fork / Homer3

DataTree/ProcStream/ProcStreamClass.m

+2 −2

Original line number	Diff line number	Diff line
		@@ -225,7 +225,7 @@ classdef ProcStreamClass < handle

		% get parameters for Output to obj.output
		lst = strfind(foos,' ');
		lst = [0, lst, length(foos)+1];
		lst = [0, lst, length(foos)+1]; %#ok<*AGROW>
		for ii=1:length(lst)-1
		foo2 = foos(lst(ii)+1:lst(ii+1)-1);
		lst2 = strmatch( foo2, paramOut, 'exact' );
		@@ -262,7 +262,7 @@ classdef ProcStreamClass < handle
		idxs = zeros(1, length(obj.fcalls));
		for ii=1:length(obj.fcalls)
		sargout = ParseOutputArgs(obj, ii);
		if strfind('dod', sargout)
		if strfind('dod', sargout) %#ok<*STRIFCND>
		idxs(ii) = 1;
		end
		if strfind('dc', sargout)

DataTree/TreeNodeClass.m

+28 −19

Original line number	Diff line number	Diff line
		@@ -162,7 +162,7 @@ classdef TreeNodeClass < handle
		% ----------------------------------------------------------------------------------
		%
		% ----------------------------------------------------------------------------------
		function options_s = parseSaveOptions(obj, options)
		function options_s = parseSaveOptions(~, options)
		options_s = struct('derived',false, 'acquired',false);
		C = str2cell(options, {':',',','+',' '});

		@@ -252,7 +252,7 @@ classdef TreeNodeClass < handle


		% ----------------------------------------------------------------------------------
		function d = GetRawData(obj)
		function d = GetRawData(~)
		d = [];
		end

		@@ -384,7 +384,7 @@ classdef TreeNodeClass < handle
		methods

		% ----------------------------------------------------------------------------------
		function s = GetStims(obj, t)
		function s = GetStims(~, ~)
		s = [];
		end

		@@ -415,37 +415,37 @@ classdef TreeNodeClass < handle


		% ----------------------------------------------------------------------------------
		function AddStims(obj, tPts, condition)
		function AddStims(~, ~, ~)
		return;
		end


		% ----------------------------------------------------------------------------------
		function DeleteStims(obj, tPts)
		function DeleteStims(~, ~)
		return;
		end


		% ----------------------------------------------------------------------------------
		function ToggleStims(obj, tPts)
		function ToggleStims(~, ~)
		return;
		end


		% ----------------------------------------------------------------------------------
		function SetStimDuration(obj, icond, duration)
		function SetStimDuration(~, ~, ~)
		return;
		end


		% ----------------------------------------------------------------------------------
		function duration = GetStimDuration(obj, icond)
		function duration = GetStimDuration(~, ~)
		duration = [];
		end


		% ----------------------------------------------------------------------------------
		function [tpts, duration, vals] = GetStimData(obj, icond)
		function [tpts, duration, vals] = GetStimData(~, ~)
		tpts = [];
		duration = [];
		vals = [];
		@@ -468,7 +468,7 @@ classdef TreeNodeClass < handle
		end
		newname = newname{1};
		end
		msg2 = sprintf('Condition name is not valid. New name must be character string. Do you want to choose another name?', newname);
		msg2 = sprintf('Condition name is not valid. New name must be character string. Do you want to choose another name?');
		while ~ischar(newname)
		q = menu(msg2,'YES','NO');
		if q==2
		@@ -501,7 +501,7 @@ classdef TreeNodeClass < handle
		lst1 = find(MeasList(:,4)==1);
		Lambda = obj.GetWls();

		if ndims(y)==2
		if ndims(y)==2 %#ok<*ISMAT>
		y = zeros(size(yold,1),length(lst1),length(Lambda));
		elseif ndims(y)==3
		y = zeros(size(yold,1),length(lst1),length(Lambda),size(yold,3));
		@@ -544,48 +544,57 @@ classdef TreeNodeClass < handle


		% ----------------------------------------------------------------------------------
		function d = GetDataMatrix(obj, iBlk)
		function d = GetDataMatrix(~, ~)
		d = [];
		end


		% ----------------------------------------------------------------------------------
		function t = GetTime(obj, iBlk)
		function t = GetTime(~, ~)
		t = [];
		end


		% ----------------------------------------------------------------------------------
		function t = GetTimeCombined(obj)
		function t = GetTimeCombined(~)
		t = [];
		end


		% ----------------------------------------------------------------------------------
		function t = GetTincAuto(obj, iBlk)
		function t = GetTincAuto(~, ~)
		t = [];
		end


		% ----------------------------------------------------------------------------------
		function t = GetTincAutoCh(obj, iBlk)
		function t = GetTincAutoCh(~, ~)
		t = [];
		end


		% ----------------------------------------------------------------------------------
		function t = GetTincMan(obj, iBlk)
		function t = GetTincMan(~, ~)
		t = [];
		end


		% ----------------------------------------------------------------------------------
		function SetTincMan(obj, idxs, iBlk, excl_incl)
		;
		function SetTincMan(~, ~, ~, ~)

		end

		end


		methods

		% ----------------------------------------------------------------------------------
		function tblcells = ExportMeanHRF(~, ~, ~)
		tblcells = {};
		end

		end

		%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
		% Static class methods implementing static class variables

MainGUI/MainGUI.m

+7 −2

Original line number	Diff line number	Diff line
		@@ -1483,9 +1483,14 @@ maingui.dataTree.currElem.ExportHRF(procElemSelect);
		function menuItemExportSubjHRFMean_Callback(hObject, eventdata, handles)
		global maingui

		out = ExportDataGUI(maingui.dataTree.groups(1).name,'.txt','Subjects HRF mean');
		if ~maingui.dataTree.currElem.IsGroup()
		MessageBox('Exporting mean HRF at this time, only applies to the currently selected group. Please select a group in the Current Processing Element panel. Then rerun the export')
		return
		end

		out = ExportDataGUI(maingui.dataTree.currElem.name,'.txt','Subjects HRF mean');
		if isempty(out.datatype)
		return;
		end
		maingui.dataTree.groups(1).ExportMeanHRF(out.trange);
		maingui.dataTree.currElem.ExportMeanHRF(out.trange);

Utils/getVernum.m

+1 −1

Original line number	Diff line number	Diff line
		@@ -2,5 +2,5 @@ function vrnnum = getVernum()

		vrnnum{1} = '1'; % Major version #
		vrnnum{2} = '16'; % Major sub-version #
		vrnnum{3} = '6'; % Minor version #
		vrnnum{3} = '7'; % Minor version #
		vrnnum{4} = '0'; % Minor sub-version # or patch #: 'p1', 'p2', etc

Admin message