TShapePairsList::iterator s1_s2 = shapesQueue.begin();
for ( ; s1_s2 != shapesQueue.end(); ++s1_s2 )
{
+ if ( theMap.IsBound( s1_s2->first )) // avoid re-binding for a seam edge
+ continue; // to avoid this: Forward seam -> Reversed seam
InsertAssociation( s1_s2->first, s1_s2->second, theMap );
TopoDS_Iterator s1It( s1_s2->first), s2It( s1_s2->second );
for ( ; s1It.More(); s1It.Next(), s2It.Next() )
RETURN_BAD_RESULT("Different nb of vertices");
}
- if ( vMap1.Extent() == 1 ) {
+ if ( vMap1.Extent() == 1 || vMap2.Extent() == 1 ) {
InsertAssociation( vMap1(1), vMap2(1), theMap );
if ( theShape1.ShapeType() == TopAbs_EDGE ) {
+ if ( vMap1.Extent() == 2 )
+ InsertAssociation( vMap1(2), vMap2(1), theMap );
+ else if ( vMap2.Extent() == 2 )
+ InsertAssociation( vMap2(2), vMap1(1), theMap );
InsertAssociation( theShape1, theShape2, theMap );
return true;
}
eE.Next();
// edge 1
if ( !assocMap.IsBound( e2, /*is2nd=*/true ))
- RETURN_BAD_RESULT("Association not found for edge " << meshDS2->ShapeToIndex( e2 ));
+ continue;
+ //RETURN_BAD_RESULT("Association not found for edge " << meshDS2->ShapeToIndex( e2 ));
TopoDS_Edge e1 = TopoDS::Edge( assocMap( e2, /*is2nd=*/true ));
if ( !helper1.IsSubShape( e1, face1 ))
RETURN_BAD_RESULT("Wrong association, edge " << meshDS1->ShapeToIndex( e1 ) <<
// get 2 matching vertices
TopoDS_Vertex V2 = TopExp::FirstVertex( TopoDS::Edge( edge2 ));
if ( !assocMap.IsBound( V2, /*is2nd=*/true ))
- RETURN_BAD_RESULT("Association not found for vertex " << meshDS2->ShapeToIndex( V2 ));
+ {
+ V2 = TopExp::LastVertex( TopoDS::Edge( edge2 ));
+ if ( !assocMap.IsBound( V2, /*is2nd=*/true ))
+ RETURN_BAD_RESULT("Association not found for vertex " << meshDS2->ShapeToIndex( V2 ));
+ }
TopoDS_Vertex V1 = TopoDS::Vertex( assocMap( V2, /*is2nd=*/true ));
// nodes on vertices