Integration of OCCT 6.5.0 from SVN

src/XSAlgo/XSAlgo.cdl

@@ -0,0 +1,49 @@
+-- File:	XSAlgo.cdl
+-- Created:	Wed Jan 19 17:35:08 2000
+-- Author:	data exchange team
+--		<det@nnov>
+---Copyright:	 Matra Datavision 2000
+
+
+package XSAlgo 
+
+    ---Purpose: 
+
+uses
+
+    MMgt,
+    Geom,
+    Geom2d,
+    TopoDS,
+    ShapeExtend,
+    ShapeAnalysis,
+    ShapeFix,
+    Transfer
+    
+is
+
+    enumeration Caller is
+    	---Purpose: Identifies the caller of the algorithm
+	DEFAULT,
+	IGES,
+	STEP
+    end Caller;
+
+    class ToolContainer;
+    	---Purpose: Returns tools used by AlgoContainer
+
+    class AlgoContainer;
+    	---Purpose: Provides initerface to the algorithms from Shape Healing
+	--          and others for XSTEP processors.
+
+    
+    Init;
+    	---Purpose: Creates and initializes default AlgoContainer.
+    
+    SetAlgoContainer (aContainer: AlgoContainer from XSAlgo);
+    	---Purpose: Sets default AlgoContainer
+
+    AlgoContainer returns AlgoContainer from XSAlgo;
+    	---Purpose: Returns default AlgoContainer
+
+end XSAlgo;

src/XSAlgo/XSAlgo.cxx

@@ -0,0 +1,82 @@
+// File:	XSAlgo.cxx
+// Created:	Wed Jan 19 17:51:01 2000
+// Author:	data exchange team
+//		<det@nnov>
+
+
+#include <XSAlgo.ixx>
+#include <ShapeAlgo.hxx>
+#include <ShapeProcess_OperLibrary.hxx>
+#include <Interface_Static.hxx>
+
+static Handle(XSAlgo_AlgoContainer) theContainer;
+
+//=======================================================================
+//function : Init
+//purpose  : 
+//=======================================================================
+
+ void XSAlgo::Init() 
+{
+  static Standard_Boolean init = Standard_False;
+  if (init) return;
+  init = Standard_True;
+  ShapeAlgo::Init();
+  theContainer = new XSAlgo_AlgoContainer;
+
+  // init parameters
+  Interface_Static::Standards();
+  
+  //#74 rln 10.03.99 S4135: adding new parameter for handling use of BRepLib::SameParameter
+  Interface_Static::Init("XSTEP"  ,"read.stdsameparameter.mode", 'e',"");
+  Interface_Static::Init("XSTEP"  ,"read.stdsameparameter.mode", '&',"ematch 0");
+  Interface_Static::Init("XSTEP"  ,"read.stdsameparameter.mode", '&',"eval Off");
+  Interface_Static::Init("XSTEP"  ,"read.stdsameparameter.mode", '&',"eval On");
+  Interface_Static::SetIVal ("read.stdsameparameter.mode",0);
+   
+  // unit: supposed to be cascade unit (target unit for reading)
+  Interface_Static::Init("XSTEP","xstep.cascade.unit", 'e',"");
+  Interface_Static::Init ("XSTEP","xstep.cascade.unit",'&',"enum 1");
+  Interface_Static::Init ("XSTEP","xstep.cascade.unit",'&',"eval INCH");  // 1
+  Interface_Static::Init ("XSTEP","xstep.cascade.unit",'&',"eval MM");    // 2
+  Interface_Static::Init ("XSTEP","xstep.cascade.unit",'&',"eval ??");    // 3
+  Interface_Static::Init ("XSTEP","xstep.cascade.unit",'&',"eval FT");    // 4
+  Interface_Static::Init ("XSTEP","xstep.cascade.unit",'&',"eval MI");    // 5
+  Interface_Static::Init ("XSTEP","xstep.cascade.unit",'&',"eval M");     // 6
+  Interface_Static::Init ("XSTEP","xstep.cascade.unit",'&',"eval KM");    // 7
+  Interface_Static::Init ("XSTEP","xstep.cascade.unit",'&',"eval MIL");   // 8
+  Interface_Static::Init ("XSTEP","xstep.cascade.unit",'&',"eval UM");    // 9
+  Interface_Static::Init ("XSTEP","xstep.cascade.unit",'&',"eval CM");    //10
+  Interface_Static::Init ("XSTEP","xstep.cascade.unit",'&',"eval UIN");   //11
+  Interface_Static::SetCVal ("xstep.cascade.unit","MM");
+  
+  //  unit : pour depannage / test de non regression  0 MM  1 M(ancien)
+  Interface_Static::Init("XSTEP"    ,"read.scale.unit", 'e',"");
+  Interface_Static::Init("XSTEP","read.scale.unit",'&',"ematch 0");
+  Interface_Static::Init("XSTEP","read.scale.unit",'&',"eval MM");
+  Interface_Static::Init("XSTEP","read.scale.unit",'&',"eval M");
+  Interface_Static::SetIVal ("read.scale.unit",0);
+
+  // init Standard Shape Processing operators
+  ShapeProcess_OperLibrary::Init();
+}
+
+//=======================================================================
+//function : SetAlgoContainer
+//purpose  : 
+//=======================================================================
+
+ void XSAlgo::SetAlgoContainer(const Handle(XSAlgo_AlgoContainer)& aContainer) 
+{
+  theContainer = aContainer;
+}
+
+//=======================================================================
+//function : AlgoContainer
+//purpose  : 
+//=======================================================================
+
+ Handle(XSAlgo_AlgoContainer) XSAlgo::AlgoContainer() 
+{
+  return theContainer;
+}

src/XSAlgo/XSAlgo_AlgoContainer.cdl

@@ -0,0 +1,107 @@
+-- File:	XSAlgo_AlgoContainer.cdl
+-- Created:	Wed Jan 19 17:49:47 2000
+-- Author:	data exchange team
+--		<det@nnov>
+---Copyright:	 Matra Datavision 2000
+
+
+class AlgoContainer from XSAlgo inherits TShared from MMgt
+
+    ---Purpose: 
+
+uses
+
+    Curve         from Geom2d,
+    Surface       from Geom,
+    Edge          from TopoDS,
+    Face          from TopoDS,
+    Shape         from TopoDS,
+    Caller        from XSAlgo,
+    ToolContainer from XSAlgo,
+    WireData      from ShapeExtend,
+    Wire          from ShapeAnalysis,
+    Wire          from ShapeFix,
+    TransientProcess from Transfer,
+    FinderProcess from Transfer
+    
+is
+
+    Create returns mutable AlgoContainer from XSAlgo;
+    	---Purpose: Empty constructor
+	
+    SetToolContainer (me: mutable; TC: ToolContainer from XSAlgo);
+    	---C++    : inline
+    	---Purpose: Sets ToolContainer
+	
+    ToolContainer (me) returns ToolContainer from XSAlgo;
+    	---C++    : inline
+    	---Purpose: Returns ToolContainer
+	
+
+    PrepareForTransfer (me) is virtual;
+    	---Purpose: Performs actions necessary for preparing environment
+	--          for transfer. Empty in Open version.
+	
+--    PerformFixShape (me; shape       : Shape from TopoDS;
+--		         TP          : TransientProcess from Transfer;
+--    	 	    	 Prec, MaxTol: Real)
+--    returns Shape from TopoDS is virtual;
+    	---Purpose: Applies fixes to the shape resulting from transfer,
+    	--          and updates map of entity-shape in TP in accordance with 
+    	--          substitutions made during fixes (if any)
+
+    ProcessShape (me; shape: Shape from TopoDS; 
+    	 	      Prec, MaxTol: Real;
+                      rscfile: CString;
+		      seq: CString;
+		      info: out Transient)
+    returns Shape from TopoDS is virtual;
+    	---Purpose: Does shape processing with specified tolerances
+    	--          and returns resulting shape and associated information 
+        --          in the form of Transient.
+	--          This information should be later transmitted to 
+	--          MergeTransferInfo in order to be recorded in the
+	--          translation map
+	--
+	---Default behaviour:
+    	--          Applies sequence with name identified by parameter named 
+        --          <seq> (see Interface_Static), defined in resource file
+        --          identified by parameter with name <rscfile>, to shape,
+    	--          and keeps info of substitutions made during the process.
+	--          The Prec and MaxTol define run-time parameters 
+	--          Runtime.Tolerance and Runtime.MaxTolerance which can be 
+        --          referred from the resource file
+        --          ("param : &Runtime.Tolerance")
+	--          In the info returns ShapeProcess_ShapeContext with recorded
+	--          modifications. If info has already this type on input, uses it.
+	--
+	--          If resource file is not found, or sequence is not defined 
+        --          there, performs default fixes:
+	--        - if <seq> is write.iges.sequence or write.step.sequence, does DirectFaces
+	--        - if <seq> is read.iges.sequence or read.step.sequence, performs FixShape
+
+    CheckPCurve (me; edge  : Edge from TopoDS;
+		     face  : Face from TopoDS;
+		     preci : Real;
+		     isSeam: Boolean)
+    returns Boolean is virtual;
+    	---Purpose: Checks quality of pcurve of the edge on the given face, 
+        --          and corrects it if necessary.
+	---Remark : In Open CASCADE does nothing.
+
+    MergeTransferInfo (me; TP : TransientProcess from Transfer;
+		           info: Transient;
+    	    	    	   startTPitem: Integer = 1) is virtual;
+    MergeTransferInfo (me; FP : FinderProcess from Transfer;
+		           info: Transient) is virtual;
+	---Purpose: Updates translation map (TP or FP) with information
+	--          resulting from ShapeProcessing
+	--          Parameter startTPitem can be used for optimisation, to
+	--          restrict modifications to entities stored in TP starting
+	--          from item startTPitem
+
+fields
+
+    myTC : ToolContainer from XSAlgo;
+    
+end AlgoContainer;

src/XSAlgo/XSAlgo_AlgoContainer.cxx

@@ -0,0 +1,517 @@
+// File:	XSAlgo_AlgoContainer.cxx
+// Created:	Wed Jan 19 17:52:41 2000
+// Author:	data exchange team
+//		<det@nnov>
+
+
+#include <XSAlgo_AlgoContainer.ixx>
+
+#include <Standard_ErrorHandler.hxx>
+#include <Standard_Failure.hxx>
+
+#include <Message_ListOfMsg.hxx>
+#include <Message_ListIteratorOfListOfMsg.hxx>
+
+#include <gp_Pnt.hxx>
+#include <gp_Pnt2d.hxx>
+#include <Geom_Curve.hxx>
+#include <Geom_Surface.hxx>
+#include <Geom2d_Curve.hxx>
+#include <TopoDS.hxx>
+#include <TopoDS_Vertex.hxx>
+#include <TopoDS_Iterator.hxx>
+#include <TopExp.hxx>
+#include <BRep_Tool.hxx>
+#include <BRep_Builder.hxx>
+#include <BRepBuilderAPI_MakeEdge.hxx>
+#include <TopTools_DataMapOfShapeShape.hxx>
+#include <TopTools_DataMapIteratorOfDataMapOfShapeShape.hxx>
+
+#include <ShapeProcess.hxx>
+#include <ShapeProcess_ShapeContext.hxx>
+#include <ShapeAlgo.hxx>
+#include <ShapeAlgo_AlgoContainer.hxx>
+#include <ShapeAlgo_ToolContainer.hxx>
+#include <ShapeBuild_ReShape.hxx>
+#include <ShapeExtend_DataMapOfShapeListOfMsg.hxx>
+#include <ShapeExtend_MsgRegistrator.hxx>
+#include <ShapeFix_Shape.hxx>
+#include <ShapeBuild_Edge.hxx>
+#include <ShapeAnalysis_Edge.hxx>
+#include <ShapeFix_Edge.hxx>
+#include <UnitsMethods.hxx>
+#include <ShapeCustom.hxx>
+
+#include <TransferBRep.hxx>
+#include <TransferBRep_ShapeMapper.hxx>
+#include <TransferBRep_ShapeBinder.hxx>
+#include <Transfer_TransientListBinder.hxx>
+#include <Resource_Manager.hxx>
+#include <Interface_Static.hxx>
+#include <Message_Msg.hxx>
+
+//=======================================================================
+//function : XSAlgo_AlgoContainer
+//purpose  : 
+//=======================================================================
+
+XSAlgo_AlgoContainer::XSAlgo_AlgoContainer()
+{
+  myTC = new XSAlgo_ToolContainer;
+}
+
+//=======================================================================
+//function : PrepareForTransfer
+//purpose  : 
+//=======================================================================
+
+void XSAlgo_AlgoContainer::PrepareForTransfer() const
+{
+  UnitsMethods::SetCasCadeLengthUnit ( Interface_Static::IVal("xstep.cascade.unit") );
+}
+
+//=======================================================================
+//function : ProcessShape
+//purpose  : 
+//=======================================================================
+
+TopoDS_Shape XSAlgo_AlgoContainer::ProcessShape (const TopoDS_Shape& shape,
+                                                 const Standard_Real Prec,
+                                                 const Standard_Real maxTol,
+                                                 const Standard_CString prscfile,
+                                                 const Standard_CString pseq,
+                                                 Handle(Standard_Transient)& info) const
+{
+  if ( shape.IsNull() ) return shape;
+  
+  Handle(ShapeProcess_ShapeContext) context = Handle(ShapeProcess_ShapeContext)::DownCast ( info );
+  if ( context.IsNull() ) {
+    Standard_CString rscfile = Interface_Static::CVal ( prscfile );
+    if ( ! rscfile ) rscfile = prscfile;
+    context = new ShapeProcess_ShapeContext (shape, rscfile);
+    context->SetDetalisation ( TopAbs_EDGE );
+  }
+  info = context;
+  
+  Standard_CString seq = Interface_Static::CVal ( pseq );
+  if ( ! seq ) seq = pseq;
+  
+  // if resource file is not loaded or does not define <seq>.exec.op, 
+  // do default fixes
+  Handle(Resource_Manager) rsc = context->ResourceManager();
+  TCollection_AsciiString str ( seq );
+  str += ".exec.op";
+  if ( ! rsc->Find ( str.ToCString() ) ) {
+#ifdef DEB
+    {
+      static Standard_Integer time = 0;
+      if ( ! time )
+	cout << "Warning: XSAlgo_AlgoContainer::ProcessShape(): Sequence " << str.ToCString() << 
+	        " is not defined in " << prscfile << " resource; do default processing" << endl;
+      time++;
+    }
+#endif
+    // if FromSTEP or FromIGES, do default ShapeFix
+    if ( ! strncmp ( pseq, "read.", 5 ) ) {
+      try {
+        OCC_CATCH_SIGNALS
+	Handle(ShapeExtend_MsgRegistrator) msg = new ShapeExtend_MsgRegistrator;
+	Handle(ShapeFix_Shape) sfs = ShapeAlgo::AlgoContainer()->ToolContainer()->FixShape();
+	sfs->Init ( shape );
+	sfs->SetMsgRegistrator ( msg );
+	sfs->SetPrecision ( Prec );
+	sfs->SetMaxTolerance ( maxTol );
+	sfs->FixFaceTool()->FixWireTool()->FixSameParameterMode() = Standard_False;
+	sfs->FixSolidTool()->CreateOpenSolidMode() = Standard_False;
+	sfs->Perform();
+
+	TopoDS_Shape S = sfs->Shape();
+	if ( ! S.IsNull() && S != shape ) {
+	  context->RecordModification ( sfs->Context(), msg );
+	  context->SetResult ( S );
+	}
+      }
+      catch (Standard_Failure) {
+#ifdef DEB
+	cout << "Error: XSAlgo_AlgoContainer::ProcessShape(): Exception in ShapeFix::Shape" << endl;
+        Standard_Failure::Caught()->Print(cout); cout << endl;
+#endif
+      }  
+      return context->Result();
+    }
+    // if ToSTEP or ToIGES, define sequence of DirectFaces
+    else if ( ! strcmp ( pseq, "write.step.sequence" ) ) {
+      rsc->SetResource ( str.ToCString(), "DirectFaces" );
+    }
+    else if ( ! strcmp ( pseq, "write.iges.sequence" ) ) {
+      rsc->SetResource ( str.ToCString(), "DirectFaces" );
+    }
+  }
+  
+  // Define runtime tolerances and do Shape Processing 
+  rsc->SetResource ( "Runtime.Tolerance", Prec );
+  rsc->SetResource ( "Runtime.MaxTolerance", maxTol );
+  ShapeProcess::Perform ( context, seq );
+  
+  return context->Result();
+}
+						  
+//=======================================================================
+//function : PerformFixShape
+//purpose  : 
+//=======================================================================
+
+/*
+TopoDS_Shape XSAlgo_AlgoContainer::PerformFixShape(const TopoDS_Shape& S,
+						      const Handle(Transfer_TransientProcess)& TP,
+						      const Standard_Real Prec,
+						      const Standard_Real MaxTol) const
+{
+  if ( S.IsNull() ) return S;
+  
+  TopoDS_Shape shape = S;
+  // fixing shape
+  try {
+    OCC_CATCH_SIGNALS
+    Handle(ShapeFix_Shape) sfs = ShapeAlgo::AlgoContainer()->ToolContainer()->FixShape();
+    sfs->Init ( S );
+    sfs->SetMsgRegistrator ( new ShapeExtend_MsgRegistrator );
+    sfs->SetPrecision ( Prec );
+    sfs->SetMaxTolerance ( MaxTol );
+    sfs->FixFaceTool()->FixWireTool()->FixSameParameterMode() = Standard_False;
+    sfs->Perform();
+
+    shape = sfs->Shape();
+    
+    // to be removed when messages come
+    if ( shape == S || shape.IsNull() ) return S;
+    
+    // update map to reflect the substitutions
+    Handle(ShapeBuild_ReShape) context = sfs->Context();
+    const ShapeExtend_DataMapOfShapeListOfMsg& msgmap = 
+      Handle(ShapeExtend_MsgRegistrator)::DownCast (sfs->MsgRegistrator())->MapShape();
+    for ( Standard_Integer i=1; i <= TP->NbMapped(); i++ ) {
+      Handle(Transfer_Binder) bnd = TP->MapItem ( i );
+      Handle(TransferBRep_ShapeBinder) sb = Handle(TransferBRep_ShapeBinder)::DownCast ( bnd );
+      if ( sb.IsNull() || sb->Result().IsNull() ) continue;
+      
+      TopoDS_Shape orig = sb->Result();
+      
+      // update messages (messages must be taken from each level in the substitution map)
+      TopoDS_Shape cur, next = orig;
+      do {
+	cur = next;
+	Message_ListOfMsg msglist;
+	if (msgmap.IsBound (cur)) {
+	  msglist = msgmap.Find (cur);
+	  for (Message_ListIteratorOfListOfMsg iter (msglist); iter.More(); iter.Next()) {
+	    const Message_Msg& msg = iter.Value();
+	    sb->AddWarning (msg.Value(), msg.Original());
+	  }
+	}
+	next = context->Value (cur);
+      } while (cur != next);
+
+      // update shapes
+      TopoDS_Shape res;
+      if ( ! context->Status ( orig, res, Standard_True ) ) continue;
+
+      sb->SetResult ( res );
+    }
+  }
+  catch (Standard_Failure) {
+#ifdef DEB
+    cout << "Error: XSAlgo_AlgoContainer::PerformFixShape(): Exception in ShapeFix::Shape" << endl;
+#endif
+  }   
+  return shape;
+}
+*/
+
+// ============================================================================
+// Method  : MakeEdgeOnCurve
+// Purpose : for CheckPCurve
+// ============================================================================
+
+static TopoDS_Edge MakeEdgeOnCurve(const TopoDS_Edge edge)
+{
+  TopoDS_Edge result;
+  //BRep_Builder B; // B not used - see below (skl)
+  Handle(Geom_Curve) C3d;
+  ShapeAnalysis_Edge sae;
+  Standard_Real cf, cl;
+  if (!sae.Curve3d (edge, C3d, cf, cl, Standard_False )) 
+    return result;
+  gp_Pnt PV1 = C3d->Value(cf);
+  gp_Pnt PV2 = C3d->Value(cl);
+  BRepBuilderAPI_MakeEdge mkEdge(C3d, PV1, PV2, cf, cl);
+//:S4136  Standard_Real tol = BRep_Tool::Tolerance (edge);
+  ShapeBuild_Edge SBE;          //skl 10.07.2001
+  SBE.SetRange3d(mkEdge,cf,cl); //skl 10.07.2001
+  result = mkEdge.Edge();
+//:S4136  B.UpdateEdge(result,tol);
+  return result;
+}
+
+//=======================================================================
+//function : CheckPCurve
+//purpose  : 
+//=======================================================================
+
+Standard_Boolean XSAlgo_AlgoContainer::CheckPCurve (const TopoDS_Edge& E,
+						    const TopoDS_Face& face,
+						    const Standard_Real preci,
+						    const Standard_Boolean isSeam) const
+{
+  Standard_Real w1, w2;  
+  Handle(Geom2d_Curve) thePC;
+  ShapeAnalysis_Edge sae;
+  if ( ! sae.PCurve (E, face, thePC, w1, w2, Standard_False ) ) {
+    return Standard_False;
+  }
+
+  // Check for pcurve longer than surface
+  Handle(Geom_Surface) surf = BRep_Tool::Surface(face);
+  Standard_Real UF,UL,VF,VL;
+  surf->Bounds (UF,UL,VF,VL);
+  gp_Pnt2d PUV1, PUV2;
+  PUV1 = thePC->Value(w1);
+  PUV2 = thePC->Value(w2);
+  //    Multi-periodique ? mieux vaut jeter (attention aux valeurs infinies)
+  Standard_Real DU = Abs (PUV1.X() - PUV2.X());
+  Standard_Real DV = Abs (PUV1.Y() - PUV2.Y());
+  if ( DU/8. > (UL/6. - UF/6.) || DV/8. > (VL/6. - VF/6.) ) {
+    ShapeBuild_Edge().RemovePCurve(E,face);
+#ifdef DEBUG
+    cout<<"Removing pcuve periodic"<<endl;
+#endif      
+    return Standard_False;
+  }
+
+  // Second Check : 2D and 3D consistency (if the Pcurve has not been 
+  //                dropped)
+  //  On verifie aussi qu on ne s enroule pas trop ...
+  //  ex. : UVV en DEGRES sur une surface en RADIANS, recalee = 57 tours !
+
+  Handle(Geom_Curve) C3d;
+  Standard_Real cf1, cl1;
+  sae.Curve3d (E, C3d, cf1, cl1, Standard_False );
+
+  gp_Pnt P1 = surf->Value(PUV1.X(), PUV1.Y());
+  gp_Pnt P2 = surf->Value(PUV2.X(), PUV2.Y());
+  TopoDS_Vertex V1 = TopExp::FirstVertex(E);
+  TopoDS_Vertex V2 = TopExp::LastVertex(E);
+  gp_Pnt PV1 = ( C3d.IsNull() ? BRep_Tool::Pnt(V1) : C3d->Value(cf1) );
+  gp_Pnt PV2 = ( C3d.IsNull() ? BRep_Tool::Pnt(V2) : C3d->Value(cl1) );
+  Standard_Real Dist11 = PV1.Distance(P1), Dist22 = PV2.Distance(P2);
+    
+  if (!((Dist11 <= preci) && (Dist22 <= preci))) {
+    ShapeBuild_Edge().RemovePCurve(E,face);
+#ifdef DEBUG      
+    cout<<"Removing pcurve points"<<endl;
+#endif      
+    return Standard_False;
+  }
+
+  //
+  // pdn checking deviation between pcurve and 3D curve
+  //
+  
+  // Make temporary edge for analysis
+  if ( C3d.IsNull() ) return Standard_False;
+  TopoDS_Edge edge = MakeEdgeOnCurve(E);
+  
+  // fill it with pcurve(s)
+  BRep_Builder B;
+  Handle(Geom2d_Curve) seamPC;
+  if ( isSeam ) {
+    Standard_Real f, l;
+    TopoDS_Shape REdge = E.Reversed() ;
+    if ( ! sae.PCurve ( TopoDS::Edge ( REdge ), 
+		        face, seamPC, f, l, Standard_False ) ||
+	 seamPC == thePC ) 
+      seamPC = Handle(Geom2d_Curve)::DownCast ( thePC->Copy() );
+    B.UpdateEdge ( edge, thePC, seamPC, face, 0.);
+  }
+  else B.UpdateEdge ( edge, thePC, face, 0.);
+  B.Range(edge,face,w1,w2);
+  B.SameRange(edge, Standard_False );
+  //:S4136
+  Standard_Integer SPmode = Interface_Static::IVal("read.stdsameparameter.mode");
+  if ( SPmode ) 
+    B.SameParameter (edge, Standard_False );
+
+  // call FixSP to see what it will do
+  Handle(ShapeFix_Edge) sfe = new ShapeFix_Edge;
+  sfe->FixSameParameter(edge);
+  Standard_Real tol = BRep_Tool::Tolerance (edge);
+  //    Standard_Real tolV1 = BRep_Tool::Tolerance(TopExp::FirstVertex(edge));
+  //    Standard_Real tolV2 = BRep_Tool::Tolerance(TopExp::LastVertex(edge));			       
+  Standard_Boolean sr = BRep_Tool::SameRange ( edge );
+  Standard_Boolean sp = BRep_Tool::SameParameter ( edge );
+  
+  // if result is not nice, try to call projection and take the best
+  if ( tol > Min ( 1., 2.*preci ) || ! sr ) {
+    //pdn trying to recompute pcurve 
+    TopoDS_Edge edgePr = MakeEdgeOnCurve(E);
+    sfe->FixAddPCurve(edgePr, face, isSeam, preci);
+    sfe->FixSameParameter(edgePr);
+    Standard_Real tolPr = BRep_Tool::Tolerance (edgePr);
+    //pdn choose the best pcurve
+    if ( tolPr < tol || ! sr ) {
+      //	tolV1 = BRep_Tool::Tolerance(TopExp::FirstVertex(edgePr));
+      //	tolV2 = BRep_Tool::Tolerance(TopExp::LastVertex(edgePr));
+      sr = BRep_Tool::SameRange ( edgePr );
+      sp = BRep_Tool::SameParameter ( edgePr );
+      tol = tolPr;
+      edge = edgePr;
+    }
+  }
+  
+  // get corrected pcurve from the temporary edge, and put to original
+  sae.PCurve ( edge, face, thePC, w1, w2, Standard_False );
+  if ( isSeam ) {
+    Standard_Real f, l;
+    TopoDS_Shape REdge = edge.Reversed();
+    sae.PCurve ( TopoDS::Edge ( REdge ), face, seamPC, f, l, Standard_False );
+    if ( E.Orientation() == TopAbs_REVERSED ) //:abv 14.11.01: coneEl.sat loop
+      B.UpdateEdge ( E, seamPC, thePC, face, tol );
+    else 
+      B.UpdateEdge ( E, thePC, seamPC, face, tol );
+  }
+  else B.UpdateEdge ( E, thePC, face, tol );
+
+  B.UpdateVertex(V1,tol);
+  B.UpdateVertex(V2,tol);
+  B.Range(E,face, w1, w2);
+  if(BRep_Tool::SameRange(E))
+    B.SameRange( E, sr );
+  if(BRep_Tool::SameParameter(E))
+    B.SameParameter ( E, sp );
+  
+  return Standard_True;
+}
+
+//=======================================================================
+//function : MergeTransferInfo
+//purpose  : 
+//=======================================================================
+
+void XSAlgo_AlgoContainer::MergeTransferInfo(const Handle(Transfer_TransientProcess)& TP,
+						const Handle(Standard_Transient) &info,
+						const Standard_Integer startTPitem) const
+{
+  Handle(ShapeProcess_ShapeContext) context = Handle(ShapeProcess_ShapeContext)::DownCast ( info );
+  if ( context.IsNull() ) return;
+
+  const TopTools_DataMapOfShapeShape &map = context->Map();
+  Handle(ShapeExtend_MsgRegistrator) msg = context->Messages();
+  if ( map.Extent() <=0 && ( msg.IsNull() || msg->MapShape().Extent() <=0 ) )
+    return;
+
+  Standard_Integer i = ( startTPitem >0 ? startTPitem : 1 );
+  for ( ; i <= TP->NbMapped(); i++ ) {
+    Handle(Transfer_Binder) bnd = TP->MapItem ( i );
+    Handle(TransferBRep_ShapeBinder) sb = Handle(TransferBRep_ShapeBinder)::DownCast ( bnd );
+    if ( sb.IsNull() || sb->Result().IsNull() ) continue;
+      
+    TopoDS_Shape orig = sb->Result();
+    if ( map.IsBound ( orig ) ) sb->SetResult ( map.Find ( orig ) );
+    else if ( !orig.Location().IsIdentity() )
+    {
+      TopLoc_Location aNullLoc;
+      TopoDS_Shape atmpSh = orig.Located(aNullLoc);
+      if ( map.IsBound ( atmpSh ) ) sb->SetResult ( map.Find ( atmpSh ) );
+    }
+      
+    // update messages
+    if ( ! msg.IsNull() ) {
+      const ShapeExtend_DataMapOfShapeListOfMsg& msgmap = msg->MapShape();
+      if ( msgmap.IsBound (orig) ) {
+	const Message_ListOfMsg &msglist = msgmap.Find (orig);
+	for (Message_ListIteratorOfListOfMsg iter (msglist); iter.More(); iter.Next()) {
+	  const Message_Msg& mess = iter.Value();
+	  sb->AddWarning (TCollection_AsciiString(mess.Value()).ToCString(),
+                          TCollection_AsciiString(mess.Original()).ToCString());
+	}
+      }
+    }
+  }
+}
+
+//=======================================================================
+//function : MergeTransferInfo
+//purpose  : 
+//=======================================================================
+
+void XSAlgo_AlgoContainer::MergeTransferInfo(const Handle(Transfer_FinderProcess)& FP,
+						const Handle(Standard_Transient) &info) const
+{
+  Handle(ShapeProcess_ShapeContext) context = Handle(ShapeProcess_ShapeContext)::DownCast ( info );
+  if ( context.IsNull() ) return;
+
+  const TopTools_DataMapOfShapeShape &map = context->Map();
+  TopTools_DataMapIteratorOfDataMapOfShapeShape ShapeShapeIterator(map);
+  Handle(ShapeExtend_MsgRegistrator) msg = context->Messages();
+
+  for ( ; ShapeShapeIterator.More(); ShapeShapeIterator.Next() ) {
+
+    TopoDS_Shape orig = ShapeShapeIterator.Key(), res = ShapeShapeIterator.Value();
+    Handle(TransferBRep_ShapeMapper) resMapper = TransferBRep::ShapeMapper ( FP, res );
+    Handle(Transfer_Binder) resBinder = FP->Find ( resMapper );
+    
+    if (resBinder.IsNull()) {
+      resBinder = new TransferBRep_ShapeBinder(res);
+      //if <orig> shape was splitted, put entities corresponding to new shapes
+      // into Transfer_TransientListBinder.
+      if ( orig.ShapeType() > res.ShapeType() ) {
+	TopoDS_Shape sub;
+	Handle(Transfer_TransientListBinder) TransientListBinder = new Transfer_TransientListBinder;
+	for (TopoDS_Iterator it(res); it.More(); it.Next()) {
+	  Handle(Transfer_Finder) subMapper = TransferBRep::ShapeMapper ( FP, it.Value());
+	  if (subMapper.IsNull()) continue;
+
+	  Handle(Standard_Transient) tr = FP->FindTransient ( subMapper );
+	  if (tr.IsNull()) continue;
+	  TransientListBinder->AddResult(tr);
+	  sub = it.Value();
+	}
+	if ( TransientListBinder->NbTransients() == 1 ) resBinder = new TransferBRep_ShapeBinder(sub);
+	else if ( TransientListBinder->NbTransients() > 1 ) {
+          resBinder->AddResult(TransientListBinder);
+//	  resBinder->SetNext(TransientListBinder, Standard_True);
+#ifdef DEB
+	  cout<<"Info: TransientListBinder created for splitted shape"<<endl;
+	} 
+	else {
+	  cout<<"Warning: XSAlgo_AlgoContainer::MergeTransferInfo() "
+	    <<"No results were found for splitted shape. "<<endl;
+	  //<<"Transfer_FinderProcess->NbMapped() = "<<FP->NbMapped()<<endl;
+#endif	  
+	}
+      }
+    }
+    
+    Handle(TransferBRep_ShapeMapper) origMapper= TransferBRep::ShapeMapper ( FP, orig);
+    Handle(Transfer_Binder) origBinder = FP->Find ( origMapper );
+    if ( origBinder.IsNull() ) {
+      FP->Bind(origMapper, resBinder);
+    }
+    else {
+      origBinder->AddResult ( resBinder );
+    }
+    
+    // update messages
+    if ( ! msg.IsNull() ) {
+      const ShapeExtend_DataMapOfShapeListOfMsg& msgmap = msg->MapShape();
+      if ( msgmap.IsBound (orig) ) {
+	const Message_ListOfMsg &msglist = msgmap.Find (orig);
+	for (Message_ListIteratorOfListOfMsg iter (msglist); iter.More(); iter.Next()) {
+	  const Message_Msg& mess = iter.Value();
+	  resBinder->AddWarning (TCollection_AsciiString(mess.Value()).ToCString(),
+                                 TCollection_AsciiString(mess.Original()).ToCString());
+	}
+      }
+    }
+  }
+}

src/XSAlgo/XSAlgo_AlgoContainer.lxx

@@ -0,0 +1,26 @@
+// File:	XSAlgo_AlgoContainer.lxx
+// Created:	Fri Jan 28 16:53:48 2000
+// Author:	data exchange team
+//		<det@nnov>
+
+#include <XSAlgo_AlgoContainer.hxx>
+
+//=======================================================================
+//function : SetToolContainer
+//purpose  : 
+//=======================================================================
+
+inline  void XSAlgo_AlgoContainer::SetToolContainer(const Handle(XSAlgo_ToolContainer)& TC) 
+{
+  myTC = TC;
+}
+
+//=======================================================================
+//function : ToolContainer
+//purpose  : 
+//=======================================================================
+
+inline  Handle(XSAlgo_ToolContainer) XSAlgo_AlgoContainer::ToolContainer() const
+{
+  return myTC;
+}

src/XSAlgo/XSAlgo_ToolContainer.cdl

@@ -0,0 +1,16 @@
+-- File:	XSAlgo_ToolContainer.cdl
+-- Created:	Wed Jan 19 17:48:16 2000
+-- Author:	data exchange team
+--		<det@nnov>
+---Copyright:	 Matra Datavision 2000
+
+
+class ToolContainer from XSAlgo inherits TShared from MMgt
+
+    ---Purpose: 
+
+is
+    Create returns mutable ToolContainer from XSAlgo;
+    	---Purpose: Empty constructor
+	
+end ToolContainer;

src/XSAlgo/XSAlgo_ToolContainer.cxx

@@ -0,0 +1,27 @@
+// File:	XSAlgo_ToolContainer.cxx
+// Created:	Wed Jan 19 17:52:23 2000
+// Author:	data exchange team
+//		<det@nnov>
+
+
+#include <XSAlgo_ToolContainer.ixx>
+
+//=======================================================================
+//function : XSAlgo_ToolContainer
+//purpose  : 
+//=======================================================================
+
+XSAlgo_ToolContainer::XSAlgo_ToolContainer()
+{
+}
+/*
+//=======================================================================
+//function : FixWire
+//purpose  : 
+//=======================================================================
+
+Handle(ShapeFix_Wire) XSAlgo_ToolContainer::FixWire() const
+{
+  return new ShapeFix_Wire;
+}
+*/