X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fmatita%2FmatitaMathView.ml;h=0923622291bc2f1057aac701a544d4fe9b612962;hb=ac7687ce66526f905874ed99a845223c853c558a;hp=97449912d040645721489621270d0f796c1a89ec;hpb=1fa0472bfe2ed04c7adf166fa48df687f0022226;p=helm.git

diff --git a/helm/matita/matitaMathView.ml b/helm/matita/matitaMathView.ml
index 97449912d..092362229 100644
--- a/helm/matita/matitaMathView.ml
+++ b/helm/matita/matitaMathView.ml
@@ -23,15 +23,9 @@
  * http://cs.unibo.it/helm/.
  *)
 
-(***************************************************************************)
-(*                                                                         *)
-(*                             PROJECT HELM                                *)
-(*                                                                         *)
-(*                  29/01/2003 Claudio Sacerdoti Coen                      *)
-(*                                                                         *)
-(*                                                                         *)
-(***************************************************************************)
+open Printf
 
+open MatitaCicMisc
 open MatitaTypes
 
 (* List utility functions *)
@@ -50,7 +44,48 @@ let list_map_fail f =
  in
   aux
 
-(* End of the list utility functions *)
+class proof_viewer obj =
+ object(self)
+
+  inherit GMathViewAux.single_selection_math_view obj
+
+(*   initializer self#set_log_verbosity 3 *)
+
+  initializer
+    ignore (self#connect#click (fun (gdome_elt, _, _, _) ->
+      match gdome_elt with
+      | 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
+
+  method load_proof ((uri_opt, _, _, _) as proof, (goal_opt: int option)) =
+    let (annobj, 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 (cicCurrentProof proof)
+    in
+    current_infos <- Some (ids_to_terms, ids_to_father_ids, ids_to_conjectures,
+      ids_to_hypotheses);
+    let mathml =
+      ApplyTransformation.mml_of_cic_object ~explode_all:true
+        (unopt_uri uri_opt) annobj ids_to_inner_sorts ids_to_inner_types
+    in
+    debug_print "load_proof: dumping MathML to /tmp/proof";
+    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 ;
+        XmlDiff.update_dom ~from:current_mathml mathml ;
+        self#thaw
+  end
 
 class sequent_viewer obj =
  object(self)
@@ -99,48 +134,88 @@ class sequent_viewer obj =
           | None -> assert false (* "ERROR: No current term!!!" *)
      ) selections
   
-  method load_sequent (mml:Gdome.document) (metadata:MatitaTypes.hist_metadata)
-      sequent_no
-  =
+  method load_sequent metasenv metano =
+(*
     let (annconjecture, ids_to_terms, ids_to_father_ids, ids_to_inner_sorts,
-        ids_to_hypotheses)
-    =
-      try
-        List.assoc sequent_no (snd metadata)
-      with Not_found -> assert false
+        ids_to_hypotheses) =
+      Cic2acic.asequent_of_sequent metasenv conjecture
+    in
+*)
+    let sequent = CicUtil.lookup_meta metano metasenv in
+    let (mathml, (ids_to_terms, ids_to_father_ids, ids_to_hypotheses)) =
+      ApplyTransformation.mml_of_cic_sequent metasenv sequent
     in
     current_infos <- Some (ids_to_terms, ids_to_father_ids, ids_to_hypotheses);
-    self#load_root ~root:mml#get_documentElement
+    debug_print "load_sequent: dumping MathML to /tmp/prova";
+    ignore (Misc.domImpl#saveDocumentToFile ~name:"/tmp/prova" ~doc:mathml ());
+    self#load_root ~root:mathml#get_documentElement
  end
 
-class proof_viewer obj =
- object(self)
-
-  inherit GMathViewAux.single_selection_math_view obj
-
-(*   initializer self#set_log_verbosity 3 *)
 
-  val mutable current_infos = None
-  val mutable current_mml = None
+class sequents_viewer ~(notebook:GPack.notebook)
+  ~(sequent_viewer:MatitaTypes.sequent_viewer) ~set_goal ()
+=
+  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 _metasenv = []
+
+    method reset =
+      for i = 1 to pages do notebook#remove_page 0 done;
+      pages <- 0;
+      page2goal <- [];
+      goal2page <- [];
+      _metasenv <- [];
+      (match switch_page_callback with
+      | Some id ->
+          GtkSignal.disconnect notebook#as_widget id;
+          switch_page_callback <- None
+      | None -> ())
+
+    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 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)
+        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))
+
+    method private render_page goal =
+      sequent_viewer#load_sequent _metasenv goal
+
+    method goto_sequent goal =
+      let page =
+        try
+          List.assoc goal goal2page
+        with Not_found -> assert false
+      in
+      notebook#goto_page page;
+      self#render_page goal
 
-  method load_proof (mml:Gdome.document) (metadata:MatitaTypes.hist_metadata) =
-    let (acic, ids_to_terms, ids_to_father_ids, ids_to_inner_sorts,
-        ids_to_inner_types, ids_to_conjectures, ids_to_hypotheses) =
-      (fst metadata)
-    in
-    current_infos <-
-      Some
-       (ids_to_terms,ids_to_father_ids,ids_to_conjectures,ids_to_hypotheses);
-    match current_mml with
-    |  None ->
-        MatitaTypes.debug_print "no previous MathML";
-        self#load_root ~root:mml#get_documentElement ;
-        current_mml <- Some mml
-    | Some current_mml' ->
-        MatitaTypes.debug_print "Previous MathML available: xmldiffing ...";
-        self#freeze ;
-        XmlDiff.update_dom ~from:current_mml' mml ;
-        self#thaw
   end
 
  (** constructors *)
@@ -161,3 +236,8 @@ let proof_viewer ?hadjustment ?vadjustment ?font_size ?log_verbosity =
         ~font_size ~log_verbosity))
     []
 
+let sequents_viewer ~(notebook:GPack.notebook)
+  ~(sequent_viewer:MatitaTypes.sequent_viewer) ~set_goal ()
+=
+  new sequents_viewer ~notebook ~sequent_viewer ~set_goal ()
+