From 75c998c277f71aa84d10e5e0ec1b1de6fe496778 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?D=C3=B3ra=20Kocsis?= <dora@dynare.org> Date: Thu, 17 Sep 2020 19:17:40 +0200 Subject: [PATCH] add nograph tick box in shock decomposition tabs, closes Dynare/matlab-gui#15 --- src/gui_realtime_shock_decomposition.m | 12 ++++++++++++ src/gui_shock_decomposition.m | 11 +++++++++++ 2 files changed, 23 insertions(+) diff --git a/src/gui_realtime_shock_decomposition.m b/src/gui_realtime_shock_decomposition.m index d7cd78d..3ccc5f7 100644 --- a/src/gui_realtime_shock_decomposition.m +++ b/src/gui_realtime_shock_decomposition.m @@ -269,6 +269,15 @@ handles.pushbuttonClose = uicontrol( ... 'Position', [spc*3+dwidth*1.5 top-num*dheight dwidth*2 dheight/2], ... 'String', {'qoq','yoy','aoa'}, ... 'Value', 1); + + num = num+1.5; + handles.noGraph = uicontrol(... + 'Parent', handles.uipanelResults, ... + 'Style','checkbox',... + 'Units', 'normalized', ... + 'Position', [spc top-num*dheight 1-spc*4 dheight/2], ... + 'String', 'Only compute shock decomposition, do not plot',... + 'FontWeight', 'bold'); end function pushbuttonShockDecomposition_Callback(hObject, ~) @@ -300,6 +309,8 @@ handles.pushbuttonClose = uicontrol( ... options_.nodisplay = 0; options_.plot_priors = 0; options_.type = handles.type.String; + options_.no_graph.shock_decomposition = handles.noGraph.Value; + gui_tools.project_log_entry('Running shock decomposition','...'); [jObj, guiObj] = gui_tools.create_animated_screen('Running shock decomposition, please wait...', tabId); var_list_ = handles.endoTable.Data([handles.endoTable.Data{:,1}], 2); @@ -394,6 +405,7 @@ handles.pushbuttonClose = uicontrol( ... handles.lastPeriodYear.Value = handles.lastPeriodYearDefault; handles.useShockGrouping.Value = 0; handles.type.Value = 1; + handles.noGraph = 0; end function close_tab(~, ~, hTab) diff --git a/src/gui_shock_decomposition.m b/src/gui_shock_decomposition.m index a75c7e9..da40d61 100644 --- a/src/gui_shock_decomposition.m +++ b/src/gui_shock_decomposition.m @@ -247,6 +247,15 @@ handles.pushbuttonClose = uicontrol( ... 'Position', [spc*3+dwidth*1.5 top-num*dheight dwidth*2 dheight/2], ... 'String', {'qoq','yoy','aoa'}, ... 'Value', 1); + + num = num+1.5; + handles.noGraph = uicontrol(... + 'Parent', handles.uipanelResults, ... + 'Style','checkbox',... + 'Units', 'normalized', ... + 'Position', [spc top-num*dheight 1-spc*4 dheight/2], ... + 'String', 'Only compute shock decomposition, do not plot',... + 'FontWeight', 'bold'); end function pushbuttonShockDecomposition_Callback(hObject, ~) @@ -305,6 +314,7 @@ handles.pushbuttonClose = uicontrol( ... options_.model_settings.shocks = model_settings.shocks; options_.shock_grouping = handles.useShockGrouping.Value; options_.shock_decomp.init_state = handles.useInitState.Value; + options_.no_graph.shock_decomposition = handles.noGraph.Value; oo_ = shock_decomposition(M_, oo_, options_, var_list_, bayestopt_, estim_params_); end jObj.stop; @@ -370,6 +380,7 @@ handles.pushbuttonClose = uicontrol( ... handles.useShockGrouping.Value = 0; handles.useInitState.Value = 0; handles.type.Value = 1; + handles.noGraph = 0; end function close_tab(~, ~, hTab) -- GitLab