diff options
author | Dan Gudmundsson <[email protected]> | 2017-04-03 11:43:40 +0200 |
---|---|---|
committer | Dan Gudmundsson <[email protected]> | 2017-04-03 11:43:40 +0200 |
commit | a7b73658b03f1a09d4af4d0b8250a1d5e613e378 (patch) | |
tree | d8a4221c5131c53ed2efc3a5c98d28be3d53abba /lib/observer/src/observer_lib.erl | |
parent | 6604585547b8e84d53aac174182cfb06289bbf73 (diff) | |
parent | 1f205a59ab61f159920b41d5f17f207299cb7a8c (diff) | |
download | otp-a7b73658b03f1a09d4af4d0b8250a1d5e613e378.tar.gz otp-a7b73658b03f1a09d4af4d0b8250a1d5e613e378.tar.bz2 otp-a7b73658b03f1a09d4af4d0b8250a1d5e613e378.zip |
Merge branch 'dgud/observer/keep-selection/OTP-14270'
* dgud/observer/keep-selection/OTP-14270:
observer: (re)store config
observer: Use event info to get active tab
observer: Keep sel after column change tv
observer: Keep port selection after refresh
observer: Keep tv selection after refresh
Diffstat (limited to 'lib/observer/src/observer_lib.erl')
-rw-r--r-- | lib/observer/src/observer_lib.erl | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/lib/observer/src/observer_lib.erl b/lib/observer/src/observer_lib.erl index 47844c1307..68095d7f58 100644 --- a/lib/observer/src/observer_lib.erl +++ b/lib/observer/src/observer_lib.erl @@ -24,7 +24,7 @@ display_progress_dialog/2, destroy_progress_dialog/0, wait_for_progress/0, report_progress/1, user_term/3, user_term_multiline/3, - interval_dialog/4, start_timer/1, stop_timer/1, + interval_dialog/4, start_timer/1, start_timer/2, stop_timer/1, timer_config/1, display_info/2, display_info/3, fill_info/2, update_info/2, to_str/1, create_menus/3, create_menu_item/3, create_attrs/0, @@ -90,6 +90,12 @@ stop_timer(Timer = {true, _}) -> Timer; stop_timer(Timer = {_, Intv}) -> setup_timer(false, Timer), {true, Intv}. + +start_timer(#{interval:=Intv}, _Def) -> + setup_timer(true, {false, Intv}); +start_timer(_, Def) -> + setup_timer(true, {false, Def}). + start_timer(Intv) when is_integer(Intv) -> setup_timer(true, {true, Intv}); start_timer(Timer) -> @@ -105,6 +111,11 @@ setup_timer(Bool, {Timer, Old}) -> timer:cancel(Timer), setup_timer(Bool, {false, Old}). +timer_config({_, Interval}) -> + #{interval=>Interval}; +timer_config(#{}=Config) -> + Config. + display_info_dialog(Parent,Str) -> display_info_dialog(Parent,"",Str). display_info_dialog(Parent,Title,Str) -> |