-// Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
#include "StdMeshers_ProjectionSource2D.hxx"
#include "StdMeshers_ProjectionSource3D.hxx"
+#include "SMDS_EdgePosition.hxx"
#include "SMESH_Algo.hxx"
#include "SMESH_Block.hxx"
#include "SMESH_Gen.hxx"
+#include "SMESH_HypoFilter.hxx"
#include "SMESH_Hypothesis.hxx"
#include "SMESH_Mesh.hxx"
#include "SMESH_MesherHelper.hxx"
#include "SMESH_subMesh.hxx"
#include "SMESH_subMeshEventListener.hxx"
-#include "SMDS_EdgePosition.hxx"
+#include "SMESH_MeshAlgos.hxx"
#include "utilities.h"
#include <gp_Vec.hxx>
#include <numeric>
+#include <limits>
using namespace std;
list<SMESH_subMesh*> subMeshes = tgtMesh1->GetGroupSubMeshesContaining(tgtShape);
list<SMESH_subMesh*>::iterator sm = subMeshes.begin();
int type, last = TopAbs_SHAPE;
- StdMeshers_ProjectionUtils util;
for ( ; sm != subMeshes.end(); ++sm ) {
const TopoDS_Shape & group = (*sm)->GetSubShape();
// check if group is similar to srcGroup
for ( type = srcGroup.ShapeType(); type < last; ++type)
- if ( util.Count( srcGroup, (TopAbs_ShapeEnum)type, 0) !=
- util.Count( group, (TopAbs_ShapeEnum)type, 0))
+ if ( SMESH_MesherHelper::Count( srcGroup, (TopAbs_ShapeEnum)type, 0) !=
+ SMESH_MesherHelper::Count( group, (TopAbs_ShapeEnum)type, 0))
break;
if ( type == last )
return group;
// get edges of the face
TopoDS_Edge edgeGr1, edgeGr2, verticEdge2;
list< TopoDS_Edge > edges; list< int > nbEdgesInWire;
- SMESH_Block::GetOrderedEdges( face, v1, edges, nbEdgesInWire);
+ SMESH_Block::GetOrderedEdges( face, edges, nbEdgesInWire, v1);
if ( nbEdgesInWire.front() != 4 )
return _StoreBadShape( face );
list< TopoDS_Edge >::iterator edge = edges.begin();
if ( gr1It.Value().ShapeType() == TopAbs_FACE )
{
// find a boundary edge of group1 to start from
- TopoDS_Shape bndEdge = StdMeshers_ProjectionUtils::GetBoundaryEdge( theGroup1, theMesh );
+ TopoDS_Shape bndEdge = HERE::GetBoundaryEdge( theGroup1, theMesh );
if ( bndEdge.IsNull() )
return false;
*/
//================================================================================
- TopoDS_Shape getOuterEdge( const TopoDS_Shape theShape1, SMESH_Mesh& mesh )
+ bool getOuterEdges( const TopoDS_Shape shape,
+ SMESH_Mesh& mesh,
+ std::list< TopoDS_Edge >& allBndEdges )
{
- TopoDS_Shape edge;
- if ( theShape1.ShapeType() == TopAbs_COMPOUND )
+ if ( shape.ShapeType() == TopAbs_COMPOUND )
{
- TopoDS_Iterator it( theShape1 );
- if ( it.Value().ShapeType() == TopAbs_FACE ) // group of FACEs
+ TopoDS_Iterator it( shape );
+ if ( it.More() && it.Value().ShapeType() == TopAbs_FACE ) // group of FACEs
{
// look for a boundary EDGE of a group
- edge = StdMeshers_ProjectionUtils::GetBoundaryEdge( theShape1, mesh );
- if ( !edge.IsNull() )
- return edge;
+ StdMeshers_ProjectionUtils::GetBoundaryEdge( shape, mesh, &allBndEdges );
+ if ( !allBndEdges.empty() )
+ return true;
}
}
- edge = theShape1;
- TopExp_Explorer expF( theShape1, TopAbs_FACE ), expE;
+ TopExp_Explorer expF( shape, TopAbs_FACE ), expE;
if ( expF.More() ) {
for ( ; expF.More(); expF.Next() ) {
- edge.Nullify();
TopoDS_Shape wire =
StdMeshers_ProjectionUtils::OuterShape( TopoDS::Face( expF.Current() ), TopAbs_WIRE );
- for ( expE.Init( wire, TopAbs_EDGE ); edge.IsNull() && expE.More(); expE.Next() )
+ for ( expE.Init( wire, TopAbs_EDGE ); expE.More(); expE.Next() )
if ( !SMESH_MesherHelper::IsClosedEdge( TopoDS::Edge( expE.Current() )))
- edge = expE.Current();
- if ( !edge.IsNull() )
- break;
+ allBndEdges.push_back( TopoDS::Edge( expE.Current() ));
}
- } else if (edge.ShapeType() != TopAbs_EDGE) { // no faces
- edge.Nullify();
- for ( expE.Init( theShape1, TopAbs_EDGE ); edge.IsNull() && expE.More(); expE.Next() )
+ }
+ else if ( shape.ShapeType() != TopAbs_EDGE) { // no faces
+ for ( expE.Init( shape, TopAbs_EDGE ); expE.More(); expE.Next() )
if ( !SMESH_MesherHelper::IsClosedEdge( TopoDS::Edge( expE.Current() )))
- edge = expE.Current();
+ allBndEdges.push_back( TopoDS::Edge( expE.Current() ));
}
- return edge;
+ else if ( shape.ShapeType() == TopAbs_EDGE ) {
+ if ( !SMESH_MesherHelper::IsClosedEdge( TopoDS::Edge( shape )))
+ allBndEdges.push_back( TopoDS::Edge( shape ));
+ }
+ return !allBndEdges.empty();
}
} // namespace
//=======================================================================
-/*!
- * \brief Looks for association of all sub-shapes of two shapes
- * \param theShape1 - target shape
- * \param theMesh1 - mesh built on shape 1
- * \param theShape2 - source shape
- * \param theMesh2 - mesh built on shape 2
- * \param theAssociation - association map to be filled that may
- * contain association of one or two pairs of vertices
- * \retval bool - true if association found
+/*
+ * Looks for association of all sub-shapes of two shapes
+ * \param theShape1 - target shape
+ * \param theMesh1 - mesh built on shape 1
+ * \param theShape2 - source shape
+ * \param theMesh2 - mesh built on shape 2
+ * \param theAssociation - association map to be filled that may
+ * contain association of one or two pairs of vertices
+ * \retval bool - true if association found
*/
//=======================================================================
// Maybe groups contain only one member
TopoDS_Iterator it1( theShape1 ), it2( theShape2 );
TopAbs_ShapeEnum memberType = it1.Value().ShapeType();
- int nbMembers = Count( theShape1, memberType, true );
+ int nbMembers = SMESH_MesherHelper::Count( theShape1, memberType, true );
if ( nbMembers == 0 ) return true;
if ( nbMembers == 1 ) {
return FindSubShapeAssociation( it1.Value(), theMesh1, it2.Value(), theMesh2, theMap );
if ( groupEdges[ is2ndGroup ].Contains( f.Current() ))
if ( ++nbGroupEdges > 1 )
break;
- bool add = (nbGroupEdges > 1 || Count( face, TopAbs_EDGE, true ) == 1 );
+ bool add = (nbGroupEdges > 1 ||
+ SMESH_MesherHelper::Count( face, TopAbs_EDGE, true ) == 1 );
if ( !add ) {
add = true;
for ( TopExp_Explorer v( face, TopAbs_VERTEX ); add && v.More(); v.Next())
}
// Associate shells
//
- int nbFaces1 = Count( shell1, TopAbs_FACE, 0 );
- int nbFaces2 = Count( shell2, TopAbs_FACE, 0 );
+ int nbFaces1 = SMESH_MesherHelper:: Count( shell1, TopAbs_FACE, 0 );
+ int nbFaces2 = SMESH_MesherHelper:: Count( shell2, TopAbs_FACE, 0 );
if ( nbFaces1 != nbFaces2 )
RETURN_BAD_RESULT("Different nb of faces found for shells");
if ( nbFaces1 > 0 ) {
if ( face2.Orientation() >= TopAbs_INTERNAL ) face2.Orientation( TopAbs_FORWARD );
TopoDS_Edge edge1, edge2;
// get outer edge of theShape1
- edge1 = TopoDS::Edge( OuterShape( face1, TopAbs_EDGE ));
- // find out if any edge of face2 is a propagation edge of outer edge1
- map<int,TopoDS_Edge> propag_edges; // use map to find the closest propagation edge
- for ( TopExp_Explorer exp( face2, TopAbs_EDGE ); exp.More(); exp.Next() ) {
- edge2 = TopoDS::Edge( exp.Current() );
- pair<int,TopoDS_Edge> step_edge = GetPropagationEdge( theMesh1, edge2, edge1 );
- if ( !step_edge.second.IsNull() ) { // propagation found
- propag_edges.insert( step_edge );
- if ( step_edge.first == 1 ) break; // most close found
+ TopoDS_Shape wire = OuterShape( face1, TopAbs_WIRE );
+ //edge1 = TopoDS::Edge( OuterShape( face1, TopAbs_EDGE ));
+ // use map to find the closest propagation edge
+ map<int, pair< TopoDS_Edge, TopoDS_Edge > > propag_edges;
+ for ( TopoDS_Iterator edgeIt( wire ); edgeIt.More(); edgeIt.Next() )
+ {
+ edge1 = TopoDS::Edge( edgeIt.Value() );
+ // find out if any edge of face2 is a propagation edge of outer edge1
+ for ( TopExp_Explorer exp( face2, TopAbs_EDGE ); exp.More(); exp.Next() ) {
+ edge2 = TopoDS::Edge( exp.Current() );
+ pair<int,TopoDS_Edge> step_edge = GetPropagationEdge( theMesh1, edge2, edge1 );
+ if ( !step_edge.second.IsNull() ) { // propagation found
+ propag_edges.insert( make_pair( step_edge.first,
+ ( make_pair( edge1, step_edge.second ))));
+ if ( step_edge.first == 1 ) break; // most close found
+ }
}
+ if ( !propag_edges.empty() && propag_edges.begin()->first == 1 ) break;
}
if ( !propag_edges.empty() ) // propagation found
{
- edge2 = propag_edges.begin()->second;
+ edge1 = propag_edges.begin()->second.first;
+ edge2 = propag_edges.begin()->second.second;
TopoDS_Vertex VV1[2], VV2[2];
TopExp::Vertices( edge1, VV1[0], VV1[1], true );
TopExp::Vertices( edge2, VV2[0], VV2[1], true );
TopoDS_Vertex VV1[2], VV2[2];
if ( vMap1.Extent() != vMap2.Extent() )
- RETURN_BAD_RESULT("Different nb of vertices");
+ {
+ if ( SMESH_MesherHelper:: Count( theShape1, TopAbs_EDGE, /*ignoreSame=*/false ) !=
+ SMESH_MesherHelper:: Count( theShape2, TopAbs_EDGE, /*ignoreSame=*/false ))
+ RETURN_BAD_RESULT("Different nb of vertices");
+ }
if ( vMap1.Extent() == 1 ) {
InsertAssociation( vMap1(1), vMap2(1), theMap );
// Find transformation to make the shapes be of similar size at same location
Bnd_Box box[2];
- for ( int i = 1; i <= vMap1.Extent(); ++i ) {
+ for ( int i = 1; i <= vMap1.Extent(); ++i )
box[ 0 ].Add( BRep_Tool::Pnt ( TopoDS::Vertex( vMap1( i ))));
+ for ( int i = 1; i <= vMap2.Extent(); ++i )
box[ 1 ].Add( BRep_Tool::Pnt ( TopoDS::Vertex( vMap2( i ))));
- }
gp_Pnt gc[2]; // box center
double x0,y0,z0, x1,y1,z1;
// Find 2 closest vertices
// get 2 linked vertices of shape 1 not belonging to an inner wire of a face
- TopoDS_Shape edge = getOuterEdge( theShape1, *theMesh1 );
- if ( edge.IsNull() || edge.ShapeType() != TopAbs_EDGE )
+ std::list< TopoDS_Edge > allBndEdges1;
+ if ( !getOuterEdges( theShape1, *theMesh1, allBndEdges1 ))
RETURN_BAD_RESULT("Edge not found");
- TopExp::Vertices( TopoDS::Edge( edge.Oriented(TopAbs_FORWARD)), VV1[0], VV1[1]);
- if ( VV1[0].IsSame( VV1[1] ))
- RETURN_BAD_RESULT("Only closed edges");
-
- // find vertices closest to 2 linked vertices of shape 1
- for ( int i1 = 0; i1 < 2; ++i1 )
+ std::list< TopoDS_Edge >::iterator edge1 = allBndEdges1.begin();
+ double minDist = std::numeric_limits<double>::max();
+ for ( int nbChecked=0; edge1 != allBndEdges1.end() && nbChecked++ < 10; ++edge1 )
{
- double dist2 = DBL_MAX;
- gp_Pnt p1 = BRep_Tool::Pnt( VV1[ i1 ]);
- p1.Translate( vec01 );
- p1.Scale( gc[1], scale );
- for ( int i2 = 1; i2 <= vMap2.Extent(); ++i2 )
+ TopExp::Vertices( TopoDS::Edge( edge1->Oriented(TopAbs_FORWARD)), VV1[0], VV1[1]);
+ if ( VV1[0].IsSame( VV1[1] ))
+ continue;//RETURN_BAD_RESULT("Only closed edges");
+
+ // find vertices closest to 2 linked vertices of shape 1
+ double dist2[2] = { 1e+100, 1e+100 };
+ TopoDS_Vertex edge2VV[2];
+ for ( int i1 = 0; i1 < 2; ++i1 )
{
- TopoDS_Vertex V2 = TopoDS::Vertex( vMap2( i2 ));
- gp_Pnt p2 = BRep_Tool::Pnt ( V2 );
- double d2 = p1.SquareDistance( p2 );
- if ( d2 < dist2 && !V2.IsSame( VV2[ 0 ])) {
- VV2[ i1 ] = V2; dist2 = d2;
+ gp_Pnt p1 = BRep_Tool::Pnt( VV1[ i1 ]);
+ p1.Scale( gc[0], scale );
+ p1.Translate( vec01 );
+ if ( !i1 ) {
+ // select a closest vertex among all ones in vMap2
+ for ( int i2 = 1; i2 <= vMap2.Extent(); ++i2 )
+ {
+ TopoDS_Vertex V2 = TopoDS::Vertex( vMap2( i2 ));
+ gp_Pnt p2 = BRep_Tool::Pnt ( V2 );
+ double d2 = p1.SquareDistance( p2 );
+ if ( d2 < dist2[ 0 ] && d2 < minDist ) {
+ edge2VV[ 0 ] = V2;
+ dist2 [ 0 ] = d2;
+ }
+ }
+ }
+ else if ( !edge2VV[0].IsNull() ) {
+ // select a closest vertex among ends of edges meeting at edge2VV[0]
+ PShapeIteratorPtr edgeIt = SMESH_MesherHelper::GetAncestors( edge2VV[0],
+ *theMesh2, TopAbs_EDGE);
+ while ( const TopoDS_Shape* edge2 = edgeIt->next() )
+ for ( TopoDS_Iterator itV2( *edge2 ); itV2.More(); itV2.Next() )
+ {
+ if ( itV2.Value().IsSame( edge2VV[ 0 ])) continue;
+ if ( !vMap2.Contains( itV2.Value() )) continue;
+ TopoDS_Vertex V2 = TopoDS::Vertex( itV2.Value() );
+ gp_Pnt p2 = BRep_Tool::Pnt ( V2 );
+ double d2 = p1.SquareDistance( p2 );
+ if ( d2 < dist2[1] && d2 < minDist ) {
+ edge2VV[ 1 ] = V2;
+ dist2 [ 1 ] = d2;
+ }
+ }
}
}
+ if ( dist2[0] + dist2[1] < minDist ) {
+ VV2[0] = edge2VV[0];
+ VV2[1] = edge2VV[1];
+ minDist = dist2[0] + dist2[1];
+ if ( minDist < 1e-10 )
+ break;
+ }
}
InsertAssociation( VV1[ 0 ], VV2[ 0 ], theMap );
}
//================================================================================
-/*!
- * \brief Find association of edges of faces
- * \param face1 - face 1
- * \param VV1 - vertices of face 1
- * \param face2 - face 2
- * \param VV2 - vertices of face 2 associated with ones of face 1
- * \param edges1 - out list of edges of face 1
- * \param edges2 - out list of edges of face 2
- * \retval int - nb of edges in an outer wire in a success case, else zero
+/*
+ * Find association of edges of faces
+ * \param face1 - face 1
+ * \param VV1 - vertices of face 1
+ * \param face2 - face 2
+ * \param VV2 - vertices of face 2 associated with ones of face 1
+ * \param edges1 - out list of edges of face 1
+ * \param edges2 - out list of edges of face 2
+ * \retval int - nb of edges in an outer wire in a success case, else zero
*/
//================================================================================
{
bool OK = false;
list< int > nbEInW1, nbEInW2;
+ list< TopoDS_Edge >::iterator edgeIt;
int i_ok_wire_algo = -1;
for ( int outer_wire_algo = 0; outer_wire_algo < 2 && !OK; ++outer_wire_algo )
{
edges1.clear();
edges2.clear();
- if ( SMESH_Block::GetOrderedEdges( face1, VV1[0], edges1, nbEInW1, outer_wire_algo) !=
- SMESH_Block::GetOrderedEdges( face2, VV2[0], edges2, nbEInW2, outer_wire_algo) )
+ if ( SMESH_Block::GetOrderedEdges( face1, edges1, nbEInW1, VV1[0], outer_wire_algo) !=
+ SMESH_Block::GetOrderedEdges( face2, edges2, nbEInW2, VV2[0], outer_wire_algo) )
CONT_BAD_RESULT("Different number of wires in faces ");
- if ( nbEInW1 != nbEInW2 )
- CONT_BAD_RESULT("Different number of edges in faces: " <<
+ if ( nbEInW1 != nbEInW2 && outer_wire_algo == 0 &&
+ ( std::accumulate( nbEInW1.begin(), nbEInW1.end(), 0) !=
+ std::accumulate( nbEInW2.begin(), nbEInW2.end(), 0)))
+ RETURN_BAD_RESULT("Different number of edges in faces");
+
+ if ( nbEInW1.front() != nbEInW2.front() )
+ CONT_BAD_RESULT("Different number of edges in the outer wire: " <<
nbEInW1.front() << " != " << nbEInW2.front());
i_ok_wire_algo = outer_wire_algo;
bool reverse = false;
- list< TopoDS_Edge >::iterator edgeIt;
if ( !VV1[1].IsSame( TopExp::LastVertex( edges1.front(), true ))) {
reverse = true;
edgeIt = --edges1.end();
} // loop algos getting an outer wire
// Try to orient all (if !OK) or only internal wires (issue 0020996) by UV similarity
+
if (( !OK || nbEInW1.size() > 1 ) && i_ok_wire_algo > -1 )
{
// Check that Vec(VV1[0],VV1[1]) in 2D on face1 is the same
{
edges1.clear();
edges2.clear();
- SMESH_Block::GetOrderedEdges( face1, VV1[0], edges1, nbEInW1, i_ok_wire_algo);
- SMESH_Block::GetOrderedEdges( face2, VV2[0], edges2, nbEInW2, i_ok_wire_algo);
+ SMESH_Block::GetOrderedEdges( face1, edges1, nbEInW1, VV1[0], i_ok_wire_algo);
+ SMESH_Block::GetOrderedEdges( face2, edges2, nbEInW2, VV2[0], i_ok_wire_algo);
}
gp_XY dUV = v0f2UV.XY() - v0f1UV.XY(); // UV shift between 2 faces
+ //
// skip edges of the outer wire (if the outer wire is OK)
- list< int >::iterator nbEInW = nbEInW1.begin();
- list< TopoDS_Edge >::iterator edge1Beg = edges1.begin(), edge2Beg = edges2.begin();
- if ( OK )
- {
- for ( int i = 0; i < *nbEInW; ++i )
- ++edge1Beg, ++edge2Beg;
- ++nbEInW;
- }
- for ( ; nbEInW != nbEInW1.end(); ++nbEInW ) // loop on wires
+ list< int >::iterator nbE2, nbE1 = nbEInW1.begin();
+ list< TopoDS_Edge >::iterator edge2Beg, edge1Beg = edges1.begin();
+ if ( OK ) std::advance( edge1Beg, *nbE1++ );
+ // reach an end of edges of a current wire1
+ list< TopoDS_Edge >::iterator edge2End, edge1End;
+ //
+ // find corresponding wires of face2
+ for ( int iW1 = OK; nbE1 != nbEInW1.end(); ++nbE1, ++iW1 ) // loop on wires of face1
{
- // reach an end of edges of a current wire
- list< TopoDS_Edge >::iterator edge1End = edge1Beg, edge2End = edge2Beg;
- for ( int i = 0; i < *nbEInW; ++i )
- ++edge1End, ++edge2End;
- // rotate edges2 untill coincident with edges1 in 2D
+ // reach an end of edges of a current wire1
+ edge1End = edge1Beg;
+ std::advance( edge1End, *nbE1 );
+ // UV on face1 to find on face2
v0f1UV = BRep_Tool::Parameters( TopExp::FirstVertex(*edge1Beg,true), face1 );
v1f1UV = BRep_Tool::Parameters( TopExp::LastVertex (*edge1Beg,true), face1 );
v0f1UV.ChangeCoord() += dUV;
v1f1UV.ChangeCoord() += dUV;
- int i = *nbEInW;
- while ( --i > 0 && !sameVertexUV( *edge2Beg, face2, 0, v0f1UV, vTolUV ))
- edges2.splice( edge2End, edges2, edge2Beg++ ); // move edge2Beg to place before edge2End
- if ( sameVertexUV( *edge2Beg, face2, 0, v0f1UV, vTolUV ))
+ //
+ // look through wires of face2
+ edge2Beg = edges2.begin();
+ nbE2 = nbEInW2.begin();
+ if ( OK ) std::advance( edge2Beg, *nbE2++ );
+ for ( int iW2 = OK; nbE2 != nbEInW2.end(); ++nbE2, ++iW2 ) // loop on wires of face2
{
- if ( nbEInW == nbEInW1.begin() )
- OK = true; // OK is for the first wire
- // reverse edges2 if needed
- if ( !sameVertexUV( *edge2Beg, face2, 1, v1f1UV, vTolUV ))
+ // reach an end of edges of a current wire2
+ edge2End = edge2Beg;
+ std::advance( edge2End, *nbE2 );
+ if ( *nbE1 == *nbE2 && iW2 >= iW1 )
{
- Reverse( edges2 , *nbEInW, distance( edges2.begin(),edge2Beg ));
- // set correct edge2End
- edge2End = edges2.begin();
- std::advance( edge2End, std::accumulate( nbEInW1.begin(), nbEInW, *nbEInW));
+ // rotate edge2 untill coincidence with edge1 in 2D
+ int i = *nbE2;
+ while ( i-- > 0 && !sameVertexUV( *edge2Beg, face2, 0, v0f1UV, vTolUV ))
+ // move edge2Beg to place before edge2End
+ edges2.splice( edge2End, edges2, edge2Beg++ );
+
+ if ( sameVertexUV( *edge2Beg, face2, 0, v0f1UV, vTolUV ))
+ {
+ if ( iW1 == 0 ) OK = true; // OK is for the first wire
+ // reverse edges2 if needed
+ if ( !sameVertexUV( *edge2Beg, face2, 1, v1f1UV, vTolUV ))
+ Reverse( edges2 , *nbE2, std::distance( edges2.begin(),edge2Beg ));
+ // put wire2 at a right place within edges2
+ if ( iW1 != iW2 ) {
+ list< TopoDS_Edge >::iterator place2 = edges2.begin();
+ std::advance( place2, std::distance( edges1.begin(), edge1Beg ));
+ edges2.splice( place2, edges2, edge2Beg, edge2End );
+ // move nbE2 as well
+ list< int >::iterator placeNbE2 = nbEInW2.begin();
+ std::advance( placeNbE2, iW1 );
+ nbEInW2.splice( placeNbE2, nbEInW2, nbE2 );
+ }
+ break;
+ }
}
+ // prepare to the next wire loop
+ edge2Beg = edge2End;
}
- // prepare to the next wire loop
- edge1Beg = edge1End, edge2Beg = edge2End;
+ edge1Beg = edge1End;
+ }
+ }
+ }
+
+ const int nbEdges = nbEInW1.front();
+ if ( OK && nbEdges == 2 )
+ {
+ // if wires include 2 edges, it's impossible to associate them using
+ // topological information only. Try to use length of edges for association.
+ double l1[2], l2[2];
+ edgeIt = edges1.begin();
+ l1[0] = SMESH_Algo::EdgeLength( *edgeIt++ );
+ l1[1] = SMESH_Algo::EdgeLength( *edgeIt++ );
+ if ( Abs( l1[0] - l1[1] ) > 0.1 * Max( l1[0], l1[1] ) )
+ {
+ edgeIt = edges2.begin();
+ l2[0] = SMESH_Algo::EdgeLength( *edgeIt++ );
+ l2[1] = SMESH_Algo::EdgeLength( *edgeIt++ );
+ if (( l1[0] < l1[1] ) != ( l2[0] < l2[1] ))
+ {
+ Reverse( edges2, nbEdges );
}
}
}
}
//=======================================================================
-/*!
- * \brief Inserts association theShape1 <-> theShape2 to TShapeShapeMap
- * \param theShape1 - target shape
- * \param theShape2 - source shape
- * \param theAssociationMap - association map
- * \retval bool - true if there was no association for these shapes before
+/*
+ * Inserts association theShape1 <-> theShape2 to TShapeShapeMap
+ * \param theShape1 - target shape
+ * \param theShape2 - source shape
+ * \param theAssociationMap - association map
+ * \retval bool - true if there was no association for these shapes before
*/
//=======================================================================
}
//=======================================================================
-/*!
- * \brief Finds an edge by its vertices in a main shape of the mesh
- * \param aMesh - the mesh
- * \param V1 - vertex 1
- * \param V2 - vertex 2
- * \retval TopoDS_Edge - found edge
+/*
+ * Finds an edge by its vertices in a main shape of the mesh
+ * \param aMesh - the mesh
+ * \param V1 - vertex 1
+ * \param V2 - vertex 2
+ * \retval TopoDS_Edge - found edge
*/
//=======================================================================
}
//================================================================================
-/*!
- * \brief Return another face sharing an edge
- * \param edgeToFaces - data map of descendants to ancestors
- * \param edge - edge
- * \param face - face
- * \retval TopoDS_Face - found face
+/*
+ * Return another face sharing an edge
+ * \param edgeToFaces - data map of descendants to ancestors
+ * \param edge - edge
+ * \param face - face
+ * \retval TopoDS_Face - found face
*/
//================================================================================
}
//================================================================================
-/*!
- * \brief Return other vertex of an edge
+/*
+ * Return other vertex of an edge
*/
//================================================================================
}
//================================================================================
-/*!
- * \brief Return a propagation edge
- * \param aMesh - mesh
- * \param theEdge - edge to find by propagation
- * \param fromEdge - start edge for propagation
- * \retval pair<int,TopoDS_Edge> - propagation step and found edge
+/*
+ * Return a propagation edge
+ * \param aMesh - mesh
+ * \param theEdge - edge to find by propagation
+ * \param fromEdge - start edge for propagation
+ * \retval pair<int,TopoDS_Edge> - propagation step and found edge
*/
//================================================================================
}
//================================================================================
- /*!
- * \brief Find corresponding nodes on two faces
- * \param face1 - the first face
- * \param mesh1 - mesh containing elements on the first face
- * \param face2 - the second face
- * \param mesh2 - mesh containing elements on the second face
- * \param assocMap - map associating sub-shapes of the faces
- * \param node1To2Map - map containing found matching nodes
- * \retval bool - is a success
- */
+/*
+ * Find corresponding nodes on two faces
+ * \param face1 - the first face
+ * \param mesh1 - mesh containing elements on the first face
+ * \param face2 - the second face
+ * \param mesh2 - mesh containing elements on the second face
+ * \param assocMap - map associating sub-shapes of the faces
+ * \param node1To2Map - map containing found matching nodes
+ * \retval bool - is a success
+ */
//================================================================================
bool StdMeshers_ProjectionUtils::
{
SMESHDS_Mesh* meshDS1 = mesh1->GetMeshDS();
SMESHDS_Mesh* meshDS2 = mesh2->GetMeshDS();
-
+
SMESH_MesherHelper helper1( *mesh1 );
SMESH_MesherHelper helper2( *mesh2 );
TIDSortedElemSet inSet, notInSet;
const SMDS_MeshElement* f1 =
- SMESH_MeshEditor::FindFaceInSet( vNode, eNode, inSet, notInSet );
+ SMESH_MeshAlgos::FindFaceInSet( vNode, eNode, inSet, notInSet );
if ( !f1 ) RETURN_BAD_RESULT("The first face on seam not found");
notInSet.insert( f1 );
const SMDS_MeshElement* f2 =
- SMESH_MeshEditor::FindFaceInSet( vNode, eNode, inSet, notInSet );
+ SMESH_MeshAlgos::FindFaceInSet( vNode, eNode, inSet, notInSet );
if ( !f2 ) RETURN_BAD_RESULT("The second face on seam not found");
// select a face with less UV of vNode
for ( int i = 0; i < nbNodes; ++i ) {
const SMDS_MeshNode* n1 = faceToKeep->GetNode( i );
const SMDS_MeshNode* n2 = faceToKeep->GetNode(( i+1 ) % nbNodes );
- f1 = SMESH_MeshEditor::FindFaceInSet( n1, n2, inSet, notInSet );
+ f1 = SMESH_MeshAlgos::FindFaceInSet( n1, n2, inSet, notInSet );
if ( f1 )
elems.insert( f1 );
}
node1To2Map.insert( make_pair( vNode1, vNode2 ));
}
-// don't know why this condition is usually true :(
-// if ( node1To2Map.size() * quadFactor < SM1->NbNodes() )
-// MESSAGE("FindMatchingNodes() found too few node pairs starting from nodes ("
-// << vNode1->GetID() << " - " << eNode1[0]->GetID() << ") ("
-// << vNode2->GetID() << " - " << eNode2[0]->GetID() << "):"
-// << node1To2Map.size() * quadFactor << " < " << SM1->NbNodes());
-
+ // don't know why this condition is usually true :(
+ // if ( node1To2Map.size() * quadFactor < SM1->NbNodes() )
+ // MESSAGE("FindMatchingNodes() found too few node pairs starting from nodes ("
+ // << vNode1->GetID() << " - " << eNode1[0]->GetID() << ") ("
+ // << vNode2->GetID() << " - " << eNode2[0]->GetID() << "):"
+ // << node1To2Map.size() * quadFactor << " < " << SM1->NbNodes());
+
return true;
}
//================================================================================
- /*!
- * \brief Return any sub-shape of a face belonging to the outer wire
- * \param face - the face
- * \param type - type of sub-shape to return
- * \retval TopoDS_Shape - the found sub-shape
- */
+/*
+ * Return any sub-shape of a face belonging to the outer wire
+ * \param face - the face
+ * \param type - type of sub-shape to return
+ * \retval TopoDS_Shape - the found sub-shape
+ */
//================================================================================
TopoDS_Shape StdMeshers_ProjectionUtils::OuterShape( const TopoDS_Face& face,
}
//================================================================================
- /*!
- * \brief Check that submesh is computed and try to compute it if is not
- * \param sm - submesh to compute
- * \param iterationNb - int used to stop infinite recursive call
- * \retval bool - true if computed
- */
+/*
+ * Check that submesh is computed and try to compute it if is not
+ * \param sm - submesh to compute
+ * \param iterationNb - int used to stop infinite recursive call
+ * \retval bool - true if computed
+ */
//================================================================================
bool StdMeshers_ProjectionUtils::MakeComputed(SMESH_subMesh * sm, const int iterationNb)
return true;
SMESH_Mesh* mesh = sm->GetFather();
- SMESH_Gen* gen = mesh->GetGen();
+ SMESH_Gen* gen = mesh->GetGen();
SMESH_Algo* algo = sm->GetAlgo();
if ( !algo )
{
return false;
}
+
//================================================================================
-/*!
- * \brief Count nb of sub-shapes
- * \param shape - the shape
- * \param type - the type of sub-shapes to count
- * \retval int - the calculated number
+/*
+ * Returns an error message to show in case if MakeComputed( sm ) fails.
*/
//================================================================================
-int StdMeshers_ProjectionUtils::Count(const TopoDS_Shape& shape,
- const TopAbs_ShapeEnum type,
- const bool ignoreSame)
+std::string StdMeshers_ProjectionUtils::SourceNotComputedError( SMESH_subMesh * sm,
+ SMESH_Algo* projAlgo )
{
- if ( ignoreSame ) {
- TopTools_IndexedMapOfShape map;
- TopExp::MapShapes( shape, type, map );
- return map.Extent();
- }
- else {
- int nb = 0;
- for ( TopExp_Explorer exp( shape, type ); exp.More(); exp.Next() )
- ++nb;
- return nb;
+ const char usualMessage [] = "Source mesh not computed";
+ if ( !projAlgo )
+ return usualMessage;
+ if ( !sm || sm->GetAlgoState() != SMESH_subMesh::NO_ALGO )
+ return usualMessage; // algo is OK, anything else is KO.
+
+ // Try to find a type of all-dimentional algorithm that would compute the
+ // given sub-mesh if it could be launched before projection
+ const TopoDS_Shape shape = sm->GetSubShape();
+ const int shapeDim = SMESH_Gen::GetShapeDim( shape );
+
+ for ( int dimIncrement = 1; shapeDim + dimIncrement < 4; ++dimIncrement )
+ {
+ SMESH_HypoFilter filter( SMESH_HypoFilter::IsAlgo() );
+ filter.And( filter.HasDim( shapeDim + dimIncrement ));
+
+ SMESH_Algo* algo = (SMESH_Algo*) sm->GetFather()->GetHypothesis( shape, filter, true );
+ if ( algo && !algo->NeedDiscreteBoundary() )
+ return SMESH_Comment("\"")
+ << algo->GetFeatures()._label << "\""
+ << " can't be used to compute the source mesh for \""
+ << projAlgo->GetFeatures()._label << "\" in this case";
}
+ return usualMessage;
}
//================================================================================
-/*!
- * \brief Return a boundary EDGE of edgeContainer
+/*
+ * Return a boundary EDGE (or all boundary EDGEs) of edgeContainer
*/
//================================================================================
-TopoDS_Edge StdMeshers_ProjectionUtils::GetBoundaryEdge(const TopoDS_Shape& edgeContainer,
- const SMESH_Mesh& mesh)
+TopoDS_Edge StdMeshers_ProjectionUtils::GetBoundaryEdge(const TopoDS_Shape& edgeContainer,
+ const SMESH_Mesh& mesh,
+ std::list< TopoDS_Edge >* allBndEdges)
{
TopTools_IndexedMapOfShape facesOfEdgeContainer, facesNearEdge;
TopExp::MapShapes( edgeContainer, TopAbs_FACE, facesOfEdgeContainer );
if ( facesOfEdgeContainer.Contains( *face ))
if ( facesNearEdge.Add( *face ) && facesNearEdge.Extent() > 1 )
break;
- if ( facesNearEdge.Extent() == 1 )
- return edge;
+ if ( facesNearEdge.Extent() == 1 ) {
+ if ( allBndEdges )
+ allBndEdges->push_back( edge );
+ else
+ return edge;
+ }
}
return TopoDS_Edge();
}
//================================================================================
-/*!
- * \brief Set event listeners to submesh with projection algo
- * \param subMesh - submesh with projection algo
- * \param srcShape - source shape
- * \param srcMesh - source mesh
+/*
+ * Set event listeners to submesh with projection algo
+ * \param subMesh - submesh with projection algo
+ * \param srcShape - source shape
+ * \param srcMesh - source mesh
*/
//================================================================================
TopoDS_Shape srcShape,
SMESH_Mesh* srcMesh)
{
- // Set listener that resets an event listener on source submesh when
+ // Set the listener that resets an event listener on source submesh when
// "ProjectionSource*D" hypothesis is modified since source shape can be changed
subMesh->SetEventListener( GetHypModifWaiter(),0,subMesh);
