Commit 2df093d6 authored by jayd1860's avatar jayd1860
Browse files

v1.18.1 

-- Fix error introduced in last revision which added functionality to replace obsolete processing stream function calls with their updated equivalent in the registry. Error is the ArgClass.Extract() was being used incorrectly in ProcStreamClass.GetInputArgs() method when calculating processing stream.

-- Get rid of some unnecessary print statements
parent a91ee00f

DataTree/ProcStream/ArgClass.m

+1 −1
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ classdef ArgClass < matlab.mixin.Copyable 
        

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

        function args = Extract(obj)

            args = str2cell(obj.str,',');

            args = str2cell(obj.str,',')';

            if args{1}(1)=='[' || args{1}(1)=='('

                args{1}(1) = '';

            end

DataTree/ProcStream/ProcStreamClass.m

+3 −3
Original line number Diff line number Diff line
@@ -354,10 +354,10 @@ classdef ProcStreamClass < handle 
            if ~exist('iFcall', 'var') || isempty(iFcall)

                iFcall = obj.GetFcallsIdxs();

            end

            for jj=1:length(iFcall)

                args{jj} = obj.fcalls(iFcall(jj)).argIn.Extract();

            for jj = iFcall

                args{jj} = obj.fcalls(jj).argIn.Extract();

            end

            args = unique(args(:)', 'stable');

            args = unique([args{:}], 'stable');

        end

MainGUI/DisplayAxesSDG.m

+1 −1
Original line number Diff line number Diff line
@@ -168,4 +168,4 @@ end 
h=zoom;

setAllowAxesZoom(h, hAxes, 0);



fprintf('DisplayAxesSDG: Elapsed Time - %0.3f\n', toc);
 
% fprintf('DisplayAxesSDG: Elapsed Time - %0.3f\n', toc);

Utils/MenuBox.m

+3 −3
Original line number Diff line number Diff line
@@ -140,9 +140,9 @@ set(hf, 'visible','on', 'position',p); 
t = 0;

while isempty(bttnId) && ishandles(hf)

    t=t+1;

    pause(.1);

    if mod(t,10)==0

        % fprintf('Waiting for user responce, t = %d ticks\n', t);

    pause(.2);

    if mod(t,30)==0

        fprintf('Waiting for user responce, t = %d ticks\n', t);

    end

end

Utils/MessageBox.m

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ t = 0; 
while ishandles(hm)

    t=t+1;

    pause(.2);

    if mod(t,10)==0

    if mod(t,30)==0

        fprintf('Waiting for user responce, t = %d ticks\n', t);

    end

end

CRA Git | Maintained and supported by SUSTech CRA and CCSE