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

[SALOME platform 0019943] Pb with projection 2d

Browse Source 
+  bool IsRealSeam(const int subShape) const
This commit is contained in:
eap 2008-07-28 15:57:35 +00:00
parent db17b46ddb
commit 030beb0855
2 changed files with 26 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/SMESH/SMESH_MesherHelper.cxx
View File

@ -174,23 +174,7 @@ void SMESH_MesherHelper::SetSubShape(const TopoDS_Shape& aSh)
{ {
// look for a seam edge // look for a seam edge
const TopoDS_Edge& edge = TopoDS::Edge( exp.Current() ); const TopoDS_Edge& edge = TopoDS::Edge( exp.Current() );
bool isClosed = BRep_Tool::IsClosed( edge, face ); if ( BRep_Tool::IsClosed( edge, face )) {
// BEGIN: jfa for bug 0019943
if (isClosed) {
isClosed = false;
for (TopExp_Explorer expw (face, TopAbs_WIRE); expw.More() && !isClosed; expw.Next()) {
const TopoDS_Wire& wire = TopoDS::Wire(expw.Current());
int nbe = 0;
for (BRepTools_WireExplorer we (wire, face); we.More() && !isClosed; we.Next()) {
if (we.Current().IsSame(edge)) {
nbe++;
if (nbe == 2) isClosed = true;
}
}
}
}
// END: jfa for bug 0019943
if (isClosed) {
// initialize myPar1, myPar2 and myParIndex // initialize myPar1, myPar2 and myParIndex
if ( mySeamShapeIds.empty() ) { if ( mySeamShapeIds.empty() ) {
gp_Pnt2d uv1, uv2; gp_Pnt2d uv1, uv2;
@ -207,10 +191,13 @@ void SMESH_MesherHelper::SetSubShape(const TopoDS_Shape& aSh)
myPar2 = surface.LastVParameter(); myPar2 = surface.LastVParameter();
} }
} }
// store shapes indices // store seam shape indices, negative if shape encounters twice
mySeamShapeIds.insert( meshDS->ShapeToIndex( edge )); int edgeID = meshDS->ShapeToIndex( edge );
for ( TopExp_Explorer v( edge, TopAbs_VERTEX ); v.More(); v.Next() ) mySeamShapeIds.insert( IsSeamShape( edgeID ) ? -edgeID : edgeID );
mySeamShapeIds.insert( meshDS->ShapeToIndex( v.Current() )); for ( TopExp_Explorer v( edge, TopAbs_VERTEX ); v.More(); v.Next() ) {
int vertexID = meshDS->ShapeToIndex( v.Current() );
mySeamShapeIds.insert( IsSeamShape( vertexID ) ? -vertexID : vertexID );
}
} }
// look for a degenerated edge // look for a degenerated edge
@ -335,7 +322,7 @@ gp_XY SMESH_MesherHelper::GetNodeUV(const TopoDS_Face& F,
Handle(Geom2d_Curve) C2d = BRep_Tool::CurveOnSurface(E, F, f, l); Handle(Geom2d_Curve) C2d = BRep_Tool::CurveOnSurface(E, F, f, l);
uv = C2d->Value( epos->GetUParameter() ); uv = C2d->Value( epos->GetUParameter() );
// for a node on a seam edge select one of UVs on 2 pcurves // for a node on a seam edge select one of UVs on 2 pcurves
if ( n2 && mySeamShapeIds.find( edgeID ) != mySeamShapeIds.end() ) if ( n2 && IsSeamShape( edgeID ) )
uv = GetUVOnSeam( uv, GetNodeUV( F, n2, 0 )); uv = GetUVOnSeam( uv, GetNodeUV( F, n2, 0 ));
} }
else if(Pos->GetTypeOfPosition()==SMDS_TOP_VERTEX) else if(Pos->GetTypeOfPosition()==SMDS_TOP_VERTEX)
@ -387,7 +374,7 @@ gp_XY SMESH_MesherHelper::GetNodeUV(const TopoDS_Face& F,
} }
} }
} }
if ( n2 && mySeamShapeIds.find( vertexID ) != mySeamShapeIds.end() ) if ( n2 && IsSeamShape( vertexID ) )
uv = GetUVOnSeam( uv, GetNodeUV( F, n2, 0 )); uv = GetUVOnSeam( uv, GetNodeUV( F, n2, 0 ));
} }
} }

18
src/SMESH/SMESH_MesherHelper.hxx
View File

@ -258,7 +258,8 @@ public:
* \param subShape - edge or vertex index in SMESHDS * \param subShape - edge or vertex index in SMESHDS
* \retval bool - true if subShape is a seam shape * \retval bool - true if subShape is a seam shape
* *
* It works only if IsQuadraticSubMesh() or SetSubShape() has been called * It works only if IsQuadraticSubMesh() or SetSubShape() has been called.
* Seam shape has two 2D alternative represenations on the face
*/ */
bool IsSeamShape(const int subShape) const bool IsSeamShape(const int subShape) const
{ return mySeamShapeIds.find( subShape ) != mySeamShapeIds.end(); } { return mySeamShapeIds.find( subShape ) != mySeamShapeIds.end(); }
@ -267,10 +268,23 @@ public:
* \param subShape - edge or vertex * \param subShape - edge or vertex
* \retval bool - true if subShape is a seam shape * \retval bool - true if subShape is a seam shape
* *
* It works only if IsQuadraticSubMesh() or SetSubShape() has been called * It works only if IsQuadraticSubMesh() or SetSubShape() has been called.
* Seam shape has two 2D alternative represenations on the face
*/ */
bool IsSeamShape(const TopoDS_Shape& subShape) const bool IsSeamShape(const TopoDS_Shape& subShape) const
{ return IsSeamShape( GetMeshDS()->ShapeToIndex( subShape )); } { return IsSeamShape( GetMeshDS()->ShapeToIndex( subShape )); }
/*!
* \brief Return true if an edge or a vertex encounters twice in face wire
* \param subShape - Id of edge or vertex
*/
bool IsRealSeam(const int subShape) const
{ return mySeamShapeIds.find( -subShape ) != mySeamShapeIds.end(); }
/*!
* \brief Return true if an edge or a vertex encounters twice in face wire
* \param subShape - edge or vertex
*/
bool IsRealSeam(const TopoDS_Shape& subShape) const
{ return IsRealSeam( GetMeshDS()->ShapeToIndex( subShape)); }
/*! /*!
* \brief Check if the shape set through IsQuadraticSubMesh() or SetSubShape() * \brief Check if the shape set through IsQuadraticSubMesh() or SetSubShape()
* has a seam edge * has a seam edge