ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2024-12-24 16:30:34 +05:00
Code Issues Packages Projects Releases Wiki Activity

#17871 [CEA 17868] Import 1D 2D threshold value (test_import1d2d_mesh_top.py)

Browse Source 
Workaround for OCCT bug #31112: replace BRepClass_FaceClassifier by BRepTopAdaptor_FClass2d
This commit is contained in:
eap 2019-10-30 17:24:46 +03:00
parent d52c607e29
commit 6d7121da90
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/StdMeshers/StdMeshers_Import_1D2D.cxx
View File

@ -49,6 +49,7 @@
#include <BRepBndLib.hxx> #include <BRepBndLib.hxx>
#include <BRepClass_FaceClassifier.hxx> #include <BRepClass_FaceClassifier.hxx>
#include <BRepTools.hxx> #include <BRepTools.hxx>
#include <BRepTopAdaptor_FClass2d.hxx>
#include <BRep_Builder.hxx> #include <BRep_Builder.hxx>
#include <BRep_Tool.hxx> #include <BRep_Tool.hxx>
#include <Bnd_B2d.hxx> #include <Bnd_B2d.hxx>
@ -200,7 +201,8 @@ bool StdMeshers_Import_1D2D::Compute(SMESH_Mesh & theMesh, const TopoDS_Shape &
gp_Pnt p; gp_Vec du, dv; gp_Pnt p; gp_Vec du, dv;
// BRepClass_FaceClassifier is most time consuming, so minimize its usage // BRepClass_FaceClassifier is most time consuming, so minimize its usage
BRepClass_FaceClassifier classifier; const double clsfTol = 10 * BRep_Tool::Tolerance( geomFace );
BRepTopAdaptor_FClass2d classifier( geomFace, clsfTol ); //Brimless_FaceClassifier classifier;
Bnd_B2d bndBox2d; Bnd_B2d bndBox2d;
Bnd_Box bndBox3d; Bnd_Box bndBox3d;
{ {
@ -307,12 +309,12 @@ bool StdMeshers_Import_1D2D::Compute(SMESH_Mesh & theMesh, const TopoDS_Shape &
const double groupTol = 0.5 * sqrt( getMinElemSize2( srcGroup )); const double groupTol = 0.5 * sqrt( getMinElemSize2( srcGroup ));
minGroupTol = std::min( groupTol, minGroupTol ); minGroupTol = std::min( groupTol, minGroupTol );
// clsfTol is 3D tolerance // clsfTol is 2D tolerance of a probe line
//GeomAdaptor_Surface S( surface ); //GeomAdaptor_Surface S( surface );
// const double clsfTol = Min( S.UResolution( 0.1 * groupTol ), -- issue 0023092 // const double clsfTol = Min( S.UResolution( 0.1 * groupTol ), -- issue 0023092
// S.VResolution( 0.1 * groupTol )); // S.VResolution( 0.1 * groupTol ));
// another idea: try to use max tol of all edges // another idea: try to use max tol of all edges
const double clsfTol = 10 * BRep_Tool::Tolerance( geomFace ); // 0.1 * groupTol; //const double clsfTol = 10 * BRep_Tool::Tolerance( geomFace ); // 0.1 * groupTol;
if ( helper.HasSeam() ) if ( helper.HasSeam() )
onEdgeClassifier.SetMesh( srcMesh->GetMeshDS() ); onEdgeClassifier.SetMesh( srcMesh->GetMeshDS() );
@ -376,8 +378,8 @@ bool StdMeshers_Import_1D2D::Compute(SMESH_Mesh & theMesh, const TopoDS_Shape &
//int iCoo; //int iCoo;
if ( !isOut && !isIn ) // classify if ( !isOut && !isIn ) // classify
{ {
classifier.Perform( geomFace, uv, clsfTol ); nodeState[i] = classifier.Perform( uv ); //classifier.Perform( geomFace, uv, clsfTol );
nodeState[i] = classifier.State(); //nodeState[i] = classifier.State();
isOut = ( nodeState[i] == TopAbs_OUT ); isOut = ( nodeState[i] == TopAbs_OUT );
if ( isOut && helper.IsOnSeam( uv ) && onEdgeClassifier.IsSatisfy( (*node)->GetID() )) if ( isOut && helper.IsOnSeam( uv ) && onEdgeClassifier.IsSatisfy( (*node)->GetID() ))
{ {
@ -420,8 +422,8 @@ bool StdMeshers_Import_1D2D::Compute(SMESH_Mesh & theMesh, const TopoDS_Shape &
{ {
if ( nodeState[i] != TopAbs_UNKNOWN ) continue; if ( nodeState[i] != TopAbs_UNKNOWN ) continue;
gp_XY uv = helper.GetNodeUV( geomFace, newNodes[i] ); gp_XY uv = helper.GetNodeUV( geomFace, newNodes[i] );
classifier.Perform( geomFace, uv, clsfTol ); nodeState[i] = classifier.Perform( uv ); //geomFace, uv, clsfTol );
nodeState[i] = classifier.State(); //nodeState[i] = classifier.State();
isIn = ( nodeState[i] == TopAbs_IN ); isIn = ( nodeState[i] == TopAbs_IN );
} }
if ( !isIn ) // classify face center if ( !isIn ) // classify face center
@ -442,8 +444,9 @@ bool StdMeshers_Import_1D2D::Compute(SMESH_Mesh & theMesh, const TopoDS_Shape &
Standard_Real U,V; Standard_Real U,V;
proj.LowerDistanceParameters(U,V); proj.LowerDistanceParameters(U,V);
gp_XY uv( U,V ); gp_XY uv( U,V );
classifier.Perform( geomFace, uv, clsfTol ); //classifier.Perform( geomFace, uv, clsfTol );
if ( classifier.State() != TopAbs_IN ) TopAbs_State state = classifier.Perform( uv );
if ( state != TopAbs_IN )
continue; continue;
} }
} }