Commit 2d1e399b authored by MARCHE Claude's avatar MARCHE Claude

Make max_boxes configurable

parent 46149cd7
...@@ -52,6 +52,7 @@ type t = ...@@ -52,6 +52,7 @@ type t =
mutable show_labels : bool; mutable show_labels : bool;
mutable show_locs : bool; mutable show_locs : bool;
mutable show_time_limit : bool; mutable show_time_limit : bool;
mutable max_boxes : int;
mutable saving_policy : int; mutable saving_policy : int;
(** 0 = always, 1 = never, 2 = ask *) (** 0 = always, 1 = never, 2 = ask *)
mutable premise_color : string; mutable premise_color : string;
...@@ -82,6 +83,7 @@ type ide = { ...@@ -82,6 +83,7 @@ type ide = {
ide_show_labels : bool; ide_show_labels : bool;
ide_show_locs : bool; ide_show_locs : bool;
ide_show_time_limit : bool; ide_show_time_limit : bool;
ide_max_boxes : int;
ide_saving_policy : int; ide_saving_policy : int;
ide_premise_color : string; ide_premise_color : string;
ide_goal_color : string; ide_goal_color : string;
...@@ -103,6 +105,7 @@ let default_ide = ...@@ -103,6 +105,7 @@ let default_ide =
ide_show_labels = false; ide_show_labels = false;
ide_show_locs = false; ide_show_locs = false;
ide_show_time_limit = false; ide_show_time_limit = false;
ide_max_boxes = 16;
ide_saving_policy = 2; ide_saving_policy = 2;
ide_premise_color = "chartreuse"; ide_premise_color = "chartreuse";
ide_goal_color = "gold"; ide_goal_color = "gold";
...@@ -137,6 +140,9 @@ let load_ide section = ...@@ -137,6 +140,9 @@ let load_ide section =
ide_show_time_limit = ide_show_time_limit =
get_bool section ~default:default_ide.ide_show_time_limit get_bool section ~default:default_ide.ide_show_time_limit
"print_time_limit"; "print_time_limit";
ide_max_boxes =
get_int section ~default:default_ide.ide_max_boxes
"max_boxes";
ide_saving_policy = ide_saving_policy =
get_int section ~default:default_ide.ide_saving_policy "saving_policy"; get_int section ~default:default_ide.ide_saving_policy "saving_policy";
ide_premise_color = ide_premise_color =
...@@ -219,6 +225,7 @@ let load_config config original_config env = ...@@ -219,6 +225,7 @@ let load_config config original_config env =
show_labels = ide.ide_show_labels ; show_labels = ide.ide_show_labels ;
show_locs = ide.ide_show_locs ; show_locs = ide.ide_show_locs ;
show_time_limit = ide.ide_show_time_limit; show_time_limit = ide.ide_show_time_limit;
max_boxes = ide.ide_max_boxes;
saving_policy = ide.ide_saving_policy ; saving_policy = ide.ide_saving_policy ;
premise_color = ide.ide_premise_color; premise_color = ide.ide_premise_color;
goal_color = ide.ide_goal_color; goal_color = ide.ide_goal_color;
...@@ -291,6 +298,7 @@ let save_config t = ...@@ -291,6 +298,7 @@ let save_config t =
let ide = set_bool ide "print_labels" t.show_labels in let ide = set_bool ide "print_labels" t.show_labels in
let ide = set_bool ide "print_locs" t.show_locs in let ide = set_bool ide "print_locs" t.show_locs in
let ide = set_bool ide "print_time_limit" t.show_time_limit in let ide = set_bool ide "print_time_limit" t.show_time_limit in
let ide = set_int ide "max_boxes" t.max_boxes in
let ide = set_int ide "saving_policy" t.saving_policy in let ide = set_int ide "saving_policy" t.saving_policy in
let ide = set_string ide "premise_color" t.premise_color in let ide = set_string ide "premise_color" t.premise_color in
let ide = set_string ide "goal_color" t.goal_color in let ide = set_string ide "goal_color" t.goal_color in
...@@ -618,7 +626,7 @@ let general_settings (c : t) (notebook:GPack.notebook) = ...@@ -618,7 +626,7 @@ let general_settings (c : t) (notebook:GPack.notebook) =
let _ = GMisc.label ~text:"Time limit (in sec.): " ~width ~xalign let _ = GMisc.label ~text:"Time limit (in sec.): " ~width ~xalign
~packing:(hb#pack ~expand:false) () in ~packing:(hb#pack ~expand:false) () in
let timelimit_spin = GEdit.spin_button ~digits:0 ~packing:hb#add () in let timelimit_spin = GEdit.spin_button ~digits:0 ~packing:hb#add () in
timelimit_spin#adjustment#set_bounds ~lower:0. ~upper:42_000_000. ~step_incr:1. (); timelimit_spin#adjustment#set_bounds ~lower:0. ~upper:86_400. ~step_incr:5. ();
timelimit_spin#adjustment#set_value (float_of_int c.session_time_limit); timelimit_spin#adjustment#set_value (float_of_int c.session_time_limit);
let (_ : GtkSignal.id) = let (_ : GtkSignal.id) =
timelimit_spin#connect#value_changed ~callback: timelimit_spin#connect#value_changed ~callback:
...@@ -630,7 +638,7 @@ let general_settings (c : t) (notebook:GPack.notebook) = ...@@ -630,7 +638,7 @@ let general_settings (c : t) (notebook:GPack.notebook) =
let _ = GMisc.label ~text:"Memory limit (in Mb): " ~width ~xalign let _ = GMisc.label ~text:"Memory limit (in Mb): " ~width ~xalign
~packing:(hb#pack ~expand:false) () in ~packing:(hb#pack ~expand:false) () in
let memlimit_spin = GEdit.spin_button ~digits:0 ~packing:hb#add () in let memlimit_spin = GEdit.spin_button ~digits:0 ~packing:hb#add () in
memlimit_spin#adjustment#set_bounds ~lower:0. ~upper:4000. ~step_incr:100. (); memlimit_spin#adjustment#set_bounds ~lower:0. ~upper:16_000. ~step_incr:500. ();
memlimit_spin#adjustment#set_value (float_of_int c.session_mem_limit); memlimit_spin#adjustment#set_value (float_of_int c.session_mem_limit);
let (_ : GtkSignal.id) = let (_ : GtkSignal.id) =
memlimit_spin#connect#value_changed ~callback: memlimit_spin#connect#value_changed ~callback:
...@@ -643,7 +651,7 @@ let general_settings (c : t) (notebook:GPack.notebook) = ...@@ -643,7 +651,7 @@ let general_settings (c : t) (notebook:GPack.notebook) =
~packing:(hb#pack ~expand:false) () in ~packing:(hb#pack ~expand:false) () in
let nb_processes_spin = GEdit.spin_button ~digits:0 ~packing:hb#add () in let nb_processes_spin = GEdit.spin_button ~digits:0 ~packing:hb#add () in
nb_processes_spin#adjustment#set_bounds nb_processes_spin#adjustment#set_bounds
~lower:1. ~upper:16. ~step_incr:1. (); ~lower:1. ~upper:64. ~step_incr:1. ();
nb_processes_spin#adjustment#set_value nb_processes_spin#adjustment#set_value
(float_of_int c.session_nb_processes); (float_of_int c.session_nb_processes);
let (_ : GtkSignal.id) = let (_ : GtkSignal.id) =
...@@ -671,6 +679,19 @@ let general_settings (c : t) (notebook:GPack.notebook) = ...@@ -671,6 +679,19 @@ let general_settings (c : t) (notebook:GPack.notebook) =
GPack.button_box `VERTICAL ~border_width:5 ~spacing:5 GPack.button_box `VERTICAL ~border_width:5 ~spacing:5
~packing:display_options_frame#add () ~packing:display_options_frame#add ()
in in
(* max boxes *)
let width = 200 and xalign = 0.0 in
let hb = GPack.hbox ~homogeneous:false ~packing:display_options_box#add ()
in
let _ = GMisc.label ~text:"Max boxes: " ~width ~xalign
~packing:(hb#pack ~expand:false) () in
let max_boxes_spin = GEdit.spin_button ~digits:0 ~packing:hb#add () in
max_boxes_spin#adjustment#set_bounds ~lower:0. ~upper:1000. ~step_incr:1. ();
max_boxes_spin#adjustment#set_value (float_of_int c.max_boxes);
let (_ : GtkSignal.id) =
max_boxes_spin#connect#value_changed ~callback:
(fun () -> c.max_boxes <- max_boxes_spin#value_as_int)
in
let intropremises = let intropremises =
GButton.check_button ~label:"introduce premises" GButton.check_button ~label:"introduce premises"
~packing:display_options_box#add () ~packing:display_options_box#add ()
......
...@@ -23,6 +23,7 @@ type t = ...@@ -23,6 +23,7 @@ type t =
mutable show_labels : bool; mutable show_labels : bool;
mutable show_locs : bool; mutable show_locs : bool;
mutable show_time_limit : bool; mutable show_time_limit : bool;
mutable max_boxes : int;
mutable saving_policy : int; mutable saving_policy : int;
mutable premise_color : string; mutable premise_color : string;
mutable goal_color : string; mutable goal_color : string;
......
...@@ -493,7 +493,8 @@ let env_session () = ...@@ -493,7 +493,8 @@ let env_session () =
| Some e -> e | Some e -> e
let task_text t = let task_text t =
Pp.string_of ~max_boxes:42 Pretty.print_task t let max_boxes = (Gconfig.config ()).max_boxes in
Pp.string_of ~max_boxes Pretty.print_task t
let split_transformation = "split_goal_wp" let split_transformation = "split_goal_wp"
let inline_transformation = "inline_goal" let inline_transformation = "inline_goal"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment