Commit 199eb570 authored by jayd1860's avatar jayd1860
Browse files

v1.32.1 

-- Fix issue in ProcResultClass where loading processed data file does not update data display because loading of .mat file is prevented if the tree node is deemed to already have data. This does not work for AtlasViewer
-- Fix other issues in common functions such as version2string not checking for empty string and fix incorrect version check in configSettingsGUI.m which caused error.
-- Remove unnecessary code from deleteNamespace.m
-- deleteNamespace should be called last in MainGUI_DeleteFcn() function because the namespace is used by ChildGuiClass.m to close all GUIs.
parent 88e657a0

DataTree/ProcStream/ProcResultClass.m

+3 −3
Original line number Original line Diff line number Diff line
@@ -253,9 +253,9 @@ classdef ProcResultClass < handle 




            % If object is not empty it means we already have loaded data. No

            % If object is not empty it means we already have loaded data. No

            % need to waste time loading it from file.

            % need to waste time loading it from file.

            if ~obj.IsEmpty()

%             if ~obj.IsEmpty()

                return;

%                 return;

            end

%             end

            

            

            % Error check file

            % Error check file

            if ~ispathvalid(obj.filename,'file')

            if ~ispathvalid(obj.filename,'file')

MainGUI/MainGUI.m

+3 −1
Original line number Original line Diff line number Diff line
@@ -280,17 +280,18 @@ varargout{1} = maingui.unitTest; 
function [eventdata, handles] = MainGUI_DeleteFcn(hObject, eventdata, handles)

function [eventdata, handles] = MainGUI_DeleteFcn(hObject, eventdata, handles)

global maingui;

global maingui;





deleteNamespace('Homer3');

if ishandles(hObject)

if ishandles(hObject)

    delete(hObject)

    delete(hObject)

end

end

if isempty(maingui)

if isempty(maingui)

    deleteNamespace('Homer3');

    return;

    return;

end

end

if isfield(maingui,'logger') && ~isempty(maingui.logger)

if isfield(maingui,'logger') && ~isempty(maingui.logger)

    maingui.logger.Close('Homer3');

    maingui.logger.Close('Homer3');

end

end

if isempty(maingui.dataTree)

if isempty(maingui.dataTree)

    deleteNamespace('Homer3');

    return;

    return;

end

end
@@ -301,6 +302,7 @@ end 
delete(maingui.dataTree);

delete(maingui.dataTree);

maingui = [];

maingui = [];

clear maingui;

clear maingui;

deleteNamespace('Homer3');

Utils/configSettingsGUI.m

+1 −1
Original line number Original line Diff line number Diff line
@@ -182,7 +182,7 @@ for i = 1:cfgGui.ncols 
    

    

end

end





if verGreaterThanOrEqual('matlab','9.4')

if verGreaterThanOrEqual('matlab','9.8')

    set(hp, 'ContextMenu',setMouseClickAction(hcm,hp));

    set(hp, 'ContextMenu',setMouseClickAction(hcm,hp));

else

else

    set(hp, 'ButtonDownFcn',{@mouseClickFcn_Callback,hp});

    set(hp, 'ButtonDownFcn',{@mouseClickFcn_Callback,hp});

Utils/getVernum.m

+2 −2
Original line number Original line Diff line number Diff line
@@ -20,7 +20,7 @@ function [vrnnum] = getVernum_AtlasViewerGUI() 




vrnnum{1} = '2';   % Major version #

vrnnum{1} = '2';   % Major version #

vrnnum{2} = '15';  % Major sub-version #

vrnnum{2} = '15';  % Major sub-version #

vrnnum{3} = '0';   % Minor version #

vrnnum{3} = '1';   % Minor version #

vrnnum{4} = '0';   % Minor sub-version # or patch #: 'p1', 'p2', etc

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{1} = '1';   % Major version #

vrnnum{2} = '32';  % Major sub-version #

vrnnum{2} = '32';  % Major sub-version #

vrnnum{3} = '0';   % Minor version #

vrnnum{3} = '1';   % Minor version #

vrnnum{4} = '0';   % Minor sub-version # or patch #: 'p1', 'p2', etc

vrnnum{4} = '0';   % Minor sub-version # or patch #: 'p1', 'p2', etc

Utils/namespace/deleteNamespace.m

+4 −4
Original line number Original line Diff line number Diff line
@@ -4,11 +4,11 @@ if isdeployed() 
    return;

    return;

end

end

if nargin==0

if nargin==0

    pname = filesepStandard(pwd);

    return

elseif ~isdeployed()

end

    pname = filesepStandard((fileparts(which(nm))));

if strcmp(nm, 'all')

    namespace = [];

end

end



k = [];

k = [];

for ii = 1:length(namespace)

for ii = 1:length(namespace)

    if strcmp(namespace(ii).name, nm)

    if strcmp(namespace(ii).name, nm)

CRA Git | Maintained and supported by SUSTech CRA and CCSE