Merge pull request #43 from jayd1860/development (285c6d8d) · Commits · github_fork / Homer3

AppSettings.cfg

+4 −1

Original line number	Diff line number	Diff line
		@@ -23,7 +23,10 @@ files
		% Auto Save Acquisition Files # No, Yes
		No

		% Group Data Loading Warnings
		% Group Data Loading Warnings # don't ask again, ask every time
		ask every time

		% Stim Edit GUI Save Warnings # don't ask again, ask every time
		don't ask again

		% END

+1 −1

Original line number	Diff line number	Diff line
		@@ -37,7 +37,7 @@ end


		% Set argument defaults
		dirname = filesepStandard(pwd,'full');
		dirname = filesepStandard(pwd);
		format = supportedFormats{1};
		datafiles0 = [];
		options = 'delete';

+9 −2

Original line number	Diff line number	Diff line
		@@ -161,8 +161,15 @@ classdef MetaDataTagsClass < FileLoadSaveClass


		% ----------------------------------------------------------------------------------
		function tags = Get(obj)
		function tags = Get(obj, name)
		if ~exist('name', 'var')
		name = '';
		end
		fields = propnames(obj.tags);
		k = find(strcmp(fields, name));
		if ~isempty(k)
		fields = fields(k);
		end
		tags = repmat(struct('key','','value',[]), length(fields), 1);
		for ii=1:length(fields)
		eval(sprintf('tags(ii).key = ''%s'';', fields{ii}));

+13 −0

Original line number	Diff line number	Diff line
		@@ -903,6 +903,19 @@ classdef SnirfClass < AcqDataClass & FileLoadSaveClass
		val = obj.metaDataTags.Get();
		end

		% ---------------------------------------------------------
		function val = GetLengthUnit(obj)
		val = [];
		if isempty(obj)
		return;
		end
		if isempty(obj.metaDataTags)
		return;
		end
		tag = obj.metaDataTags.Get('LengthUnit');
		val = tag.value;
		end

		end

+15 −4

Original line number	Diff line number	Diff line
		@@ -203,13 +203,24 @@ classdef StimClass < FileLoadSaveClass

		% Dimensions matter so dimensions must equal
		if ~all(size(obj.data)==size(obj2.data))
		if ~isempty(obj.data) \|\| ~isempty(obj2.data)
		return;
		end
		end

		% Now check contents
		if ~all(obj.data(:)==obj2.data(:))
		return;
		end

		if length(obj.dataLabels) ~= length(obj2.dataLabels)
		return;
		end
		for ii = 1:length(obj.dataLabels)
		if ~strcmp(obj.dataLabels{ii}, obj2.dataLabels{ii})
		return;
		end
		end
		B = true;
		end

		@@ -364,8 +375,8 @@ classdef StimClass < FileLoadSaveClass
		end
		else % If this stim is being added to an empty condition
		for i = 1:length(tPts)
		obj.data = [tPts(i), duration, amp, more];
		obj.states = [tPts(i), 1];
		obj.data(i,:) = [tPts(i), duration, amp, more];
		obj.states(i,:) = [tPts(i), 1];
		end
		end
		end