Mantis issue 0021772: EDF 2336 GEOM: Non valid face created from two circles

[modules/geom.git] / src / NMTTools / NMTTools_Tools.cxx

diff --git a/src/NMTTools/NMTTools_Tools.cxx b/src/NMTTools/NMTTools_Tools.cxx
index cdbcc5f06bd6f1890716ec5f46cd7d10b1eedc19..7d06d68c111296151b2e0d4ebc530bcf30463b94 100644 (file)
--- a/src/NMTTools/NMTTools_Tools.cxx
+++ b/src/NMTTools/NMTTools_Tools.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -18,58 +18,61 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 // File:        NMTTools_Tools.cxx
 // Created:     Mon Dec  8 10:35:15 2003
 // Author:      Peter KURNEV
+//              <pkv@irinox>
+//
+#include <NMTTools_Tools.hxx>
 
-#include <NMTTools_Tools.ixx>
+#include <TColStd_IndexedMapOfInteger.hxx>
 
-#include <Basics_OCCTVersion.hxx>
+#include <gp_Pnt.hxx>
+#include <gp_XYZ.hxx>
+#include <gp_Pnt2d.hxx>
 
-#include <NMTTools_ListIteratorOfListOfCoupleOfShape.hxx>
-#include <NMTTools_IndexedDataMapOfShapeIndexedMapOfShape.hxx>
-#include <NMTTools_CoupleOfShape.hxx>
+#include <Geom_Surface.hxx>
+#include <GeomAPI_ProjectPointOnSurf.hxx>
 
 #include <TopoDS.hxx>
 #include <TopoDS_Vertex.hxx>
 #include <TopoDS_Shape.hxx>
 #include <TopoDS_Edge.hxx>
-#include <TopoDS_Iterator.hxx>
 
 #include <TopExp.hxx>
-#include <TopExp_Explorer.hxx>
 
-#include <TopTools_MapOfShape.hxx>
-#include <TopTools_MapIteratorOfMapOfShape.hxx>
-#include <TopTools_IndexedMapOfShape.hxx>
 #include <TopTools_ListIteratorOfListOfShape.hxx>
+#include <TopTools_IndexedMapOfShape.hxx>
 
 #include <BRep_Tool.hxx>
 #include <BRep_Builder.hxx>
 #include <BRepTools.hxx>
-#include <BRepLib.hxx>
 
 #include <BOPTColStd_IndexedDataMapOfIntegerIndexedMapOfInteger.hxx>
 #include <BOPTColStd_IndexedDataMapOfIntegerIndexedMapOfInteger.hxx>
 
 #include <BOPTools_VVInterference.hxx>
 #include <BOPTools_SSInterference.hxx>
+
 #include <BOPTools_Tools2D.hxx>
-#include <BOPTools_Tools3D.hxx>
 #include <BOPTools_Tools.hxx>
-
+#include <NMTTools_ListIteratorOfListOfCoupleOfShape.hxx>
+#include <NMTTools_IndexedDataMapOfShapeIndexedMapOfShape.hxx>
+#include <NMTTools_CoupleOfShape.hxx>
+#include <TopTools_IndexedMapOfShape.hxx>
+#include <Geom2d_Curve.hxx>
 #include <Geom_Curve.hxx>
 #include <Geom_TrimmedCurve.hxx>
-#include <Geom_Surface.hxx>
-#include <GeomAPI_ProjectPointOnSurf.hxx>
-#include <Geom2d_Curve.hxx>
-
-#include <TColStd_IndexedMapOfInteger.hxx>
-
-#include <gp_Pnt.hxx>
-#include <gp_XYZ.hxx>
-#include <gp_Pnt2d.hxx>
+#include <BOPTools_Tools2D.hxx>
+#include <BRepLib.hxx>
+#include <BOPTools_Tools3D.hxx>
+#include <TopExp_Explorer.hxx>
+//
+#include <TopTools_MapOfShape.hxx>
+#include <TopTools_MapIteratorOfMapOfShape.hxx>
+#include <TopoDS_Iterator.hxx>
 
 static
   void ProcessBlock(const Standard_Integer iV,
@@ -114,6 +117,7 @@ static
   void  NMTTools_Tools::MakePCurve(const TopoDS_Edge& aE,
                                     const TopoDS_Face& aF,
                                     const Handle(Geom2d_Curve)& aC2Dx1)
+
 {
   Standard_Real aTolE, aT1, aT2, aOutFirst, aOutLast, aOutTol;
   Handle(Geom2d_Curve) aC2D, aC2DA;
@@ -211,11 +215,7 @@ static
 //=======================================================================
   Standard_Boolean NMTTools_Tools::IsSplitInOnFace(const TopoDS_Edge& aE,
                                                    const TopoDS_Face& aF,
-#if OCC_VERSION_LARGE > 0x06050200
                                                    const Handle(IntTools_Context)& aContext)
-#else
-                                                   IntTools_Context& aContext)
-#endif
 {
   Standard_Boolean bFlag;
   Standard_Real aT, aTolE, aTolF, aTol, aDist, aU, aV;
@@ -226,11 +226,7 @@ static
   aTolF=BRep_Tool::Tolerance(aF);
   aTol=aTolE+aTolF;
   //
-#if OCC_VERSION_LARGE > 0x06050200
   GeomAPI_ProjectPointOnSurf& aProjector=aContext->ProjPS(aF);
-#else
-  GeomAPI_ProjectPointOnSurf& aProjector=aContext.ProjPS(aF);
-#endif
   //
   aT=BOPTools_Tools2D::IntermediatePoint(aE);
   BOPTools_Tools::PointOnEdge(aE, aT, aP);
@@ -249,11 +245,7 @@ static
   //
   aProjector.LowerDistanceParameters(aU, aV);
   aP2D.SetCoord(aU, aV);
-#if OCC_VERSION_LARGE > 0x06050200
   bFlag=aContext->IsPointInOnFace (aF, aP2D);
-#else
-  bFlag=aContext.IsPointInOnFace (aF, aP2D);
-#endif
   return bFlag;
 }
 //=======================================================================
@@ -449,11 +441,7 @@ void ProcessBlock(const Standard_Integer iV,
 //=======================================================================
   Standard_Boolean NMTTools_Tools::AreFacesSameDomain(const TopoDS_Face& aF1x,
                                                       const TopoDS_Face& aF2y,
-#if OCC_VERSION_LARGE > 0x06050200
                                                       const Handle(IntTools_Context)& aCtx)
-#else
-                                                      IntTools_Context& aCtx)
-#endif
 {
   Standard_Boolean bFlag;
   // Modified  Thu Sep 14 14:35:18 2006
@@ -520,11 +508,7 @@ void ProcessBlock(const Standard_Integer iV,
   for (; aIt.More(); aIt.Next()) {
     const TopoDS_Edge& aE=TopoDS::Edge(aIt.Key());
     BOPTools_Tools3D::PointNearEdge(aE, aF1, aP2D, aP);
-#if OCC_VERSION_LARGE > 0x06050200
     bFlag=aCtx->IsValidPointForFace(aP, aF2, aTol);
-#else
-    bFlag=aCtx.IsValidPointForFace(aP, aF2, aTol);
-#endif
     break;
   }
   //