X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2FgTopLevel%2FtermViewer.ml;h=da7b6bdca762df7cb351d9385b0a38d00f9afccb;hb=4faf0e37e7019de16dd6862bb34d84f799a2a230;hp=5291c3587bee7dc440cd42bfbfb0a43310fa8aa6;hpb=6f65a2e518d723ea722b23bfd9fa0162ff8be457;p=helm.git diff --git a/helm/gTopLevel/termViewer.ml b/helm/gTopLevel/termViewer.ml index 5291c3587..da7b6bdca 100644 --- a/helm/gTopLevel/termViewer.ml +++ b/helm/gTopLevel/termViewer.ml @@ -147,9 +147,10 @@ class proof_viewer obj = inherit GMathViewAux.single_selection_math_view obj - initializer self#set_font_size 10 +(* initializer self#set_font_size 10 *) val mutable current_infos = None + val mutable current_mml = None method make_sequent_of_selected_term = match self#get_selection with @@ -202,6 +203,7 @@ class proof_viewer obj = ~explode_all:true uri acic ids_to_inner_sorts ids_to_inner_types in self#load_doc ~dom:mml ; + current_mml <- Some mml ; current_infos <- Some (ids_to_terms,ids_to_father_ids,ids_to_conjectures,ids_to_hypotheses) ; @@ -210,14 +212,9 @@ class proof_viewer obj = Cic.ACurrentProof (id,idbody,n,conjectures,bo,ty,params) -> let time1 = Sys.time () in let content = - Cic2content.acic2content - (ref 0) ~name:(Some "prova") ~ids_to_inner_sorts ~ids_to_inner_types bo in - let content2pres = - (Content2pres.proof2pres - (function p -> - (Cexpr2pres.cexpr2pres_charcount - (Content_expressions.acic2cexpr ids_to_inner_sorts p)))) in - let pres = content2pres content in + Cic2content.annobj2content + ~ids_to_inner_sorts ~ids_to_inner_types acic in + let pres = Content2pres.content2pres ~ids_to_inner_sorts content in let time2 = Sys.time () in (* prerr_endline ("Fine trasformazione:" ^ (string_of_float (time2 -. time1))); *) let xmlpres = Mpresentation.print_mpres pres in @@ -234,7 +231,27 @@ class proof_viewer obj = let time3 = Sys.time () in (* ignore (Misc.domImpl#saveDocumentToFile mml "tmp1" ()); *) prerr_endline "(******** FINE DOM **********)"; - self#load_doc ~dom:mml; + (match current_mml with + None -> + let time1 = Sys.time () in + self#load_doc ~dom:mml ; + let time2 = Sys.time () in + prerr_endline ("Loading and displaying the proof took " ^ string_of_float (time2 -. time1) ^ "seconds") ; + current_mml <- Some mml + | Some current_mml' -> + self#freeze ; + let time1 = Sys.time () in + XmlDiff.update_dom ~from:current_mml' mml ; + let time2 = Sys.time () in + prerr_endline ("XMLDIFF took " ^ string_of_float (time2 -. time1) ^ "seconds") ; + self#thaw ; + let time3 = Sys.time () in + prerr_endline ("The refresh of the widget took " ^ string_of_float (time3 -. time2) ^ "seconds") + ) ; +(* + self#load_doc ~dom:mml ; + current_mml <- Some mml ; +*) prerr_endline ("Fine loading:" ^ (string_of_float (time3 -. time2))) (* self#load_uri "tmp";