test_equality_only was not used in sort comparison.

[helm.git] / helm / gTopLevel / termViewer.ml

diff --git a/helm/gTopLevel/termViewer.ml b/helm/gTopLevel/termViewer.ml
index c35cdb377d700c8df6de42375fa80a34617359ab..91b2dd1a795fe470f8c72b282892ac04a7616df0 100644 (file)
--- a/helm/gTopLevel/termViewer.ml
+++ b/helm/gTopLevel/termViewer.ml
@@ -23,15 +23,14 @@
  * http://cs.unibo.it/helm/.
  *)
 
-(******************************************************************************)
-(*                                                                            *)
-(*                               PROJECT HELM                                 *)
-(*                                                                            *)
-(*                Claudio Sacerdoti Coen <sacerdot@cs.unibo.it>               *)
-(*                                 29/01/2003                                 *)
-(*                                                                            *)
-(*                                                                            *)
-(******************************************************************************)
+(***************************************************************************)
+(*                                                                         *)
+(*                             PROJECT HELM                                *)
+(*                                                                         *)
+(*                  29/01/2003 Claudio Sacerdoti Coen                      *)
+(*                                                                         *)
+(*                                                                         *)
+(***************************************************************************)
 
 (* List utility functions *)
 exception Skip;;
@@ -63,6 +62,7 @@ class sequent_viewer obj =
   (* returns the list of selected terms         *)
   (* selections which are not terms are ignored *)
   method get_selected_terms =
+   prerr_endline (string_of_int (List.length self#get_selections)) ;
    let selections = self#get_selections in
     list_map_fail
      (function node ->
@@ -71,6 +71,7 @@ class sequent_viewer obj =
           ~namespaceURI:Misc.helmns
           ~localName:(Gdome.domString "xref"))#to_string
        in
+        prerr_endline ("YAHHHHHHHHHH " ^ xpath) ;
         if xpath = "" then assert false (* "ERROR: No xref found!!!" *)
         else
          match current_infos with
@@ -105,15 +106,26 @@ class sequent_viewer obj =
      ) selections
   
   method load_sequent metasenv sequent =
+(**** SIAM QUI ****)
    let sequent_mml,(ids_to_terms,ids_to_father_ids,ids_to_hypotheses) =
-    ApplyStylesheets.mml_of_cic_sequent metasenv sequent
+     ChosenTransformer.mml_of_cic_sequent metasenv sequent
    in
     self#load_doc ~dom:sequent_mml ;
-    current_infos <-
+(*
+Misc.domImpl#saveDocumentToFile ~name:"/tmp/pippo" ~doc:sequent_mml () ;
+*)
+     current_infos <-
      Some (ids_to_terms,ids_to_father_ids,ids_to_hypotheses)
  end
 ;;
 
+let sequent_viewer ?hadjustment ?vadjustment ?font_size ?log_verbosity =
+  GtkBase.Container.make_params ~cont:(
+  OgtkMathViewProps.pack_return
+    (fun p -> OgtkMathViewProps.set_params (new sequent_viewer (GtkMathViewProps.MathView.create p)) ~font_size ~log_verbosity)) []
+;;
+
+(*
 let sequent_viewer ?adjustmenth ?adjustmentv ?font_size ?font_manager
  ?border_width ?width ?height ?packing ?show () =
  let w =
@@ -136,7 +148,7 @@ let sequent_viewer ?adjustmenth ?adjustmentv ?font_size ?font_manager
   end;
   mathview
 ;;
-
+*)
 
 (** A widget to render proofs **)
 
@@ -145,7 +157,10 @@ class proof_viewer obj =
 
   inherit GMathViewAux.single_selection_math_view obj
 
+(*   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
@@ -155,6 +170,7 @@ class proof_viewer obj =
           ~namespaceURI:Misc.helmns
           ~localName:(Gdome.domString "xref"))#to_string
        in
+        prerr_endline ("YAEEEEEEEEEEEEEEEEEEE " ^ xpath) ;
         if xpath = "" then assert false (* "ERROR: No xref found!!!" *)
         else
          begin
@@ -186,24 +202,48 @@ class proof_viewer obj =
     | None -> assert false (* "ERROR: No selection!!!" *)
 
   method load_proof uri currentproof =
-   let
-    (acic,ids_to_terms,ids_to_father_ids,ids_to_inner_sorts,
-     ids_to_inner_types,ids_to_conjectures,ids_to_hypotheses)
-   =
-    Cic2acic.acic_object_of_cic_object currentproof
-   in
+    let
+      (acic,ids_to_terms,ids_to_father_ids,ids_to_inner_sorts,
+       ids_to_inner_types,ids_to_conjectures,ids_to_hypotheses)
+      = Cic2acic.acic_object_of_cic_object currentproof
+    in
     let mml =
-     ApplyStylesheets.mml_of_cic_object
-      ~explode_all:true uri acic ids_to_inner_sorts ids_to_inner_types
+      ChosenTransformer.mml_of_cic_object
+        ~explode_all:true uri acic ids_to_inner_sorts ids_to_inner_types
     in
-     self#load_doc ~dom:mml ;
-     current_infos <-
+    current_infos <-
       Some
-       (ids_to_terms,ids_to_father_ids,ids_to_conjectures,ids_to_hypotheses) ;
-     (acic, ids_to_inner_types, ids_to_inner_sorts)
- end
+       (ids_to_terms,ids_to_father_ids,ids_to_conjectures,ids_to_hypotheses);
+    (* self#load_doc ~dom:mml ;
+       current_mml <- Some 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"));
+    (acic, ids_to_inner_types, ids_to_inner_sorts)
+  end
+;;
+
+
+let proof_viewer ?hadjustment ?vadjustment ?font_size ?log_verbosity =
+  GtkBase.Container.make_params ~cont:(
+  OgtkMathViewProps.pack_return
+    (fun p -> OgtkMathViewProps.set_params (new proof_viewer (GtkMathViewProps.MathView.create p)) ~font_size ~log_verbosity)) []
 ;;
 
+(*
 let proof_viewer ?adjustmenth ?adjustmentv ?font_size ?font_manager
  ?border_width ?width ?height ?packing ?show () =
  let w =
@@ -226,3 +266,8 @@ let proof_viewer ?adjustmenth ?adjustmentv ?font_size ?font_manager
   end;
   mathview
 ;;
+*)
+
+let _ =
+ Cexpr2pres_hashtbl.init Cexpr2pres.cexpr2pres Cexpr2pres.cexpr2pres_charcount
+;;