diff --git a/GUIs/GuiCeCryo.mlapp b/GUIs/GuiCeCryo.mlapp deleted file mode 100644 index c5cd6f1..0000000 Binary files a/GUIs/GuiCeCryo.mlapp and /dev/null differ diff --git a/GUIs/GuiLogger.mlapp b/GUIs/GuiLogger.mlapp index 6b303e4..3ee0e37 100644 Binary files a/GUIs/GuiLogger.mlapp and b/GUIs/GuiLogger.mlapp differ diff --git a/Utility functions/Local settings utilities/@MyProgramDescriptor/MyProgramDescriptor.m b/Utility functions/Local settings utilities/@MyProgramDescriptor/MyProgramDescriptor.m index 2acff12..a278b4c 100644 --- a/Utility functions/Local settings utilities/@MyProgramDescriptor/MyProgramDescriptor.m +++ b/Utility functions/Local settings utilities/@MyProgramDescriptor/MyProgramDescriptor.m @@ -1,58 +1,58 @@ % Descriptor for local data acquisition programs classdef MyProgramDescriptor properties (Access = public) name = '' % Identifier that is a MATLAB variable name title = '' % Title displayed in menus info = '' % Optional detailed description type = '' % runfile/instrument/logger enabled = true data_source = false % If program produces traces run_expr = '' % Expression to run the program run_bg_expr = '' % Expression to run the program without GUI end methods (Access = public) function this = MyProgramDescriptor(varargin) P = MyClassParser(this); processInputs(P, this, varargin{:}); end end methods function this = set.name(this, val) - assert(isvarname(val), '''name'' must be valid variable name') - this.name = val; + assert(isvarname(val), '''name'' must be valid variable name') + this.name = val; end % If title is not specified, return name function val = get.title(this) - if isempty(this.title) - val = this.name; - else - val = this.title; - end + if isempty(this.title) + val = this.name; + else + val = this.title; + end end function this = set.enabled(this, val) - % Attempt convertion to logical - val = logical(val); + % Attempt convertion to logical + val = logical(val); - assert(islogical(val) && isscalar(val), ['Value assigned ' ... + assert(islogical(val) && isscalar(val), ['Value assigned ' ... 'to ''enabled'' must be a logical scalar.']); - this.enabled = val; + this.enabled = val; end function this = set.data_source(this, val) - % Attempt convertion to logical - val = logical(val); + % Attempt convertion to logical + val = logical(val); - assert(islogical(val) && isscalar(val), ['Value assigned ' ... + assert(islogical(val) && isscalar(val), ['Value assigned ' ... 'to ''data_source'' must be a logical scalar.']); - this.data_source = val; + this.data_source = val; end end end diff --git a/Utility functions/Local settings utilities/getLocalSettings.m b/Utility functions/Local settings utilities/getLocalSettings.m index b68467c..2e06ebb 100644 --- a/Utility functions/Local settings utilities/getLocalSettings.m +++ b/Utility functions/Local settings utilities/getLocalSettings.m @@ -1,22 +1,26 @@ % Load local settings function Settings = getLocalSettings(varargin) try AllSettings = load('LocalInstrumentControlSettings.mat'); catch error(['The local settings file is not found. Add the folder, '... 'containing an existing file to the Matlab path or create '... 'a new one by runnign Setup.']); end % If a property is specified as varargin{1}, return it directly if ~isempty(varargin) try Settings = AllSettings.(varargin{1}); catch error(['No local setting with name ''%s'' found. Existing ' ... 'settings are the following:\n%s'], varargin{1}, ... var2str(fieldnames(AllSettings))); end + else + + % Return all settings as a structure + Settings = AllSettings; end end