ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2025-01-13 02:00:34 +05:00
Code Issues Packages Projects Releases Wiki Activity

#19026 EDF 21355 - Problem with Belog to GEOM

Browse Source
This commit is contained in:
eap 2020-04-29 19:54:39 +03:00
parent 9f9759f50d
commit 54580d9a2a
4 changed files with 32 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/Controls/SMESH_Controls.cxx
View File

@ -35,6 +35,7 @@
#include "SMESH_MeshAlgos.hxx" #include "SMESH_MeshAlgos.hxx"
#include "SMESH_OctreeNode.hxx" #include "SMESH_OctreeNode.hxx"
#include <GEOMUtils.hxx>
#include <Basics_Utils.hxx> #include <Basics_Utils.hxx>
#include <BRepAdaptor_Surface.hxx> #include <BRepAdaptor_Surface.hxx>
@ -4265,6 +4266,8 @@ private:
bool isOutOfNone (const gp_Pnt& p) { return true; } bool isOutOfNone (const gp_Pnt& p) { return true; }
bool isBox (const TopoDS_Shape& s); bool isBox (const TopoDS_Shape& s);
TopoDS_Shape prepareSolid( const TopoDS_Shape& theSolid );
bool (Classifier::* myIsOutFun)(const gp_Pnt& p); bool (Classifier::* myIsOutFun)(const gp_Pnt& p);
BRepClass3d_SolidClassifier* mySolidClfr; // ptr because of a run-time forbidden copy-constructor BRepClass3d_SolidClassifier* mySolidClfr; // ptr because of a run-time forbidden copy-constructor
Bnd_B3d myBox; Bnd_B3d myBox;
@ -4524,11 +4527,17 @@ bool ElementsOnShape::IsSatisfy (const SMDS_MeshElement* elem)
centerXYZ /= elem->NbNodes(); centerXYZ /= elem->NbNodes();
isSatisfy = false; isSatisfy = false;
if ( myOctree ) if ( myOctree )
{
myWorkClassifiers.clear();
myOctree->GetClassifiersAtPoint( centerXYZ, myWorkClassifiers );
for ( size_t i = 0; i < myWorkClassifiers.size() && !isSatisfy; ++i ) for ( size_t i = 0; i < myWorkClassifiers.size() && !isSatisfy; ++i )
isSatisfy = ! myWorkClassifiers[i]->IsOut( centerXYZ ); isSatisfy = ! myWorkClassifiers[i]->IsOut( centerXYZ );
}
else else
{
for ( size_t i = 0; i < myClassifiers.size() && !isSatisfy; ++i ) for ( size_t i = 0; i < myClassifiers.size() && !isSatisfy; ++i )
isSatisfy = ! myClassifiers[i].IsOut( centerXYZ ); isSatisfy = ! myClassifiers[i].IsOut( centerXYZ );
}
} }
return isSatisfy; return isSatisfy;
@ -4613,7 +4622,7 @@ void ElementsOnShape::Classifier::Init( const TopoDS_Shape& theShape,
} }
else else
{ {
mySolidClfr = new BRepClass3d_SolidClassifier(theShape); mySolidClfr = new BRepClass3d_SolidClassifier( prepareSolid( theShape ));
myIsOutFun = & ElementsOnShape::Classifier::isOutOfSolid; myIsOutFun = & ElementsOnShape::Classifier::isOutOfSolid;
} }
break; break;
@ -4692,6 +4701,25 @@ ElementsOnShape::Classifier::~Classifier()
delete mySolidClfr; mySolidClfr = 0; delete mySolidClfr; mySolidClfr = 0;
} }
TopoDS_Shape ElementsOnShape::Classifier::prepareSolid( const TopoDS_Shape& theSolid )
{
// try to limit tolerance of theSolid down to myTol (issue #19026)
// check if tolerance of theSolid is more than myTol
bool tolIsOk = true; // max tolerance is at VERTEXes
for ( TopExp_Explorer exp( theSolid, TopAbs_VERTEX ); exp.More() && tolIsOk; exp.Next() )
tolIsOk = ( myTol >= BRep_Tool::Tolerance( TopoDS::Vertex( exp.Current() )));
if ( tolIsOk )
return theSolid;
// make a copy to prevent the original shape from changes
TopoDS_Shape resultShape = BRepBuilderAPI_Copy( theSolid );
if ( !GEOMUtils::FixShapeTolerance( resultShape, TopAbs_SHAPE, myTol ))
return theSolid;
return resultShape;
}
bool ElementsOnShape::Classifier::isOutOfSolid( const gp_Pnt& p ) bool ElementsOnShape::Classifier::isOutOfSolid( const gp_Pnt& p )
{ {
if ( isOutOfBox( p )) return true; if ( isOutOfBox( p )) return true;

2
src/SMESH/SMESH_subMesh.hxx
View File

@ -126,7 +126,7 @@ class SMESH_EXPORT SMESH_subMesh
// ================================================================== // ==================================================================
/*! /*!
* \brief Sets an event listener and its data to a submesh * \brief Set an event listener and its data to a submesh
* \param listener - the listener to store * \param listener - the listener to store
* \param data - the listener data to store * \param data - the listener data to store
* \param where - the submesh to store the listener and it's data * \param where - the submesh to store the listener and it's data

2
src/SMESH/SMESH_subMeshEventListener.hxx
View File

@ -92,7 +92,7 @@ struct SMESH_subMeshEventListenerData
!! they are used to track intermesh !! they are used to track intermesh
dependencies at mesh loading as well !! */ dependencies at mesh loading as well !! */
public: public:
SMESH_subMeshEventListenerData(bool isDeletable):myIsDeletable(isDeletable) {} SMESH_subMeshEventListenerData(bool isDeletable):myIsDeletable(isDeletable),myType(-1) {}
virtual ~SMESH_subMeshEventListenerData() {} virtual ~SMESH_subMeshEventListenerData() {}
bool IsDeletable() const { return myIsDeletable; } bool IsDeletable() const { return myIsDeletable; }

1
src/StdMeshers/StdMeshers_FaceSide.cxx
View File

@ -450,6 +450,7 @@ const std::vector<UVPtStruct>& StdMeshers_FaceSide::GetUVPtStruct(bool isXCons
for ( size_t j = 0; j < u2nodeVec.size(); ++j ) for ( size_t j = 0; j < u2nodeVec.size(); ++j )
u2node.insert( u2node.end(), u2nodeVec[j] ); u2node.insert( u2node.end(), u2nodeVec[j] );
} }
continue;
} // loop on myEdge's } // loop on myEdge's
// Add 2nd VERTEX node for a last EDGE // Add 2nd VERTEX node for a last EDGE