X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FStdMeshers%2FStdMeshers_ProjectionUtils.cxx;h=2bf6ac4be03b1dc46868342214f9d810e67dbcb9;hb=127d2277c6a516d0e9fadd77b4ef0b0c6286cf17;hp=c276b3afa70705ebc049ab19c2630874c39b7d21;hpb=358f8ddd54e7ed553eecc22ca665575e4019e3a0;p=modules%2Fsmesh.git diff --git a/src/StdMeshers/StdMeshers_ProjectionUtils.cxx b/src/StdMeshers/StdMeshers_ProjectionUtils.cxx index c276b3afa..2bf6ac4be 100644 --- a/src/StdMeshers/StdMeshers_ProjectionUtils.cxx +++ b/src/StdMeshers/StdMeshers_ProjectionUtils.cxx @@ -1,31 +1,29 @@ -// SMESH SMESH : idl implementation based on 'SMESH' unit's calsses +// Copyright (C) 2007-2008 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 +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License. // -// Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS -// -// This library is free software; you can redistribute it and/or -// modify it under the terms of the GNU Lesser General Public -// License as published by the Free Software Foundation; either -// version 2.1 of the License. -// -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// Lesser General Public License for more details. -// -// You should have received a copy of the GNU Lesser General Public -// License along with this library; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -// -// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. // +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // +// 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 // Author : Edward AGAPOV (eap) - - +// #include "StdMeshers_ProjectionUtils.hxx" #include "StdMeshers_ProjectionSource1D.hxx" @@ -45,25 +43,30 @@ #include "utilities.h" -#include #include #include +#include #include #include #include +#include +#include #include -#include #include #include #include +#include +#include #include -#include #include -#include #include +#include +#include + +using namespace std; -#define RETURN_BAD_RESULT(msg) { MESSAGE(msg); return false; } +#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) {\ @@ -146,10 +149,11 @@ namespace { * \param edges2 - matching edges of another face * \param theMesh1 - mesh 1 * \param theMesh2 - mesh 2 + * \retval bool - true if association was fixed */ //================================================================================ - void FixAssocByPropagation( const int nbEdges, + bool FixAssocByPropagation( const int nbEdges, list< TopoDS_Edge > & edges1, list< TopoDS_Edge > & edges2, SMESH_Mesh* theMesh1, @@ -159,10 +163,44 @@ namespace { { list< TopoDS_Edge >::iterator eIt2 = ++edges2.begin(); // 2nd edge of the 2nd face TopoDS_Edge edge2 = - StdMeshers_ProjectionUtils::GetPropagationEdge( theMesh1, *eIt2, edges1.front() ); - if ( !edge2.IsNull() ) // propagation found for the second edge + StdMeshers_ProjectionUtils::GetPropagationEdge( theMesh1, *eIt2, edges1.front() ).second; + if ( !edge2.IsNull() ) { // propagation found for the second edge Reverse( edges2, nbEdges ); + return true; + } } + return false; + } + + //================================================================================ + /*! + * \brief Look for a group containing a target shape and similar to a source group + * \param tgtShape - target edge or face + * \param tgtMesh1 - target mesh + * \param srcGroup - source group + * \retval TopoDS_Shape - found target group + */ + //================================================================================ + + TopoDS_Shape FindGroupContaining(const TopoDS_Shape& tgtShape, + const SMESH_Mesh* tgtMesh1, + const TopoDS_Shape& srcGroup) + { + list subMeshes = tgtMesh1->GetGroupSubMeshesContaining(tgtShape); + list::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)) + break; + if ( type == last ) + return group; + } + return TopoDS_Shape(); } } @@ -185,15 +223,32 @@ bool StdMeshers_ProjectionUtils::FindSubShapeAssociation(const TopoDS_Shape& the SMESH_Mesh* theMesh2, TShapeShapeMap & theMap) { - if ( theShape1.ShapeType() != theShape2.ShapeType() ) - RETURN_BAD_RESULT("Different shape types"); + 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; + group2 = FindGroupContaining( theShape2, theMesh2, group1 ); + } + else if ( theShape2.ShapeType() == TopAbs_COMPOUND ) { + group2 = theShape2; + group1 = FindGroupContaining( theShape1, theMesh1, group2 ); + } + if ( group1.IsNull() || group2.IsNull() ) + RETURN_BAD_RESULT("Different shape types"); + // Associate compounds + return FindSubShapeAssociation(group1, theMesh1, group2, theMesh2, theMap ); + } bool bidirect = ( !theShape1.IsSame( theShape2 )); - if ( !theMap.IsEmpty()) + if ( !theMap.IsEmpty() ) { + //====================================================================== + // HAS initial vertex association + //====================================================================== switch ( theShape1.ShapeType() ) { - - case TopAbs_EDGE: { + // ---------------------------------------------------------------------- + case TopAbs_EDGE: { // TopAbs_EDGE // ---------------------------------------------------------------------- if ( theMap.Extent() != 2 ) RETURN_BAD_RESULT("Wrong map extent " << theMap.Extent() ); @@ -206,10 +261,11 @@ bool StdMeshers_ProjectionUtils::FindSubShapeAssociation(const TopoDS_Shape& the if ( theMap.IsBound( VV1[ i1 ] )) i1 = 1; if ( theMap.IsBound( VV2[ i2 ] )) i2 = 1; InsertAssociation( VV1[ i1 ], VV2[ i2 ], theMap, bidirect); + InsertAssociation( theShape1, theShape2, theMap, bidirect ); return true; } - - case TopAbs_FACE: { + // ---------------------------------------------------------------------- + case TopAbs_FACE: { // TopAbs_FACE // ---------------------------------------------------------------------- TopoDS_Face face1 = TopoDS::Face( theShape1 ); TopoDS_Face face2 = TopoDS::Face( theShape2 ); @@ -247,10 +303,11 @@ bool StdMeshers_ProjectionUtils::FindSubShapeAssociation(const TopoDS_Shape& the VV2[0] = TopExp::FirstVertex( *eIt2, true ); InsertAssociation( VV1[0], VV2[0], theMap, bidirect); } + InsertAssociation( theShape1, theShape2, theMap, bidirect ); return true; } - - case TopAbs_SHELL: + // ---------------------------------------------------------------------- + case TopAbs_SHELL: // TopAbs_SHELL, TopAbs_SOLID case TopAbs_SOLID: { // ---------------------------------------------------------------------- TopoDS_Vertex VV1[2], VV2[2]; @@ -272,22 +329,42 @@ bool StdMeshers_ProjectionUtils::FindSubShapeAssociation(const TopoDS_Shape& the if ( edge2.IsNull() ) RETURN_BAD_RESULT("GetEdgeByVertices() failed"); - // get a face sharing edge1 - TopoDS_Shape F1, F2, FF2[2]; - TopTools_ListIteratorOfListOfShape ancestIt = theMesh1->GetAncestors( edge1 ); - for ( ; F1.IsNull() && ancestIt.More(); ancestIt.Next() ) - if ( ancestIt.Value().ShapeType() == TopAbs_FACE ) - F1 = ancestIt.Value().Oriented( TopAbs_FORWARD ); + // build map of edge to faces if shapes are not subshapes of main ones + bool isSubOfMain = false; + if ( SMESHDS_SubMesh * sm = theMesh1->GetMeshDS()->MeshElements( theShape1 )) + isSubOfMain = !sm->IsComplexSubmesh(); + else + isSubOfMain = theMesh1->GetMeshDS()->ShapeToIndex( theShape1 ); + TAncestorMap e2f1, e2f2; + const TAncestorMap& edgeToFace1 = isSubOfMain ? theMesh1->GetAncestorMap() : e2f1; + const TAncestorMap& edgeToFace2 = isSubOfMain ? theMesh2->GetAncestorMap() : e2f2; + if (!isSubOfMain) { + TopExp::MapShapesAndAncestors( theShape1, TopAbs_EDGE, TopAbs_FACE, e2f1 ); + TopExp::MapShapesAndAncestors( theShape2, TopAbs_EDGE, TopAbs_FACE, e2f2 ); + if ( !edgeToFace1.Contains( edge1 )) + RETURN_BAD_RESULT("edge1 does not belong to theShape1"); + if ( !edgeToFace2.Contains( edge2 )) + RETURN_BAD_RESULT("edge2 does not belong to theShape2"); + } + // + // Look for 2 corresponing faces: + // + TopoDS_Shape F1, F2; + + // get a face sharing edge1 (F1) + TopoDS_Shape FF2[2]; + TopTools_ListIteratorOfListOfShape ancestIt1( edgeToFace1.FindFromKey( edge1 )); + for ( ; F1.IsNull() && ancestIt1.More(); ancestIt1.Next() ) + if ( ancestIt1.Value().ShapeType() == TopAbs_FACE ) + F1 = ancestIt1.Value().Oriented( TopAbs_FORWARD ); if ( F1.IsNull() ) RETURN_BAD_RESULT(" Face1 not found"); - // get 2 faces sharing edge2 - ancestIt = theMesh2->GetAncestors( edge2 ); - for ( int i = 0; FF2[1].IsNull() && ancestIt.More(); ancestIt.Next() ) - if ( ancestIt.Value().ShapeType() == TopAbs_FACE ) - FF2[ i++ ] = ancestIt.Value().Oriented( TopAbs_FORWARD ); - if ( FF2[1].IsNull() ) - RETURN_BAD_RESULT("2 faces not found"); + // get 2 faces sharing edge2 (one of them is F2) + TopTools_ListIteratorOfListOfShape ancestIt2( edgeToFace2.FindFromKey( edge2 )); + for ( int i = 0; FF2[1].IsNull() && ancestIt2.More(); ancestIt2.Next() ) + if ( ancestIt2.Value().ShapeType() == TopAbs_FACE ) + FF2[ i++ ] = ancestIt2.Value().Oriented( TopAbs_FORWARD ); // get oriented edge1 and edge2 from F1 and FF2[0] for ( exp.Init( F1, TopAbs_EDGE ); exp.More(); exp.Next() ) @@ -295,7 +372,6 @@ bool StdMeshers_ProjectionUtils::FindSubShapeAssociation(const TopoDS_Shape& the edge1 = TopoDS::Edge( exp.Current() ); break; } - for ( exp.Init( FF2[ 0 ], TopAbs_EDGE ); exp.More(); exp.Next() ) if ( edge2.IsSame( exp.Current() )) { edge2 = TopoDS::Edge( exp.Current() ); @@ -305,13 +381,16 @@ bool StdMeshers_ProjectionUtils::FindSubShapeAssociation(const TopoDS_Shape& the // compare first vertices of edge1 and edge2 TopExp::Vertices( edge1, VV1[0], VV1[1], true ); TopExp::Vertices( edge2, VV2[0], VV2[1], true ); - F2 = FF2[ 0 ]; + F2 = FF2[ 0 ]; // (F2 !) if ( !VV1[ 0 ].IsSame( theMap( VV2[ 0 ]))) { - F2 = FF2[ 1 ]; edge2.Reverse(); + if ( FF2[ 1 ].IsNull() ) + F2.Reverse(); + else + F2 = FF2[ 1 ]; } - TopTools_MapOfShape boundEdges; + TopTools_MapOfShape boundEdges; // association of face subshapes and neighbour faces list< pair < TopoDS_Face, TopoDS_Edge > > FE1, FE2; @@ -330,39 +409,280 @@ bool StdMeshers_ProjectionUtils::FindSubShapeAssociation(const TopoDS_Shape& the list< TopoDS_Edge > edges1, edges2; int nbE = FindFaceAssociation( face1, VV1, face2, VV2, edges1, edges2 ); if ( !nbE ) RETURN_BAD_RESULT("FindFaceAssociation() failed"); - FixAssocByPropagation( nbE, edges1, edges2, theMesh1, theMesh2 ); - InsertAssociation( face1, face2, theMap, bidirect); // assoc faces + MESSAGE("Assoc FACE " << theMesh1->GetMeshDS()->ShapeToIndex( face1 )<< + " to " << theMesh2->GetMeshDS()->ShapeToIndex( face2 )); + if ( nbE == 2 && (edge1.IsSame( edges1.front())) != (edge2.IsSame( edges2.front()))) + { + Reverse( edges2, nbE ); + } list< TopoDS_Edge >::iterator eIt1 = edges1.begin(); list< TopoDS_Edge >::iterator eIt2 = edges2.begin(); for ( ; eIt1 != edges1.end(); ++eIt1, ++eIt2 ) { if ( !boundEdges.Add( *eIt1 )) continue; // already associated InsertAssociation( *eIt1, *eIt2, theMap, bidirect); // assoc edges + MESSAGE("Assoc edge " << theMesh1->GetMeshDS()->ShapeToIndex( *eIt1 )<< + " to " << theMesh2->GetMeshDS()->ShapeToIndex( *eIt2 )); VV1[0] = TopExp::FirstVertex( *eIt1, true ); VV2[0] = TopExp::FirstVertex( *eIt2, true ); InsertAssociation( VV1[0], VV2[0], theMap, bidirect); // assoc vertices + MESSAGE("Assoc vertex " << theMesh1->GetMeshDS()->ShapeToIndex( VV1[0] )<< + " to " << theMesh2->GetMeshDS()->ShapeToIndex( VV2[0] )); // add adjacent faces to process - TopoDS_Face nextFace1 = GetNextFace( theMesh1, *eIt1, face1 ); - TopoDS_Face nextFace2 = GetNextFace( theMesh2, *eIt2, face2 ); + TopoDS_Face nextFace1 = GetNextFace( edgeToFace1, *eIt1, face1 ); + TopoDS_Face nextFace2 = GetNextFace( edgeToFace2, *eIt2, face2 ); if ( !nextFace1.IsNull() && !nextFace2.IsNull() ) { FE1.push_back( make_pair( nextFace1, *eIt1 )); FE2.push_back( make_pair( nextFace2, *eIt2 )); } } } + InsertAssociation( theShape1, theShape2, theMap, bidirect ); + return true; + } + // ---------------------------------------------------------------------- + case TopAbs_COMPOUND: { // GROUP + // ---------------------------------------------------------------------- + // Maybe groups contain only one member + TopoDS_Iterator it1( theShape1 ), it2( theShape2 ); + TopAbs_ShapeEnum memberType = it1.Value().ShapeType(); + int nbMembers = Count( theShape1, memberType, true ); + if ( nbMembers == 0 ) return true; + if ( nbMembers == 1 ) { + return FindSubShapeAssociation( it1.Value(), theMesh1, it2.Value(), theMesh2, theMap ); + } + // Try to make shells of faces + // + BRep_Builder builder; + TopoDS_Shell shell1, shell2; + builder.MakeShell(shell1); builder.MakeShell(shell2); + if ( memberType == TopAbs_FACE ) { + // just add faces of groups to shells + for (; it1.More(); it1.Next(), it2.Next() ) + builder.Add( shell1, it1.Value() ), builder.Add( shell2, it2.Value() ); + } + else if ( memberType == TopAbs_EDGE ) { + // Try to add faces sharing more than one edge of a group or + // sharing all its vertices with the group + TopTools_IndexedMapOfShape groupVertices[2]; + TopExp::MapShapes( theShape1, TopAbs_VERTEX, groupVertices[0]); + TopExp::MapShapes( theShape2, TopAbs_VERTEX, groupVertices[1]); + // + TopTools_MapOfShape groupEdges[2], addedFaces[2]; + bool hasInitAssoc = (!theMap.IsEmpty()), initAssocOK = !hasInitAssoc; + for (; it1.More(); it1.Next(), it2.Next() ) { + groupEdges[0].Add( it1.Value() ); + groupEdges[1].Add( it2.Value() ); + 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 ); + initAssocOK = ( theMap.IsBound( v1 ) && theMap.IsBound( v2 )); + } + } + for (int is2ndGroup = 0; initAssocOK && is2ndGroup < 2; ++is2ndGroup) { + const TopoDS_Shape& group = is2ndGroup ? theShape2: theShape1; + SMESH_Mesh* mesh = is2ndGroup ? theMesh2 : theMesh1; + TopoDS_Shell& shell = is2ndGroup ? shell2 : shell1; + for ( TopoDS_Iterator it( group ); it.More(); it.Next() ) { + const TopoDS_Edge& edge = TopoDS::Edge( it.Value() ); + TopoDS_Face face; + for ( int iF = 0; iF < 2; ++iF ) { // loop on 2 faces sharing edge + face = GetNextFace(mesh->GetAncestorMap(), edge, face); + if ( !face.IsNull() ) { + int nbGroupEdges = 0; + for ( TopExp_Explorer f( face, TopAbs_EDGE ); f.More(); f.Next()) + if ( groupEdges[ is2ndGroup ].Contains( f.Current() )) + if ( ++nbGroupEdges > 1 ) + break; + bool add = (nbGroupEdges > 1 || Count( face, TopAbs_EDGE, true ) == 1 ); + if ( !add ) { + add = true; + for ( TopExp_Explorer v( face, TopAbs_VERTEX ); add && v.More(); v.Next()) + add = groupVertices[ is2ndGroup ].Contains( v.Current() ); + } + if ( add && addedFaces[ is2ndGroup ].Add( face )) + builder.Add( shell, face ); + } + } + } + } + } else { + RETURN_BAD_RESULT("Unexpected group type"); + } + // Associate shells + // + int nbFaces1 = Count( shell1, TopAbs_FACE, 0 ); + int nbFaces2 = Count( shell2, TopAbs_FACE, 0 ); + if ( nbFaces1 != nbFaces2 ) + RETURN_BAD_RESULT("Different nb of faces found for shells"); + if ( nbFaces1 > 0 ) { + bool ok = false; + if ( nbFaces1 == 1 ) { + TopoDS_Shape F1 = TopoDS_Iterator( shell1 ).Value(); + TopoDS_Shape F2 = TopoDS_Iterator( shell2 ).Value(); + ok = FindSubShapeAssociation( F1, theMesh1, F2, theMesh2, theMap ); + } + else { + ok = FindSubShapeAssociation(shell1, theMesh1, shell2, theMesh2, theMap ); + } + // Check if all members are mapped + if ( ok ) { + TopTools_MapOfShape boundMembers[2]; + TopoDS_Iterator mIt; + for ( mIt.Initialize( theShape1 ); mIt.More(); mIt.Next()) + if ( theMap.IsBound( mIt.Value() )) { + boundMembers[0].Add( mIt.Value() ); + boundMembers[1].Add( theMap( mIt.Value() )); + } + if ( boundMembers[0].Extent() != nbMembers ) { + // make compounds of not bound members + TopoDS_Compound comp[2]; + for ( int is2ndGroup = 0; is2ndGroup < 2; ++is2ndGroup ) { + builder.MakeCompound( comp[is2ndGroup] ); + for ( mIt.Initialize( is2ndGroup ? theShape2:theShape1 ); mIt.More(); mIt.Next()) + if ( ! boundMembers[ is2ndGroup ].Contains( mIt.Value() )) + builder.Add( comp[ is2ndGroup ], mIt.Value() ); + } + // check if theMap contains initial association for the comp's + bool hasInitialAssoc = false; + if ( memberType == TopAbs_EDGE ) { + for ( TopExp_Explorer v( comp[0], TopAbs_VERTEX ); v.More(); v.Next()) + if ( theMap.IsBound( v.Current() )) { + hasInitialAssoc = true; + break; + } + } + if ( hasInitialAssoc == bool( !theMap.IsEmpty() )) + ok = FindSubShapeAssociation( comp[0], theMesh1, comp[1], theMesh2, theMap ); + else { + TShapeShapeMap tmpMap; + ok = FindSubShapeAssociation( comp[0], theMesh1, comp[1], theMesh2, tmpMap ); + if ( ok ) { + TopTools_DataMapIteratorOfDataMapOfShapeShape mapIt( tmpMap ); + for ( ; mapIt.More(); mapIt.Next() ) + theMap.Bind( mapIt.Key(), mapIt.Value()); + } + } + } + } + return ok; + } + // Each edge of an edge group is shared by own faces + // ------------------------------------------------------------------ + // + // map vertices to edges sharing them, avoid doubling edges in lists + TopTools_DataMapOfShapeListOfShape v2e[2]; + for (int isFirst = 0; isFirst < 2; ++isFirst ) { + const TopoDS_Shape& group = isFirst ? theShape1 : theShape2; + TopTools_DataMapOfShapeListOfShape& veMap = v2e[ isFirst ? 0 : 1 ]; + TopTools_MapOfShape addedEdges; + for ( TopExp_Explorer e( group, TopAbs_EDGE ); e.More(); e.Next() ) { + const TopoDS_Shape& edge = e.Current(); + if ( addedEdges.Add( edge )) { + for ( TopExp_Explorer v( edge, TopAbs_VERTEX ); v.More(); v.Next()) { + const TopoDS_Shape& vertex = v.Current(); + if ( !veMap.IsBound( vertex )) { + TopTools_ListOfShape l; + veMap.Bind( vertex, l ); + } + veMap( vertex ).Append( edge ); + } + } + } + } + while ( !v2e[0].IsEmpty() ) + { + // find a bound vertex + TopoDS_Vertex V[2]; + TopTools_DataMapIteratorOfDataMapOfShapeListOfShape v2eIt( v2e[0] ); + for ( ; v2eIt.More(); v2eIt.Next()) + if ( theMap.IsBound( v2eIt.Key() )) { + V[0] = TopoDS::Vertex( v2eIt.Key() ); + V[1] = TopoDS::Vertex( theMap( V[0] )); + break; + } + if ( V[0].IsNull() ) + RETURN_BAD_RESULT("No more bound vertices"); + + while ( !V[0].IsNull() && v2e[0].IsBound( V[0] )) { + TopTools_ListOfShape& edges0 = v2e[0]( V[0] ); + TopTools_ListOfShape& edges1 = v2e[1]( V[1] ); + int nbE0 = edges0.Extent(), nbE1 = edges1.Extent(); + if ( nbE0 != nbE1 ) + RETURN_BAD_RESULT("Different nb of edges: "<< nbE0 << " != " << nbE1); + + if ( nbE0 == 1 ) + { + TopoDS_Edge e0 = TopoDS::Edge( edges0.First() ); + TopoDS_Edge e1 = TopoDS::Edge( edges1.First() ); + v2e[0].UnBind( V[0] ); + v2e[1].UnBind( V[1] ); + InsertAssociation( e0, e1, theMap, bidirect ); + MESSAGE("Assoc edge " << theMesh1->GetMeshDS()->ShapeToIndex( e0 )<< + " to " << theMesh2->GetMeshDS()->ShapeToIndex( e1 )); + V[0] = GetNextVertex( e0, V[0] ); + V[1] = GetNextVertex( e1, V[1] ); + if ( !V[0].IsNull() ) { + InsertAssociation( V[0], V[1], theMap, bidirect ); + MESSAGE("Assoc vertex " << theMesh1->GetMeshDS()->ShapeToIndex( V[0] )<< + " to " << theMesh2->GetMeshDS()->ShapeToIndex( V[1] )); + } + } + else if ( nbE0 == 2 ) + { + // one of edges must have both ends bound + TopoDS_Vertex v0e0 = GetNextVertex( TopoDS::Edge( edges0.First() ), V[0] ); + TopoDS_Vertex v1e0 = GetNextVertex( TopoDS::Edge( edges0.Last() ), V[0] ); + TopoDS_Vertex v0e1 = GetNextVertex( TopoDS::Edge( edges1.First() ), V[1] ); + TopoDS_Vertex v1e1 = GetNextVertex( TopoDS::Edge( edges1.Last() ), V[1] ); + TopoDS_Shape e0b, e1b, e0n, e1n, v1b; // bound and not-bound + TopoDS_Vertex v0n, v1n; + if ( theMap.IsBound( v0e0 )) { + v0n = v1e0; e0b = edges0.First(); e0n = edges0.Last(); v1b = theMap( v0e0 ); + } else if ( theMap.IsBound( v1e0 )) { + v0n = v0e0; e0n = edges0.First(); e0b = edges0.Last(); v1b = theMap( v1e0 ); + } else { + RETURN_BAD_RESULT("None of vertices bound"); + } + if ( v1b.IsSame( v1e1 )) { + v1n = v0e1; e1n = edges1.First(); e1b = edges1.Last(); + } else { + v1n = v1e1; e1b = edges1.First(); e1n = edges1.Last(); + } + InsertAssociation( e0b, e1b, theMap, bidirect ); + InsertAssociation( e0n, e1n, theMap, bidirect ); + InsertAssociation( v0n, v1n, theMap, bidirect ); + MESSAGE("Assoc edge " << theMesh1->GetMeshDS()->ShapeToIndex( e0b )<< + " to " << theMesh2->GetMeshDS()->ShapeToIndex( e1b )); + MESSAGE("Assoc edge " << theMesh1->GetMeshDS()->ShapeToIndex( e0n )<< + " to " << theMesh2->GetMeshDS()->ShapeToIndex( e1n )); + MESSAGE("Assoc vertex " << theMesh1->GetMeshDS()->ShapeToIndex( v0n )<< + " to " << theMesh2->GetMeshDS()->ShapeToIndex( v1n )); + v2e[0].UnBind( V[0] ); + v2e[1].UnBind( V[1] ); + V[0] = v0n; + V[1] = v1n; + } + else { + RETURN_BAD_RESULT("Not implemented"); + } + } + } //while ( !v2e[0].IsEmpty() ) return true; } + default: RETURN_BAD_RESULT("Unexpected shape type"); } // end switch by shape type } // end case of available initial vertex association - //---------------------------------------------------------------------- + //====================================================================== // NO INITIAL VERTEX ASSOCIATION - //---------------------------------------------------------------------- + //====================================================================== switch ( theShape1.ShapeType() ) { @@ -372,7 +692,7 @@ bool StdMeshers_ProjectionUtils::FindSubShapeAssociation(const TopoDS_Shape& the TopoDS_Edge edge2 = TopoDS::Edge( theShape2 ); if ( IsPropagationPossible( theMesh1, theMesh2 )) { - TopoDS_Edge prpEdge = GetPropagationEdge( theMesh1, edge2, edge1 ); + TopoDS_Edge prpEdge = GetPropagationEdge( theMesh1, edge2, edge1 ).second; if ( !prpEdge.IsNull() ) { TopoDS_Vertex VV1[2], VV2[2]; @@ -385,6 +705,7 @@ bool StdMeshers_ProjectionUtils::FindSubShapeAssociation(const TopoDS_Shape& the { InsertAssociation( edge1, prpEdge, theMap, bidirect); // insert with a proper orientation } + InsertAssociation( theShape1, theShape2, theMap, bidirect ); return true; // done } } @@ -394,6 +715,7 @@ bool StdMeshers_ProjectionUtils::FindSubShapeAssociation(const TopoDS_Shape& the InsertAssociation( edge1, edge2, theMap, bidirect); // insert with a proper orientation InsertAssociation( TopExp::FirstVertex(edge1), TopExp::FirstVertex(edge2), theMap, bidirect); + InsertAssociation( theShape1, theShape2, theMap, bidirect ); return true; // done } break; // try by vertex closeness @@ -405,41 +727,121 @@ bool StdMeshers_ProjectionUtils::FindSubShapeAssociation(const TopoDS_Shape& the { TopoDS_Face face1 = TopoDS::Face(theShape1); TopoDS_Face face2 = TopoDS::Face(theShape2); + TopoDS_Edge edge1, edge2; // get outer edge of theShape1 - TopoDS_Edge edge1 = TopoDS::Edge( OuterShape( face1, TopAbs_EDGE )); + edge1 = TopoDS::Edge( OuterShape( face1, TopAbs_EDGE )); // find out if any edge of face2 is a propagation edge of outer edge1 + map propag_edges; // use map to find the closest propagation edge for ( TopExp_Explorer exp( face2, TopAbs_EDGE ); exp.More(); exp.Next() ) { - TopoDS_Edge edge2 = TopoDS::Edge( exp.Current() ); - edge2 = GetPropagationEdge( theMesh1, edge2, edge1 ); - if ( !edge2.IsNull() ) // propagation found + edge2 = TopoDS::Edge( exp.Current() ); + pair step_edge = GetPropagationEdge( theMesh1, edge2, edge1 ); + if ( !step_edge.second.IsNull() ) { // propagation found + propag_edges.insert( step_edge ); + } + } + if ( !propag_edges.empty() ) // propagation found + { + edge2 = propag_edges.begin()->second; + TopoDS_Vertex VV1[2], VV2[2]; + TopExp::Vertices( edge1, VV1[0], VV1[1], true ); + TopExp::Vertices( edge2, VV2[0], VV2[1], true ); + list< TopoDS_Edge > edges1, edges2; + int nbE = FindFaceAssociation( face1, VV1, face2, VV2, edges1, edges2 ); + if ( !nbE ) RETURN_BAD_RESULT("FindFaceAssociation() failed"); + if ( nbE == 2 ) // only 2 edges { - TopoDS_Vertex VV1[2], VV2[2]; - TopExp::Vertices( edge1, VV1[0], VV1[1], true ); - TopExp::Vertices( edge2, VV2[0], VV2[1], true ); - list< TopoDS_Edge > edges1, edges2; - int nbE = FindFaceAssociation( face1, VV1, face2, VV2, edges1, edges2 ); - if ( !nbE ) RETURN_BAD_RESULT("FindFaceAssociation() failed"); - if ( nbE == 2 ) // only 2 edges - { - // take care of proper association of propagated edges - bool same1 = edge1.IsSame( edges1.front() ); - bool same2 = edge2.IsSame( edges2.front() ); - if ( same1 != same2 ) - Reverse(edges2, nbE); + // take care of proper association of propagated edges + bool same1 = edge1.IsSame( edges1.front() ); + bool same2 = edge2.IsSame( edges2.front() ); + if ( same1 != same2 ) + Reverse(edges2, nbE); + } + // store association + list< TopoDS_Edge >::iterator eIt1 = edges1.begin(); + list< TopoDS_Edge >::iterator eIt2 = edges2.begin(); + for ( ; eIt1 != edges1.end(); ++eIt1, ++eIt2 ) + { + InsertAssociation( *eIt1, *eIt2, theMap, bidirect); + VV1[0] = TopExp::FirstVertex( *eIt1, true ); + VV2[0] = TopExp::FirstVertex( *eIt2, true ); + InsertAssociation( VV1[0], VV2[0], theMap, bidirect); + } + InsertAssociation( theShape1, theShape2, theMap, bidirect ); + return true; + } + } + break; // try by vertex closeness + } + case TopAbs_COMPOUND: { + // ---------------------------------------------------------------------- + if ( IsPropagationPossible( theMesh1, theMesh2 )) { + // find a boundary edge for theShape1 + TopoDS_Edge E; + for(TopExp_Explorer exp(theShape1, TopAbs_EDGE); exp.More(); exp.Next() ) { + E = TopoDS::Edge( exp.Current() ); + int NbFacesFromShape1 = 0; + const TopTools_ListOfShape& EAncestors = theMesh1->GetAncestors(E); + TopTools_ListIteratorOfListOfShape itea(EAncestors); + for(; itea.More(); itea.Next()) { + if( itea.Value().ShapeType() != TopAbs_FACE ) continue; + TopoDS_Face face = TopoDS::Face(itea.Value()); + for(TopExp_Explorer expf(theShape1, TopAbs_FACE); expf.More(); expf.Next() ) { + if(face.IsSame(expf.Current())) { + NbFacesFromShape1++; + break; + } } - // store association - list< TopoDS_Edge >::iterator eIt1 = edges1.begin(); - list< TopoDS_Edge >::iterator eIt2 = edges2.begin(); - for ( ; eIt1 != edges1.end(); ++eIt1, ++eIt2 ) - { - InsertAssociation( *eIt1, *eIt2, theMap, bidirect); - VV1[0] = TopExp::FirstVertex( *eIt1, true ); - VV2[0] = TopExp::FirstVertex( *eIt2, true ); - InsertAssociation( VV1[0], VV2[0], theMap, bidirect); + } + if(NbFacesFromShape1==1) break; + } + // find association for vertices of edge E + TopoDS_Vertex VV1[2], VV2[2]; + for(TopExp_Explorer eexp(E, TopAbs_VERTEX); eexp.More(); eexp.Next()) { + TopoDS_Vertex V1 = TopoDS::Vertex( eexp.Current() ); + // look for an edge ending in E whose one vertex is in theShape1 + // and the other, in theShape2 + const TopTools_ListOfShape& Ancestors = theMesh1->GetAncestors(V1); + TopTools_ListIteratorOfListOfShape ita(Ancestors); + for(; ita.More(); ita.Next()) { + if( ita.Value().ShapeType() != TopAbs_EDGE ) continue; + TopoDS_Edge edge = TopoDS::Edge(ita.Value()); + bool FromShape1 = false; + for(TopExp_Explorer expe(theShape1, TopAbs_EDGE); expe.More(); expe.Next() ) { + if(edge.IsSame(expe.Current())) { + FromShape1 = true; + break; + } + } + if(!FromShape1) { + // is it an edge between theShape1 and theShape2? + TopExp_Explorer expv(edge, TopAbs_VERTEX); + TopoDS_Vertex V2 = TopoDS::Vertex( expv.Current() ); + if(V2.IsSame(V1)) { + expv.Next(); + V2 = TopoDS::Vertex( expv.Current() ); + } + bool FromShape2 = false; + for ( expv.Init( theShape2, TopAbs_VERTEX ); expv.More(); expv.Next()) { + if ( V2.IsSame( expv.Current() )) { + FromShape2 = true; + break; + } + } + if ( FromShape2 ) { + if ( VV1[0].IsNull() ) + VV1[0] = V1, VV2[0] = V2; + else + VV1[1] = V1, VV2[1] = V2; + break; // from loop on ancestors of V1 + } } - return true; } } + if ( !VV1[1].IsNull() ) { + InsertAssociation( VV1[0], VV2[0], theMap, bidirect); + InsertAssociation( VV1[1], VV2[1], theMap, bidirect); + return FindSubShapeAssociation( theShape1, theMesh1, theShape2, theMesh2, theMap); + } } break; // try by vertex closeness } @@ -458,8 +860,10 @@ bool StdMeshers_ProjectionUtils::FindSubShapeAssociation(const TopoDS_Shape& the if ( vMap1.Extent() == 1 ) { InsertAssociation( vMap1(1), vMap2(1), theMap, bidirect); - if ( theShape1.ShapeType() == TopAbs_EDGE ) + if ( theShape1.ShapeType() == TopAbs_EDGE ) { + InsertAssociation( theShape1, theShape2, theMap, bidirect ); return true; + } return FindSubShapeAssociation( theShape1, theMesh1, theShape2, theMesh2, theMap); } @@ -488,14 +892,21 @@ bool StdMeshers_ProjectionUtils::FindSubShapeAssociation(const TopoDS_Shape& the // 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; - for ( ; expF.More(); expF.Next() ) { + if ( expF.More() ) { + for ( ; expF.More(); expF.Next() ) { + edge.Nullify(); + TopoDS_Shape wire = OuterShape( TopoDS::Face( expF.Current() ), TopAbs_WIRE ); + for ( expE.Init( wire, TopAbs_EDGE ); edge.IsNull() && expE.More(); expE.Next() ) + if ( !IsClosedEdge( TopoDS::Edge( expE.Current() ))) + edge = expE.Current(); + if ( !edge.IsNull() ) + break; + } + } else if (edge.ShapeType() != TopAbs_EDGE) { // no faces edge.Nullify(); - TopoDS_Shape wire = OuterShape( TopoDS::Face( expF.Current() ), TopAbs_WIRE ); - for ( expE.Init( wire, TopAbs_EDGE ); edge.IsNull() && expE.More(); expE.Next() ) + for ( expE.Init( theShape1, TopAbs_EDGE ); edge.IsNull() && expE.More(); expE.Next() ) if ( !IsClosedEdge( TopoDS::Edge( expE.Current() ))) edge = expE.Current(); - if ( !edge.IsNull() ) - break; } if ( edge.IsNull() || edge.ShapeType() != TopAbs_EDGE ) RETURN_BAD_RESULT("Edge not found"); @@ -522,10 +933,16 @@ bool StdMeshers_ProjectionUtils::FindSubShapeAssociation(const TopoDS_Shape& the } } - InsertAssociation( VV1[ 0 ], VV2 [ 0 ], theMap, bidirect); - InsertAssociation( VV1[ 1 ], VV2 [ 1 ], theMap, bidirect); - if ( theShape1.ShapeType() == TopAbs_EDGE ) + InsertAssociation( VV1[ 0 ], VV2[ 0 ], theMap, bidirect); + InsertAssociation( VV1[ 1 ], VV2[ 1 ], theMap, bidirect); + MESSAGE("Initial assoc VERT " << theMesh1->GetMeshDS()->ShapeToIndex( VV1[ 0 ] )<< + " to " << theMesh2->GetMeshDS()->ShapeToIndex( VV2[ 0 ] )<< + "\nand VERT " << theMesh1->GetMeshDS()->ShapeToIndex( VV1[ 1 ] )<< + " to " << theMesh2->GetMeshDS()->ShapeToIndex( VV2[ 1 ] )); + if ( theShape1.ShapeType() == TopAbs_EDGE ) { + InsertAssociation( theShape1, theShape2, theMap, bidirect ); return true; + } return FindSubShapeAssociation( theShape1, theMesh1, theShape2, theMesh2, theMap ); } @@ -568,6 +985,7 @@ int StdMeshers_ProjectionUtils::FindFaceAssociation(const TopoDS_Face& face1, 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 ))) { @@ -580,10 +998,10 @@ int StdMeshers_ProjectionUtils::FindFaceAssociation(const TopoDS_Face& face1, if ( KO ) RETURN_BAD_RESULT("GetOrderedEdges() failed"); } - reverse = true; } 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 @@ -595,7 +1013,6 @@ int StdMeshers_ProjectionUtils::FindFaceAssociation(const TopoDS_Face& face1, if ( KO ) RETURN_BAD_RESULT("GetOrderedEdges() failed"); } - reverse = !reverse; } if ( reverse ) { @@ -613,15 +1030,15 @@ int StdMeshers_ProjectionUtils::FindFaceAssociation(const TopoDS_Face& face1, //======================================================================= void StdMeshers_ProjectionUtils::InitVertexAssociation( const SMESH_Hypothesis* theHyp, - TShapeShapeMap & theAssociationMap) + TShapeShapeMap & theAssociationMap, + const TopoDS_Shape& theTargetShape) { string hypName = theHyp->GetName(); if ( hypName == "ProjectionSource1D" ) { const StdMeshers_ProjectionSource1D * hyp = static_cast( theHyp ); - if ( hyp->HasVertexAssociation() ) { + if ( hyp->HasVertexAssociation() ) InsertAssociation( hyp->GetSourceVertex(),hyp->GetTargetVertex(),theAssociationMap); - } } else if ( hypName == "ProjectionSource2D" ) { const StdMeshers_ProjectionSource2D * hyp = @@ -664,6 +1081,9 @@ bool StdMeshers_ProjectionUtils::InsertAssociation( const TopoDS_Shape& theShape theAssociationMap.Bind( theShape2, theShape1 ); return isNew; } + else { + throw SALOME_Exception("StdMeshers_ProjectionUtils: attempt to associate NULL shape"); + } return false; } @@ -677,7 +1097,10 @@ bool StdMeshers_ProjectionUtils::IsSubShape( const TopoDS_Shape& shape, { if ( shape.IsNull() || !aMesh ) return false; - return aMesh->GetMeshDS()->ShapeToIndex( shape ); + return + aMesh->GetMeshDS()->ShapeToIndex( shape ) || + // PAL16202 + shape.ShapeType() == TopAbs_COMPOUND && aMesh->GetMeshDS()->IsGroupOfSubShapes( shape ); } //======================================================================= @@ -733,27 +1156,43 @@ TopoDS_Edge StdMeshers_ProjectionUtils::GetEdgeByVertices( SMESH_Mesh* //================================================================================ /*! * \brief Return another face sharing an edge - * \param aMesh - mesh + * \param edgeToFaces - data map of descendants to ancestors * \param edge - edge * \param face - face * \retval TopoDS_Face - found face */ //================================================================================ -TopoDS_Face StdMeshers_ProjectionUtils::GetNextFace( SMESH_Mesh* mesh, - const TopoDS_Edge& edge, - const TopoDS_Face& face) +TopoDS_Face StdMeshers_ProjectionUtils::GetNextFace( const TAncestorMap& edgeToFaces, + const TopoDS_Edge& edge, + const TopoDS_Face& face) { - if ( mesh && !edge.IsNull() && !face.IsNull() ) +// if ( !edge.IsNull() && !face.IsNull() && edgeToFaces.Contains( edge )) + if ( !edge.IsNull() && edgeToFaces.Contains( edge )) // PAL16202 { - TopTools_ListIteratorOfListOfShape ancestorIt( mesh->GetAncestors( edge )); + TopTools_ListIteratorOfListOfShape ancestorIt( edgeToFaces.FindFromKey( edge )); for ( ; ancestorIt.More(); ancestorIt.Next() ) if ( ancestorIt.Value().ShapeType() == TopAbs_FACE && !face.IsSame( ancestorIt.Value() )) return TopoDS::Face( ancestorIt.Value() ); } return TopoDS_Face(); - +} + +//================================================================================ +/*! + * \brief Return other vertex of an edge + */ +//================================================================================ + +TopoDS_Vertex StdMeshers_ProjectionUtils::GetNextVertex(const TopoDS_Edge& edge, + const TopoDS_Vertex& vertex) +{ + TopoDS_Vertex vF,vL; + TopExp::Vertices(edge,vF,vL); + if ( vF.IsSame( vL )) + return TopoDS_Vertex(); + return vertex.IsSame( vF ) ? vL : vF; } //================================================================================ @@ -762,23 +1201,25 @@ TopoDS_Face StdMeshers_ProjectionUtils::GetNextFace( SMESH_Mesh* mesh, * \param aMesh - mesh * \param theEdge - edge to find by propagation * \param fromEdge - start edge for propagation - * \retval TopoDS_Edge - found edge + * \retval pair - propagation step and found edge */ //================================================================================ -TopoDS_Edge StdMeshers_ProjectionUtils::GetPropagationEdge( SMESH_Mesh* aMesh, - const TopoDS_Edge& theEdge, - const TopoDS_Edge& fromEdge) +pair +StdMeshers_ProjectionUtils::GetPropagationEdge( SMESH_Mesh* aMesh, + const TopoDS_Edge& theEdge, + const TopoDS_Edge& fromEdge) { SMESH_IndexedMapOfShape aChain; - //aChain.Add(fromEdge); + int step = 0; // List of edges, added to chain on the previous cycle pass TopTools_ListOfShape listPrevEdges; - listPrevEdges.Append(fromEdge/*.Oriented( TopAbs_FORWARD )*/); + listPrevEdges.Append(fromEdge); // Collect all edges pass by pass while (listPrevEdges.Extent() > 0) { + step++; // List of edges, added to chain on this cycle pass TopTools_ListOfShape listCurEdges; @@ -823,7 +1264,7 @@ TopoDS_Edge StdMeshers_ProjectionUtils::GetPropagationEdge( SMESH_Mesh* a ori = TopAbs::Reverse( ori ); anOppE.Orientation( ori ); if ( anOppE.IsSame( theEdge )) - return TopoDS::Edge( anOppE ); + return make_pair( step, TopoDS::Edge( anOppE )); aChain.Add(anOppE); listCurEdges.Append(anOppE); } @@ -835,7 +1276,7 @@ TopoDS_Edge StdMeshers_ProjectionUtils::GetPropagationEdge( SMESH_Mesh* a listPrevEdges = listCurEdges; } // while (listPrevEdges.Extent() > 0) - return TopoDS_Edge(); + return make_pair( INT_MAX, TopoDS_Edge()); } //================================================================================ @@ -888,33 +1329,59 @@ FindMatchingNodesOnFaces( const TopoDS_Face& face1, // 1. Nodes of corresponding links: - // get 2 matching edges, not seam ones - TopoDS_Edge edge1, edge2; + // get 2 matching edges, try to find not seam ones + TopoDS_Edge edge1, edge2, seam1, seam2; TopExp_Explorer eE( OuterShape( face2, TopAbs_WIRE ), TopAbs_EDGE ); do { - edge2 = TopoDS::Edge( eE.Current() ); + // edge 2 + TopoDS_Edge e2 = TopoDS::Edge( eE.Current() ); eE.Next(); - } while ( BRep_Tool::IsClosed( edge2, face2 ) && eE.More()); - if ( !assocMap.IsBound( edge2 )) - RETURN_BAD_RESULT("Association not found for edge " << meshDS2->ShapeToIndex( edge2 )); - edge1 = TopoDS::Edge( assocMap( edge2 )); - if ( !IsSubShape( edge1, face1 )) - RETURN_BAD_RESULT("Wrong association, edge " << meshDS1->ShapeToIndex( edge1 ) << - " isn't a subshape of face " << meshDS1->ShapeToIndex( face1 )); + // edge 1 + 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 )) + 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 + SMESHDS_SubMesh * eSM1 = meshDS1->MeshElements( e1 ); + SMESHDS_SubMesh * eSM2 = meshDS2->MeshElements( e2 ); + bool nodesOnEdges = ( eSM1 && eSM2 && eSM1->NbNodes() && eSM2->NbNodes() ); + // check that the nodes on edges belong to faces + bool nodesOfFaces = false; + if ( nodesOnEdges ) { + const SMDS_MeshNode* n1 = eSM1->GetNodes()->next(); + const SMDS_MeshNode* n2 = eSM2->GetNodes()->next(); + nodesOfFaces = ( n1->GetInverseElementIterator(SMDSAbs_Face)->more() && + n2->GetInverseElementIterator(SMDSAbs_Face)->more() ); + } + if ( nodesOfFaces ) + { + if ( helper2.IsRealSeam( e2 )) { + seam1 = e1; seam2 = e2; + } + else { + edge1 = e1; edge2 = e2; + } + } + } while ( edge2.IsNull() && eE.More() ); + // + if ( edge2.IsNull() ) { + edge1 = seam1; edge2 = seam2; + } + if ( edge2.IsNull() ) RETURN_BAD_RESULT("No matching edges with nodes found"); // get 2 matching vertices - TopoDS_Shape V2 = TopExp::FirstVertex( TopoDS::Edge( edge2 )); + TopoDS_Vertex V2 = TopExp::FirstVertex( TopoDS::Edge( edge2 )); if ( !assocMap.IsBound( V2 )) RETURN_BAD_RESULT("Association not found for vertex " << meshDS2->ShapeToIndex( V2 )); - TopoDS_Shape V1 = assocMap( V2 ); + TopoDS_Vertex V1 = TopoDS::Vertex( assocMap( V2 )); // nodes on vertices - SMESHDS_SubMesh * vSM1 = meshDS1->MeshElements( V1 ); - SMESHDS_SubMesh * vSM2 = meshDS2->MeshElements( V2 ); - if ( !vSM1 || !vSM2 || vSM1->NbNodes() != 1 || vSM2->NbNodes() != 1 ) - RETURN_BAD_RESULT("Bad node submesh"); - const SMDS_MeshNode* vNode1 = vSM1->GetNodes()->next(); - const SMDS_MeshNode* vNode2 = vSM2->GetNodes()->next(); + const SMDS_MeshNode* vNode1 = SMESH_Algo::VertexNode( V1, meshDS1 ); + const SMDS_MeshNode* vNode2 = SMESH_Algo::VertexNode( V2, meshDS2 ); + if ( !vNode1 ) RETURN_BAD_RESULT("No node on vertex #" << meshDS1->ShapeToIndex( V1 )); + if ( !vNode2 ) RETURN_BAD_RESULT("No node on vertex #" << meshDS2->ShapeToIndex( V2 )); // nodes on edges linked with nodes on vertices const SMDS_MeshNode* nullNode = 0; @@ -962,13 +1429,13 @@ FindMatchingNodesOnFaces( const TopoDS_Face& face1, const TopoDS_Face & face = is2 ? face2 : face1; SMDS_ElemIteratorPtr eIt = sm->GetElements(); - if ( !helper->IsSeamShape( is2 ? edge2 : edge1 )) + if ( !helper->IsRealSeam( is2 ? edge2 : edge1 )) { while ( eIt->more() ) elems.insert( eIt->next() ); } else { - // there is only seam edge in a face, i.e. it is a sphere. + // the only suitable edge is seam, i.e. it is a sphere. // FindMatchingNodes() will not know which way to go from any edge. // So we ignore all faces having nodes on edges or vertices except // one of faces sharing current start nodes @@ -1020,9 +1487,23 @@ FindMatchingNodesOnFaces( const TopoDS_Face& face1, if ( !onBnd ) elems.insert( f ); } + // add also faces adjacent to faceToKeep + int nbNodes = faceToKeep->NbNodes(); + if ( faceToKeep->IsQuadratic() ) nbNodes /= 2; + notInSet.insert( f1 ); + notInSet.insert( f2 ); + for ( int i = 0; i < nbNodes; ++i ) { + const SMDS_MeshNode* n1 = faceToKeep->GetNode( i ); + const SMDS_MeshNode* n2 = faceToKeep->GetNode( i+1 ); + f1 = SMESH_MeshEditor::FindFaceInSet( n1, n2, inSet, notInSet ); + if ( f1 ) + elems.insert( f1 ); + } } // case on a sphere } // loop on 2 faces + // int quadFactor = (*Elems1.begin())->IsQuadratic() ? 2 : 1; + node1To2Map.clear(); int res = SMESH_MeshEditor::FindMatchingNodes( Elems1, Elems2, vNode1, vNode2, @@ -1031,10 +1512,9 @@ FindMatchingNodesOnFaces( const TopoDS_Face& face1, if ( res != SMESH_MeshEditor::SEW_OK ) RETURN_BAD_RESULT("FindMatchingNodes() result " << res ); - // On a sphere, add matching nodes on the edge - if ( helper1.IsSeamShape( edge1 )) + if ( helper1.IsRealSeam( edge1 )) { // sort nodes on edges by param on edge map< double, const SMDS_MeshNode* > u2nodesMaps[2]; @@ -1083,15 +1563,20 @@ FindMatchingNodesOnFaces( const TopoDS_Face& face1, V2 = TopExp::LastVertex( TopoDS::Edge( edge2 )); if ( !assocMap.IsBound( V2 )) RETURN_BAD_RESULT("Association not found for vertex " << meshDS2->ShapeToIndex( V2 )); - V1 = assocMap( V2 ); - vSM1 = meshDS1->MeshElements( V1 ); - vSM2 = meshDS2->MeshElements( V2 ); - if ( !vSM1 || !vSM2 || vSM1->NbNodes() != 1 || vSM2->NbNodes() != 1 ) - RETURN_BAD_RESULT("Bad node submesh"); - vNode1 = vSM1->GetNodes()->next(); - vNode2 = vSM2->GetNodes()->next(); + V1 = TopoDS::Vertex( assocMap( V2 )); + vNode1 = SMESH_Algo::VertexNode( V1, meshDS1 ); + vNode2 = SMESH_Algo::VertexNode( V2, meshDS2 ); + if ( !vNode1 ) RETURN_BAD_RESULT("No node on vertex #" << meshDS1->ShapeToIndex( V1 )); + if ( !vNode2 ) RETURN_BAD_RESULT("No node on vertex #" << meshDS2->ShapeToIndex( V2 )); 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()); return true; } @@ -1149,7 +1634,17 @@ bool StdMeshers_ProjectionUtils::MakeComputed(SMESH_subMesh * sm, const int iter SMESH_Gen* gen = mesh->GetGen(); SMESH_Algo* algo = gen->GetAlgo( *mesh, sm->GetSubShape() ); if ( !algo ) - RETURN_BAD_RESULT("No algo assigned to submesh " << sm->GetId()); + { + if ( sm->GetSubShape().ShapeType() != TopAbs_COMPOUND ) + RETURN_BAD_RESULT("No algo assigned to submesh " << sm->GetId()); + // group + bool computed = true; + for ( TopoDS_Iterator grMember( sm->GetSubShape() ); grMember.More(); grMember.Next()) + if ( SMESH_subMesh* grSub = mesh->GetSubMesh( grMember.Value() )) + if ( !MakeComputed( grSub, iterationNb + 1 )) + computed = false; + return computed; + } string algoType = algo->GetName(); if ( algoType.substr(0, 11) != "Projection_") @@ -1193,7 +1688,10 @@ bool StdMeshers_ProjectionUtils::MakeComputed(SMESH_subMesh * sm, const int iter if ( !srcMesh ) srcMesh = mesh; - return MakeComputed( srcMesh->GetSubMesh( srcShape ), iterationNb + 1 ); + if ( MakeComputed( srcMesh->GetSubMesh( srcShape ), iterationNb + 1 )) + return gen->Compute( *mesh, sm->GetSubShape() ); + + return false; } //================================================================================ @@ -1300,9 +1798,30 @@ void StdMeshers_ProjectionUtils::SetEventListener(SMESH_subMesh* subMesh, SMESH_subMesh* srcShapeSM = srcMesh->GetSubMesh( srcShape ); - if ( srcShapeSM != subMesh ) - subMesh->SetEventListener( GetSrcSubMeshListener(), - SMESH_subMeshEventListenerData::MakeData( subMesh ), - srcShapeSM ); + if ( srcShapeSM != subMesh ) { + if ( srcShapeSM->GetSubMeshDS() && + srcShapeSM->GetSubMeshDS()->IsComplexSubmesh() ) + { // source shape is a group + TopExp_Explorer it(srcShapeSM->GetSubShape(), // explore the group into subshapes... + subMesh->GetSubShape().ShapeType()); // ...of target shape type + 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 ); + } + } + else + { + subMesh->SetEventListener( GetSrcSubMeshListener(), + SMESH_subMeshEventListenerData::MakeData( subMesh ), + srcShapeSM ); + } + } } }