{
// look for a seam edge
const TopoDS_Edge& edge = TopoDS::Edge( exp.Current() );
- bool isClosed = 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) {
+ if ( BRep_Tool::IsClosed( edge, face )) {
// initialize myPar1, myPar2 and myParIndex
if ( mySeamShapeIds.empty() ) {
gp_Pnt2d uv1, uv2;
myPar2 = surface.LastVParameter();
}
}
- // store shapes indices
- mySeamShapeIds.insert( meshDS->ShapeToIndex( edge ));
- for ( TopExp_Explorer v( edge, TopAbs_VERTEX ); v.More(); v.Next() )
- mySeamShapeIds.insert( meshDS->ShapeToIndex( v.Current() ));
+ // store seam shape indices, negative if shape encounters twice
+ int edgeID = meshDS->ShapeToIndex( edge );
+ mySeamShapeIds.insert( IsSeamShape( edgeID ) ? -edgeID : edgeID );
+ 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
int edgeID = Pos->GetShapeId();
TopoDS_Edge E = TopoDS::Edge(meshDS->IndexToShape(edgeID));
double f, l;
- TopLoc_Location loc;
Handle(Geom2d_Curve) C2d = BRep_Tool::CurveOnSurface(E, F, f, l);
uv = C2d->Value( epos->GetUParameter() );
// 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 ));
}
else if(Pos->GetTypeOfPosition()==SMDS_TOP_VERTEX)
}
}
}
- if ( n2 && mySeamShapeIds.find( vertexID ) != mySeamShapeIds.end() )
+ if ( n2 && IsSeamShape( vertexID ) )
uv = GetUVOnSeam( uv, GetNodeUV( F, n2, 0 ));
}
}
}
//=======================================================================
- /*!
- * \brief Load nodes bound to face into a map of node columns
- * \param theParam2ColumnMap - map of node columns to fill
- * \param theFace - the face on which nodes are searched for
- * \param theBaseEdge - the edge nodes of which are columns' bases
- * \param theMesh - the mesh containing nodes
- * \retval bool - false if something is wrong
- *
- * The key of the map is a normalized parameter of each
- * base node on theBaseEdge.
- * This method works in supposition that nodes on the face
- * forms a rectangular grid and elements can be quardrangles or triangles
- */
+/*!
+ * \brief Load nodes bound to face into a map of node columns
+ * \param theParam2ColumnMap - map of node columns to fill
+ * \param theFace - the face on which nodes are searched for
+ * \param theBaseEdge - the edge nodes of which are columns' bases
+ * \param theMesh - the mesh containing nodes
+ * \retval bool - false if something is wrong
+ *
+ * The key of the map is a normalized parameter of each
+ * base node on theBaseEdge.
+ * This method works in supposition that nodes on the face
+ * forms a rectangular grid and elements can be quardrangles or triangles
+ */
//=======================================================================
bool SMESH_MesherHelper::LoadNodeColumns(TParam2ColumnMap & theParam2ColumnMap,
// load nodes from theBaseEdge
- set<const SMDS_MeshNode*> loadedNodes;
+ std::set<const SMDS_MeshNode*> loadedNodes;
const SMDS_MeshNode* nullNode = 0;
- vector<const SMDS_MeshNode*> & nVecf = theParam2ColumnMap[ 0.];
+ std::vector<const SMDS_MeshNode*> & nVecf = theParam2ColumnMap[ 0.];
nVecf.resize( vsize, nullNode );
loadedNodes.insert( nVecf[ 0 ] = smVfb->GetNodes()->next() );
- vector<const SMDS_MeshNode*> & nVecl = theParam2ColumnMap[ 1.];
+ std::vector<const SMDS_MeshNode*> & nVecl = theParam2ColumnMap[ 1.];
nVecl.resize( vsize, nullNode );
loadedNodes.insert( nVecl[ 0 ] = smVlb->GetNodes()->next() );
return false;
}
double u = ( pos->GetUParameter() - f ) / range;
- vector<const SMDS_MeshNode*> & nVec = theParam2ColumnMap[ u ];
+ std::vector<const SMDS_MeshNode*> & nVec = theParam2ColumnMap[ u ];
nVec.resize( vsize, nullNode );
loadedNodes.insert( nVec[ 0 ] = node );
}
// load nodes from e1
- map< double, const SMDS_MeshNode*> sortedNodes; // sort by param on edge
+ std::map< double, const SMDS_MeshNode*> sortedNodes; // sort by param on edge
nIt = sm1->GetNodes();
while ( nIt->more() ) {
node = nIt->next();
if ( !pos ) {
return false;
}
- sortedNodes.insert( make_pair( pos->GetUParameter(), node ));
+ sortedNodes.insert( std::make_pair( pos->GetUParameter(), node ));
}
loadedNodes.insert( nVecf[ vsize - 1 ] = smVft->GetNodes()->next() );
- map< double, const SMDS_MeshNode*>::iterator u_n = sortedNodes.begin();
+ std::map< double, const SMDS_MeshNode*>::iterator u_n = sortedNodes.begin();
int row = rev1 ? vsize - 1 : 0;
int dRow = rev1 ? -1 : +1;
for ( ; u_n != sortedNodes.end(); u_n++ ) {
return true;
}
+//=======================================================================
/**
* Check mesh without geometry for: if all elements on this shape are quadratic,
* quadratic elements will be created.
* Used then generated 3D mesh without geometry.
- */
+ */
+//=======================================================================
+
SMESH_MesherHelper:: MType SMESH_MesherHelper::IsQuadraticMesh()
{
int NbAllEdgsAndFaces=0;
return SMESH_MesherHelper::COMP;
}
+//=======================================================================
+/*!
+ * \brief Return an alternative parameter for a node on seam
+ */
+//=======================================================================
+
+double SMESH_MesherHelper::GetOtherParam(const double param) const
+{
+ return fabs(param-myPar1) < fabs(param-myPar2) ? myPar2 : myPar1;
+}
