From fc55960da7fc3bb24b4bca9ca9228143a8f6dc83 Mon Sep 17 00:00:00 2001
From: Erwan Jahier <erwan.jahier@univ-grenoble-alpes.fr>
Date: Wed, 4 Jan 2023 11:45:14 +0100
Subject: [PATCH] fix: in rdbgui4sasa, the manual daemon activated all enabled
nodes
---
tools/rdbg4sasa/gtkgui.ml | 17 +++++++----------
1 file changed, 7 insertions(+), 10 deletions(-)
diff --git a/tools/rdbg4sasa/gtkgui.ml b/tools/rdbg4sasa/gtkgui.ml
index 411bd7a0..523f0a96 100644
--- a/tools/rdbg4sasa/gtkgui.ml
+++ b/tools/rdbg4sasa/gtkgui.ml
@@ -1,4 +1,4 @@
-(* Time-stamp: <modified the 11/07/2022 (at 14:12) by Erwan Jahier> *)
+(* Time-stamp: <modified the 04/01/2023 (at 11:44) by Erwan Jahier> *)
#thread
#require "lablgtk3"
@@ -170,9 +170,9 @@ let init_rdbg_hook () =
| None -> false
| Some x -> x
in
- let activate = match enabled with (* activate the Enabled actions! *)
+ let activate = match enabled with
| B true -> B to_activate
- | B false -> B false
+ | B false -> B false (* activate only the Enabled actions! *)
| _ -> assert false
in
(str, activate)
@@ -259,8 +259,8 @@ let custom_daemon p gtext vbox step_button back_step_button round_button
Hashtbl.filter_map_inplace (fun n _prev_status -> Some (n = node)) daemongui_activate;
)
| Manual ->
- let txt = Printf.sprintf "Manual step: \n\n%s" (str_of_sasa_event false !e) in
- blue gtext#buffer txt;
+ let txt = Printf.sprintf "Set %s to %b\n" node activate in
+ blue_add gtext#buffer txt;
Hashtbl.replace daemongui_activate node activate
);
in
@@ -427,12 +427,9 @@ let custom_daemon p gtext vbox step_button back_step_button round_button
hide checkbox_grid; hide pushbox_grid;
in
let update_all_checkboxes () =
+ (* only display the buttons of enabled nodes (for the manual daemon) *)
let nodes_enabled = rdbg_nodes_enabled !e in
- List.iter (fun (name, enabled) ->
- Hashtbl.replace daemongui_activate name enabled;
- update_checkbox name enabled
- )
- nodes_enabled
+ List.iter (fun (name, enabled) -> update_checkbox name enabled) nodes_enabled
in
Hashtbl.add refresh_fun_tbl "" update_all_checkboxes;
--
GitLab