Commit 349a96d6 authored by jayd1860's avatar jayd1860
Browse files

v1.74.0 

-- Move updateVersions and supporting function out of Utils/submodules to Utils/Shared in DataTree standalone mode to update repo versions.
-- Move JSON library from Utils to Utils/Shared for use in DataTree standalone mode to write JSON files when expoerting proc stream.

* DataTree, v1.8.0

-- Fix issue of DataTree in standalone mode not getting the right value for config parameter "Export Processing Stream Functions".
-- Remove reliance on static method TreeNodeClass.ExportProcStreamFunctions to get value of config parameter which tells you if code should export processing stream. Instead switch to getting the value directly from the ConfigFileClass global variable cfg which is automatically updated when changes are made to any config parameters through the configSettingsGUI.

* Utils, v1.3.0

-- Add JSON library so that export of procesaswing stream to JSON files can work in DataTree in standalone mode.
-- Add repoManagement/updateVersions.m and supporting function so that use can use the script to update versions in DataTree in standalone mode.
-- When saving config parameters in configSettingsGUI update global ConfigFileClass variable cfg so that DataTree in standalone mode has immediate access to changes in config params without having to rerun dataTree.
parent d86615da

DataTree/DataTreeClass.m

+1 −2
Original line number Diff line number Diff line
@@ -798,9 +798,8 @@ classdef DataTreeClass < handle 
        function CalcCurrElem(obj)

            banner = sprintf('Calculating derived data at %s with the following processing stream:\n\n', char(datetime(datetime, 'Format','HH:mm:ss, MMMM d, yyyy')));

            obj.PrintProcStream(banner);

            obj.currElem.ExportProcStreamFunctionsOpen();

            obj.currElem.Calc();

            obj.currElem.ExportProcStreamFunctionsClose();

            obj.currElem.ExportProcStreamFunctions();

        end

DataTree/ProcStream/ProcStreamClass.m

+4 −21
Original line number Diff line number Diff line
@@ -43,7 +43,6 @@ classdef ProcStreamClass < handle 
                return;

            end

            obj.CreateDefault();

            obj.ExportProcStreamFunctions(false);

        end
@@ -403,13 +402,14 @@ classdef ProcStreamClass < handle 
        % ----------------------------------------------------------------------------------        

        function ExportProcStream(obj, filename, fcalls)

            global logger

            global cfg

            temp = obj.output.SetFilename(filename);

            if isempty(temp)

                return;

            end

            [p,f,e] = fileparts(temp); 

            [p,f] = fileparts(temp); 

            fname = [filesepStandard(p), f, '_processing.json'];

            if obj.ExportProcStreamFunctions()==true

            if strcmpi(cfg.GetValue('Export Processing Stream Functions'), 'yes')

                logger.Write('Saving processing stream  %s:\n', fname);

                appname = sprintf('%s', getNamespace());

                vernum  = sprintf('v%s', getVernum(appname));
@@ -1968,23 +1968,6 @@ classdef ProcStreamClass < handle 
        

    end

        

    

    

    methods (Static)

        

        % ----------------------------------------------------------------------------------

        function out = ExportProcStreamFunctions(arg)

            persistent saveProcStream;

            if nargin == 0

                out = saveProcStream;

                return;

            end

            saveProcStream = arg;

            out = saveProcStream;

        end

        

    end

    

end

DataTree/TreeNodeClass.m

+2 −14
Original line number Diff line number Diff line
@@ -1559,26 +1559,14 @@ classdef TreeNodeClass < handle 
    methods        



        % ----------------------------------------------------------------------------------

        function ExportProcStreamFunctionsOpen(obj)

            val = obj.cfg.GetValue('Export Processing Stream Functions');

            if strcmpi(val, 'yes')

                obj.procStream.ExportProcStreamFunctions(true);

            elseif strcmpi(val, 'no')

                obj.procStream.ExportProcStreamFunctions(false);

            end

        end

        

        

        

        % ----------------------------------------------------------------------------------

        function ExportProcStreamFunctionsClose(obj)

        function ExportProcStreamFunctions(obj)

            if ispathvalid([obj.path, obj.outputDirname, 'ProcStreamFunctionsSummary.txt'])

                try

                    delete([obj.path, obj.outputDirname, 'ProcStreamFunctionsSummary.txt'])

                catch

                end

            end

            if ~obj.procStream.ExportProcStreamFunctions()

            if strcmpi(obj.cfg.GetValue('Export Processing Stream Functions'), 'no')

                return

            end

            obj.ExportProcStreamFunctionsSummary();

DataTree/Version.txt

+1 −1
Original line number Diff line number Diff line 
1.7.0
 
 No newline at end of file
 
1.8.0
 
 No newline at end of file

Utils/Shared/Version.txt

+1 −1
Original line number Diff line number Diff line 
1.2.1
 
 No newline at end of file
 
1.3.0
 
 No newline at end of file

CRA Git | Maintained and supported by SUSTech CRA and CCSE