Commit c7b8c42e authored by jayd1860's avatar jayd1860
Browse files

v1.31.7 

-- Fix bug in finding derived data output for dataTree nodes in AtlasViewer - have to provide absolute path of root group folder.
-- Fix unit test error - maingui global variable has to be set to empty so that unit test does not try tpo access MainGUI which doesn't exist
-- Fix small warning in Logger when restarting Homer3 in another folder from menu.
parent d09bca97

DataTree/ProcStream/ProcResultClass.m

+13 −9
Original line number Diff line number Diff line
@@ -173,24 +173,28 @@ classdef ProcResultClass < handle 
                                

                rootdir = '';

                if ispathvalid(pname)

                    rootdir = [filesepStandard(pname), filesepStandard(fname)];

                    rootdir = [filesepStandard(pname), filesepStandard(fname, 'nameonly')];

                elseif ispathvalid(filename)

                    rootdir = filesepStandard(filename);

                end

                

                % Set the containing folder name 

                if ispathvalid(['./', rootdir, fname, '.mat'], 'file')

                    pname = ['./', rootdir];

                elseif ispathvalid(['../', rootdir, fname, '.mat'], 'file')

                    pname = ['../', rootdir];

                else

                    pname = ['./', rootdir]; 

                if ispathvalid(['./', rootdir])

                    rootdir = ['./', rootdir];

                elseif ispathvalid(['../', rootdir])

                    rootdir = ['../', rootdir];                    

                end                

                if ispathvalid([rootdir, fname, '.mat'], 'file')

                    pname = rootdir;

                end

                pname = filesepStandard(pname);

                

            elseif ispathvalid(pname)

                

                if ispathvalid(['./', filesepStandard(pname)])

                    pname = ['./', filesepStandard(pname)];

                else

                    pname = [filesepStandard(pname)];

                end



            end

DataTree/RunClass.m

+1 −1
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ classdef RunClass < TreeNodeClass 
            if isempty(obj)

                return;

            end

            err = obj.procStream.Load(obj.GetFilename);            

            err = obj.procStream.Load([obj.path, obj.GetFilename]);

        end

DataTree/SubjClass.m

+1 −1
Original line number Diff line number Diff line
@@ -216,7 +216,7 @@ classdef SubjClass < TreeNodeClass 
            if isempty(obj)

                return;

            end

            err1 = obj.procStream.Load(obj.GetFilename);

            err1 = obj.procStream.Load([obj.path, obj.GetFilename]);

            err2 = obj.runs(1).Load();

            if err1==0 && err2==0

                err = 0;

DataTree/TreeNodeClass.m

+1 −1
Original line number Diff line number Diff line
@@ -640,7 +640,7 @@ classdef TreeNodeClass < handle 
                return

            end

            err = obj.LoadSubBranch(); %#ok<*MCNPN>

            obj.procStream.Load(obj.GetFilename);

            obj.procStream.Load([obj.path, obj.GetFilename]);

        end

MainGUI/MainGUI.m

+1 −1
Original line number Diff line number Diff line
@@ -690,7 +690,7 @@ if isempty(maingui.unitTest) 
end



% restart

MainGUI(pathnm, fmt, unitTest, 'userargs');

MainGUI(filesepStandard(pathnm), fmt, unitTest, 'userargs');

CRA Git | Maintained and supported by SUSTech CRA and CCSE