snapshot, notably:

[helm.git] / helm / matita / matitaMathView.ml

diff --git a/helm/matita/matitaMathView.ml b/helm/matita/matitaMathView.ml
index 0923622291bc2f1057aac701a544d4fe9b612962..b83c9b37fa9abe3c21fc28bdae1b266581e021b7 100644 (file)
--- a/helm/matita/matitaMathView.ml
+++ b/helm/matita/matitaMathView.ml
@@ -49,7 +49,8 @@ class proof_viewer obj =
 
   inherit GMathViewAux.single_selection_math_view obj
 
-(*   initializer self#set_log_verbosity 3 *)
+  val mutable current_infos = None
+  val mutable current_mathml = None
 
   initializer
     ignore (self#connect#click (fun (gdome_elt, _, _, _) ->
@@ -57,10 +58,12 @@ class proof_viewer obj =
       | Some gdome_elt ->
           prerr_endline (gdome_elt#get_nodeName#to_string);
           ignore (self#action_toggle gdome_elt)
-      | None -> ()))
-
-  val mutable current_infos = None
-  val mutable current_mathml = None
+      | None -> ()));
+      (* bugfix: until mapping gtkmathview doesn't draw anything *)
+    ignore (self#misc#connect#after#map (fun _ ->
+      match current_mathml with
+      | None -> ()
+      | Some mathml -> self#load_root ~root:mathml#get_documentElement))
 
   method load_proof ((uri_opt, _, _, _) as proof, (goal_opt: int option)) =
     let (annobj, ids_to_terms, ids_to_father_ids, ids_to_inner_sorts,
@@ -77,12 +80,10 @@ class proof_viewer obj =
     ignore (Misc.domImpl#saveDocumentToFile ~name:"/tmp/proof" ~doc:mathml ());
     match current_mathml with
     |  None ->
-        debug_print "no previous MathML";
         self#load_root ~root:mathml#get_documentElement ;
         current_mathml <- Some mathml
     | Some current_mathml ->
-        debug_print "Previous MathML available: xmldiffing ...";
-        self#freeze ;
+        self#freeze;
         XmlDiff.update_dom ~from:current_mathml mathml ;
         self#thaw
   end
@@ -155,11 +156,15 @@ class sequent_viewer obj =
 class sequents_viewer ~(notebook:GPack.notebook)
   ~(sequent_viewer:MatitaTypes.sequent_viewer) ~set_goal ()
 =
+  let tab_label metano =
+    (GMisc.label ~text:(sprintf "?%d" metano) ~show:true ())#coerce
+  in
   object (self)
     val mutable pages = 0
     val mutable switch_page_callback = None
     val mutable page2goal = []  (* associative list: page no -> goal no *)
     val mutable goal2page = []  (* the other way round *)
+    val mutable goal2win = []   (* associative list: goal no -> scrolled win *)
     val mutable _metasenv = []
 
     method reset =
@@ -167,6 +172,7 @@ class sequents_viewer ~(notebook:GPack.notebook)
       pages <- 0;
       page2goal <- [];
       goal2page <- [];
+      goal2win <- [];
       _metasenv <- [];
       (match switch_page_callback with
       | Some id ->
@@ -177,35 +183,43 @@ class sequents_viewer ~(notebook:GPack.notebook)
     method load_sequents metasenv =
       let sequents_no = List.length metasenv in
       _metasenv <- metasenv;
-      debug_print (sprintf "sequents no: %d" sequents_no);
       pages <- sequents_no;
-      let widget = sequent_viewer#coerce in
+      let win metano =
+        let w =
+          GBin.scrolled_window ~hpolicy:`AUTOMATIC ~vpolicy:`AUTOMATIC
+            ~show:true ()
+        in
+        let reparent () =
+          match sequent_viewer#misc#parent with
+          | None -> w#add sequent_viewer#coerce
+          | Some _ -> sequent_viewer#misc#reparent w#coerce
+        in
+        goal2win <- (metano, reparent) :: goal2win;
+        w#coerce
+      in
       let page = ref 0 in
       List.iter
         (fun (metano, _, _) ->
           page2goal <- (!page, metano) :: page2goal;
           goal2page <- (metano, !page) :: goal2page;
           incr page;
-          let tab_label =
-            (GMisc.label ~text:(sprintf "?%d" metano) ~show:true ())#coerce
-          in
-          notebook#append_page ~tab_label widget)
+          notebook#append_page ~tab_label:(tab_label metano) (win metano))
         metasenv;
       switch_page_callback <-
-        (* TODO Zack the "#after" may probably be removed after Luca's fix for
-        * widget not loading documents before being realized *)
         Some (notebook#connect#after#switch_page ~callback:(fun page ->
-          debug_print "switch_page callback";
           let goal =
             try
               List.assoc page page2goal
             with Not_found -> assert false
           in
           set_goal goal;
-          self#render_page goal))
+          self#render_page ~page ~goal))
 
-    method private render_page goal =
-      sequent_viewer#load_sequent _metasenv goal
+    method private render_page ~page ~goal =
+      sequent_viewer#load_sequent _metasenv goal;
+      try
+        List.assoc goal goal2win ()
+      with Not_found -> assert false
 
     method goto_sequent goal =
       let page =
@@ -214,7 +228,7 @@ class sequents_viewer ~(notebook:GPack.notebook)
         with Not_found -> assert false
       in
       notebook#goto_page page;
-      self#render_page goal
+      self#render_page page goal
 
   end
 
@@ -236,6 +250,17 @@ let proof_viewer ?hadjustment ?vadjustment ?font_size ?log_verbosity =
         ~font_size ~log_verbosity))
     []
 
+let proof_viewer_instance =
+  let instance = lazy (
+    let gui = MatitaGui.instance () in
+    let frame =
+      GBin.frame ~packing:(gui#proof#scrolledProof#add_with_viewport)
+        ~show:true ()
+    in
+    proof_viewer ~show:true ~packing:(frame#add) ()
+  ) in
+  fun () -> Lazy.force instance
+
 let sequents_viewer ~(notebook:GPack.notebook)
   ~(sequent_viewer:MatitaTypes.sequent_viewer) ~set_goal ()
 =