0025088: Revert or change API of BRepMesh_IncrementalMesh to prevent possible errors...

Revert old constructor

diff --git a/src/BRepMesh/BRepMesh_IncrementalMesh.cxx b/src/BRepMesh/BRepMesh_IncrementalMesh.cxx
index 51b68fb9895d61636158b34d9ab92a5a123f045b..e313ce718354151b31841fb6faa821329b1eaf96 100644 (file)
--- a/src/BRepMesh/BRepMesh_IncrementalMesh.cxx
+++ b/src/BRepMesh/BRepMesh_IncrementalMesh.cxx
@@ -83,15 +83,15 @@ BRepMesh_IncrementalMesh::BRepMesh_IncrementalMesh()
 //=======================================================================
 BRepMesh_IncrementalMesh::BRepMesh_IncrementalMesh(
   const TopoDS_Shape&    theShape,
-  const Standard_Real    theDeflection,
-  const Standard_Real    theAngle,
-  const Standard_Boolean theRelative,
-  const Standard_Boolean theInParallel)
-: myRelative  (theRelative),
-  myInParallel(theInParallel)
+  const Standard_Real    theLinDeflection,
+  const Standard_Boolean isRelative,
+  const Standard_Real    theAngDeflection,
+  const Standard_Boolean isInParallel)
+  : myRelative  (isRelative),
+    myInParallel(isInParallel)
 {
-  myDeflection = theDeflection;
-  myAngle      = theAngle;
+  myDeflection = theLinDeflection;
+  myAngle      = theAngDeflection;
   myShape      = theShape;
 
   Perform();

diff --git a/src/BRepMesh/BRepMesh_IncrementalMesh.hxx b/src/BRepMesh/BRepMesh_IncrementalMesh.hxx
index a5933728cfc493271d021d0155b635b9571f8582..83a044b554e74eed7409c48b5163bb8d63e5f98e 100644 (file)
--- a/src/BRepMesh/BRepMesh_IncrementalMesh.hxx
+++ b/src/BRepMesh/BRepMesh_IncrementalMesh.hxx
@@ -49,16 +49,16 @@ public: //! \name mesher API
   //! Automatically calls method Perform.
   //! \param theShape shape to be meshed.
   //! \param theLinDeflection linear deflection.
-  //! \param theAngDeflection angular deflection.
-  //! \paarm isRelative if TRUE deflection used for discretization of 
+  //! \param isRelative if TRUE deflection used for discretization of 
   //! each edge will be <theLinDeflection> * <size of edge>. Deflection 
   //! used for the faces will be the maximum deflection of their edges.
+  //! \param theAngDeflection angular deflection.
   //! \param isInParallel if TRUE shape will be meshed in parallel.
   Standard_EXPORT BRepMesh_IncrementalMesh(
     const TopoDS_Shape&    theShape,
     const Standard_Real    theLinDeflection,
-    const Standard_Real    theAngDeflection = 0.5,
     const Standard_Boolean isRelative       = Standard_False,
+    const Standard_Real    theAngDeflection = 0.5,
     const Standard_Boolean isInParallel     = Standard_False);
 
   //! Performs meshing ot the shape.

diff --git a/src/DBRep/DBRep_DrawableShape.cxx b/src/DBRep/DBRep_DrawableShape.cxx
index c4d08336f756365ab7e802ac638dbb5f0c506ad3..320a11b3061defc393b1eecf4e96db54d952db50 100644 (file)
--- a/src/DBRep/DBRep_DrawableShape.cxx
+++ b/src/DBRep/DBRep_DrawableShape.cxx
@@ -842,7 +842,7 @@ void DBRep_DrawableShape::DisplayHiddenLines(Draw_Display& dis)
   if (!strcmp(dout.GetType(id),"PERS")) focal = dout.Focal(id);
   Standard_Real Ang,Def;
   HLRBRep::PolyHLRAngleAndDeflection(myAng,Ang,Def);
-  BRepMesh_IncrementalMesh MESH(myShape, Def, Ang, Standard_True);
+  BRepMesh_IncrementalMesh MESH(myShape, Def, Standard_True, Ang);
   Standard_Boolean recompute = Standard_True;
   // find if the view must be recomputed
   DBRep_ListIteratorOfListOfHideData it(myHidData);

diff --git a/src/MeshTest/MeshTest.cxx b/src/MeshTest/MeshTest.cxx
index 2810bda2aaaa4b8dee068b68e5ca1bb6f6fb0080..db6db2eacc18864c4eb3762ea9552c604a9f016a 100644 (file)
--- a/src/MeshTest/MeshTest.cxx
+++ b/src/MeshTest/MeshTest.cxx
@@ -140,7 +140,7 @@ static Standard_Integer incrementalmesh(Draw_Interpretor& di, Standard_Integer n
   di << "Incremental Mesh, multi-threading "
     << (isInParallel ? "ON\n" : "OFF\n");
   
-  BRepMesh_IncrementalMesh MESH(aShape, aDeflection, 0.5, Standard_False, isInParallel);
+  BRepMesh_IncrementalMesh MESH(aShape, aDeflection, Standard_False, 0.5, isInParallel);
   Standard_Integer statusFlags = MESH.GetStatusFlags();  
 
   di << "Meshing statuses: ";

diff --git a/src/QABugs/QABugs_11.cxx b/src/QABugs/QABugs_11.cxx
index 0be433d9eff966169bb6c902a32731c9172b6175..b6785d51ab9da3fdd135dd600e125eaf899f209d 100644 (file)
--- a/src/QABugs/QABugs_11.cxx
+++ b/src/QABugs/QABugs_11.cxx
@@ -1348,7 +1348,7 @@ static Standard_Integer OCC369(Draw_Interpretor& di, Standard_Integer argc, cons
     if(aShape.IsNull()) {di << "OCC369 FAULTY. Entry shape is NULL \n"; return 0;}
 
     // 3. Build mesh
-    BRepMesh_IncrementalMesh aMesh(aShape, 0.2, M_PI/6, Standard_True);
+    BRepMesh_IncrementalMesh aMesh(aShape, 0.2, Standard_True, M_PI / 6);
 
   }
   catch (Standard_Failure) {di << "OCC369 Exception \n" ;return 0;}
@@ -3194,7 +3194,7 @@ Standard_Integer OCC14376(Draw_Interpretor& di, Standard_Integer argc, const cha
   }
   di<<"deflection="<< aDeflection << "\n";
 
-  BRepMesh_IncrementalMesh aIMesh(aShape, aDeflection, M_PI/9., Standard_False);
+  BRepMesh_IncrementalMesh aIMesh(aShape, aDeflection, Standard_False, M_PI / 9.);
   TopLoc_Location aLocation;
   Handle(Poly_Triangulation) aTriang = BRep_Tool::Triangulation(TopoDS::Face(aShape), aLocation);
 

diff --git a/src/StdPrs/StdPrs_HLRPolyShape.cxx b/src/StdPrs/StdPrs_HLRPolyShape.cxx
index e499af7c0ab186a1ec1843e0b292574bcb7f83de..cddcff878a95526cc14e882b972ed535a777b1ff 100644 (file)
--- a/src/StdPrs/StdPrs_HLRPolyShape.cxx
+++ b/src/StdPrs/StdPrs_HLRPolyShape.cxx
@@ -66,7 +66,7 @@ void StdPrs_HLRPolyShape::Add(const Handle (Prs3d_Presentation)& aPresentation,
 
   const Standard_Boolean rel = aDrawer->TypeOfDeflection() == Aspect_TOD_RELATIVE;
   Standard_Real def = rel? aDrawer->HLRDeviationCoefficient() : aDrawer->MaximalChordialDeviation();
-  BRepMesh_IncrementalMesh mesh(aShape, def, aDrawer->HLRAngle(), rel);
+  BRepMesh_IncrementalMesh mesh(aShape, def, rel, aDrawer->HLRAngle());
   
   Handle(HLRBRep_PolyAlgo) hider = new HLRBRep_PolyAlgo(aShape);
 

diff --git a/src/StdSelect/StdSelect_BRepSelectionTool.cxx b/src/StdSelect/StdSelect_BRepSelectionTool.cxx
index e608e82f61c53f1c09a309ea0c7bb624945daf93..c981be3e3f2b883a4b924d9bc1fb725d35087b0f 100644 (file)
--- a/src/StdSelect/StdSelect_BRepSelectionTool.cxx
+++ b/src/StdSelect/StdSelect_BRepSelectionTool.cxx
@@ -80,7 +80,7 @@ void StdSelect_BRepSelectionTool
 
   if( isAutoTriangulation && !BRepTools::Triangulation (theShape, Precision::Infinite()) )
   {
-    BRepMesh_IncrementalMesh aMesher(theShape, theDeflection, theDeviationAngle, Standard_False);
+    BRepMesh_IncrementalMesh aMesher(theShape, theDeflection, Standard_False, theDeviationAngle);
   }
 
   Handle(StdSelect_BRepOwner) aBrepOwner;

diff --git a/src/StlTransfer/StlTransfer.cxx b/src/StlTransfer/StlTransfer.cxx
index 131d2372f7cbbe326aa07d99927aaf2eef72bdd4..bd1da2c240e14c0c999f70aac614b0fbbaf6e529 100644 (file)
--- a/src/StlTransfer/StlTransfer.cxx
+++ b/src/StlTransfer/StlTransfer.cxx
@@ -117,7 +117,7 @@ void StlTransfer::BuildIncrementalMesh (const TopoDS_Shape&  Shape,
     Standard_ConstructionError::Raise ("StlTransfer::BuildIncrementalMesh");
     }
   
-  BRepMesh_IncrementalMesh aMesher(Shape, Deflection, 0.5, Standard_False, InParallel);
+  BRepMesh_IncrementalMesh aMesher(Shape, Deflection, Standard_False, 0.5, InParallel);
   for (TopExp_Explorer itf(Shape,TopAbs_FACE); itf.More(); itf.Next()) {
     TopoDS_Face face = TopoDS::Face(itf.Current());
     TopLoc_Location Loc, loc;

diff --git a/src/VrmlData/VrmlData_ShapeConvert.cxx b/src/VrmlData/VrmlData_ShapeConvert.cxx
index a49e9838bcc2a3795e28cae04aea8cf46a140003..25abb080607f478cd91c81de7f393165eef68900 100644 (file)
--- a/src/VrmlData/VrmlData_ShapeConvert.cxx
+++ b/src/VrmlData/VrmlData_ShapeConvert.cxx
@@ -165,7 +165,7 @@ void VrmlData_ShapeConvert::Convert (const Standard_Boolean theExtractFaces,
                 isTessellate = Standard_True;
               if (isTessellate) {
                 // Triangulate the face by the standard OCC mesher
-                BRepMesh_IncrementalMesh IM (aFace, aDeflection, theDeflAngle, Standard_False);
+                BRepMesh_IncrementalMesh IM(aFace, aDeflection, Standard_False, theDeflAngle);
                 aTri = BRep_Tool::Triangulation (aFace, aLoc);
               }
               if (aTri.IsNull() == Standard_False) {