From c6aa1e483ee29125960e006d5651c8f886085523 Mon Sep 17 00:00:00 2001 From: Houtan Bastani <houtan@dynare.org> Date: Thu, 27 Dec 2018 17:00:53 +0100 Subject: [PATCH] fix typo --- src/gui_calib_smoother.m | 40 ++++++++++----------- src/gui_cond_forecast.m | 28 +++++++-------- src/gui_define_comm_options.m | 18 +++++----- src/gui_determ_simulation.m | 50 +++++++++++++------------- src/gui_estimation.m | 40 ++++++++++----------- src/gui_forecast.m | 40 ++++++++++----------- src/gui_realtime_shock_decomposition.m | 28 +++++++-------- src/gui_results.m | 12 +++---- src/gui_select_window.m | 18 +++++----- src/gui_shock_decomposition.m | 28 +++++++-------- 10 files changed, 151 insertions(+), 151 deletions(-) diff --git a/src/gui_calib_smoother.m b/src/gui_calib_smoother.m index 9d1e8a7..6cf1e2f 100644 --- a/src/gui_calib_smoother.m +++ b/src/gui_calib_smoother.m @@ -95,47 +95,47 @@ handles.calib_smoother = uicontrol( ... % --- PUSHBUTTONS ------------------------------------- -handles.pussbuttonCalib_smoother = uicontrol( ... +handles.pushbuttonCalib_smoother = uicontrol( ... 'Parent', tabId, ... - 'Tag', 'pussbuttonSimulation', ... + 'Tag', 'pushbuttonSimulation', ... 'Style', 'pushbutton', ... 'Units','normalized','Position',[gui_size.space gui_size.bottom gui_size.button_width gui_size.button_height],... 'String', 'Calibrated smoother !', ... - 'Callback', @pussbuttonCalib_smoother_Callback); + 'Callback', @pushbuttonCalib_smoother_Callback); -handles.pussbuttonReset = uicontrol( ... +handles.pushbuttonReset = uicontrol( ... 'Parent', tabId, ... - 'Tag', 'pussbuttonReset', ... + 'Tag', 'pushbuttonReset', ... 'Style', 'pushbutton', ... 'Units','normalized','Position',[gui_size.space*2+gui_size.button_width gui_size.bottom gui_size.button_width gui_size.button_height],... 'String', 'Reset', ... - 'Callback', @pussbuttonReset_Callback); + 'Callback', @pushbuttonReset_Callback); -handles.pussbuttonClose = uicontrol( ... +handles.pushbuttonClose = uicontrol( ... 'Parent', tabId, ... - 'Tag', 'pussbuttonReset', ... + 'Tag', 'pushbuttonReset', ... 'Style', 'pushbutton', ... 'Units','normalized','Position',[gui_size.space*3+gui_size.button_width*2 gui_size.bottom gui_size.button_width gui_size.button_height],... 'String', 'Close this tab', ... 'Callback',{@close_tab,tabId}); -handles.pussbuttonResults = uicontrol( ... +handles.pushbuttonResults = uicontrol( ... 'Parent', tabId, ... - 'Tag', 'pussbuttonSimulation', ... + 'Tag', 'pushbuttonSimulation', ... 'Style', 'pushbutton', ... 'Units','normalized','Position',[gui_size.space*4+gui_size.button_width*3 gui_size.bottom gui_size.button_width gui_size.button_height],... 'String', 'Browse results...', ... 'Enable', 'on',... - 'Callback', @pussbuttonResults_Callback); + 'Callback', @pushbuttonResults_Callback); -handles.pussbuttonCloseAll = uicontrol( ... +handles.pushbuttonCloseAll = uicontrol( ... 'Parent', tabId, ... - 'Tag', 'pussbuttonSimulation', ... + 'Tag', 'pushbuttonSimulation', ... 'Style', 'pushbutton', ... 'Units','normalized','Position',[gui_size.space*5+gui_size.button_width*4 gui_size.bottom gui_size.button_width gui_size.button_height],... 'String', 'Close all output figures', ... 'Enable', 'on',... - 'Callback', @pussbuttonCloseAll_Callback); + 'Callback', @pushbuttonCloseAll_Callback); function uipanelResults_CreateFcn() top = 1; @@ -293,9 +293,9 @@ handles.pussbuttonCloseAll = uicontrol( ... end end - function pussbuttonCalib_smoother_Callback(hObject,evendata) + function pushbuttonCalib_smoother_Callback(hObject,evendata) - set(handles.pussbuttonResults, 'Enable', 'off'); + set(handles.pushbuttonResults, 'Enable', 'off'); if(isempty(options_.datafile)) gui_tools.show_warning('Please define datafile first: go to following option of GUI menu "Estimation -> Oberved variables & data file"'); return; @@ -379,7 +379,7 @@ handles.pussbuttonCloseAll = uicontrol( ... jObj.setBusyText('All done!'); uiwait(msgbox('Calibrated smoother executed successfully!', 'DynareGUI','modal')); - set(handles.pussbuttonResults, 'Enable', 'on'); + set(handles.pushbuttonResults, 'Enable', 'on'); project_info.modified = 1; @@ -399,7 +399,7 @@ handles.pussbuttonCloseAll = uicontrol( ... end end - function pussbuttonReset_Callback(hObject,evendata) + function pushbuttonReset_Callback(hObject,evendata) for ii = 1:handles.numVars set(handles.vars(ii),'Value',0); end @@ -450,11 +450,11 @@ handles.pussbuttonCloseAll = uicontrol( ... end - function pussbuttonResults_Callback(hObject,evendata) + function pushbuttonResults_Callback(hObject,evendata) gui_results('calib_smoother', dynare_gui_.calib_smoother_results); end - function pussbuttonCloseAll_Callback(hObject,evendata) + function pushbuttonCloseAll_Callback(hObject,evendata) gui_tools.close_all_figures(); end diff --git a/src/gui_cond_forecast.m b/src/gui_cond_forecast.m index 8e66eae..6ad4683 100644 --- a/src/gui_cond_forecast.m +++ b/src/gui_cond_forecast.m @@ -111,38 +111,38 @@ handles.conditional_forecast = uicontrol( ... 'HorizontalAlignment', 'left'); % --- PUSHBUTTONS ------------------------------------- -handles.pussbuttonCondForecast = uicontrol( ... +handles.pushbuttonCondForecast = uicontrol( ... 'Parent', tabId, ... - 'Tag', 'pussbuttonCondForecast', ... + 'Tag', 'pushbuttonCondForecast', ... 'Style', 'pushbutton', ... 'Units','normalized','Position',[gui_size.space gui_size.bottom gui_size.button_width gui_size.button_height],... 'String', 'Conditional forecast !', ... - 'Callback', @pussbuttonCondForecast_Callback); + 'Callback', @pushbuttonCondForecast_Callback); -handles.pussbuttonReset = uicontrol( ... +handles.pushbuttonReset = uicontrol( ... 'Parent', tabId, ... - 'Tag', 'pussbuttonReset', ... + 'Tag', 'pushbuttonReset', ... 'Style', 'pushbutton', ... 'Units','normalized','Position',[gui_size.space*2+gui_size.button_width gui_size.bottom gui_size.button_width gui_size.button_height],... 'String', 'Reset', ... - 'Callback', @pussbuttonReset_Callback); + 'Callback', @pushbuttonReset_Callback); -handles.pussbuttonClose = uicontrol( ... +handles.pushbuttonClose = uicontrol( ... 'Parent', tabId, ... - 'Tag', 'pussbuttonReset', ... + 'Tag', 'pushbuttonReset', ... 'Style', 'pushbutton', ... 'Units','normalized','Position',[gui_size.space*3+gui_size.button_width*2 gui_size.bottom gui_size.button_width gui_size.button_height],... 'String', 'Close this tab', ... 'Callback',{@close_tab,tabId}); -handles.pussbuttonCloseAll = uicontrol( ... +handles.pushbuttonCloseAll = uicontrol( ... 'Parent', tabId, ... - 'Tag', 'pussbuttonSimulation', ... + 'Tag', 'pushbuttonSimulation', ... 'Style', 'pushbutton', ... 'Units','normalized','Position',[gui_size.space*4+gui_size.button_width*3 gui_size.bottom gui_size.button_width gui_size.button_height],... 'String', 'Close all output figures', ... 'Enable', 'on',... - 'Callback', @pussbuttonCloseAll_Callback); + 'Callback', @pushbuttonCloseAll_Callback); handles.pushbuttonCommandDefinition = uicontrol( ... 'Parent', tabId, ... @@ -271,7 +271,7 @@ handles.pushbuttonDeleteCond = uicontrol( ... end end - function pussbuttonCondForecast_Callback(hObject,evendata) + function pushbuttonCondForecast_Callback(hObject,evendata) if(~(isfield(oo_, 'dr') && isfield(oo_.dr, 'ghu')&& isfield(oo_.dr, 'ghx'))) gui_tools.show_warning('Please solve the model before running this command (run estimation or stochastic simulation)!'); @@ -434,7 +434,7 @@ handles.pushbuttonDeleteCond = uicontrol( ... end end - function pussbuttonReset_Callback(hObject,evendata) + function pushbuttonReset_Callback(hObject,evendata) for ii = 1:handles.numVars set(handles.vars(ii),'Value',0); @@ -482,7 +482,7 @@ handles.pushbuttonDeleteCond = uicontrol( ... gui_tabs.delete_tab(hTab); end - function pussbuttonCloseAll_Callback(hObject,evendata) + function pushbuttonCloseAll_Callback(hObject,evendata) gui_tools.close_all_figures(); end diff --git a/src/gui_define_comm_options.m b/src/gui_define_comm_options.m index 5806a26..b9b1aa8 100644 --- a/src/gui_define_comm_options.m +++ b/src/gui_define_comm_options.m @@ -89,13 +89,13 @@ end %handles.tab_group.SelectedChild = 1; % --- PUSHBUTTONS ------------------------------------- -handles.pussbuttonUseOptions = uicontrol( ... +handles.pushbuttonUseOptions = uicontrol( ... 'Parent', fHandle, ... 'Style', 'pushbutton', ... 'Units', 'characters', ... 'Position', [2 1 25 2], ... 'String', 'Use these options', ... - 'Callback', @pussbuttonUseOptions_Callback); + 'Callback', @pushbuttonUseOptions_Callback); handles.pushbuttonSaveDefaults = uicontrol( ... 'Parent', fHandle, ... @@ -113,21 +113,21 @@ handles.pushbuttonLoadDefaults = uicontrol( ... 'String', 'Load default options', ... 'Callback', @pushbuttonLoadDefaults_Callback); -handles.pussbuttonReset = uicontrol( ... +handles.pushbuttonReset = uicontrol( ... 'Parent', fHandle, ... 'Style', 'pushbutton', ... 'Units', 'characters', ... 'Position', [83 1 25 2], ... 'String', 'Reset options', ... - 'Callback', @pussbuttonReset_Callback); + 'Callback', @pushbuttonReset_Callback); -handles.pussbuttonClose = uicontrol( ... +handles.pushbuttonClose = uicontrol( ... 'Parent', fHandle, ... 'Style', 'pushbutton', ... 'Units', 'characters', ... 'Position', [83 1 25 2], ... 'String', 'Close this window', ... - 'Callback', @pussbuttonClose_Callback); + 'Callback', @pushbuttonClose_Callback); function create_tab(num, group_name) @@ -511,7 +511,7 @@ handles.pussbuttonClose = uicontrol( ... end end - function pussbuttonUseOptions_Callback(hObject, callbackdata) + function pushbuttonUseOptions_Callback(hObject, callbackdata) comm_str = saveUserOptions(); setappdata(0,comm_name,comm_str); close; @@ -624,7 +624,7 @@ handles.pussbuttonClose = uicontrol( ... gui_tools.project_log_entry(sprintf('Defining %s command', comm_name),'Default values loaded successfully'); end - function pussbuttonReset_Callback(hObject, callbackdata) + function pushbuttonReset_Callback(hObject, callbackdata) numOptions = size(handles.values,2); for ii = 1:numOptions option_type = get(handles.values(ii),'TooltipString'); @@ -636,7 +636,7 @@ handles.pussbuttonClose = uicontrol( ... end end - function pussbuttonClose_Callback(hObject, callbackdata) + function pushbuttonClose_Callback(hObject, callbackdata) close; end end \ No newline at end of file diff --git a/src/gui_determ_simulation.m b/src/gui_determ_simulation.m index a1b1da2..064e863 100644 --- a/src/gui_determ_simulation.m +++ b/src/gui_determ_simulation.m @@ -105,38 +105,38 @@ handles.simul = uicontrol( ... % --- PUSHBUTTONS ------------------------------------- -handles.pussbuttonSimulation = uicontrol( ... +handles.pushbuttonSimulation = uicontrol( ... 'Parent', tabId, ... - 'Tag', 'pussbuttonSimulation', ... + 'Tag', 'pushbuttonSimulation', ... 'Style', 'pushbutton', ... 'Units','normalized','Position',[gui_size.space gui_size.bottom gui_size.button_width_small gui_size.button_height],... 'String', 'Simulation !', ... - 'Callback', @pussbuttonSimulation_Callback); + 'Callback', @pushbuttonSimulation_Callback); -handles.pussbuttonReset = uicontrol( ... +handles.pushbuttonReset = uicontrol( ... 'Parent', tabId, ... - 'Tag', 'pussbuttonReset', ... + 'Tag', 'pushbuttonReset', ... 'Style', 'pushbutton', ... 'Units','normalized','Position',[gui_size.space*2+gui_size.button_width_small gui_size.bottom gui_size.button_width_small gui_size.button_height],... 'String', 'Reset', ... - 'Callback', @pussbuttonReset_Callback); + 'Callback', @pushbuttonReset_Callback); -handles.pussbuttonClose = uicontrol( ... +handles.pushbuttonClose = uicontrol( ... 'Parent', tabId, ... - 'Tag', 'pussbuttonReset', ... + 'Tag', 'pushbuttonReset', ... 'Style', 'pushbutton', ... 'Units','normalized','Position',[gui_size.space*3+gui_size.button_width_small*2 gui_size.bottom gui_size.button_width_small gui_size.button_height],... 'String', 'Close this tab', ... 'Callback',{@close_tab,tabId}); -handles.pussbuttonCloseAll = uicontrol( ... +handles.pushbuttonCloseAll = uicontrol( ... 'Parent', tabId, ... - 'Tag', 'pussbuttonSimulation', ... + 'Tag', 'pushbuttonSimulation', ... 'Style', 'pushbutton', ... 'Units','normalized','Position',[gui_size.space*4+gui_size.button_width_small*3 gui_size.bottom gui_size.button_width_small gui_size.button_height],... 'String', 'Close all output figures', ... 'Enable', 'on',... - 'Callback', @pussbuttonCloseAll_Callback); + 'Callback', @pushbuttonCloseAll_Callback); handles.pushbuttonCommandDefinition = uicontrol( ... 'Parent', tabId, ... @@ -168,13 +168,13 @@ handles.pushbuttonCommandDefinition = uicontrol( ... list_shocks = uicontrol('Parent',handles.shocks_panel,'Style','popupmenu','Units','normalized','Position',[0.02 0.77 0.7 0.06]); list2 = shocks(:,3); set(list_shocks,'String',['Select varexo...'; list2]); - set(list_shocks,'Callback', @pussbuttonValueChanged_Callback); + set(list_shocks,'Callback', @pushbuttonValueChanged_Callback); - handles.pussbuttonAddValue = uicontrol('Parent',handles.shocks_panel,'Style','pushbutton','Units','normalized','Position',[0.73 0.77 0.25 0.06],... + handles.pushbuttonAddValue = uicontrol('Parent',handles.shocks_panel,'Style','pushbutton','Units','normalized','Position',[0.73 0.77 0.25 0.06],... 'String', 'Add variable ...', ... 'TooltipString', 'Add variable as many times as number in periods in which you want to define temporary changes in the value',... 'Enable', 'Off',... - 'Callback', @pussbuttonAddValue_Callback); + 'Callback', @pushbuttonAddValue_Callback); column_names = {'Shock ','Period ','Value ', 'Remove ','Unanticipated?'}; %%% column_format = {'char','numeric','numeric', 'logical','logical'};%%% @@ -188,10 +188,10 @@ handles.pushbuttonCommandDefinition = uicontrol( ... 'RowName',[],... 'CellEditCallback',@savedata); - handles.pussbuttonRemoveValue = uicontrol('Parent',handles.shocks_panel,'Style','pushbutton','Units','normalized','Position',[0.73 0.03 0.25 0.06],... + handles.pushbuttonRemoveValue = uicontrol('Parent',handles.shocks_panel,'Style','pushbutton','Units','normalized','Position',[0.73 0.03 0.25 0.06],... 'String', 'Remove all selected', ... 'Enable', 'Off',... - 'Callback', @pussbuttonRemoveValues_Callback); + 'Callback', @pushbuttonRemoveValues_Callback); %initval and endval column_names = {'Shock ','Initval ','Endval '}; @@ -205,16 +205,16 @@ handles.pushbuttonCommandDefinition = uicontrol( ... 'ColumnWidth', {190, 100, 100}, ... 'RowName',[]); - function pussbuttonValueChanged_Callback(hObject,callbackdata) + function pushbuttonValueChanged_Callback(hObject,callbackdata) value = get(hObject, 'Value'); if(value == 1) - set(handles.pussbuttonAddValue, 'Enable','Off'); + set(handles.pushbuttonAddValue, 'Enable','Off'); else - set(handles.pussbuttonAddValue, 'Enable','On'); + set(handles.pushbuttonAddValue, 'Enable','On'); end end - function pussbuttonAddValue_Callback(hObject,callbackdata) + function pushbuttonAddValue_Callback(hObject,callbackdata) value = get(list_shocks, 'Value'); if(value >1) selected_shock = list2{value-1}; @@ -228,7 +228,7 @@ handles.pushbuttonCommandDefinition = uicontrol( ... end end - function pussbuttonRemoveValues_Callback(hObject,callbackdata) + function pushbuttonRemoveValues_Callback(hObject,callbackdata) shocks_data = get(handles.shocks_table, 'Data'); shocks_data_items = size(shocks_data,1); num=0; @@ -250,7 +250,7 @@ handles.pushbuttonCommandDefinition = uicontrol( ... if(c == 4) %remove if(val) - set(handles.pussbuttonRemoveValue,'Enable','On'); + set(handles.pushbuttonRemoveValue,'Enable','On'); end end end @@ -326,7 +326,7 @@ handles.pushbuttonCommandDefinition = uicontrol( ... end end - function pussbuttonSimulation_Callback(hObject,evendata) + function pushbuttonSimulation_Callback(hObject,evendata) comm_str = get(handles.simul, 'String'); if(isempty(comm_str)) @@ -422,7 +422,7 @@ handles.pushbuttonCommandDefinition = uicontrol( ... end end - function pussbuttonReset_Callback(hObject,evendata) + function pushbuttonReset_Callback(hObject,evendata) for ii = 1:handles.numVars set(handles.vars(ii),'Value',0); end @@ -498,7 +498,7 @@ handles.pushbuttonCommandDefinition = uicontrol( ... end end - function pussbuttonCloseAll_Callback(hObject,evendata) + function pushbuttonCloseAll_Callback(hObject,evendata) gui_tools.close_all_figures(); end diff --git a/src/gui_estimation.m b/src/gui_estimation.m index 6392d86..f404840 100644 --- a/src/gui_estimation.m +++ b/src/gui_estimation.m @@ -115,48 +115,48 @@ handles.estimation = uicontrol( ... % --- PUSHBUTTONS ------------------------------------- -handles.pussbuttonEstimation = uicontrol( ... +handles.pushbuttonEstimation = uicontrol( ... 'Parent', tabId, ... - 'Tag', 'pussbuttonSimulation', ... + 'Tag', 'pushbuttonSimulation', ... 'Style', 'pushbutton', ... 'Units','normalized','Position',[gui_size.space gui_size.bottom gui_size.button_width_small gui_size.button_height],... 'String', 'Estimation !', ... 'Interruptible','on',... - 'Callback', @pussbuttonEstimation_Callback); + 'Callback', @pushbuttonEstimation_Callback); -handles.pussbuttonReset = uicontrol( ... +handles.pushbuttonReset = uicontrol( ... 'Parent', tabId, ... - 'Tag', 'pussbuttonReset', ... + 'Tag', 'pushbuttonReset', ... 'Style', 'pushbutton', ... 'Units','normalized','Position',[gui_size.space*2+gui_size.button_width_small gui_size.bottom gui_size.button_width_small gui_size.button_height],... 'String', 'Reset', ... - 'Callback', @pussbuttonReset_Callback); + 'Callback', @pushbuttonReset_Callback); -handles.pussbuttonClose = uicontrol( ... +handles.pushbuttonClose = uicontrol( ... 'Parent', tabId, ... - 'Tag', 'pussbuttonReset', ... + 'Tag', 'pushbuttonReset', ... 'Style', 'pushbutton', ... 'Units','normalized','Position',[gui_size.space*3+gui_size.button_width_small*2 gui_size.bottom gui_size.button_width_small gui_size.button_height],... 'String', 'Close this tab', ... 'Callback',{@close_tab,tabId}); -handles.pussbuttonResults = uicontrol( ... +handles.pushbuttonResults = uicontrol( ... 'Parent', tabId, ... - 'Tag', 'pussbuttonSimulation', ... + 'Tag', 'pushbuttonSimulation', ... 'Style', 'pushbutton', ... 'Units','normalized','Position',[gui_size.space*4+gui_size.button_width_small*3 gui_size.bottom gui_size.button_width_small gui_size.button_height],... 'String', 'Browse results...', ... 'Enable', 'on',... - 'Callback', @pussbuttonResults_Callback); + 'Callback', @pushbuttonResults_Callback); -handles.pussbuttonCloseAll = uicontrol( ... +handles.pushbuttonCloseAll = uicontrol( ... 'Parent', tabId, ... - 'Tag', 'pussbuttonSimulation', ... + 'Tag', 'pushbuttonSimulation', ... 'Style', 'pushbutton', ... 'Units','normalized','Position',[gui_size.space*5+gui_size.button_width_small*4 gui_size.bottom gui_size.button_width_small gui_size.button_height],... 'String', 'Close all output figures', ... 'Enable', 'On',... - 'Callback', @pussbuttonCloseAll_Callback); + 'Callback', @pushbuttonCloseAll_Callback); handles.pushbuttonCommandDefinition = uicontrol( ... 'Parent', tabId, ... @@ -394,8 +394,8 @@ handles.pushbuttonCommandDefinition = uicontrol( ... end - function pussbuttonEstimation_Callback(hObject,evendata) - set(handles.pussbuttonResults, 'Enable', 'off'); + function pushbuttonEstimation_Callback(hObject,evendata) + set(handles.pushbuttonResults, 'Enable', 'off'); user_options = model_settings.estimation; old_options = options_; @@ -455,7 +455,7 @@ handles.pushbuttonCommandDefinition = uicontrol( ... uiwait(msgbox('Estimation executed successfully!', 'DynareGUI','modal')); %enable menu options gui_tools.menu_options('output','On'); - set(handles.pussbuttonResults, 'Enable', 'on'); + set(handles.pushbuttonResults, 'Enable', 'on'); project_info.modified = 1; catch ME @@ -474,7 +474,7 @@ handles.pushbuttonCommandDefinition = uicontrol( ... end - function pussbuttonReset_Callback(hObject,evendata) + function pushbuttonReset_Callback(hObject,evendata) for ii = 1:handles.numVars set(handles.vars(ii),'Value',0); end @@ -570,11 +570,11 @@ handles.pushbuttonCommandDefinition = uicontrol( ... end - function pussbuttonResults_Callback(hObject,evendata) + function pushbuttonResults_Callback(hObject,evendata) gui_results('estimation', dynare_gui_.est_results); end - function pussbuttonCloseAll_Callback(hObject,evendata) + function pushbuttonCloseAll_Callback(hObject,evendata) gui_tools.close_all_figures(); end end \ No newline at end of file diff --git a/src/gui_forecast.m b/src/gui_forecast.m index 2953ea0..502af37 100644 --- a/src/gui_forecast.m +++ b/src/gui_forecast.m @@ -70,47 +70,47 @@ uicontrol( ... 'HorizontalAlignment', 'left'); % --- PUSHBUTTONS ------------------------------------- -handles.pussbuttonForecast = uicontrol( ... +handles.pushbuttonForecast = uicontrol( ... 'Parent', tabId, ... - 'Tag', 'pussbuttonSimulation', ... + 'Tag', 'pushbuttonSimulation', ... 'Style', 'pushbutton', ... 'Units','normalized','Position',[gui_size.space gui_size.bottom gui_size.button_width gui_size.button_height],... 'String', 'Forecast !', ... - 'Callback', @pussbuttonForecast_Callback); + 'Callback', @pushbuttonForecast_Callback); -handles.pussbuttonReset = uicontrol( ... +handles.pushbuttonReset = uicontrol( ... 'Parent', tabId, ... - 'Tag', 'pussbuttonReset', ... + 'Tag', 'pushbuttonReset', ... 'Style', 'pushbutton', ... 'Units','normalized','Position',[gui_size.space*2+gui_size.button_width gui_size.bottom gui_size.button_width gui_size.button_height],... 'String', 'Reset', ... - 'Callback', @pussbuttonReset_Callback); + 'Callback', @pushbuttonReset_Callback); -handles.pussbuttonClose = uicontrol( ... +handles.pushbuttonClose = uicontrol( ... 'Parent', tabId, ... - 'Tag', 'pussbuttonReset', ... + 'Tag', 'pushbuttonReset', ... 'Style', 'pushbutton', ... 'Units','normalized','Position',[gui_size.space*3+gui_size.button_width*2 gui_size.bottom gui_size.button_width gui_size.button_height],... 'String', 'Close this tab', ... 'Callback',{@close_tab,tabId}); -handles.pussbuttonResults = uicontrol( ... +handles.pushbuttonResults = uicontrol( ... 'Parent', tabId, ... - 'Tag', 'pussbuttonSimulation', ... + 'Tag', 'pushbuttonSimulation', ... 'Style', 'pushbutton', ... 'Units','normalized','Position',[gui_size.space*4+gui_size.button_width*3 gui_size.bottom gui_size.button_width gui_size.button_height],... 'String', 'Browse results...', ... 'Enable', 'On',... - 'Callback', @pussbuttonResults_Callback); + 'Callback', @pushbuttonResults_Callback); -handles.pussbuttonCloseAll = uicontrol( ... +handles.pushbuttonCloseAll = uicontrol( ... 'Parent', tabId, ... - 'Tag', 'pussbuttonSimulation', ... + 'Tag', 'pushbuttonSimulation', ... 'Style', 'pushbutton', ... 'Units','normalized','Position',[gui_size.space*5+gui_size.button_width*4 gui_size.bottom gui_size.button_width gui_size.button_height],... 'String', 'Close all output figures', ... 'Enable', 'on',... - 'Callback', @pussbuttonCloseAll_Callback); + 'Callback', @pushbuttonCloseAll_Callback); function uipanelResults_CreateFcn() @@ -222,9 +222,9 @@ handles.pussbuttonCloseAll = uicontrol( ... end end - function pussbuttonForecast_Callback(hObject,evendata) + function pushbuttonForecast_Callback(hObject,evendata) - set(handles.pussbuttonResults, 'Enable', 'off'); + set(handles.pushbuttonResults, 'Enable', 'off'); old_options = options_; old_oo = oo_; @@ -281,7 +281,7 @@ handles.pussbuttonCloseAll = uicontrol( ... jObj.setBusyText('All done!'); uiwait(msgbox('Forecast executed successfully!', 'DynareGUI','modal')); - set(handles.pussbuttonResults, 'Enable', 'on'); + set(handles.pushbuttonResults, 'Enable', 'on'); project_info.modified = 1; catch ME @@ -296,7 +296,7 @@ handles.pussbuttonCloseAll = uicontrol( ... delete(guiObj); end - function pussbuttonReset_Callback(hObject,evendata) + function pushbuttonReset_Callback(hObject,evendata) for ii = 1:handles.numVars set(handles.vars(ii),'Value',0); end @@ -341,11 +341,11 @@ handles.pussbuttonCloseAll = uicontrol( ... end - function pussbuttonResults_Callback(hObject,evendata) + function pushbuttonResults_Callback(hObject,evendata) gui_results('forecast', dynare_gui_.forecast_results); end - function pussbuttonCloseAll_Callback(hObject,evendata) + function pushbuttonCloseAll_Callback(hObject,evendata) gui_tools.close_all_figures(); end diff --git a/src/gui_realtime_shock_decomposition.m b/src/gui_realtime_shock_decomposition.m index a00f0cc..d930f52 100644 --- a/src/gui_realtime_shock_decomposition.m +++ b/src/gui_realtime_shock_decomposition.m @@ -84,34 +84,34 @@ uicontrol( ... %% --- PUSHBUTTONS ------------------------------------- -handles.pussbuttonShockDecomposition = uicontrol( ... +handles.pushbuttonShockDecomposition = uicontrol( ... 'Parent', tabId, ... - 'Tag', 'pussbuttonSimulation', ... + 'Tag', 'pushbuttonSimulation', ... 'Style', 'pushbutton', ... 'Units','normalized','Position',[gui_size.space gui_size.bottom gui_size.button_width gui_size.button_height],... 'String', 'Shock decomposition !', ... - 'Callback', @pussbuttonShockDecomposition_Callback); + 'Callback', @pushbuttonShockDecomposition_Callback); -handles.pussbuttonReset = uicontrol( ... +handles.pushbuttonReset = uicontrol( ... 'Parent', tabId, ... - 'Tag', 'pussbuttonReset', ... + 'Tag', 'pushbuttonReset', ... 'Style', 'pushbutton', ... 'Units','normalized','Position',[gui_size.space*2+gui_size.button_width gui_size.bottom gui_size.button_width gui_size.button_height],... 'String', 'Reset', ... - 'Callback', @pussbuttonReset_Callback); + 'Callback', @pushbuttonReset_Callback); -handles.pussbuttonCloseAll = uicontrol( ... +handles.pushbuttonCloseAll = uicontrol( ... 'Parent', tabId, ... - 'Tag', 'pussbuttonSimulation', ... + 'Tag', 'pushbuttonSimulation', ... 'Style', 'pushbutton', ... 'Units','normalized','Position',[gui_size.space*3+gui_size.button_width*2 gui_size.bottom gui_size.button_width gui_size.button_height],... 'String', 'Close all output figures', ... 'Enable', 'on',... - 'Callback', @pussbuttonCloseAll_Callback); + 'Callback', @pushbuttonCloseAll_Callback); -handles.pussbuttonClose = uicontrol( ... +handles.pushbuttonClose = uicontrol( ... 'Parent', tabId, ... - 'Tag', 'pussbuttonReset', ... + 'Tag', 'pushbuttonReset', ... 'Units','normalized','Position',[gui_size.space*4+gui_size.button_width*3 gui_size.bottom gui_size.button_width gui_size.button_height],... 'String', 'Close this tab', ... 'Callback',{@close_tab,tabId}); @@ -242,7 +242,7 @@ handles.pussbuttonClose = uicontrol( ... 'FontWeight', 'normal'); end - function pussbuttonShockDecomposition_Callback(hObject,evendata) + function pushbuttonShockDecomposition_Callback(hObject,evendata) if(~(isfield(oo_, 'SmoothedVariables') && isfield(oo_, 'SmoothedShocks'))) gui_tools.show_warning('Please run estimation before shock decomposition!'); @@ -402,7 +402,7 @@ handles.pussbuttonClose = uicontrol( ... end - function pussbuttonReset_Callback(hObject,evendata) + function pushbuttonReset_Callback(hObject,evendata) for ii = 1:handles.numVars set(handles.vars(ii),'Value',0); @@ -514,7 +514,7 @@ handles.pussbuttonClose = uicontrol( ... end - function pussbuttonCloseAll_Callback(hObject,evendata) + function pushbuttonCloseAll_Callback(hObject,evendata) gui_tools.close_all_figures(); end end \ No newline at end of file diff --git a/src/gui_results.m b/src/gui_results.m index 32dd224..ba81798 100644 --- a/src/gui_results.m +++ b/src/gui_results.m @@ -69,25 +69,25 @@ handles.uipanelSelect = uipanel( ... uipanelSelect_CreateFcn; % --- PUSHBUTTONS ------------------------------------- -handles.pussbuttonClose = uicontrol( ... +handles.pushbuttonClose = uicontrol( ... 'Parent', fHandle, ... 'Style', 'pushbutton', ... 'Units','normalized','Position',[gui_size.space gui_size.bottom gui_size.button_width_long gui_size.button_height],... 'String', 'Close this view', ... - 'Callback', @pussbuttonClose_Callback); + 'Callback', @pushbuttonClose_Callback); -handles.pussbuttonCloseAll = uicontrol( ... +handles.pushbuttonCloseAll = uicontrol( ... 'Parent', fHandle, ... 'Style', 'pushbutton', ... 'Units','normalized','Position',[gui_size.space*2+gui_size.button_width_long gui_size.bottom gui_size.button_width_long gui_size.button_height],... 'String', 'Close all output figures', ... - 'Callback', @pussbuttonCloseAll_Callback); + 'Callback', @pushbuttonCloseAll_Callback); - function pussbuttonClose_Callback(hObject,callbackdata) + function pushbuttonClose_Callback(hObject,callbackdata) close; end - function pussbuttonCloseAll_Callback(hObject,evendata) + function pushbuttonCloseAll_Callback(hObject,evendata) fh=findall(0,'type','figure'); for i=1:length(fh) if(~(fh(i)==main_figure) && ~(fh(i)==fHandle)) diff --git a/src/gui_select_window.m b/src/gui_select_window.m index 457605a..d50dbcf 100644 --- a/src/gui_select_window.m +++ b/src/gui_select_window.m @@ -90,30 +90,30 @@ handles.table = uitable(handles.uipanel,'Data',base_items,... end % --- PUSHBUTTONS ------------------------------------- -handles.pussbuttonSave = uicontrol( ... +handles.pushbuttonSave = uicontrol( ... 'Parent', fHandle, ... 'Style', 'pushbutton', ... 'Units', 'characters', ... 'Position', [2 1 30 2], ... 'String', 'Save changes and return', ... - 'Callback', @pussbuttonSave_Callback); + 'Callback', @pushbuttonSave_Callback); -handles.pussbuttonReset = uicontrol( ... +handles.pushbuttonReset = uicontrol( ... 'Parent', fHandle, ... 'Style', 'pushbutton', ... 'Units', 'characters', ... 'Position', [34 1 30 2], ... 'String', 'Reset changes', ... - 'Callback', @pussbuttonReset_Callback); + 'Callback', @pushbuttonReset_Callback); -handles.pussbuttonClose = uicontrol( ... +handles.pushbuttonClose = uicontrol( ... 'Parent', fHandle, ... 'Style', 'pushbutton', ... 'Units', 'characters', ... 'Position', [66 1 30 2], ... 'String', 'Close without saving', ... - 'Callback', @pussbuttonClose_Callback); + 'Callback', @pushbuttonClose_Callback); function set_initial() num_items = size(base_items,1); @@ -140,7 +140,7 @@ handles.pussbuttonClose = uicontrol( ... end end - function pussbuttonSave_Callback(hObject,callbackdata) + function pushbuttonSave_Callback(hObject,callbackdata) selected = find(cell2mat(base_items(:,4))); switch base_field_name @@ -275,13 +275,13 @@ handles.pussbuttonClose = uicontrol( ... end - function pussbuttonReset_Callback(hObject,callbackdata) + function pushbuttonReset_Callback(hObject,callbackdata) set_initial(); set(handles.table, 'Data', base_items); end - function pussbuttonClose_Callback(hObject,callbackdata) + function pushbuttonClose_Callback(hObject,callbackdata) close; end diff --git a/src/gui_shock_decomposition.m b/src/gui_shock_decomposition.m index f0246f4..9eb1b54 100644 --- a/src/gui_shock_decomposition.m +++ b/src/gui_shock_decomposition.m @@ -83,34 +83,34 @@ uicontrol( ... 'HorizontalAlignment', 'left'); % --- PUSHBUTTONS ------------------------------------- -handles.pussbuttonShockDecomposition = uicontrol( ... +handles.pushbuttonShockDecomposition = uicontrol( ... 'Parent', tabId, ... - 'Tag', 'pussbuttonSimulation', ... + 'Tag', 'pushbuttonSimulation', ... 'Style', 'pushbutton', ... 'Units','normalized','Position',[gui_size.space gui_size.bottom gui_size.button_width gui_size.button_height],... 'String', 'Shock decomposition !', ... - 'Callback', @pussbuttonShockDecomposition_Callback); + 'Callback', @pushbuttonShockDecomposition_Callback); -handles.pussbuttonReset = uicontrol( ... +handles.pushbuttonReset = uicontrol( ... 'Parent', tabId, ... - 'Tag', 'pussbuttonReset', ... + 'Tag', 'pushbuttonReset', ... 'Style', 'pushbutton', ... 'Units','normalized','Position',[gui_size.space*2+gui_size.button_width gui_size.bottom gui_size.button_width gui_size.button_height],... 'String', 'Reset', ... - 'Callback', @pussbuttonReset_Callback); + 'Callback', @pushbuttonReset_Callback); -handles.pussbuttonCloseAll = uicontrol( ... +handles.pushbuttonCloseAll = uicontrol( ... 'Parent', tabId, ... - 'Tag', 'pussbuttonSimulation', ... + 'Tag', 'pushbuttonSimulation', ... 'Style', 'pushbutton', ... 'Units','normalized','Position',[gui_size.space*3+gui_size.button_width*2 gui_size.bottom gui_size.button_width gui_size.button_height],... 'String', 'Close all output figures', ... 'Enable', 'on',... - 'Callback', @pussbuttonCloseAll_Callback); + 'Callback', @pushbuttonCloseAll_Callback); -handles.pussbuttonClose = uicontrol( ... +handles.pushbuttonClose = uicontrol( ... 'Parent', tabId, ... - 'Tag', 'pussbuttonReset', ... + 'Tag', 'pushbuttonReset', ... 'Units','normalized','Position',[gui_size.space*4+gui_size.button_width*3 gui_size.bottom gui_size.button_width gui_size.button_height],... 'String', 'Close this tab', ... 'Callback',{@close_tab,tabId}); @@ -219,7 +219,7 @@ handles.pussbuttonClose = uicontrol( ... end - function pussbuttonShockDecomposition_Callback(hObject,evendata) + function pushbuttonShockDecomposition_Callback(hObject,evendata) if(~(isfield(oo_, 'SmoothedVariables') && isfield(oo_, 'SmoothedShocks'))) gui_tools.show_warning('Please run estimation before shock decomposition!'); @@ -375,7 +375,7 @@ handles.pussbuttonClose = uicontrol( ... end - function pussbuttonReset_Callback(hObject,evendata) + function pushbuttonReset_Callback(hObject,evendata) for ii = 1:handles.numVars set(handles.vars(ii),'Value',0); @@ -488,7 +488,7 @@ handles.pussbuttonClose = uicontrol( ... end - function pussbuttonCloseAll_Callback(hObject,evendata) + function pushbuttonCloseAll_Callback(hObject,evendata) gui_tools.close_all_figures(); end end \ No newline at end of file -- GitLab