Commit b0eeb227 authored by Jay Dubb's avatar Jay Dubb
Browse files

v1.29.6 

-- Remove checkbox feature from Tools menu which checked the menu item for a gui when launching it and then user could close gui by selecting the checked menu option, closing the gui and unchecking the menu option. Now menu items are no longer checked/unchecked when launching/closing gui and if you select the gui menu option while the gui is up, then the gui simply is broght to the forefront rather than closed.

-- Fix probe display issue Meryem was seeing when restarting Homer3 from the command line while Homer3 is already up and running. If it was started in a different group folder with a different probe then both probes were displayed in the probe axes.

-- Add Probe display panel controls to MainGUI_EnableDisableGUI function.
parent 6eca40ab

MainGUI.fig

−2.37 KiB (92.4 KiB)

File changed.

No diff preview for this file type.

View original file
View changed file

MainGUI/MainGUI.m

+38 −32
Original line number Diff line number Diff line
@@ -57,12 +57,17 @@ end 
positionGUI(hFig, 0.15, 0.05, 0.80, 0.90)

setGuiFonts(hFig);



% Clear axes

cla(handles.axesSDG)

cla(handles.axesData)



set(handles.togglebuttonMinimizeGUI, 'tooltipstring','Minimize GUI Window')



% Set checkForUpdates checkbox based on config setting

cfg = ConfigFileClass();

handles.menuItemUpdateCheck.Checked = cfg.GetValue('Check For Updates');



MainGUI_EnableDisableGUI(handles, 'off')





% ---------------------------------------------------------------------
@@ -76,18 +81,26 @@ set(handles.radiobuttonProcTypeSubj, 'enable', val); 
set(handles.radiobuttonProcTypeRun, 'enable', val);

set(handles.textStatus, 'enable', val);



% Plot window panel

% Data plot panel

set(handles.textPanLeftRight, 'enable', val);

set(handles.pushbuttonPanLeft, 'enable', val);

set(handles.pushbuttonPanRight, 'enable', val);

set(handles.pushbuttonPanLeft, 'enable', val);

set(handles.pushbuttonResetView, 'enable', val);

set(handles.pushbuttonPanLeft, 'enable', val);

set(handles.pushbuttonDataPanLeft, 'enable', val);

set(handles.pushbuttonDataPanRight, 'enable', val);

set(handles.pushbuttonDataResetView, 'enable', val);

set(handles.checkboxFixRangeX, 'enable', val);

set(handles.editFixRangeX, 'enable', val);

set(handles.checkboxFixRangeY, 'enable', val);

set(handles.editFixRangeY, 'enable', val);



% Probe display panel

set(handles.pushbuttonProbePanLeft, 'enable', val);

set(handles.pushbuttonProbePanRight, 'enable', val);

set(handles.pushbuttonProbePanUp, 'enable', val);

set(handles.pushbuttonProbePanDown, 'enable', val);

set(handles.pushbuttonProbeZoomIn, 'enable', val);

set(handles.pushbuttonProbeZoomOut, 'enable', val);

set(handles.pushbuttonProbeResetView, 'enable', val);

set(handles.textPanDisplay, 'enable', val);



% Plot type selected panel

set(handles.listboxPlotConc, 'enable', val);

set(handles.radiobuttonPlotRaw, 'enable', val);
@@ -699,9 +712,6 @@ if ~exist('varargin','var') 
    varargin = {};

end

idx = FindChildGuiIdx(guiname);

checked = get(h,'checked');

if strcmp(checked, 'off')

    set(h, 'checked', 'on');



% Allow up to 5 parameters to be passed

switch(length(varargin))
@@ -718,10 +728,6 @@ if strcmp(checked, 'off') 
    case 5

        maingui.childguis(idx).Launch(varargin{1}, varargin{2}, varargin{3}, varargin{4}, varargin{5});

end

elseif strcmp(checked, 'on')

    set(h, 'checked', 'off');

    maingui.childguis(idx).Close();

end
@@ -1308,7 +1314,7 @@ DisplayGroupTree(handles); 




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

function pushbuttonPanLeft_Callback(hObject, eventdata, handles)

function pushbuttonDataPanLeft_Callback(hObject, eventdata, handles)

global maingui

procElem = maingui.dataTree.currElem;

iCh0     = maingui.axesSDG.iCh;
@@ -1350,13 +1356,13 @@ end 




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

function pushbuttonPanRight_Callback(hObject, eventdata, handles)

pushbuttonPanLeft_Callback(hObject, eventdata, handles)

function pushbuttonDataPanRight_Callback(hObject, eventdata, handles)

pushbuttonDataPanLeft_Callback(hObject, eventdata, handles)







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

function pushbuttonResetView_Callback(hObject, eventdata, handles)

function pushbuttonDataResetView_Callback(hObject, eventdata, handles)

global maingui

set(handles.checkboxFixRangeX, 'value',0);

set(handles.checkboxFixRangeY, 'value',0);

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} = '29';  % 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