-// Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2010 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
//
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
+
// SMESH SMESH : idl implementation based on 'SMESH' unit's calsses
// File : StdMeshers_ProjectionUtils.cxx
// Created : Fri Oct 27 10:24:28 2006
#include "utilities.h"
+#include <BRepAdaptor_Surface.hxx>
#include <BRepTools.hxx>
#include <BRepTools_WireExplorer.hxx>
#include <BRep_Builder.hxx>
#include <TopExp.hxx>
#include <TopExp_Explorer.hxx>
#include <TopTools_Array1OfShape.hxx>
+#include <TopTools_DataMapIteratorOfDataMapOfShapeListOfShape.hxx>
+#include <TopTools_DataMapIteratorOfDataMapOfShapeShape.hxx>
#include <TopTools_ListIteratorOfListOfShape.hxx>
#include <TopTools_ListOfShape.hxx>
#include <TopTools_MapOfShape.hxx>
#include <TopoDS_Shape.hxx>
#include <gp_Pnt.hxx>
#include <gp_Vec.hxx>
-#include <TopTools_DataMapIteratorOfDataMapOfShapeShape.hxx>
-#include <TopTools_DataMapIteratorOfDataMapOfShapeListOfShape.hxx>
+
+#include <numeric>
using namespace std;
#define RETURN_BAD_RESULT(msg) { MESSAGE(")-: Error: " << msg); return false; }
-#define SHOW_VERTEX(v,msg) // { \
-// if ( v.IsNull() ) cout << msg << " NULL SHAPE" << endl; \
-// else if (v.ShapeType() == TopAbs_VERTEX) {\
-// gp_Pnt p = BRep_Tool::Pnt( TopoDS::Vertex( v ));\
-// cout << msg << (v).TShape().operator->()<<" ( " <<p.X()<<", "<<p.Y()<<", "<<p.Z()<<" )"<<endl;}\
+#define CONT_BAD_RESULT(msg) { MESSAGE(")-: Error: " << msg); continue; }
+#define SHOW_SHAPE(v,msg) \
+// { \
+// if ( (v).IsNull() ) cout << msg << " NULL SHAPE" << endl; \
+// else if ((v).ShapeType() == TopAbs_VERTEX) {\
+// gp_Pnt p = BRep_Tool::Pnt( TopoDS::Vertex( (v) ));\
+// cout<<msg<<" "<<shapeIndex((v))<<" ( "<<p.X()<<", "<<p.Y()<<", "<<p.Z()<<" )"<<endl;} \
// else {\
-// cout << msg << " "; TopAbs::Print(v.ShapeType(),cout) <<" "<<(v).TShape().operator->()<<endl;}\
+// cout << msg << " "; TopAbs::Print((v).ShapeType(),cout) <<" "<<shapeIndex((v))<<endl;}\
// }
#define SHOW_LIST(msg,l) \
// { \
namespace {
+ static SMESHDS_Mesh* theMeshDS[2] = { 0, 0 }; // used to debug only
+ long shapeIndex(const TopoDS_Shape& S)
+ {
+ if ( theMeshDS[0] && theMeshDS[1] )
+ return max(theMeshDS[0]->ShapeToIndex(S), theMeshDS[1]->ShapeToIndex(S) );
+ return long(S.TShape().operator->());
+ }
+
//================================================================================
/*!
* \brief Write shape for debug purposes
*/
//================================================================================
- void Reverse( list< TopoDS_Edge > & edges, const int nbEdges )
+ void Reverse( list< TopoDS_Edge > & edges, const int nbEdges, const int firstEdge=0)
{
SHOW_LIST("BEFORE REVERSE", edges);
list< TopoDS_Edge >::iterator eIt = edges.begin();
- if ( edges.size() == nbEdges )
- {
- edges.reverse();
- }
- else // reverse only the given nb of edges
+ std::advance( eIt, firstEdge );
+ list< TopoDS_Edge >::iterator eBackIt = eIt;
+ for ( int i = 0; i < nbEdges; ++i, ++eBackIt )
+ eBackIt->Reverse(); // reverse edge
+ // reverse list
+ --eBackIt;
+ while ( eIt != eBackIt )
{
- // look for the last edge to be reversed
- list< TopoDS_Edge >::iterator eBackIt = edges.begin();
- for ( int i = 1; i < nbEdges; ++i )
- ++eBackIt;
- // reverse
- while ( eIt != eBackIt ) {
- std::swap( *eIt, *eBackIt );
- SHOW_LIST("# AFTER SWAP", edges)
+ std::swap( *eIt, *eBackIt );
+ SHOW_LIST("# AFTER SWAP", edges)
if ( (++eIt) != eBackIt )
--eBackIt;
- }
}
- for ( eIt = edges.begin(); eIt != edges.end(); ++eIt )
- eIt->Reverse();
SHOW_LIST("ATFER REVERSE", edges)
}
return true;
}
+ //================================================================================
+ /*!
+ * \brief Return true if uv position of the vIndex-th vertex of edge on face is close
+ * enough to given uv
+ */
+ //================================================================================
+
+ bool sameVertexUV( const TopoDS_Edge& edge,
+ const TopoDS_Face& face,
+ const int& vIndex,
+ const gp_Pnt2d& uv,
+ const double& tol2d )
+ {
+ TopoDS_Vertex VV[2];
+ TopExp::Vertices( edge, VV[0], VV[1], true);
+ gp_Pnt2d v1UV = BRep_Tool::Parameters( VV[vIndex], face);
+ double dist2d = v1UV.Distance( uv );
+ return dist2d < tol2d;
+ }
+
} // namespace
//=======================================================================
SMESH_Mesh* theMesh2,
TShapeShapeMap & theMap)
{
+ // Structure of this long function is following
+ // 1) Group->group projection: theShape1 is a group member,
+ // theShape2 is a group. We find a group theShape1 is in and recall self.
+ // 2) Accosiate same shapes with different location (partners).
+ // 3) If vertex association is given, perform accosiation according to shape type:
+ // switch ( ShapeType ) {
+ // case TopAbs_EDGE:
+ // case ...:
+ // }
+ // 4) else try to accosiate in different ways:
+ // a) accosiate shapes by propagation and other simple cases
+ // switch ( ShapeType ) {
+ // case TopAbs_EDGE:
+ // case ...:
+ // }
+ // b) find association of a couple of vertices and recall self.
+ //
+
+ theMeshDS[0] = theMesh1->GetMeshDS(); // debug
+ theMeshDS[1] = theMesh2->GetMeshDS();
+
+ // =================================================================================
+ // 1) Is it the case of associating a group member -> another group? (PAL16202, 16203)
+ // =================================================================================
if ( theShape1.ShapeType() != theShape2.ShapeType() ) {
- // is it the case of a group member -> another group? (PAL16202, 16203)
TopoDS_Shape group1, group2;
if ( theShape1.ShapeType() == TopAbs_COMPOUND ) {
group1 = theShape1;
}
bool bidirect = ( !theShape1.IsSame( theShape2 ));
+
+ // ============
+ // 2) Is partner?
+ // ============
+ bool partner = theShape1.IsPartner( theShape2 );
+ TopTools_DataMapIteratorOfDataMapOfShapeShape vvIt( theMap );
+ for ( ; partner && vvIt.More(); vvIt.Next() )
+ partner = vvIt.Key().IsPartner( vvIt.Value() );
+
+ if ( partner ) // Same shape with different location
+ {
+ // recursively associate all subshapes of theShape1 and theShape2
+ typedef list< pair< TopoDS_Shape, TopoDS_Shape > > TShapePairsList;
+ TShapePairsList shapesQueue( 1, make_pair( theShape1, theShape2 ));
+ TShapePairsList::iterator s1_s2 = shapesQueue.begin();
+ for ( ; s1_s2 != shapesQueue.end(); ++s1_s2 )
+ {
+ InsertAssociation( s1_s2->first, s1_s2->second, theMap, bidirect);
+ TopoDS_Iterator s1It( s1_s2->first), s2It( s1_s2->second );
+ for ( ; s1It.More(); s1It.Next(), s2It.Next() )
+ shapesQueue.push_back( make_pair( s1It.Value(), s2It.Value() ));
+ }
+ return true;
+ }
+
if ( !theMap.IsEmpty() )
{
//======================================================================
- // HAS initial vertex association
+ // 3) HAS initial vertex association
//======================================================================
switch ( theShape1.ShapeType() ) {
// ----------------------------------------------------------------------
RETURN_BAD_RESULT("Wrong map extent " << theMap.Extent() );
TopoDS_Edge edge1 = TopoDS::Edge( theShape1 );
TopoDS_Edge edge2 = TopoDS::Edge( theShape2 );
+ if ( edge1.Orientation() >= TopAbs_INTERNAL ) edge1.Orientation( TopAbs_FORWARD );
+ if ( edge2.Orientation() >= TopAbs_INTERNAL ) edge2.Orientation( TopAbs_FORWARD );
TopoDS_Vertex VV1[2], VV2[2];
TopExp::Vertices( edge1, VV1[0], VV1[1] );
TopExp::Vertices( edge2, VV2[0], VV2[1] );
// ----------------------------------------------------------------------
TopoDS_Face face1 = TopoDS::Face( theShape1 );
TopoDS_Face face2 = TopoDS::Face( theShape2 );
+ if ( face1.Orientation() >= TopAbs_INTERNAL ) face1.Orientation( TopAbs_FORWARD );
+ if ( face2.Orientation() >= TopAbs_INTERNAL ) face2.Orientation( TopAbs_FORWARD );
TopoDS_Vertex VV1[2], VV2[2];
// find a not closed edge of face1 both vertices of which are associated
TopExp_Explorer exp ( theShape1, TopAbs_EDGE );
for ( ; VV2[ 1 ].IsNull() && exp.More(); exp.Next() ) {
edge1 = TopoDS::Edge( exp.Current() );
+ if ( edge1.Orientation() >= TopAbs_INTERNAL ) edge1.Orientation( TopAbs_FORWARD );
TopExp::Vertices( edge1 , VV1[0], VV1[1] );
if ( theMap.IsBound( VV1[0] )) {
VV2[ 0 ] = TopoDS::Vertex( theMap( VV1[0] ));
if ( !initAssocOK ) {
// for shell association there must be an edge with both vertices bound
TopoDS_Vertex v1, v2;
- TopExp::Vertices( TopoDS::Edge( it1.Value()), v1, v2 );
+ TopExp::Vertices( TopoDS::Edge( it1.Value().Oriented(TopAbs_FORWARD)), v1, v2 );
initAssocOK = ( theMap.IsBound( v1 ) && theMap.IsBound( v2 ));
}
}
} // end case of available initial vertex association
//======================================================================
- // NO INITIAL VERTEX ASSOCIATION
+ // 4) NO INITIAL VERTEX ASSOCIATION
//======================================================================
switch ( theShape1.ShapeType() ) {
{
TopoDS_Face face1 = TopoDS::Face(theShape1);
TopoDS_Face face2 = TopoDS::Face(theShape2);
+ if ( face1.Orientation() >= TopAbs_INTERNAL ) face1.Orientation( TopAbs_FORWARD );
+ 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 ));
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
}
}
if ( !propag_edges.empty() ) // propagation found
TopTools_IndexedMapOfShape vMap1, vMap2;
TopExp::MapShapes( theShape1, TopAbs_VERTEX, vMap1 );
TopExp::MapShapes( theShape2, TopAbs_VERTEX, vMap2 );
+ TopoDS_Vertex VV1[2], VV2[2];
if ( vMap1.Extent() != vMap2.Extent() )
RETURN_BAD_RESULT("Different nb of vertices");
return FindSubShapeAssociation( theShape1, theMesh1, theShape2, theMesh2, theMap);
}
+ // Try to associate by common vertices of an edge
+ for ( int i = 1; i <= vMap1.Extent(); ++i )
+ {
+ const TopoDS_Shape& v1 = vMap1(i);
+ if ( vMap2.Contains( v1 ))
+ {
+ // find an egde sharing v1 and sharing at the same time another common vertex
+ PShapeIteratorPtr edgeIt = SMESH_MesherHelper::GetAncestors( v1, *theMesh1, TopAbs_EDGE);
+ bool edgeFound = false;
+ while ( edgeIt->more() && !edgeFound )
+ {
+ TopoDS_Edge edge = TopoDS::Edge( edgeIt->next()->Oriented(TopAbs_FORWARD));
+ TopExp::Vertices(edge, VV1[0], VV1[1]);
+ if ( !VV1[0].IsSame( VV1[1] ))
+ edgeFound = ( vMap2.Contains( VV1[ v1.IsSame(VV1[0]) ? 1:0]));
+ }
+ if ( edgeFound )
+ {
+ InsertAssociation( VV1[0], VV1[0], theMap, bidirect );
+ InsertAssociation( VV1[1], VV1[1], theMap, bidirect );
+ if (FindSubShapeAssociation( theShape1, theMesh1, theShape2, theMesh2, theMap ))
+ return true;
+ }
+ }
+ }
+
// Find transformation to make the shapes be of similar size at same location
Bnd_Box box[2];
// Find 2 closest vertices
- TopoDS_Vertex VV1[2], VV2[2];
// get 2 linked vertices of shape 1 not belonging to an inner wire of a face
TopoDS_Shape edge = theShape1;
TopExp_Explorer expF( theShape1, TopAbs_FACE ), expE;
if ( edge.IsNull() || edge.ShapeType() != TopAbs_EDGE )
RETURN_BAD_RESULT("Edge not found");
- TopExp::Vertices( TopoDS::Edge( edge ), VV1[0], VV1[1]);
+ TopExp::Vertices( TopoDS::Edge( edge.Oriented(TopAbs_FORWARD)), VV1[0], VV1[1]);
if ( VV1[0].IsSame( VV1[1] ))
RETURN_BAD_RESULT("Only closed edges");
*/
//================================================================================
-int StdMeshers_ProjectionUtils::FindFaceAssociation(const TopoDS_Face& face1,
- TopoDS_Vertex VV1[2],
- const TopoDS_Face& face2,
- TopoDS_Vertex VV2[2],
+int StdMeshers_ProjectionUtils::FindFaceAssociation(const TopoDS_Face& face1,
+ TopoDS_Vertex VV1[2],
+ const TopoDS_Face& face2,
+ TopoDS_Vertex VV2[2],
list< TopoDS_Edge > & edges1,
list< TopoDS_Edge > & edges2)
{
- edges1.clear();
- edges2.clear();
-
- list< int > nbVInW1, nbVInW2;
- if ( SMESH_Block::GetOrderedEdges( face1, VV1[0], edges1, nbVInW1) !=
- SMESH_Block::GetOrderedEdges( face2, VV2[0], edges2, nbVInW2) )
- RETURN_BAD_RESULT("Different number of wires in faces ");
-
- if ( nbVInW1.front() != nbVInW2.front() )
- RETURN_BAD_RESULT("Different number of edges in faces: " <<
- nbVInW1.front() << " != " << nbVInW2.front());
-
- // Define if we need to reverse one of wires to make edges in lists match each other
-
- bool reverse = false;
-
- list< TopoDS_Edge >::iterator eBackIt;
- if ( !VV1[1].IsSame( TopExp::LastVertex( edges1.front(), true ))) {
- reverse = true;
- eBackIt = --edges1.end();
- // check if the second vertex belongs to the first or last edge in the wire
- if ( !VV1[1].IsSame( TopExp::FirstVertex( *eBackIt, true ))) {
- bool KO = true; // belongs to none
- if ( nbVInW1.size() > 1 ) { // several wires
- eBackIt = edges1.begin();
- for ( int i = 1; i < nbVInW1.front(); ++i ) ++eBackIt;
- KO = !VV1[1].IsSame( TopExp::FirstVertex( *eBackIt, true ));
+ bool OK = false;
+ list< int > nbEInW1, nbEInW2;
+ 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) )
+ CONT_BAD_RESULT("Different number of wires in faces ");
+
+ if ( nbEInW1 != nbEInW2 )
+ CONT_BAD_RESULT("Different number of edges in faces: " <<
+ nbEInW1.front() << " != " << nbEInW2.front());
+
+ i_ok_wire_algo = outer_wire_algo;
+
+ // Define if we need to reverse one of wires to make edges in lists match each other
+
+ bool reverse = false;
+
+ list< TopoDS_Edge >::iterator edgeIt;
+ if ( !VV1[1].IsSame( TopExp::LastVertex( edges1.front(), true ))) {
+ reverse = true;
+ edgeIt = --edges1.end();
+ // check if the second vertex belongs to the first or last edge in the wire
+ if ( !VV1[1].IsSame( TopExp::FirstVertex( *edgeIt, true ))) {
+ bool KO = true; // belongs to none
+ if ( nbEInW1.size() > 1 ) { // several wires
+ edgeIt = edges1.begin();
+ std::advance( edgeIt, nbEInW1.front()-1 );
+ KO = !VV1[1].IsSame( TopExp::FirstVertex( *edgeIt, true ));
+ }
+ if ( KO )
+ CONT_BAD_RESULT("GetOrderedEdges() failed");
}
- if ( KO )
- RETURN_BAD_RESULT("GetOrderedEdges() failed");
}
- }
- eBackIt = --edges2.end();
- if ( !VV2[1].IsSame( TopExp::LastVertex( edges2.front(), true ))) {
- reverse = !reverse;
- // check if the second vertex belongs to the first or last edge in the wire
- if ( !VV2[1].IsSame( TopExp::FirstVertex( *eBackIt, true ))) {
- bool KO = true; // belongs to none
- if ( nbVInW2.size() > 1 ) { // several wires
- eBackIt = edges2.begin();
- for ( int i = 1; i < nbVInW2.front(); ++i ) ++eBackIt;
- KO = !VV2[1].IsSame( TopExp::FirstVertex( *eBackIt, true ));
+ edgeIt = --edges2.end();
+ if ( !VV2[1].IsSame( TopExp::LastVertex( edges2.front(), true ))) {
+ reverse = !reverse;
+ // check if the second vertex belongs to the first or last edge in the wire
+ if ( !VV2[1].IsSame( TopExp::FirstVertex( *edgeIt, true ))) {
+ bool KO = true; // belongs to none
+ if ( nbEInW2.size() > 1 ) { // several wires
+ edgeIt = edges2.begin();
+ std::advance( edgeIt, nbEInW2.front()-1 );
+ KO = !VV2[1].IsSame( TopExp::FirstVertex( *edgeIt, true ));
+ }
+ if ( KO )
+ CONT_BAD_RESULT("GetOrderedEdges() failed");
}
- if ( KO )
- RETURN_BAD_RESULT("GetOrderedEdges() failed");
}
- }
- if ( reverse )
+ if ( reverse )
+ {
+ Reverse( edges2 , nbEInW2.front());
+ if (( VV1[1].IsSame( TopExp::LastVertex( edges1.front(), true ))) !=
+ ( VV2[1].IsSame( TopExp::LastVertex( edges2.front(), true ))))
+ CONT_BAD_RESULT("GetOrderedEdges() failed");
+ }
+ OK = true;
+
+ } // 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 )
{
- Reverse( edges2 , nbVInW2.front());
- if (( VV1[1].IsSame( TopExp::LastVertex( edges1.front(), true ))) !=
- ( VV2[1].IsSame( TopExp::LastVertex( edges2.front(), true ))))
- RETURN_BAD_RESULT("GetOrderedEdges() failed");
+ // Check that Vec(VV1[0],VV1[1]) in 2D on face1 is the same
+ // as Vec(VV2[0],VV2[1]) on face2
+ double vTol = BRep_Tool::Tolerance( VV1[0] );
+ BRepAdaptor_Surface surface1( face1, false );
+ double vTolUV =
+ surface1.UResolution( vTol ) + surface1.VResolution( vTol ); // let's be tolerant
+ gp_Pnt2d v0f1UV = BRep_Tool::Parameters( VV1[0], face1 );
+ gp_Pnt2d v0f2UV = BRep_Tool::Parameters( VV2[0], face2 );
+ gp_Pnt2d v1f1UV = BRep_Tool::Parameters( VV1[1], face1 );
+ gp_Pnt2d v1f2UV = BRep_Tool::Parameters( VV2[1], face2 );
+ gp_Vec2d v01f1Vec( v0f1UV, v1f1UV );
+ gp_Vec2d v01f2Vec( v0f2UV, v1f2UV );
+ if ( Abs( v01f1Vec.X()-v01f2Vec.X()) < vTolUV && Abs( v01f1Vec.Y()-v01f2Vec.Y()) < vTolUV )
+ {
+ if ( i_ok_wire_algo != 1 )
+ {
+ 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);
+ }
+ 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
+ {
+ // 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
+ 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 ))
+ {
+ if ( nbEInW == nbEInW1.begin() )
+ OK = true; // OK is for the first wire
+ // reverse edges2 if needed
+ if ( !sameVertexUV( *edge2Beg, face2, 1, v1f1UV, vTolUV ))
+ {
+ Reverse( edges2 , *nbEInW, distance( edges2.begin(),edge2Beg ));
+ // set correct edge2End
+ edge2End = edges2.begin();
+ std::advance( edge2End, std::accumulate( nbEInW1.begin(), nbEInW, *nbEInW));
+ }
+ }
+ // prepare to the next wire loop
+ edge1Beg = edge1End, edge2Beg = edge2End;
+ }
+ }
}
- return nbVInW2.front();
+
+ return OK ? nbEInW1.front() : 0;
}
//=======================================================================
const bool theBidirectional)
{
if ( !theShape1.IsNull() && !theShape2.IsNull() ) {
- SHOW_VERTEX(theShape1,"Assoc ");
- SHOW_VERTEX(theShape2," to ");
+ SHOW_SHAPE(theShape1,"Assoc ");
+ SHOW_SHAPE(theShape2," to ");
bool isNew = ( theAssociationMap.Bind( theShape1, theShape2 ));
if ( theBidirectional )
theAssociationMap.Bind( theShape2, theShape1 );
return false;
}
-//=======================================================================
-//function : IsSubShape
-//purpose :
-//=======================================================================
-
-bool StdMeshers_ProjectionUtils::IsSubShape( const TopoDS_Shape& shape,
- SMESH_Mesh* aMesh )
-{
- if ( shape.IsNull() || !aMesh )
- return false;
- return
- aMesh->GetMeshDS()->ShapeToIndex( shape ) ||
- // PAL16202
- shape.ShapeType() == TopAbs_COMPOUND && aMesh->GetMeshDS()->IsGroupOfSubShapes( shape );
-}
-
-//=======================================================================
-//function : IsSubShape
-//purpose :
-//=======================================================================
-
-bool StdMeshers_ProjectionUtils::IsSubShape( const TopoDS_Shape& shape,
- const TopoDS_Shape& mainShape )
-{
- if ( !shape.IsNull() && !mainShape.IsNull() )
- {
- for ( TopExp_Explorer exp( mainShape, shape.ShapeType());
- exp.More();
- exp.Next() )
- if ( shape.IsSame( exp.Current() ))
- return true;
- }
- SCRUTE((shape.IsNull()));
- SCRUTE((mainShape.IsNull()));
- return false;
-}
-
-
//=======================================================================
/*!
* \brief Finds an edge by its vertices in a main shape of the mesh
if ( !assocMap.IsBound( e2 ))
RETURN_BAD_RESULT("Association not found for edge " << meshDS2->ShapeToIndex( e2 ));
TopoDS_Edge e1 = TopoDS::Edge( assocMap( e2 ));
- if ( !IsSubShape( e1, face1 ))
+ if ( !helper1.IsSubShape( e1, face1 ))
RETURN_BAD_RESULT("Wrong association, edge " << meshDS1->ShapeToIndex( e1 ) <<
" isn't a subshape of face " << meshDS1->ShapeToIndex( face1 ));
// check that there are nodes on edges
const SMDS_MeshElement* f = ( iF ? f2 : f1 );
for ( int i = 0; !notSeamNode[ iF ] && i < f->NbNodes(); ++i ) {
const SMDS_MeshNode* node = f->GetNode( i );
- if ( !helper->IsSeamShape( node->GetPosition()->GetShapeId() ))
+ if ( !helper->IsSeamShape( node->getshapeId() ))
notSeamNode[ iF ] = node;
}
}
while ( nIt->more() ) {
const SMDS_MeshNode* node = nIt->next();
const SMDS_EdgePosition* pos =
- static_cast<const SMDS_EdgePosition*>(node->GetPosition().get());
+ static_cast<const SMDS_EdgePosition*>(node->GetPosition());
pos2nodes.insert( make_pair( pos->GetUParameter(), node ));
}
if ( pos2nodes.size() != edgeSM->NbNodes() )
SMESH_Mesh* srcMesh)
{
// Set listener that resets an event listener on source submesh when
- // "ProjectionSource*D" hypothesis is modified
+ // "ProjectionSource*D" hypothesis is modified since source shape can be changed
subMesh->SetEventListener( GetHypModifWaiter(),0,subMesh);
// Set an event listener to submesh of the source shape
for (; it.More(); it.Next())
{
SMESH_subMesh* srcSM = srcMesh->GetSubMesh( it.Current() );
- SMESH_subMeshEventListenerData* data =
- srcSM->GetEventListenerData(GetSrcSubMeshListener());
- if ( data )
- data->mySubMeshes.push_back( subMesh );
- else
- data = SMESH_subMeshEventListenerData::MakeData( subMesh );
- subMesh->SetEventListener ( GetSrcSubMeshListener(), data, srcSM );
+ if ( srcSM != subMesh )
+ {
+ SMESH_subMeshEventListenerData* data =
+ srcSM->GetEventListenerData(GetSrcSubMeshListener());
+ if ( data )
+ data->mySubMeshes.push_back( subMesh );
+ else
+ data = SMESH_subMeshEventListenerData::MakeData( subMesh );
+ subMesh->SetEventListener ( GetSrcSubMeshListener(), data, srcSM );
+ }
}
}
else
