Commit e90d7f85 authored by Jay's avatar Jay
Browse files

v1.24.6 

-- Fix small bug when launcing ProcStreamEditGUI when a group or subject is the current elemnt elected in MainGUI, the ProcStreamEditGUI will not start and instead throw an error. Need to set portions of current element index ID hat are zero to ones in UpdateProcElem function

-- Also get rid of message box saying "Loading default config" and prompting them to click OK when Homer3 starts. Instead just print message to stdout. Seems like a needless delay when starting Homer3. In addition shorten pause before asking user to select proc stream config file from .5 to .1 seconds in order to further speed up startup process.
parent bcefe0ae

DataTree/ProcStream/ProcStreamClass.m

+3 −3
Original line number Diff line number Diff line
@@ -550,10 +550,10 @@ classdef ProcStreamClass < handle 
            % This pause is a workaround for a matlab bug in version

            % 7.11 for Linux, where uigetfile won't block unless there's

            % a breakpoint.

            pause(.5);

            pause(.1);

            [fname, pname] = uigetfile([pathname, '*.cfg'], 'Load Process Options File' );

            if fname==0

                MessageBox( sprintf('Loading default config file.'),'Creating default config');

                fprintf('Loading default config file.\n');

                fname = [pathname, procStreamCfgFile];

                autoGenDefault = true;

            else

ProcStreamEditGUI/ProcStreamEditGUI.m

+1 −0
Original line number Diff line number Diff line
@@ -172,6 +172,7 @@ LoadProcStream(handles); 
function UpdateProcElem()

global procStreamEdit

idx = procStreamEdit.dataTree.currElem.GetIndexID();

idx(idx==0)=1;

iG = idx(1);

iS = idx(2);

iR = idx(3);

Utils/getVernum.m

+1 −1
Original line number Diff line number Diff line
@@ -2,5 +2,5 @@ function vrnnum = getVernum() 


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

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

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

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

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

CRA Git | Maintained and supported by SUSTech CRA and CCSE