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

v1.22.8 

-- Fix issue with tools menu child GUIs ProcStreamEditGUI and StimEditGUI not unchecking the checked menu options when closed.

-- Standardize naming convention of MainGUI objects launching the helper child GUIs to contain the literal name of the GUI after the menuItem prefix as a standard naming convention...so for instance rename from menuItemLaunchStimGUI to menuItemStimEditGUI, etc.
parent ba286356

AppSettings.cfg

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ SNIRF 
On



% Last Checked For Update

07-Jul-2020 13:07:06

17-Jul-2020 16:07:16



% Check For Updates

on

MainGUI/EnableDisableGuiPlotBttns.m

+4 −4
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ iCondGrp = get(handles.popupmenuConditions, 'value'); 
CondName = maingui.dataTree.groups(1).CondNames{iCondGrp};

if ~isempty(maingui.dataTree.currElem.GetDodAvg(CondName)) || ~isempty(maingui.dataTree.currElem.GetDcAvg(CondName))

    set(handles.checkboxPlotHRF, 'enable','on');

    set(handles.menuItemPlotProbe, 'enable','on');

    set(handles.menuItemPlotProbeGUI, 'enable','on');

    if ~isa(maingui.dataTree.currElem, 'RunClass')

        set(handles.checkboxPlotHRF, 'value',1);

        if ~isempty(maingui.dataTree.currElem.GetDcAvg())
@@ -53,15 +53,15 @@ if ~isempty(maingui.dataTree.currElem.GetDodAvg(CondName)) || ~isempty(maingui.d 
        end

    end

elseif raw_enable && raw_checked

    set(handles.menuItemPlotProbe, 'enable','off');

    set(handles.menuItemPlotProbeGUI, 'enable','off');

    set(handles.checkboxPlotHRF, 'enable','off');

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

elseif ~OD_enable && ~Conc_enable

    set(handles.menuItemPlotProbe, 'enable','off');

    set(handles.menuItemPlotProbeGUI, 'enable','off');

    set(handles.checkboxPlotHRF, 'enable','off');

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

else

    set(handles.menuItemPlotProbe, 'enable','off');

    set(handles.menuItemPlotProbeGUI, 'enable','off');

    set(handles.checkboxPlotHRF, 'enable','off');

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

end

MainGUI/MainGUI.fig

−1.17 KiB (79.1 KiB)

File changed.

No diff preview for this file type.

View original file
View changed file

MainGUI/MainGUI.m

+70 −57
Original line number Diff line number Diff line
@@ -67,12 +67,12 @@ checkboxApplyProcStreamEditToAll_Callback([]); 
pushbuttonCalcProcStream_Callback([]);

listboxFilesErr_Callback([]);

uipanelPlot_SelectionChangeFcn([]);

menuItemProcStreamEdit_Callback([]);

menuItemPlotProbe_Callback([]);

menuItemProcStreamEditGUI_Callback([]);

menuItemPlotProbeGUI_Callback([]);

menuItemSaveGroup_Callback([]);

menuItemViewHRFStdErr_Callback([]);

menuItemLaunchStimGUI_Callback([]);

pushbuttonProcStreamOptionsEdit_Callback([]);

menuItemStimEditGUI_Callback([]);

pushbuttonProcStreamOptionsGUI_Callback([]);

guiControls_ButtonDownFcn([]);

axesSDG_ButtonDownFcn([]);

popupmenuConditions_Callback([]);
@@ -98,6 +98,7 @@ function MainGUI_EnableDisableGUI(handles, val) 
set(handles.checkboxPlotHRF, 'enable', val);

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

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



% Plot window panel

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

set(handles.pushbuttonPanRight, 'enable', val);
@@ -108,15 +109,18 @@ function MainGUI_EnableDisableGUI(handles, val) 
set(handles.editFixRangeX, 'enable', val);

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

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



% Motion artifact panel

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

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

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

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



% Control

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

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

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

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



% Menu

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

set(handles.ViewMenu, 'enable', val);
@@ -126,6 +130,9 @@ function MainGUI_EnableDisableGUI(handles, val) 
set(handles.menuItemResetGroupFolder, 'enable', val)











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

function eventdata = MainGUI_OpeningFcn(hObject, eventdata, handles, varargin)

global maingui
@@ -413,7 +420,7 @@ MainGUI_EnableDisableGUI(handles,'off'); 
% Save original selection in listboxGroupTree because it'll change during auto processing 

val0 = get(handles.listboxGroupTree, 'value');



% Measure elapsed time

% Measure elapsed time of calculation

t = tic;



% Set the display status to pending. In order to avoid redisplaying
@@ -641,7 +648,7 @@ axis off 




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

function [eventdata, handles] = pushbuttonProcStreamOptionsEdit_Callback(hObject, eventdata, handles)

function [eventdata, handles] = pushbuttonProcStreamOptionsGUI_Callback(hObject, eventdata, handles)

global maingui

if ~ishandles(hObject)

    return;
@@ -675,19 +682,19 @@ end 




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

function menuItemPlotProbe_Callback(hObject, eventdata, handles)

function menuItemPlotProbeGUI_Callback(hObject, eventdata, handles)

LaunchChildGuiFromMenu('PlotProbeGUI', hObject);







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

function [eventdata, handles] = menuItemLaunchStimGUI_Callback(hObject, eventdata, handles)

function [eventdata, handles] = menuItemStimEditGUI_Callback(hObject, eventdata, handles)

LaunchChildGuiFromMenu('StimEditGUI', hObject);







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

function [eventdata, handles] = menuItemProcStreamEdit_Callback(hObject, eventdata, handles)

function [eventdata, handles] = menuItemProcStreamEditGUI_Callback(hObject, eventdata, handles)

LaunchChildGuiFromMenu('ProcStreamEditGUI', hObject);
@@ -1172,23 +1179,35 @@ end 
function Update(varargin)

global maingui



% Which application called us? 

% Args: 1) Which application called us? 2) What action is being performed?

guiname = '';

action = '';

if nargin>0

    guiname = varargin{1};

end

if nargin>1

    action = varargin{2};

end



% Redisplay main GUI based on what was done in the calling app

switch(guiname)

    case 'PlotProbeGUI'

        set(maingui.handles.menuItemPlotProbe, 'checked','off'); 

        set(maingui.handles.menuItemPlotProbeGUI, 'checked','off'); 

    case 'StimEditGUI'

        if strcmp(action, 'close')

            set(maingui.handles.menuItemStimEditGUI, 'checked','off'); 

        else

            Display(maingui.handles, maingui.handles.axesData);  % Redisplay data axes since stims might have edited

        end

    case 'ProcStreamOptionsGUI'

        set(maingui.handles.pushbuttonProcStreamOptionsEdit, 'value',0);  % Redisplay enable/disable toggle button 

        set(maingui.handles.pushbuttonProcStreamOptionsGUI, 'value',0);  % Redisplay enable/disable toggle button 

    case 'ProcStreamEditGUI'

        if strcmp(action, 'close')

            set(maingui.handles.menuItemProcStreamEditGUI, 'checked','off'); 

        else

            idx = FindChildGuiIdx('ProcStreamOptionsGUI');

            maingui.childguis(idx).Update();

        end

    case 'DataTreeClass'

        if ~isempty(maingui.handles)

            iGroup = varargin{2}(1);
@@ -1590,9 +1609,3 @@ else 
end





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

function SettingsMenu_Callback(hObject, eventdata, handles)

% hObject    handle to SettingsMenu (see GCBO)

% eventdata  reserved - to be defined in a future version of MATLAB

% handles    structure with handles and user data (see GUIDATA)
 
 No newline at end of file

ProcStreamEditGUI/ProcStreamEditGUI.m

+7 −1
Original line number Diff line number Diff line
@@ -20,11 +20,17 @@ else 
end





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

function ProcStreamEditGUI_Close()

global procStreamEdit

procStreamEdit.updateParentGui('ProcStreamEditGUI', 'close');







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

function varargout = ProcStreamEditGUI_OutputFcn(hObject, eventdata, handles)

handles.updateptr = @ProcStreamEditGUI_Update;

handles.closeptr = [];

handles.closeptr = @ProcStreamEditGUI_Close;

varargout{1} = handles;

CRA Git | Maintained and supported by SUSTech CRA and CCSE