Commit 328f2a45 authored by jayd1860's avatar jayd1860
Browse files

v1.32.5

-- Sync DataTree and Utils with AtlasViewer
parent 224339c0
Loading
Loading
Loading
Loading
+3 −3
Original line number Diff line number Diff line
@@ -55,9 +55,9 @@ classdef MeasListClass < FileLoadSaveClass
            if nargin==1 && isa(varargin{1}, 'MeasListClass')
                obj                  = varargin{1}.copy();                    % shallow copy ok because MeasListClass has no handle properties 
            elseif nargin==1 
                obj.sourceIndex      = varargin{1}(1);
                obj.detectorIndex    = varargin{1}(2);
                obj.wavelengthIndex  = varargin{1}(4);
                obj.sourceIndex      = varargin{1}(:,1);
                obj.detectorIndex    = varargin{1}(:,2);
                obj.wavelengthIndex  = varargin{1}(:,4);
                obj.dataType         = dataTypeValues.Raw.CW.Amplitude;
            elseif nargin==3
                obj.sourceIndex      = varargin{1};
+31 −0
Original line number Diff line number Diff line
@@ -525,6 +525,37 @@ classdef ConfigFileClass < FileClass
        end


        % -------------------------------------------------------------------------------------------------
        function b = eq(obj, obj2)
            b = false;
            if ~isempty(obj) && isempty(obj2)
                return;
            end
            if isempty(obj) && ~isempty(obj2)
                return;
            end
            for ii = 1:length(obj.params)
                if ~strcmpi(obj.params(ii).name, obj2.params(ii).name)
                    return;
                end
                if ~strcmpi(obj.params(ii).val, obj2.params(ii).val)
                    return;
                end
            end
            b = true;
        end

        
        % -------------------------------------------------------------------------------------------------
        function b = Modified(obj)
            obj2 = ConfigFileClass();
            if obj == obj2
                b = false;
            else
                b = true;
            end
        end
        
    end
end

+5 −1
Original line number Diff line number Diff line
@@ -31,13 +31,17 @@ classdef Logger < handle
            if exist(self.filename, 'file') == 2
                fds = fopen('all');
                for ii = 1:length(fds)
                    if strcmp(fopen(fds(ii)), self.filename)
                    filename = fopen(fds(ii));
                    if pathscompare(filename, self.filename)
                        fclose(fds(ii));
                        warning('off','MATLAB:DELETE:Permission');
                        delete(self.filename)
                        warning('on','MATLAB:DELETE:Permission');
                    end
                end
            end
            
            
            try
                self.fhandle = fopen(self.filename, 'wt');
            catch ME
+2 −2
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ function [vrnnum] = getVernum_AtlasViewerGUI()

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


@@ -30,6 +30,6 @@ function [vrnnum] = getVernum_Homer3()

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