0024940: WOK: Cyclic dependency detected between: BOPInt IntTools

Classes BOPInt_Context, BOPInt_ShrunkRange, BOPInt_Tools have been removed. Package BOPInt has been removed Classes IntTools_Context, IntTools_ShrunkRange have been added to replace corresponding BOPInt_ classes. The classes provide same functionality as corresponding BOPInt_ classes. Classes : BOPAlgo_ArgumentAnalyzer BOPAlgo_Builder BOPAlgo_BuilderArea BOPAlgo_BuilderFace BOPAlgo_BuilderSolid BOPAlgo_CheckerSI BOPAlgo_PaveFiller BOPAlgo_ShellSplitter BOPTools_AlgoTools3D BRepFill_TrimShellCorner IntTools_BeanFaceIntersector IntTools_EdgeFace IntTools_FaceFace IntTools_Tools have been modified to use new classes IntTools_Context IntTools_ShrunkRange Class IntTools_Tools has been modofied to provide the functionality that was in BOPInt_Tools.
2025-08-09 13:22:24 +03:00 · 2014-05-26 10:48:29 +04:00
parent 68bd84a5f0
commit 1e143abba6
45 changed files with 1798 additions and 1972 deletions
--- a/src/BOPAlgo/BOPAlgo.cdl
+++ b/src/BOPAlgo/BOPAlgo.cdl
@@ -28,7 +28,6 @@ uses
    IntSurf,
    --
    BOPDS, 
-    BOPInt, 
    BOPCol, 
    BOPTools 
 is   
--- a/src/BOPAlgo/BOPAlgo_ArgumentAnalyzer.cxx
+++ b/src/BOPAlgo/BOPAlgo_ArgumentAnalyzer.cxx
@@ -47,7 +47,7 @@
 #include <IntTools_EdgeEdge.hxx>
 #include <IntTools_CommonPrt.hxx>

-#include <BOPInt_Context.hxx>
+#include <IntTools_Context.hxx>

 #include <BOPTools_AlgoTools3D.hxx>
 #include <BOPTools_AlgoTools.hxx>
@@ -76,7 +76,6 @@ myMergeEdgeMode(Standard_False),
 myContinuityMode(Standard_False),
 myEmpty1(Standard_False),
 myEmpty2(Standard_False)
-// myMergeFaceMode(Standard_False)
 {
 }

@@ -379,9 +378,9 @@ void BOPAlgo_ArgumentAnalyzer::TestSmallEdge()
 {
  Standard_Integer i = 0;
  BRepExtrema_DistShapeShape aDist;
-  Handle(BOPInt_Context) aCtx;
+  Handle(IntTools_Context) aCtx;
  //
-  aCtx = new BOPInt_Context;
+  aCtx = new IntTools_Context;
  
  for(i = 0; i < 2; i++) {
    const TopoDS_Shape& aS = (i == 0) ? myShape1 : myShape2;
@@ -816,12 +815,3 @@ void BOPAlgo_ArgumentAnalyzer::TestContinuity()
    }
  }
 }
-
-// ================================================================================
-// function: TestMergeFace
-// purpose:
-// ================================================================================
-// void BOPAlgo_ArgumentAnalyzer::TestMergeFace() 
-// {
-  // not implemented
-// }
--- a/src/BOPAlgo/BOPAlgo_Builder.cdl
+++ b/src/BOPAlgo/BOPAlgo_Builder.cdl
@@ -32,7 +32,7 @@ uses
    MapOfShape from BOPCol, 
    DataMapOfShapeShape from BOPCol, 
    DataMapOfShapeListOfShape from BOPCol,  
-    Context from BOPInt,
+    Context from IntTools,
    PDS from BOPDS, 
    PaveFiller  from BOPAlgo,
    PPaveFiller from BOPAlgo 
@@ -218,7 +218,7 @@ fields
    myMapFence   : MapOfShape from BOPCol is protected; 
    myPaveFiller : PPaveFiller from BOPAlgo is protected;  
    myDS         : PDS from BOPDS is protected; 
-    myContext    : Context from BOPInt is protected;   
+    myContext    : Context from IntTools is protected;   
    myEntryPoint : Integer from Standard is protected;
    -- 
    myImages     : DataMapOfShapeListOfShape from BOPCol is protected;  
--- a/src/BOPAlgo/BOPAlgo_BuilderArea.cdl
+++ b/src/BOPAlgo/BOPAlgo_BuilderArea.cdl
@@ -16,66 +16,64 @@
 -- commercial license or contractual agreement.

 deferred class BuilderArea from BOPAlgo 
-    	inherits Algo from BOPAlgo 
-	 
-	---Purpose: The root class for algorithms to build  
-    	--          faces/solids from set of edges/faces  
+     inherits Algo from BOPAlgo 
+  
+ ---Purpose: The root class for algorithms to build  
+     --          faces/solids from set of edges/faces  

 uses 
    Shape from TopoDS, 
    BaseAllocator from BOPCol, 
    ListOfShape from BOPCol,
    MapOfOrientedShape from BOPCol, 
-    Context  from BOPInt 
+    Context  from IntTools 
    
 --raises

 is 
    Initialize  
-    	returns BuilderArea from BOPAlgo; 
+     returns BuilderArea from BOPAlgo; 
    ---C++: alias "Standard_EXPORT virtual ~BOPAlgo_BuilderArea();"  
     
    Initialize(theAllocator: BaseAllocator from BOPCol)   
-    	returns BuilderArea from BOPAlgo; 
+     returns BuilderArea from BOPAlgo; 
     
    SetContext(me:out; 
-    	    theContext:Context from BOPInt);  
-    	
+         theContext:Context from IntTools);  
+     
    Shapes(me) 
-    	returns ListOfShape from BOPCol;   
+     returns ListOfShape from BOPCol;   
    ---C++:  return const &   
    ---C++: alias "Standard_EXPORT void SetShapes(const BOPCol_ListOfShape& theLS);"  
    
    Loops(me)  
-    	returns ListOfShape from BOPCol; 
+     returns ListOfShape from BOPCol; 
    ---C++:  return const &   
     
    Areas(me) 
-    	returns ListOfShape from BOPCol; 
+     returns ListOfShape from BOPCol; 
    ---C++:  return const &     
     
    PerformShapesToAvoid(me:out) 
-    	is deferred protected; 
-	 
+     is deferred protected; 
+  
    PerformLoops(me:out) 
-    	is deferred protected;  
-	 
+     is deferred protected;  
+  
    PerformAreas(me:out)   
-    	is deferred protected;  
+     is deferred protected;  

    PerformInternalShapes(me:out)   
-    	is deferred protected;  
+     is deferred protected;  

 fields  
-    myContext        :  Context from BOPInt is protected; 
+    myContext        :  Context from IntTools is protected; 
    myShapes         :  ListOfShape from BOPCol is protected;  
    myLoops          :  ListOfShape from BOPCol is protected;  
    myLoopsInternal  :  ListOfShape from BOPCol is protected;
    
    myAreas          :  ListOfShape from BOPCol is protected;  
    myShapesToAvoid  :  MapOfOrientedShape from BOPCol is protected;  
-    --
-       	 
-
+ 
 end BuilderArea; 

--- a/src/BOPAlgo/BOPAlgo_BuilderArea.cxx
+++ b/src/BOPAlgo/BOPAlgo_BuilderArea.cxx
@@ -25,10 +25,9 @@
 //function : 
 //purpose  : 
 //=======================================================================
-  BOPAlgo_BuilderArea::BOPAlgo_BuilderArea()
+BOPAlgo_BuilderArea::BOPAlgo_BuilderArea()
 :
  BOPAlgo_Algo(),
-  //myContext(NULL),
  myShapes(myAllocator),
  myLoops(myAllocator),
  myLoopsInternal(myAllocator),
@@ -40,10 +39,10 @@
 //function : 
 //purpose  : 
 //=======================================================================
-  BOPAlgo_BuilderArea::BOPAlgo_BuilderArea(const Handle(NCollection_BaseAllocator)& theAllocator)
+BOPAlgo_BuilderArea::BOPAlgo_BuilderArea
+  (const Handle(NCollection_BaseAllocator)& theAllocator)
 :
  BOPAlgo_Algo(theAllocator),
-  //myContext(NULL),
  myShapes(myAllocator),
  myLoops(myAllocator),
  myLoopsInternal(myAllocator),
@@ -55,14 +54,15 @@
 //function : ~
 //purpose  : 
 //=======================================================================
-  BOPAlgo_BuilderArea::~BOPAlgo_BuilderArea()
+BOPAlgo_BuilderArea::~BOPAlgo_BuilderArea()
 {
 }
 //=======================================================================
 //function : SetContext
 //purpose  : 
 //=======================================================================
-  void BOPAlgo_BuilderArea::SetContext(const Handle(BOPInt_Context)& theContext)
+void BOPAlgo_BuilderArea::SetContext
+  (const Handle(IntTools_Context)& theContext)
 {
  myContext=theContext;
 }
@@ -85,7 +85,7 @@
 //function : Shapes
 //purpose  : 
 //=======================================================================
-  const BOPCol_ListOfShape& BOPAlgo_BuilderArea::Shapes()const
+const BOPCol_ListOfShape& BOPAlgo_BuilderArea::Shapes()const
 {
  return myShapes;
 }
@@ -93,7 +93,7 @@
 //function : Loops
 //purpose  : 
 //=======================================================================
-  const BOPCol_ListOfShape& BOPAlgo_BuilderArea::Loops()const
+const BOPCol_ListOfShape& BOPAlgo_BuilderArea::Loops()const
 {
  return myLoops;
 }
@@ -105,33 +105,3 @@
 {
  return myAreas;
 }
-/*
-//=======================================================================
-//function :PerformShapesToAvoid
-//purpose  : 
-//=======================================================================
-  void BOPAlgo_BuilderArea::PerformShapesToAvoid()
-{
-}
-//=======================================================================
-//function : PerformLoops
-//purpose  : 
-//=======================================================================
-  void BOPAlgo_BuilderArea::PerformLoops()
-{
-}
-//=======================================================================
-//function : PerformAreas
-//purpose  : 
-//=======================================================================
-  void BOPAlgo_BuilderArea::PerformAreas()
-{
-}
-//=======================================================================
-//function : PerformInternalShapes
-//purpose  : 
-//=======================================================================
-  void BOPAlgo_BuilderArea::PerformInternalShapes()
-{
-}
-*/
--- a/src/BOPAlgo/BOPAlgo_BuilderFace.cxx
+++ b/src/BOPAlgo/BOPAlgo_BuilderFace.cxx
@@ -44,7 +44,7 @@
 #include <TopExp_Explorer.hxx>

 #include <IntTools_FClass2d.hxx>
-#include <BOPInt_Context.hxx>
+#include <IntTools_Context.hxx>

 //
 #include <BOPTools_AlgoTools.hxx>
@@ -67,13 +67,13 @@ static
 static 
  Standard_Boolean IsInside(const TopoDS_Shape& ,
                            const TopoDS_Shape& ,
-                            Handle(BOPInt_Context)& );
+                            Handle(IntTools_Context)& );
 static
  void MakeInternalWires(const BOPCol_MapOfShape& ,
                         BOPCol_ListOfShape& );
 static 
  void GetWire(const TopoDS_Shape& , 
-	       TopoDS_Shape& ); 
+        TopoDS_Shape& ); 
 //
 #include <NCollection_UBTreeFiller.hxx>
 #include <BOPCol_Box2DBndTree.hxx>
@@ -199,7 +199,7 @@ void BOPAlgo_BuilderFace::CheckData()
    return;
  }
  if (myContext.IsNull()) {
-    myContext = new BOPInt_Context;
+    myContext = new IntTools_Context;
  }
 }
 //=======================================================================
@@ -261,9 +261,6 @@ void BOPAlgo_BuilderFace::PerformShapesToAvoid()
      if (!myShapesToAvoid.Contains(aE)) {
        BOPTools::MapShapesAndAncestors(aE, TopAbs_VERTEX, TopAbs_EDGE, aMVE);
      }
-      //else {
-	//int a=0;
-      //}
    }
    aNbV=aMVE.Extent();
    //
@@ -393,7 +390,10 @@ void BOPAlgo_BuilderFace::PerformLoops()
  aItM.Initialize(myShapesToAvoid);
  for (; aItM.More(); aItM.Next()) {
    const TopoDS_Shape& aEE=aItM.Key();
-    BOPTools::MapShapesAndAncestors(aEE, TopAbs_VERTEX, TopAbs_EDGE, aVEMap);
+    BOPTools::MapShapesAndAncestors(aEE, 
+                                    TopAbs_VERTEX, 
+                                    TopAbs_EDGE, 
+                                    aVEMap);
  }
  //
  bFlag=Standard_True;
@@ -492,11 +492,11 @@ void BOPAlgo_BuilderFace::PerformAreas()
      bIsHole=aClsf.IsHole();
      if (bIsHole) {
        BOPTools::MapShapes(aWire, TopAbs_EDGE, aMHE);
-	//
-	bIsHole=Standard_True;
+          //
+          bIsHole=Standard_True;
      }
      else {
-	bIsHole=Standard_False;
+        bIsHole=Standard_False;
      }
    }
    //
@@ -557,8 +557,8 @@ void BOPAlgo_BuilderFace::PerformAreas()
      }
      //
      if (aInOutMap.IsBound (aHole)){
-	const TopoDS_Shape& aF2=aInOutMap(aHole);
-	if (IsInside(aF, aF2, myContext)) {
+        const TopoDS_Shape& aF2=aInOutMap(aHole);
+        if (IsInside(aF, aF2, myContext)) {
          aInOutMap.UnBind(aHole);
          aInOutMap.Bind (aHole, aF);
        }
@@ -769,7 +769,7 @@ void MakeInternalWires(const BOPCol_MapOfShape& theME,
 //=======================================================================
 Standard_Boolean IsInside(const TopoDS_Shape& theHole,
                          const TopoDS_Shape& theF2,
-                          Handle(BOPInt_Context)& theContext)
+                          Handle(IntTools_Context)& theContext)
 {
  Standard_Boolean bRet;
  Standard_Real aT, aU, aV;
--- a/src/BOPAlgo/BOPAlgo_BuilderSolid.cxx
+++ b/src/BOPAlgo/BOPAlgo_BuilderSolid.cxx
@@ -66,7 +66,7 @@
 #include <BOPTools_CoupleOfShape.hxx>
 #include <BOPTools_AlgoTools.hxx>
 //
-#include <BOPInt_Context.hxx>
+#include <IntTools_Context.hxx>
 //
 #include <BOPAlgo_ShellSplitter.hxx>

@@ -75,11 +75,11 @@ static
                                 const BOPCol_IndexedMapOfShape& );
 static
  Standard_Boolean IsHole(const TopoDS_Shape& ,
-                          Handle(BOPInt_Context)& );
+                          Handle(IntTools_Context)& );
 static
  Standard_Boolean IsInside(const TopoDS_Shape& ,
                            const TopoDS_Shape& ,
-                            Handle(BOPInt_Context)& );
+                            Handle(IntTools_Context)& );
 static
  void MakeInternalShells(const BOPCol_MapOfShape& ,
                          BOPCol_ListOfShape& );
@@ -185,7 +185,7 @@ void BOPAlgo_BuilderSolid::Perform()
  myErrorStatus=0;
  //
  if (myContext.IsNull()) {
-    myContext=new BOPInt_Context;
+    myContext=new IntTools_Context;
  }
  //
  TopoDS_Compound aC;
@@ -381,8 +381,8 @@ void BOPAlgo_BuilderSolid::PerformLoops()
  for (; aItM.More(); aItM.Next()) {
    const TopoDS_Shape& aFF=aItM.Key();
    BOPTools::MapShapesAndAncestors(aFF, 
-				    TopAbs_EDGE, TopAbs_FACE, 
-				    aEFMap);
+        TopAbs_EDGE, TopAbs_FACE, 
+        aEFMap);
  }
  //
  aItM.Initialize(myShapesToAvoid);
@@ -472,7 +472,7 @@ void BOPAlgo_BuilderSolid::PerformAreas()
      if (bIsHole) {
        aHoleShells.Append(aShell);
        BOPTools::MapShapes(aShell, TopAbs_FACE, aMHF);
-	aSB.SetShape(aShell);
+        aSB.SetShape(aShell);
      }
      else {
        // make a growth solid from a shell
@@ -480,7 +480,7 @@ void BOPAlgo_BuilderSolid::PerformAreas()
        aBB.Add (aSolid, aShell);
        //
        aNewSolids.Append (aSolid);
-	aSB.SetShape(aSolid);
+        aSB.SetShape(aSolid);
      }
    }
    //
@@ -537,8 +537,8 @@ void BOPAlgo_BuilderSolid::PerformAreas()
      }
      //
      if (aInOutMap.IsBound (aHole)){
-	const TopoDS_Shape& aHole2=aInOutMap(aHole);
-	if (IsInside(aHole, aHole2, myContext)) {
+        const TopoDS_Shape& aHole2=aInOutMap(aHole);
+        if (IsInside(aHole, aHole2, myContext)) {
          aInOutMap.UnBind(aHole);
          aInOutMap.Bind (aHole, aSolid);
        }
@@ -657,8 +657,8 @@ void BOPAlgo_BuilderSolid::PerformInternalShapes()
    }
    aMEF.Clear();
    BOPTools::MapShapesAndAncestors(aSolid, 
-				    TopAbs_EDGE, TopAbs_FACE, 
-				    aMEF);
+        TopAbs_EDGE, TopAbs_FACE, 
+        aMEF);
    //
    // 2.1 Separate faces to process aMFP
    aMFP.Clear();
@@ -667,10 +667,10 @@ void BOPAlgo_BuilderSolid::PerformInternalShapes()
      const TopoDS_Face& aF=(*(TopoDS_Face*)(&aItMF.Key()));
      if (!aMFx.Contains(aF)) {
        if (BOPTools_AlgoTools::IsInternalFace(aF, 
-					       aSolid, 
-					       aMEF, 
-					       1.e-14, 
-					       myContext)) {
+            aSolid, 
+            aMEF, 
+            1.e-14, 
+            myContext)) {
          aMFP.Add(aF);
        }
      }
@@ -732,8 +732,8 @@ void MakeInternalShells(const BOPCol_MapOfShape& theMF,
  for (; aItM.More(); aItM.Next()) {
    const TopoDS_Shape& aF=aItM.Key();
    BOPTools::MapShapesAndAncestors(aF, 
-				    TopAbs_EDGE, TopAbs_FACE, 
-				    aMEF);
+        TopAbs_EDGE, TopAbs_FACE, 
+        aMEF);
  }
  //
  aItM.Initialize(theMF);
@@ -775,7 +775,7 @@ void MakeInternalShells(const BOPCol_MapOfShape& theMF,
 //purpose  : 
 //=======================================================================
 Standard_Boolean IsHole(const TopoDS_Shape& theS2,
-                        Handle(BOPInt_Context)& theContext)
+                        Handle(IntTools_Context)& theContext)
 {
  TopoDS_Solid *pS2=(TopoDS_Solid *)&theS2;
  BRepClass3d_SolidClassifier& aClsf=theContext->SolidClassifier(*pS2);
@@ -790,7 +790,7 @@ Standard_Boolean IsHole(const TopoDS_Shape& theS2,
 //=======================================================================
 Standard_Boolean IsInside(const TopoDS_Shape& theS1,
                          const TopoDS_Shape& theS2,
-                          Handle(BOPInt_Context)& theContext)
+                          Handle(IntTools_Context)& theContext)
 {
  TopExp_Explorer aExp;
  TopAbs_State aState;
@@ -808,7 +808,7 @@ Standard_Boolean IsInside(const TopoDS_Shape& theS1,
    BOPTools::MapShapes(*pS2, TopAbs_EDGE, aBounds);
    const TopoDS_Face& aF = (*(TopoDS_Face*)(&aExp.Current()));
    aState=BOPTools_AlgoTools::ComputeState(aF, *pS2, 1.e-14, 
-					    aBounds, theContext);
+                                            aBounds, theContext);
  }
  return (aState==TopAbs_IN);
 }
--- a/src/BOPAlgo/BOPAlgo_Builder_2.cxx
+++ b/src/BOPAlgo/BOPAlgo_Builder_2.cxx
@@ -38,7 +38,7 @@
 #include <BOPCol_NCVector.hxx>
 #include <BOPCol_TBB.hxx>
 //
-#include <BOPInt_Context.hxx>
+#include <IntTools_Context.hxx>
 //
 #include <BOPDS_PaveBlock.hxx>
 #include <BOPDS_ShapeInfo.hxx>
@@ -132,9 +132,9 @@ class BOPAlgo_BuilderSDFaceFunctor {
  void operator()( const flexible_range<Standard_Integer>& aBR ) const {
    Standard_Boolean bFlag;
    Standard_Integer i, iBeg, iEnd;
-    Handle(BOPInt_Context) aContext;
+    Handle(IntTools_Context) aContext;
    //
-    aContext=new BOPInt_Context;
+    aContext=new IntTools_Context;
    //
    BOPAlgo_VectorOfPairOfShapeBoolean& aVPSB=*myPVPSB;
    //
@@ -223,11 +223,11 @@ class BOPAlgo_VFI {
    return myFlag;
  }
  //
-  void SetContext(const Handle(BOPInt_Context)& aContext) {
+  void SetContext(const Handle(IntTools_Context)& aContext) {
    myContext=aContext;
  }
  //
-  const Handle(BOPInt_Context)& Context()const {
+  const Handle(IntTools_Context)& Context()const {
    return myContext;
  }
  //
@@ -241,7 +241,7 @@ class BOPAlgo_VFI {
  Standard_Integer myFlag;
  TopoDS_Vertex myV;
  TopoDS_Face myF;
-  Handle(BOPInt_Context) myContext;
+  Handle(IntTools_Context) myContext;
 };
 //
 typedef BOPCol_NCVector<BOPAlgo_VFI> BOPAlgo_VectorOfVFI; 
@@ -249,13 +249,13 @@ typedef BOPCol_NCVector<BOPAlgo_VFI> BOPAlgo_VectorOfVFI;
 typedef BOPCol_TBBContextFunctor 
  <BOPAlgo_VFI,
  BOPAlgo_VectorOfVFI,
-  Handle(BOPInt_Context), 
-  BOPInt_Context> BOPAlgo_VFIFunctor;
+  Handle(IntTools_Context), 
+  IntTools_Context> BOPAlgo_VFIFunctor;
 //
 typedef BOPCol_TBBContextCnt 
  <BOPAlgo_VFIFunctor,
  BOPAlgo_VectorOfVFI,
-  Handle(BOPInt_Context)> BOPAlgo_VFICnt;
+  Handle(IntTools_Context)> BOPAlgo_VFICnt;
 //
 //=======================================================================
 //function : FillImagesFaces
--- a/src/BOPAlgo/BOPAlgo_Builder_3.cxx
+++ b/src/BOPAlgo/BOPAlgo_Builder_3.cxx
@@ -52,7 +52,7 @@
 #include <BOPCol_NCVector.hxx>
 #include <BOPCol_TBB.hxx>
 //
-#include <BOPInt_Context.hxx>
+#include <IntTools_Context.hxx>
 //
 #include <BOPDS_DS.hxx>
 #include <BOPDS_ShapeInfo.hxx>
@@ -434,9 +434,8 @@ void BOPAlgo_Builder::BuildDraftSolid(const TopoDS_Shape& theSolid,
              theLIF.Append(aFSDx);
            }
            else {
-              bToReverse=BOPTools_AlgoTools::IsSplitToReverse(aFSDx, 
-	 aF, 
-	 myContext); 
+              bToReverse=BOPTools_AlgoTools::IsSplitToReverse
+                (aFSDx, aF, myContext); 
              if (bToReverse) {
                aFSDx.Reverse();
              }
--- a/src/BOPAlgo/BOPAlgo_CheckerSI.cxx
+++ b/src/BOPAlgo/BOPAlgo_CheckerSI.cxx
@@ -39,7 +39,7 @@
 #include <BOPDS_VectorOfInterfEF.hxx>
 #include <BOPDS_VectorOfInterfFF.hxx>

-#include <BOPInt_Context.hxx>
+#include <IntTools_Context.hxx>

 #include <BOPTools.hxx>
 #include <BOPTools_AlgoTools.hxx>
@@ -115,7 +115,7 @@ void BOPAlgo_CheckerSI::Init()
  myIterator=theIterSI;
  //
  // 3 myContext
-  myContext=new BOPInt_Context;
+  myContext=new IntTools_Context;
  //
  myErrorStatus=0;
 }
--- a/src/BOPAlgo/BOPAlgo_CheckerSI_1.cxx
+++ b/src/BOPAlgo/BOPAlgo_CheckerSI_1.cxx
@@ -20,7 +20,7 @@

 #include <BOPDS_DS.hxx>
 #include <BOPDS_IteratorSI.hxx>
-#include <BOPInt_Context.hxx>
+#include <IntTools_Context.hxx>

 #include <BOPDS_Interf.hxx>
 #include <TopoDS_Solid.hxx>
--- a/src/BOPAlgo/BOPAlgo_PaveFiller.cdl
+++ b/src/BOPAlgo/BOPAlgo_PaveFiller.cdl
@@ -38,7 +38,7 @@ uses
    DataMapOfIntegerReal from BOPCol, 
    DataMapOfIntegerInteger from BOPCol,
    --  
-    Context from BOPInt,
+    Context from IntTools,
    -- 
    SectionAttribute from BOPAlgo, 
    
@@ -68,7 +68,7 @@ is
     
    Create (theAllocator: BaseAllocator from BOPCol) 
      returns PaveFiller from BOPAlgo;   
-	
+ 
    DS(me:out) 
      returns DS from BOPDS; 
    ---C++:return  const &   
@@ -87,7 +87,7 @@ is
    ---C++: alias "Standard_EXPORT void SetArguments(const BOPCol_ListOfShape& theLS);" 

    Context(me:out) 
-      returns Context from BOPInt;  
+      returns Context from IntTools;  
       
    SetSectionAttribute(me:out; 
        theSecAttr : SectionAttribute from BOPAlgo); 
@@ -114,10 +114,10 @@ is
     
    PerformVF(me:out) 
      is virtual protected;  
-	 
+  
    PerformEE(me:out) 
      is virtual protected; 
-	  
+   
    PerformEF(me:out) 
      is virtual protected; 
     
@@ -133,10 +133,10 @@ is
        
    MakeBlocks(me:out) 
      is protected; 
-	 
+  
    MakePCurves(me:out) 
      is protected; 
-	 
+  
    ProcessDE(me:out) 
      is protected;  
       
@@ -147,14 +147,14 @@ is
    FillShrunkData(me:out; 
        theType1: ShapeEnum from TopAbs; 
        theType2: ShapeEnum from TopAbs) 
-      is protected; 	 
+      is protected;   
 
    PerformVerticesEE(me:out; 
        theMVCPB:out IndexedDataMapOfShapeCoupleOfPaveBlocks from BOPDS; 
        theAllocator:out BaseAllocator from BOPCol) 
      returns Integer from Standard 
      is protected; 
-	 
+  
    PerformVerticesEF(me:out; 
        theMVCPB:out IndexedDataMapOfShapeCoupleOfPaveBlocks from BOPDS; 
        theAllocator:out BaseAllocator from BOPCol) 
@@ -166,14 +166,14 @@ is
        theMIF:MapOfInteger from BOPCol) 
      returns Boolean from Standard 
      is protected;  
-	  
+   
    CheckFacePaves(myclass; 
        theN:Integer from Standard; 
        theMIFOn:MapOfInteger from BOPCol; 
        theMIFIn:MapOfInteger from BOPCol) 
      returns Boolean from Standard 
      is protected;  
-	 
+  
    IsExistingVertex(me; 
        theP:Pnt from gp; 
        theTol:Real from Standard; 
@@ -210,7 +210,7 @@ is
    -- 1 - checks only EE; 
    -- 2 - checks only EF;
    -- other - checks both types of intersections.
-	 
+  
    PutBoundPaveOnCurve(me:out;  
        theF1: Face from TopoDS;  
        theF2: Face from TopoDS;  
@@ -263,12 +263,12 @@ is
        theLPB: ListOfPaveBlock from BOPDS; 
        thePB: PaveBlock from BOPDS) 
      is protected; 
-	 
+  
    MakeSplitEdge(me:out;  
        theV:Integer from Standard; 
        theF:Integer from Standard) 
      is protected;  
-    	 
+      
    GetEFPnts(me:out;
        nF1 : Integer from Standard;
        nF2 : Integer from Standard;
@@ -348,7 +348,7 @@ is
        theMVB     : MapOfInteger from BOPCol; 
        theMPB     : out MapOfPaveBlock from BOPDS)
      is  protected; 
-    ---Purpose: 	     
+    ---Purpose:       
    -- Adds the existing edges from the map <theMPBOnIn> which interfere  
    -- with the vertices from <theMVB> map to the post treatment of section edges.
 
@@ -449,7 +449,7 @@ fields
    myArguments   : ListOfShape from BOPCol is protected;  
    myDS          : PDS from BOPDS is protected; 
    myIterator    : PIterator from BOPDS is protected; 
-    myContext     : Context from BOPInt is protected;   
+    myContext     : Context from IntTools is protected;   
    mySectionAttribute : SectionAttribute from BOPAlgo is protected;

 end PaveFiller;
--- a/src/BOPAlgo/BOPAlgo_PaveFiller.cxx
+++ b/src/BOPAlgo/BOPAlgo_PaveFiller.cxx
@@ -22,7 +22,7 @@

 #include <NCollection_BaseAllocator.hxx>

-#include <BOPInt_Context.hxx>
+#include <IntTools_Context.hxx>
 #include <BOPDS_DS.hxx>
 #include <BOPDS_Iterator.hxx>

@@ -93,7 +93,7 @@ BOPDS_PDS BOPAlgo_PaveFiller::PDS()
 //function : Context
 //purpose  : 
 //=======================================================================
-Handle(BOPInt_Context) BOPAlgo_PaveFiller::Context()
+Handle(IntTools_Context) BOPAlgo_PaveFiller::Context()
 {
  return myContext;
 }
@@ -150,7 +150,7 @@ void BOPAlgo_PaveFiller::Init()
  myIterator->Prepare();
  //
  // 3 myContext
-  myContext=new BOPInt_Context;
+  myContext=new IntTools_Context;
  //
  myErrorStatus=0;
 }
--- a/src/BOPAlgo/BOPAlgo_PaveFiller_2.cxx
+++ b/src/BOPAlgo/BOPAlgo_PaveFiller_2.cxx
@@ -24,7 +24,7 @@
 #include <BOPCol_NCVector.hxx>
 #include <BOPCol_TBB.hxx>

-#include <BOPInt_Context.hxx>
+#include <IntTools_Context.hxx>

 #include <BOPDS_Iterator.hxx>
 #include <BOPDS_VectorOfInterfVE.hxx>
@@ -87,11 +87,11 @@ class BOPAlgo_VertexEdge {
    return myT;
  }
  //
-  void SetContext(const Handle(BOPInt_Context)& aContext) {
+  void SetContext(const Handle(IntTools_Context)& aContext) {
    myContext=aContext;
  }
  //
-  const Handle(BOPInt_Context)& Context()const {
+  const Handle(IntTools_Context)& Context()const {
    return myContext;
  }
  //
@@ -107,7 +107,7 @@ class BOPAlgo_VertexEdge {
  Standard_Real myT;
  TopoDS_Vertex myV;
  TopoDS_Edge myE;
-  Handle(BOPInt_Context) myContext;
+  Handle(IntTools_Context) myContext;
 };
 //=======================================================================
 typedef BOPCol_NCVector
@@ -116,13 +116,13 @@ typedef BOPCol_NCVector
 typedef BOPCol_TBBContextFunctor 
  <BOPAlgo_VertexEdge,
  BOPAlgo_VectorOfVertexEdge,
-  Handle(BOPInt_Context), 
-  BOPInt_Context> BOPAlgo_VertexEdgeFunctor;
+  Handle(IntTools_Context), 
+  IntTools_Context> BOPAlgo_VertexEdgeFunctor;
 //
 typedef BOPCol_TBBContextCnt 
  <BOPAlgo_VertexEdgeFunctor,
  BOPAlgo_VectorOfVertexEdge,
-  Handle(BOPInt_Context)> BOPAlgo_VertexEdgeCnt;
+  Handle(IntTools_Context)> BOPAlgo_VertexEdgeCnt;
 //
 //=======================================================================
 // function: PerformVE
--- a/src/BOPAlgo/BOPAlgo_PaveFiller_3.cxx
+++ b/src/BOPAlgo/BOPAlgo_PaveFiller_3.cxx
@@ -49,9 +49,9 @@
 #include <BOPCol_NCVector.hxx>
 #include <BOPCol_TBB.hxx>
 //
-#include <BOPInt_Context.hxx>
-#include <BOPInt_ShrunkRange.hxx>
-#include <BOPInt_Tools.hxx>
+#include <IntTools_Context.hxx>
+#include <IntTools_ShrunkRange.hxx>
+#include <IntTools_Tools.hxx>
 //
 #include <BOPDS_DataMapOfPaveBlockListOfPaveBlock.hxx>
 #include <BOPDS_MapOfPaveBlock.hxx>
@@ -216,11 +216,11 @@ class BOPAlgo_PVE {
    return myT;
  }
  //
-  void SetContext(const Handle(BOPInt_Context)& aContext) {
+  void SetContext(const Handle(IntTools_Context)& aContext) {
    myContext=aContext;
  }
  //
-  const Handle(BOPInt_Context)& Context()const {
+  const Handle(IntTools_Context)& Context()const {
    return myContext;
  }
  //
@@ -236,7 +236,7 @@ class BOPAlgo_PVE {
  TopoDS_Vertex myV;
  TopoDS_Edge myE;
  Handle(BOPDS_PaveBlock) myPB;
-  Handle(BOPInt_Context) myContext;
+  Handle(IntTools_Context) myContext;
 };
 //=======================================================================
 typedef BOPCol_NCVector
@@ -245,13 +245,13 @@ typedef BOPCol_NCVector
 typedef BOPCol_TBBContextFunctor 
  <BOPAlgo_PVE,
  BOPAlgo_VectorOfPVE,
-  Handle(BOPInt_Context), 
-  BOPInt_Context> BOPAlgo_PVEFunctor;
+  Handle(IntTools_Context), 
+  IntTools_Context> BOPAlgo_PVEFunctor;
 //
 typedef BOPCol_TBBContextCnt 
  <BOPAlgo_PVEFunctor,
  BOPAlgo_VectorOfPVE,
-  Handle(BOPInt_Context)> BOPAlgo_PVECnt;
+  Handle(IntTools_Context)> BOPAlgo_PVECnt;
 /////////////////////////////////////////////////////////////////////////
 //=======================================================================
 // function: PerformEE
@@ -394,20 +394,20 @@ void BOPAlgo_PaveFiller::PerformEE()
          TopoDS_Vertex aVnew;
          IntTools_Range aCR1, aCR2;
          //
-          BOPInt_Tools::VertexParameters(aCPart, aT1, aT2);
+          IntTools_Tools::VertexParameters(aCPart, aT1, aT2);
          aTol = Precision::Confusion();
          aCR1 = aCPart.Range1();
          aCR2 = aCPart.Ranges2()(1);
          // 
          //decide to keep the pave or not
-          bIsOnPave[0] = BOPInt_Tools::IsOnPave1(aT1, aR11, aTol) ||
-            BOPInt_Tools::IsOnPave1(aR11.First(), aCR1, aTol);
-          bIsOnPave[1] = BOPInt_Tools::IsOnPave1(aT1, aR12, aTol) || 
-            BOPInt_Tools::IsOnPave1(aR12.Last(), aCR1, aTol);
-          bIsOnPave[2] = BOPInt_Tools::IsOnPave1(aT2, aR21, aTol) ||
-            BOPInt_Tools::IsOnPave1(aR21.First(), aCR2, aTol);
-          bIsOnPave[3] = BOPInt_Tools::IsOnPave1(aT2, aR22, aTol) ||
-            BOPInt_Tools::IsOnPave1(aR22.Last(), aCR2, aTol);
+          bIsOnPave[0] = IntTools_Tools::IsOnPave1(aT1, aR11, aTol) ||
+            IntTools_Tools::IsOnPave1(aR11.First(), aCR1, aTol);
+          bIsOnPave[1] = IntTools_Tools::IsOnPave1(aT1, aR12, aTol) || 
+            IntTools_Tools::IsOnPave1(aR12.Last(), aCR1, aTol);
+          bIsOnPave[2] = IntTools_Tools::IsOnPave1(aT2, aR21, aTol) ||
+            IntTools_Tools::IsOnPave1(aR21.First(), aCR2, aTol);
+          bIsOnPave[3] = IntTools_Tools::IsOnPave1(aT2, aR22, aTol) ||
+            IntTools_Tools::IsOnPave1(aR22.Last(), aCR2, aTol);
          //
          aPB1->Indices(nV[0], nV[1]);
          aPB2->Indices(nV[2], nV[3]);
@@ -824,7 +824,7 @@ void BOPAlgo_PaveFiller::FillShrunkData(Handle(BOPDS_PaveBlock)& thePB)
 {
  Standard_Integer nE, nV1, nV2, iErr;
  Standard_Real aT1, aT2, aTS1, aTS2;
-  BOPInt_ShrunkRange aSR;
+  IntTools_ShrunkRange aSR;
  //
  myErrorStatus=0;
  myWarningStatus = 0;
--- a/src/BOPAlgo/BOPAlgo_PaveFiller_4.cxx
+++ b/src/BOPAlgo/BOPAlgo_PaveFiller_4.cxx
@@ -29,7 +29,7 @@
 #include <BOPCol_NCVector.hxx>
 #include <BOPCol_TBB.hxx>
 //
-#include <BOPInt_Context.hxx>
+#include <IntTools_Context.hxx>
 //
 #include <BOPDS_Iterator.hxx>
 #include <BOPDS_VectorOfInterfVF.hxx>
@@ -94,11 +94,11 @@ class BOPAlgo_VertexFace {
    aT2=myT2;
  }
  //
-  void SetContext(const Handle(BOPInt_Context)& aContext) {
+  void SetContext(const Handle(IntTools_Context)& aContext) {
    myContext=aContext;
  }
  //
-  const Handle(BOPInt_Context)& Context()const {
+  const Handle(IntTools_Context)& Context()const {
    return myContext;
  }
  //
@@ -115,7 +115,7 @@ class BOPAlgo_VertexFace {
  Standard_Real myT2;
  TopoDS_Vertex myV;
  TopoDS_Face myF;
-  Handle(BOPInt_Context) myContext;
+  Handle(IntTools_Context) myContext;
 };
 //=======================================================================
 typedef BOPCol_NCVector<BOPAlgo_VertexFace>
@@ -124,13 +124,13 @@ typedef BOPCol_NCVector<BOPAlgo_VertexFace>
 typedef BOPCol_TBBContextFunctor 
  <BOPAlgo_VertexFace,
  BOPAlgo_VectorOfVertexFace,
-  Handle(BOPInt_Context), 
-  BOPInt_Context> BOPAlgo_VertexFaceFunctor;
+  Handle(IntTools_Context), 
+  IntTools_Context> BOPAlgo_VertexFaceFunctor;
 //
 typedef BOPCol_TBBContextCnt 
  <BOPAlgo_VertexFaceFunctor,
  BOPAlgo_VectorOfVertexFace,
-  Handle(BOPInt_Context)> BOPAlgo_VertexFaceCnt;
+  Handle(IntTools_Context)> BOPAlgo_VertexFaceCnt;
 //
 //=======================================================================
 // function: PerformVF
--- a/src/BOPAlgo/BOPAlgo_PaveFiller_5.cxx
+++ b/src/BOPAlgo/BOPAlgo_PaveFiller_5.cxx
@@ -40,8 +40,8 @@
 #include <BOPCol_NCVector.hxx>
 #include <BOPCol_TBB.hxx>
 //
-#include <BOPInt_Context.hxx>
-#include <BOPInt_Tools.hxx>
+#include <IntTools_Context.hxx>
+#include <IntTools_Tools.hxx>
 //
 #include <BOPDS_Interf.hxx>
 #include <BOPDS_Iterator.hxx>
@@ -110,13 +110,13 @@ typedef BOPCol_NCVector<BOPAlgo_EdgeFace> BOPAlgo_VectorOfEdgeFace;
 typedef BOPCol_TBBContextFunctor 
  <BOPAlgo_EdgeFace,
  BOPAlgo_VectorOfEdgeFace,
-  Handle(BOPInt_Context), 
-  BOPInt_Context> BOPAlgo_EdgeFaceFunctor;
+  Handle(IntTools_Context), 
+  IntTools_Context> BOPAlgo_EdgeFaceFunctor;
 //
 typedef BOPCol_TBBContextCnt 
  <BOPAlgo_EdgeFaceFunctor,
  BOPAlgo_VectorOfEdgeFace,
-  Handle(BOPInt_Context)> BOPAlgo_EdgeFaceCnt;
+  Handle(IntTools_Context)> BOPAlgo_EdgeFaceCnt;
 //
 //=======================================================================
 //function : PerformEF
@@ -270,7 +270,7 @@ void BOPAlgo_PaveFiller::PerformEF()
          Standard_Real aT, aTolToDecide; 
          TopoDS_Vertex aVnew;
          //
-          BOPInt_Tools::VertexParameter(aCPart, aT);
+          IntTools_Tools::VertexParameter(aCPart, aT);
          BOPTools_AlgoTools::MakeNewVertex(aE, aT, aF, aVnew);
          //
          const IntTools_Range& aR=aCPart.Range1();
@@ -278,8 +278,8 @@ void BOPAlgo_PaveFiller::PerformEF()
          //
          IntTools_Range aR1(aT1,anewSR.First()),aR2(anewSR.Last(), aT2);
          //
-          bIsOnPave[0]=BOPInt_Tools::IsInRange(aR1, aR, aTolToDecide); 
-          bIsOnPave[1]=BOPInt_Tools::IsInRange(aR2, aR, aTolToDecide); 
+          bIsOnPave[0]=IntTools_Tools::IsInRange(aR1, aR, aTolToDecide); 
+          bIsOnPave[1]=IntTools_Tools::IsInRange(aR2, aR, aTolToDecide); 
          //
          if (bIsOnPave[0] && bIsOnPave[1]) {
            bV[0]=CheckFacePaves(nV[0], aMIFOn, aMIFIn);
--- a/src/BOPAlgo/BOPAlgo_PaveFiller_6.cxx
+++ b/src/BOPAlgo/BOPAlgo_PaveFiller_6.cxx
@@ -65,8 +65,8 @@
 #include <BOPCol_NCVector.hxx>
 #include <BOPCol_TBB.hxx>

-#include <BOPInt_Context.hxx>
-#include <BOPInt_Tools.hxx>
+#include <IntTools_Context.hxx>
+#include <IntTools_Tools.hxx>

 #include <BOPDS_Interf.hxx>
 #include <BOPDS_Iterator.hxx>
@@ -89,7 +89,7 @@
 #include <BOPAlgo_Tools.hxx>
 #include <BRepBuilderAPI_MakeVertex.hxx>
 #include <TopExp.hxx>
-#include <BOPInt_ShrunkRange.hxx>
+#include <IntTools_ShrunkRange.hxx>
 #include <BOPDS_DataMapOfPaveBlockListOfPaveBlock.hxx>

 static void ToleranceFF(const BRepAdaptor_Surface& aBAS1,
@@ -313,7 +313,7 @@ void BOPAlgo_PaveFiller::PerformFF()
        //
        const IntTools_Curve& aIC=aCvsX(i);
        const Handle(Geom_Curve)& aC3D= aIC.Curve();
-        bValid=BOPInt_Tools::CheckCurve(aC3D, aTolR3D, aBox);
+        bValid=IntTools_Tools::CheckCurve(aC3D, aTolR3D, aBox);
        if (bValid) {
          iC=aVNC.Append()-1;
          BOPDS_Curve& aNC=aVNC(iC);
--- a/src/BOPAlgo/BOPAlgo_PaveFiller_9.cxx
+++ b/src/BOPAlgo/BOPAlgo_PaveFiller_9.cxx
@@ -28,16 +28,16 @@
 #include <BOPDS_Iterator.hxx>
 #include <BOPDS_ListOfPaveBlock.hxx>

-#include <BOPInt_ShrunkRange.hxx>
+#include <IntTools_ShrunkRange.hxx>

 //=======================================================================
 //class    : BOPAlgo_ShrunkRange
 //purpose  : 
 //=======================================================================
-class BOPAlgo_ShrunkRange : public BOPInt_ShrunkRange {
+class BOPAlgo_ShrunkRange : public IntTools_ShrunkRange {
 public:
  BOPAlgo_ShrunkRange() 
-  : BOPInt_ShrunkRange(),
+  : IntTools_ShrunkRange(),
    myWarningStatus(0) {
  }
  //
@@ -56,7 +56,7 @@ class BOPAlgo_ShrunkRange : public BOPInt_ShrunkRange {
    //
    myWarningStatus=0;
    //
-    BOPInt_ShrunkRange::Perform();
+    IntTools_ShrunkRange::Perform();
    if (myErrorStatus) {
      myWarningStatus=1;
    }
@@ -78,13 +78,13 @@ typedef BOPCol_NCVector
 typedef BOPCol_TBBContextFunctor 
  <BOPAlgo_ShrunkRange,
  BOPAlgo_VectorOfShrunkRange,
-  Handle(BOPInt_Context), 
-  BOPInt_Context> BOPAlgo_ShrunkRangeFunctor;
+  Handle(IntTools_Context), 
+  IntTools_Context> BOPAlgo_ShrunkRangeFunctor;
 //
 typedef BOPCol_TBBContextCnt 
  <BOPAlgo_ShrunkRangeFunctor,
  BOPAlgo_VectorOfShrunkRange,
-  Handle(BOPInt_Context)> BOPAlgo_ShrunkRangeCnt;
+  Handle(IntTools_Context)> BOPAlgo_ShrunkRangeCnt;
 //
 //=======================================================================
 // function: FillShrunkData
--- a/src/BOPAlgo/BOPAlgo_ShellSplitter.cxx
+++ b/src/BOPAlgo/BOPAlgo_ShellSplitter.cxx
@@ -32,7 +32,7 @@
 #include <BOPCol_NCVector.hxx>
 #include <BOPCol_IndexedDataMapOfShapeListOfShape.hxx>
 //
-#include <BOPInt_Context.hxx>
+#include <IntTools_Context.hxx>
 //
 #include <BOPTools.hxx>
 #include <BOPTools_AlgoTools.hxx>
@@ -320,7 +320,7 @@ void BOPAlgo_ShellSplitter::SplitBlock(BOPTools_ConnexityBlock& aCB)
  BOPCol_MapOfOrientedShape AddedFacesMap;
  BOPCol_IndexedDataMapOfShapeListOfShape aEFMap, aMEFP;
  // 
-  Handle (BOPInt_Context) aContext=new BOPInt_Context;
+  Handle (IntTools_Context) aContext=new IntTools_Context;
  //
  const BOPCol_ListOfShape& myShapes=aCB.Shapes();
  //