Salome HOME
52504: Projection 1D2D fails to project from a half-disk to a half-cone.
[modules/smesh.git] / src / StdMeshers / StdMeshers_Projection_2D.cxx
index 0e3d183f2415ec124b047f66926699b6b51bc5cb..d2b943b5bacee02c9184ede2cc0aaecf8434118d 100644 (file)
 
 #include "utilities.h"
 
+#include <BRepAdaptor_Surface.hxx>
 #include <BRep_Tool.hxx>
 #include <Bnd_B2d.hxx>
+#include <GeomAPI_ProjectPointOnSurf.hxx>
 #include <TopExp.hxx>
 #include <TopExp_Explorer.hxx>
 #include <TopTools_DataMapIteratorOfDataMapOfShapeShape.hxx>
@@ -139,6 +141,7 @@ bool StdMeshers_Projection_2D::CheckHypothesis(SMESH_Mesh&
            !SMESH_MesherHelper::IsSubShape( edge, _sourceHypo->GetSourceFace() ))
       {
         theStatus = HYP_BAD_PARAMETER;
+        error("Invalid source vertices");
         SCRUTE((edge.IsNull()));
         SCRUTE((SMESH_MesherHelper::IsSubShape( edge, srcMesh )));
         SCRUTE((SMESH_MesherHelper::IsSubShape( edge, _sourceHypo->GetSourceFace() )));
@@ -151,6 +154,7 @@ bool StdMeshers_Projection_2D::CheckHypothesis(SMESH_Mesh&
         if ( edge.IsNull() || !SMESH_MesherHelper::IsSubShape( edge, tgtMesh ))
         {
           theStatus = HYP_BAD_PARAMETER;
+          error("Invalid target vertices");
           SCRUTE((edge.IsNull()));
           SCRUTE((SMESH_MesherHelper::IsSubShape( edge, tgtMesh )));
         }
@@ -159,6 +163,7 @@ bool StdMeshers_Projection_2D::CheckHypothesis(SMESH_Mesh&
                   !SMESH_MesherHelper::IsSubShape( edge, theShape ))
         {
           theStatus = HYP_BAD_PARAMETER;
+          error("Invalid target vertices");
           SCRUTE((SMESH_MesherHelper::IsSubShape( edge, theShape )));
         }
       }
@@ -168,6 +173,7 @@ bool StdMeshers_Projection_2D::CheckHypothesis(SMESH_Mesh&
          ( srcMesh == tgtMesh && theShape == _sourceHypo->GetSourceFace() ))
     {
       theStatus = HYP_BAD_PARAMETER;
+      error("Invalid source face");
       SCRUTE((SMESH_MesherHelper::IsSubShape( _sourceHypo->GetSourceFace(), srcMesh )));
       SCRUTE((srcMesh == tgtMesh));
       SCRUTE(( theShape == _sourceHypo->GetSourceFace() ));
@@ -190,7 +196,7 @@ namespace {
    */
   //================================================================================
 
-  bool isOldNode( const SMDS_MeshNode* node/*, const bool is1DComputed*/ )
+  bool isOldNode( const SMDS_MeshNode* node )
   {
     // old nodes are shared by edges and new ones are shared
     // only by faces created by mapper
@@ -370,200 +376,262 @@ namespace {
 
   //================================================================================
   /*!
-   * \brief Preform projection in case if tgtFace.IsPartner( srcFace ) and in case
-   * if projection by transformation is possible
+   * \brief Check if two consecutive EDGEs are connected in 2D
+   *  \param [in] E1 - a well oriented non-seam EDGE
+   *  \param [in] E2 - a possibly well oriented seam EDGE
+   *  \param [in] F - a FACE
+   *  \return bool - result
    */
   //================================================================================
 
-  bool projectPartner(const TopoDS_Face&                tgtFace,
-                      const TopoDS_Face&                srcFace,
-                      SMESH_Mesh *                      tgtMesh,
-                      SMESH_Mesh *                      srcMesh,
-                      const TAssocTool::TShapeShapeMap& shape2ShapeMap)
+  bool are2dConnected( const TopoDS_Edge & E1,
+                       const TopoDS_Edge & E2,
+                       const TopoDS_Face & F )
+  {
+    double f,l;
+    Handle(Geom2d_Curve) c1 = BRep_Tool::CurveOnSurface( E1, F, f, l );
+    gp_Pnt2d uvLast1 = c1->Value( E1.Orientation() == TopAbs_REVERSED ? f : l );
+
+    Handle(Geom2d_Curve) c2 = BRep_Tool::CurveOnSurface( E2, F, f, l );
+    gp_Pnt2d uvFirst2 = c2->Value( f );
+    gp_Pnt2d uvLast2  = c2->Value( l );
+    double tol2 = 1e-5 * uvLast2.SquareDistance( uvFirst2 );
+
+    return (( uvLast1.SquareDistance( uvFirst2 ) < tol2 ) ||
+            ( uvLast1.SquareDistance( uvLast2 ) < tol2 ));
+  }
+
+  //================================================================================
+  /*!
+   * \brief Compose TSideVector for both FACEs keeping matching order of EDGEs
+   *        and fill src2tgtNodes map
+   */
+  //================================================================================
+
+  TError getWires(const TopoDS_Face&                 tgtFace,
+                  const TopoDS_Face&                 srcFace,
+                  SMESH_Mesh *                       tgtMesh,
+                  SMESH_Mesh *                       srcMesh,
+                  const TAssocTool::TShapeShapeMap&  shape2ShapeMap,
+                  TSideVector&                       srcWires,
+                  TSideVector&                       tgtWires,
+                  TAssocTool::TNodeNodeMap&          src2tgtNodes,
+                  bool&                              is1DComputed)
   {
     SMESHDS_Mesh* tgtMeshDS = tgtMesh->GetMeshDS();
     SMESHDS_Mesh* srcMeshDS = srcMesh->GetMeshDS();
 
-    const double tol = 1.e-7 * srcMeshDS->getMaxDim();
+    src2tgtNodes.clear();
 
-    gp_Trsf trsf; // transformation to get location of target nodes from source ones
-    if ( tgtFace.IsPartner( srcFace ))
-    {
-      gp_Trsf srcTrsf = srcFace.Location();
-      gp_Trsf tgtTrsf = tgtFace.Location();
-      trsf = srcTrsf.Inverted() * tgtTrsf;
-    }
-    else
+    // get ordered src EDGEs
+    TError err;
+    srcWires = StdMeshers_FaceSide::GetFaceWires( srcFace, *srcMesh,/*skipMediumNodes=*/0, err);
+    if ( err && !err->IsOK() )
+      return err;
+
+    // make corresponding sequence of tgt EDGEs
+    tgtWires.resize( srcWires.size() );
+    for ( size_t iW = 0; iW < srcWires.size(); ++iW )
     {
-      // Try to find the transformation
-
-      // make any local coord systems of src and tgt faces
-      vector<gp_Pnt> srcPP, tgtPP; // 3 points on face boundaries to make axes of CS
-      int tgtNbVert = SMESH_MesherHelper::Count( tgtFace, TopAbs_VERTEX, /*ignoreSame=*/true );
-      int srcNbVert = SMESH_MesherHelper::Count( srcFace, TopAbs_VERTEX, /*ignoreSame=*/true );
-      SMESH_subMesh *         srcSM = srcMesh->GetSubMesh( srcFace );
-      SMESH_subMeshIteratorPtr smIt = srcSM->getDependsOnIterator(/*includeSelf=*/false,false);
-      srcSM = smIt->next(); // sm of a vertex
-      while ( smIt->more() && srcPP.size() < 3 )
+      list< TopoDS_Edge > tgtEdges;
+      StdMeshers_FaceSidePtr srcWire = srcWires[iW];
+      TopTools_IndexedMapOfShape edgeMap; // to detect seam edges
+      for ( int iE = 0; iE < srcWire->NbEdges(); ++iE )
       {
-        srcSM = smIt->next();
-        SMESHDS_SubMesh* srcSmds = srcSM->GetSubMeshDS();
-        if ( !srcSmds ) continue;
-        SMDS_NodeIteratorPtr nIt = srcSmds->GetNodes();
-        while ( nIt->more() )
+        TopoDS_Edge srcE = srcWire->Edge( iE );
+        TopoDS_Edge tgtE = TopoDS::Edge( shape2ShapeMap( srcE, /*isSrc=*/true));
+        // reverse a seam edge encountered for the second time
+        const int index = edgeMap.Add( tgtE );
+        if ( index < edgeMap.Extent() ) // E is a seam
         {
-          SMESH_TNodeXYZ p ( nIt->next());
-          bool pOK = false;
-          switch ( srcPP.size() )
+          // check which of edges to reverse, E or one already being in tgtEdges
+          if ( are2dConnected( tgtEdges.back(), tgtE, tgtFace ))
           {
-          case 0: pOK = true; break;
-
-          case 1: pOK = ( srcPP[0].SquareDistance( p ) > 10*tol ); break;
-            
-          case 2:
-            {
-              gp_Vec p0p1( srcPP[0], srcPP[1] ), p0p( srcPP[0], p );
-              // pOK = !p0p1.IsParallel( p0p, tol );
-              pOK = !p0p1.IsParallel( p0p, 3.14/20 ); // angle min 18 degrees
-              break;
-            }
+            list< TopoDS_Edge >::iterator eIt = tgtEdges.begin();
+            std::advance( eIt, index-1 );
+            eIt->Reverse();
           }
-          if ( !pOK )
-            continue;
-
-          // find corresponding point on target shape
-          pOK = false;
-          gp_Pnt tgtP;
-          const TopoDS_Shape& tgtShape = shape2ShapeMap( srcSM->GetSubShape(), /*isSrc=*/true );
-          if ( tgtShape.ShapeType() == TopAbs_VERTEX )
+          else
           {
-            tgtP = BRep_Tool::Pnt( TopoDS::Vertex( tgtShape ));
-            if ( srcNbVert == tgtNbVert || tgtPP.empty() )
-              pOK = true;
-            else
-              pOK = (( tgtP.Distance( tgtPP[0] ) > tol*tol ) &&
-                     ( tgtPP.size() == 1 || tgtP.Distance( tgtPP[1] ) > tol*tol ));
-            //cout << "V - nS " << p._node->GetID() << " - nT " << SMESH_Algo::VertexNode(TopoDS::Vertex( tgtShape),tgtMeshDS)->GetID() << endl;
+            tgtE.Reverse();
           }
-          else if ( tgtPP.size() > 0 )
+        }
+        if ( srcWire->NbEdges() == 1 && tgtMesh == srcMesh ) // circle
+        {
+          // try to verify ori by propagation
+          pair<int,TopoDS_Edge> nE =
+            StdMeshers_ProjectionUtils::GetPropagationEdge( srcMesh, tgtE, srcE );
+          if ( !nE.second.IsNull() )
+            tgtE = nE.second;
+        }
+        tgtEdges.push_back( tgtE );
+
+
+        // Fill map of src to tgt nodes with nodes on edges
+
+        if ( srcMesh->GetSubMesh( srcE )->IsEmpty() ||
+             tgtMesh->GetSubMesh( tgtE )->IsEmpty() )
+        {
+          // add nodes on VERTEXes for a case of not meshes EDGEs
+          const TopoDS_Shape&  srcV = SMESH_MesherHelper::IthVertex( 0, srcE );
+          const TopoDS_Shape&  tgtV = shape2ShapeMap( srcV, /*isSrc=*/true );
+          const SMDS_MeshNode* srcN = SMESH_Algo::VertexNode( TopoDS::Vertex( srcV ), srcMeshDS );
+          const SMDS_MeshNode* tgtN = SMESH_Algo::VertexNode( TopoDS::Vertex( tgtV ), tgtMeshDS );
+          if ( srcN && tgtN )
+            src2tgtNodes.insert( make_pair( srcN, tgtN ));
+        }
+        else
+        {
+          map< double, const SMDS_MeshNode* > srcNodes, tgtNodes;
+          if (( ! SMESH_Algo::GetSortedNodesOnEdge( srcMeshDS, TopoDS::Edge( srcE ),
+                                                    /*ignoreMediumNodes = */true,
+                                                    srcNodes ))
+              ||
+              ( ! SMESH_Algo::GetSortedNodesOnEdge( tgtMeshDS, TopoDS::Edge( tgtE ),
+                                                    /*ignoreMediumNodes = */true,
+                                                    tgtNodes ))
+              )
+            return SMESH_ComputeError::New( COMPERR_BAD_INPUT_MESH,
+                                            "Invalid node parameters on edges");
+
+          if (( srcNodes.size() != tgtNodes.size() ) && tgtNodes.size() > 0 )
+            return SMESH_ComputeError::New( COMPERR_BAD_INPUT_MESH,
+                                            "Different number of nodes on edges");
+          if ( !tgtNodes.empty() )
           {
-            if ( SMESHDS_SubMesh* tgtSmds = tgtMeshDS->MeshElements( tgtShape ))
-            {
-              double srcDist = srcPP[0].Distance( p );
-              double eTol = BRep_Tool::Tolerance( TopoDS::Edge( tgtShape ));
-              if (eTol < tol) eTol = tol;
-              SMDS_NodeIteratorPtr nItT = tgtSmds->GetNodes();
-              while ( nItT->more() && !pOK )
-              {
-                const SMDS_MeshNode* n = nItT->next();
-                tgtP = SMESH_TNodeXYZ( n );
-                pOK = ( fabs( srcDist - tgtPP[0].Distance( tgtP )) < 2*eTol );
-                //cout << "E - nS " << p._node->GetID() << " - nT " << n->GetID()<< " OK - " << pOK<< " " << fabs( srcDist - tgtPP[0].Distance( tgtP ))<< " tol " << eTol<< endl;
-              }
-            }
-          }
-          if ( !pOK )
-            continue;
+            map< double, const SMDS_MeshNode* >::iterator u_tn = tgtNodes.begin();
+            map< double, const SMDS_MeshNode* >::iterator u_sn = srcNodes.begin();
+            for ( ; u_tn != tgtNodes.end(); ++u_tn, ++u_sn)
+              src2tgtNodes.insert( make_pair( u_sn->second, u_tn->second ));
 
-          srcPP.push_back( p );
-          tgtPP.push_back( tgtP );
+            is1DComputed = true;
+          }
         }
-      }
-      if ( srcPP.size() != 3 )
-        return false;
+      } // loop on EDGEs of a WIRE
 
-      // make transformation
-      gp_Trsf fromTgtCS, toSrcCS; // from/to global CS
-      gp_Ax2 srcCS( srcPP[0], gp_Vec( srcPP[0], srcPP[1] ), gp_Vec( srcPP[0], srcPP[2]));
-      gp_Ax2 tgtCS( tgtPP[0], gp_Vec( tgtPP[0], tgtPP[1] ), gp_Vec( tgtPP[0], tgtPP[2]));
-      toSrcCS  .SetTransformation( gp_Ax3( srcCS ));
-      fromTgtCS.SetTransformation( gp_Ax3( tgtCS ));
-      fromTgtCS.Invert();
+      tgtWires[ iW ].reset( new StdMeshers_FaceSide( tgtFace, tgtEdges, tgtMesh,
+                                                     /*theIsForward = */ true,
+                                                     /*theIgnoreMediumNodes = */false));
+    } // loop on WIREs
 
-      trsf = fromTgtCS * toSrcCS;
-    }
+    return TError();
+  }
 
-    // Fill map of src to tgt nodes with nodes on edges
+  //================================================================================
+  /*!
+   * \brief Preform projection in case if tgtFace.IsPartner( srcFace ) and in case
+   * if projection by 3D transformation is possible
+   */
+  //================================================================================
+
+  bool projectPartner(const TopoDS_Face&                 tgtFace,
+                      const TopoDS_Face&                 srcFace,
+                      const TSideVector&                 tgtWires,
+                      const TSideVector&                 srcWires,
+                      const TAssocTool::TShapeShapeMap&  shape2ShapeMap,
+                      TAssocTool::TNodeNodeMap&          src2tgtNodes,
+                      const bool                         is1DComputed)
+  {
+    SMESH_Mesh *    tgtMesh = tgtWires[0]->GetMesh();
+    SMESH_Mesh *    srcMesh = srcWires[0]->GetMesh();
+    SMESHDS_Mesh* tgtMeshDS = tgtMesh->GetMeshDS();
+    SMESHDS_Mesh* srcMeshDS = srcMesh->GetMeshDS();
+    SMESH_MesherHelper helper( *tgtMesh );
 
-    map<const SMDS_MeshNode* , const SMDS_MeshNode*> src2tgtNodes;
-    map<const SMDS_MeshNode* , const SMDS_MeshNode*>::iterator srcN_tgtN;
+    const double tol = 1.e-7 * srcMeshDS->getMaxDim();
 
-    for ( TopExp_Explorer srcExp( srcFace, TopAbs_EDGE); srcExp.More(); srcExp.Next() )
+    // transformation to get location of target nodes from source ones
+    StdMeshers_ProjectionUtils::TrsfFinder3D trsf;
+    if ( tgtFace.IsPartner( srcFace ))
     {
-      const TopoDS_Shape& srcEdge = srcExp.Current();
-      const TopoDS_Shape& tgtEdge = shape2ShapeMap( srcEdge, /*isSrc=*/true );
-      if ( srcMesh->GetSubMesh( srcEdge )->IsEmpty() ||
-           tgtMesh->GetSubMesh( tgtEdge )->IsEmpty() )
-        continue;
-
-      map< double, const SMDS_MeshNode* > srcNodes, tgtNodes;
-      if (( ! SMESH_Algo::GetSortedNodesOnEdge( srcMeshDS,
-                                                TopoDS::Edge( srcEdge ),
-                                                /*ignoreMediumNodes = */true,
-                                                srcNodes ))
-           ||
-          ( ! SMESH_Algo::GetSortedNodesOnEdge( tgtMeshDS,
-                                                TopoDS::Edge( tgtEdge ),
-                                                /*ignoreMediumNodes = */true,
-                                                tgtNodes ))
-           ||
-          (( srcNodes.size() != tgtNodes.size() ) && tgtNodes.size() > 0 )
-          )
-        return false;
+      gp_Trsf srcTrsf = srcFace.Location();
+      gp_Trsf tgtTrsf = tgtFace.Location();
+      trsf.Set( srcTrsf.Inverted() * tgtTrsf );
+    }
+    else
+    {
+      // Try to find the 3D transformation
 
-      if ( !tgtEdge.IsPartner( srcEdge ))
+      const int totNbSeg = 50;
+      vector< gp_XYZ > srcPnts, tgtPnts;
+      srcPnts.reserve( totNbSeg );
+      tgtPnts.reserve( totNbSeg );
+      for ( size_t iW = 0; iW < srcWires.size(); ++iW )
       {
-        if ( tgtNodes.empty() )
-          return false;
-        // check that transformation is OK by three nodes
-        gp_Pnt p0S = SMESH_TNodeXYZ( (srcNodes.begin())  ->second);
-        gp_Pnt p1S = SMESH_TNodeXYZ( (srcNodes.rbegin()) ->second);
-        gp_Pnt p2S = SMESH_TNodeXYZ( (++srcNodes.begin())->second);
-
-        gp_Pnt p0T = SMESH_TNodeXYZ( (tgtNodes.begin())  ->second);
-        gp_Pnt p1T = SMESH_TNodeXYZ( (tgtNodes.rbegin()) ->second);
-        gp_Pnt p2T = SMESH_TNodeXYZ( (++tgtNodes.begin())->second);
-
-        // transform source points, they must coincide with target ones
-        if ( p0T.SquareDistance( p0S.Transformed( trsf )) > tol ||
-             p1T.SquareDistance( p1S.Transformed( trsf )) > tol ||
-             p2T.SquareDistance( p2S.Transformed( trsf )) > tol )
+        const double minSegLen = srcWires[iW]->Length() / totNbSeg;
+        for ( int iE = 0; iE < srcWires[iW]->NbEdges(); ++iE )
         {
-          //cout << "KO trsf, 3 dist: "
-          //<< p0T.SquareDistance( p0S.Transformed( trsf ))<< ", "
-          //<< p1T.SquareDistance( p1S.Transformed( trsf ))<< ", "
-          //<< p2T.SquareDistance( p2S.Transformed( trsf ))<< ", "<<endl;
-          return false;
+          int nbSeg    = Max( 1, int( srcWires[iW]->EdgeLength( iE ) / minSegLen ));
+          double srcU  = srcWires[iW]->FirstParameter( iE );
+          double tgtU  = tgtWires[iW]->FirstParameter( iE );
+          double srcDu = ( srcWires[iW]->LastParameter( iE )- srcU ) / nbSeg;
+          double tgtDu = ( tgtWires[iW]->LastParameter( iE )- tgtU ) / nbSeg;
+          for ( size_t i = 0; i < nbSeg; ++i  )
+          {
+            srcPnts.push_back( srcWires[iW]->Value3d( srcU ).XYZ() );
+            tgtPnts.push_back( tgtWires[iW]->Value3d( tgtU ).XYZ() );
+            srcU += srcDu;
+            tgtU += tgtDu;
+          }
         }
       }
-      if ( !tgtNodes.empty() )
+      if ( !trsf.Solve( srcPnts, tgtPnts ))
+        return false;
+
+      // check trsf
+
+      bool trsfIsOK = true;
+      const int nbTestPnt = 20;
+      const size_t  iStep = Max( 1, int( srcPnts.size() / nbTestPnt ));
+      // check boundary
+      for ( size_t i = 0; ( i < srcPnts.size() && trsfIsOK ); i += iStep )
+      {
+        gp_Pnt trsfTgt = trsf.Transform( srcPnts[i] );
+        trsfIsOK = ( trsfTgt.SquareDistance( tgtPnts[i] ) < tol*tol );
+      }
+      // check an in-FACE point
+      if ( trsfIsOK )
       {
-        map< double, const SMDS_MeshNode* >::iterator u_tn = tgtNodes.begin();
-        map< double, const SMDS_MeshNode* >::iterator u_sn = srcNodes.begin();
-        for ( ; u_tn != tgtNodes.end(); ++u_tn, ++u_sn)
-          src2tgtNodes.insert( make_pair( u_sn->second, u_tn->second ));
+        BRepAdaptor_Surface srcSurf( srcFace );
+        gp_Pnt srcP =
+          srcSurf.Value( 0.5 * ( srcSurf.FirstUParameter() + srcSurf.LastUParameter() ),
+                         0.5 * ( srcSurf.FirstVParameter() + srcSurf.LastVParameter() ));
+        gp_Pnt tgtTrsfP = trsf.Transform( srcP );
+        TopLoc_Location loc;
+        GeomAPI_ProjectPointOnSurf& proj = helper.GetProjector( tgtFace, loc, 0.1*tol );
+        if ( !loc.IsIdentity() )
+          tgtTrsfP.Transform( loc.Transformation().Inverted() );
+        proj.Perform( tgtTrsfP );
+        trsfIsOK = ( proj.IsDone() &&
+                     proj.NbPoints() > 0 &&
+                     proj.LowerDistance() < tol );
       }
+      if ( !trsfIsOK )
+        return false;
     }
 
     // Make new faces
 
     // prepare the helper to adding quadratic elements if necessary
-    SMESH_MesherHelper helper( *tgtMesh );
     helper.SetSubShape( tgtFace );
     helper.IsQuadraticSubMesh( tgtFace );
 
+    SMESHDS_SubMesh* srcSubDS = srcMeshDS->MeshElements( srcFace );
+    if ( !is1DComputed && srcSubDS->NbElements() )
+      helper.SetIsQuadratic( srcSubDS->GetElements()->next()->IsQuadratic() );
+
     SMESH_MesherHelper srcHelper( *srcMesh );
     srcHelper.SetSubShape( srcFace );
 
     const SMDS_MeshNode* nullNode = 0;
+    TAssocTool::TNodeNodeMap::iterator srcN_tgtN;
 
     // indices of nodes to create properly oriented faces
-    bool isReverse = ( trsf.Form() != gp_Identity );
+    bool isReverse = ( !trsf.IsIdentity() );
     int tri1 = 1, tri2 = 2, quad1 = 1, quad3 = 3;
     if ( isReverse )
       std::swap( tri1, tri2 ), std::swap( quad1, quad3 );
 
-    SMESHDS_SubMesh*   srcSubDS = srcMeshDS->MeshElements( srcFace );
     SMDS_ElemIteratorPtr elemIt = srcSubDS->GetElements();
     vector< const SMDS_MeshNode* > tgtNodes;
     while ( elemIt->more() ) // loop on all mesh faces on srcFace
@@ -579,7 +647,7 @@ namespace {
         if ( srcN_tgtN->second == nullNode )
         {
           // create a new node
-          gp_Pnt tgtP = gp_Pnt( SMESH_TNodeXYZ( srcNode )).Transformed( trsf );
+          gp_Pnt tgtP = trsf.Transform( SMESH_TNodeXYZ( srcNode ));
           SMDS_MeshNode* n = helper.AddNode( tgtP.X(), tgtP.Y(), tgtP.Z() );
           srcN_tgtN->second = n;
           switch ( srcNode->GetPosition()->GetTypeOfPosition() )
@@ -663,95 +731,29 @@ namespace {
 
   } //   bool projectPartner()
 
-  //================================================================================
-  /*!
-   * \brief Check if two consecutive EDGEs are connected in 2D
-   *  \param [in] E1 - a well oriented non-seam EDGE
-   *  \param [in] E2 - a possibly well oriented seam EDGE
-   *  \param [in] F - a FACE
-   *  \return bool - result
-   */
-  //================================================================================
-
-  bool are2dConnected( const TopoDS_Edge & E1,
-                       const TopoDS_Edge & E2,
-                       const TopoDS_Face & F )
-  {
-    double f,l;
-    Handle(Geom2d_Curve) c1 = BRep_Tool::CurveOnSurface( E1, F, f, l );
-    gp_Pnt2d uvLast1 = c1->Value( E1.Orientation() == TopAbs_REVERSED ? f : l );
-
-    Handle(Geom2d_Curve) c2 = BRep_Tool::CurveOnSurface( E2, F, f, l );
-    gp_Pnt2d uvFirst2 = c2->Value( f );
-    gp_Pnt2d uvLast2  = c2->Value( l );
-    double tol2 = 1e-5 * uvLast2.SquareDistance( uvFirst2 );
-
-    return (( uvLast1.SquareDistance( uvFirst2 ) < tol2 ) ||
-            ( uvLast1.SquareDistance( uvLast2 ) < tol2 ));
-  }
-
   //================================================================================
   /*!
    * \brief Preform projection in case if the faces are similar in 2D space
    */
   //================================================================================
 
-  bool projectBy2DSimilarity(const TopoDS_Face&                tgtFace,
-                             const TopoDS_Face&                srcFace,
-                             SMESH_Mesh *                      tgtMesh,
-                             SMESH_Mesh *                      srcMesh,
-                             const TAssocTool::TShapeShapeMap& shape2ShapeMap,
-                             const bool                        is1DComputed)
+  bool projectBy2DSimilarity(const TopoDS_Face&                 tgtFace,
+                             const TopoDS_Face&                 srcFace,
+                             const TSideVector&                 tgtWires,
+                             const TSideVector&                 srcWires,
+                             const TAssocTool::TShapeShapeMap&  shape2ShapeMap,
+                             TAssocTool::TNodeNodeMap&          src2tgtNodes,
+                             const bool                         is1DComputed)
   {
-    // 1) Preparation
-
-    // get ordered src EDGEs
-    TError err;
-    TSideVector srcWires =
-      StdMeshers_FaceSide::GetFaceWires( srcFace, *srcMesh,/*ignoreMediumNodes = */false, err);
-    if ( err && !err->IsOK() )
-      return false;
+    SMESH_Mesh * tgtMesh = tgtWires[0]->GetMesh();
+    SMESH_Mesh * srcMesh = srcWires[0]->GetMesh();
 
-    // make corresponding sequence of tgt EDGEs
-    TSideVector tgtWires( srcWires.size() );
-    for ( size_t iW = 0; iW < srcWires.size(); ++iW )
-    {
-      list< TopoDS_Edge > tgtEdges;
-      StdMeshers_FaceSidePtr srcWire = srcWires[iW];
-      TopTools_IndexedMapOfShape edgeMap; // to detect seam edges
-      for ( int iE = 0; iE < srcWire->NbEdges(); ++iE )
-      {
-        TopoDS_Edge E = TopoDS::Edge( shape2ShapeMap( srcWire->Edge( iE ), /*isSrc=*/true));
-        // reverse a seam edge encountered for the second time
-        const int index = edgeMap.Add( E );
-        if ( index < edgeMap.Extent() ) // E is a seam
-        {
-          // check which of edges to reverse, E or one already being in tgtEdges
-          if ( are2dConnected( tgtEdges.back(), E, tgtFace ))
-          {
-            list< TopoDS_Edge >::iterator eIt = tgtEdges.begin();
-            std::advance( eIt, index-1 );
-            eIt->Reverse();
-          }
-          else
-          {
-            E.Reverse();
-          }
-        }
-        tgtEdges.push_back( E );
-      }
-      tgtWires[ iW ].reset( new StdMeshers_FaceSide( tgtFace, tgtEdges, tgtMesh,
-                                                     /*theIsForward = */ true,
-                                                     /*theIgnoreMediumNodes = */false));
-      if ( is1DComputed &&
-           srcWires[iW]->GetUVPtStruct().size() !=
-           tgtWires[iW]->GetUVPtStruct().size())
-        return false;
-    }
+    // WARNING: we can have problems if the FACE is symmetrical in 2D,
+    // then the projection can be mirrored relating to what is expected
 
-    // 2) Find transformation
+    // 1) Find 2D transformation
 
-    gp_Trsf2d trsf;
+    StdMeshers_ProjectionUtils::TrsfFinder2D trsf;
     {
       // get 2 pairs of corresponding UVs
       gp_Pnt2d srcP0 = srcWires[0]->Value2d(0.0);
@@ -766,50 +768,63 @@ namespace {
       toSrcCS  .SetTransformation( srcCS );
       fromTgtCS.SetTransformation( tgtCS );
       fromTgtCS.Invert();
-
-      trsf = fromTgtCS * toSrcCS;
+      trsf.Set( fromTgtCS * toSrcCS );
 
       // check transformation
+      bool trsfIsOK = true;
       const double tol = 1e-5 * gp_Vec2d( srcP0, srcP1 ).Magnitude();
-      for ( double u = 0.12; u < 1.; u += 0.1 )
+      for ( double u = 0.12; ( u < 1. && trsfIsOK ); u += 0.1 )
       {
-        gp_Pnt2d srcUV = srcWires[0]->Value2d( u );
-        gp_Pnt2d tgtUV = tgtWires[0]->Value2d( u );
-        gp_Pnt2d tgtUV2 = srcUV.Transformed( trsf );
-        if ( tgtUV.Distance( tgtUV2 ) > tol )
-          return false;
+        gp_Pnt2d srcUV  = srcWires[0]->Value2d( u );
+        gp_Pnt2d tgtUV  = tgtWires[0]->Value2d( u );
+        gp_Pnt2d tgtUV2 = trsf.Transform( srcUV );
+        trsfIsOK = ( tgtUV.Distance( tgtUV2 ) < tol );
       }
-    }
 
-    // 3) Projection
+      // Find trsf using a least-square approximation
+      if ( !trsfIsOK )
+      {
+        // find trsf
+        const int totNbSeg = 50;
+        vector< gp_XY > srcPnts, tgtPnts;
+        srcPnts.resize( totNbSeg );
+        tgtPnts.resize( totNbSeg );
+        for ( size_t iW = 0; iW < srcWires.size(); ++iW )
+        {
+          const double minSegLen = srcWires[iW]->Length() / totNbSeg;
+          for ( int iE = 0; iE < srcWires[iW]->NbEdges(); ++iE )
+          {
+            int nbSeg    = Max( 1, int( srcWires[iW]->EdgeLength( iE ) / minSegLen ));
+            double srcU  = srcWires[iW]->FirstParameter( iE );
+            double tgtU  = tgtWires[iW]->FirstParameter( iE );
+            double srcDu = ( srcWires[iW]->LastParameter( iE )- srcU ) / nbSeg;
+            double tgtDu = ( tgtWires[iW]->LastParameter( iE )- tgtU ) / nbSeg;
+            for ( size_t i = 0; i < nbSeg; ++i, srcU += srcDu, tgtU += tgtDu  )
+            {
+              srcPnts.push_back( srcWires[iW]->Value2d( srcU ).XY() );
+              tgtPnts.push_back( tgtWires[iW]->Value2d( tgtU ).XY() );
+            }
+          }
+        }
+        if ( !trsf.Solve( srcPnts, tgtPnts ))
+          return false;
 
-    typedef map<const SMDS_MeshNode* , const SMDS_MeshNode*, TIDCompare> TN2NMap;
-    TN2NMap src2tgtNodes;
-    TN2NMap::iterator srcN_tgtN;
+        // check trsf
 
-    // fill src2tgtNodes in with nodes on EDGEs
-    for ( unsigned iW = 0; iW < srcWires.size(); ++iW )
-      if ( is1DComputed )
-      {
-        const vector<UVPtStruct>& srcUVs = srcWires[iW]->GetUVPtStruct();
-        const vector<UVPtStruct>& tgtUVs = tgtWires[iW]->GetUVPtStruct();
-        for ( unsigned i = 0; i < srcUVs.size(); ++i )
-          src2tgtNodes.insert( make_pair( srcUVs[i].node, tgtUVs[i].node ));
-      }
-      else
-      {
-        for ( int iE = 0; iE < srcWires[iW]->NbEdges(); ++iE )
+        trsfIsOK = true;
+        const int nbTestPnt = 10;
+        const size_t  iStep = Max( 1, int( srcPnts.size() / nbTestPnt ));
+        for ( size_t i = 0; ( i < srcPnts.size() && trsfIsOK ); i += iStep )
         {
-          TopoDS_Vertex srcV = srcWires[iW]->FirstVertex(iE);
-          TopoDS_Vertex tgtV = tgtWires[iW]->FirstVertex(iE);
-          const SMDS_MeshNode* srcNode = SMESH_Algo::VertexNode( srcV, srcMesh->GetMeshDS() );
-          const SMDS_MeshNode* tgtNode = SMESH_Algo::VertexNode( tgtV, tgtMesh->GetMeshDS() );
-          if ( tgtNode && srcNode )
-            src2tgtNodes.insert( make_pair( srcNode, tgtNode ));
+          gp_Pnt2d trsfTgt = trsf.Transform( srcPnts[i] );
+          trsfIsOK = ( trsfTgt.Distance( tgtPnts[i] ) < tol );
         }
+        if ( !trsfIsOK )
+          return false;
       }
+    } // "Find transformation" block
 
-    // make elements
+    // 2) Projection
 
     SMESHDS_SubMesh* srcSubDS = srcMesh->GetMeshDS()->MeshElements( srcFace );
 
@@ -827,6 +842,7 @@ namespace {
     srcHelper.SetSubShape( srcFace );
 
     const SMDS_MeshNode* nullNode = 0;
+    TAssocTool::TNodeNodeMap::iterator srcN_tgtN;
 
     SMDS_ElemIteratorPtr elemIt = srcSubDS->GetElements();
     vector< const SMDS_MeshNode* > tgtNodes;
@@ -845,8 +861,8 @@ namespace {
           // create a new node
           gp_Pnt2d srcUV = srcHelper.GetNodeUV( srcFace, srcNode,
                                                 elem->GetNode( helper.WrapIndex(i+1,nbN)), &uvOK);
-          gp_Pnt2d tgtUV = srcUV.Transformed( trsf );
-          gp_Pnt   tgtP  = tgtSurface->Value( tgtUV.X(), tgtUV.Y() );
+          gp_Pnt2d   tgtUV = trsf.Transform( srcUV );
+          gp_Pnt      tgtP = tgtSurface->Value( tgtUV.X(), tgtUV.Y() );
           SMDS_MeshNode* n = tgtMeshDS->AddNode( tgtP.X(), tgtP.Y(), tgtP.Z() );
           switch ( srcNode->GetPosition()->GetTypeOfPosition() )
           {
@@ -885,16 +901,110 @@ namespace {
 
   } // bool projectBy2DSimilarity(...)
 
+  //================================================================================
+  /*!
+   * \brief Fix bad faces by smoothing
+   */
+  //================================================================================
+
+  void fixDistortedFaces( SMESH_MesherHelper& helper,
+                          TSideVector&        )
+  {
+    // Detect bad faces
+
+    bool haveBadFaces = false;
+
+    const TopoDS_Face&  F = TopoDS::Face( helper.GetSubShape() );
+    SMESHDS_SubMesh* smDS = helper.GetMeshDS()->MeshElements( F );
+    if ( !smDS || smDS->NbElements() == 0 ) return;
+
+    SMDS_ElemIteratorPtr faceIt = smDS->GetElements();
+    double prevArea2D = 0;
+    vector< const SMDS_MeshNode* > nodes;
+    vector< gp_XY >                uv;
+    while ( faceIt->more() && !haveBadFaces )
+    {
+      const SMDS_MeshElement* face = faceIt->next();
+
+      // get nodes
+      nodes.resize( face->NbCornerNodes() );
+      SMDS_MeshElement::iterator n = face->begin_nodes();
+      for ( size_t i = 0; i < nodes.size(); ++n, ++i )
+        nodes[ i ] = *n;
+
+      // get UVs
+      const SMDS_MeshNode* inFaceNode = 0;
+      if ( helper.HasSeam() )
+        for ( size_t i = 0; ( i < nodes.size() && !inFaceNode ); ++i )
+          if ( !helper.IsSeamShape( nodes[ i ]->getshapeId() ))
+            inFaceNode = nodes[ i ];
+
+      uv.resize( nodes.size() );
+      for ( size_t i = 0; i < nodes.size(); ++i )
+        uv[ i ] = helper.GetNodeUV( F, nodes[ i ], inFaceNode );
+
+      // compare orientation of triangles
+      for ( int iT = 0, nbT = nodes.size()-2; iT < nbT; ++iT )
+      {
+        gp_XY v1 = uv[ iT+1 ] - uv[ 0 ];
+        gp_XY v2 = uv[ iT+2 ] - uv[ 0 ];
+        double area2D = v2 ^ v1;
+        if (( haveBadFaces = ( area2D * prevArea2D < 0 )))
+          break;
+        prevArea2D = area2D;
+      }
+    }
+
+    // Fix faces
+
+    if ( haveBadFaces )
+    {
+      SMESH_MeshEditor editor( helper.GetMesh() );
+
+      TIDSortedElemSet faces;
+      for ( faceIt = smDS->GetElements(); faceIt->more(); )
+        faces.insert( faces.end(), faceIt->next() );
+
+      // choose smoothing algo
+      //SMESH_MeshEditor:: SmoothMethod algo = SMESH_MeshEditor::CENTROIDAL;
+      bool isConcaveBoundary = false;
+      TError err;
+      TSideVector tgtWires =
+        StdMeshers_FaceSide::GetFaceWires( F, *helper.GetMesh(),/*skipMediumNodes=*/0, err);
+      for ( size_t iW = 0; iW < tgtWires.size() && !isConcaveBoundary; ++iW )
+      {
+        TopoDS_Edge prevEdge = tgtWires[iW]->Edge( tgtWires[iW]->NbEdges() - 1 );
+        for ( int iE = 0; iE < tgtWires[iW]->NbEdges() && !isConcaveBoundary; ++iE )
+        {
+          double angle = helper.GetAngle( prevEdge, tgtWires[iW]->Edge( iE ),
+                                          F,        tgtWires[iW]->FirstVertex( iE ));
+          isConcaveBoundary = ( angle < -5. * M_PI / 180. );
+
+          prevEdge = tgtWires[iW]->Edge( iE );
+        }
+      }
+      SMESH_MeshEditor:: SmoothMethod algo =
+        isConcaveBoundary ? SMESH_MeshEditor::CENTROIDAL : SMESH_MeshEditor::LAPLACIAN;
+
+      // smoothing
+      set<const SMDS_MeshNode*> fixedNodes;
+      editor.Smooth( faces, fixedNodes, algo, /*nbIterations=*/ 10,
+                     /*theTgtAspectRatio=*/1.0, /*the2D=*/false);
+    }
+  }
+
 } // namespace
 
 
 //=======================================================================
 //function : Compute
-//purpose  : 
+//purpose  :
 //=======================================================================
 
 bool StdMeshers_Projection_2D::Compute(SMESH_Mesh& theMesh, const TopoDS_Shape& theShape)
 {
+  _src2tgtNodes.clear();
+
   MESSAGE("Projection_2D Compute");
   if ( !_sourceHypo )
     return false;
@@ -955,28 +1065,27 @@ bool StdMeshers_Projection_2D::Compute(SMESH_Mesh& theMesh, const TopoDS_Shape&
   // Projection
   // ===========
 
-  // find out if EDGEs are meshed or not
-  bool is1DComputed = false;
-  SMESH_subMeshIteratorPtr smIt = tgtSubMesh->getDependsOnIterator(/*includeSelf=*/false,
-                                                                   /*complexShapeFirst=*/true);
-  while ( smIt->more() && !is1DComputed )
-  {
-    SMESH_subMesh* sm = smIt->next();
-    if ( sm->GetSubShape().ShapeType() == TopAbs_EDGE )
-      is1DComputed = sm->IsMeshComputed();
-  }
+  // get ordered src and tgt EDGEs
+  TSideVector srcWires, tgtWires;
+  bool is1DComputed = false; // if any tgt EDGE is meshed
+  TError err = getWires( tgtFace, srcFace, tgtMesh, srcMesh,
+                         shape2ShapeMap, srcWires, tgtWires, _src2tgtNodes, is1DComputed );
+  if ( err && !err->IsOK() )
+    return error( err );
 
   bool done = false;
 
 if ( !done )
+ if ( !done )
   {
     // try to project from the same face with different location
-    done = projectPartner( tgtFace, srcFace, tgtMesh, srcMesh, shape2ShapeMap );
+    done = projectPartner( tgtFace, srcFace, tgtWires, srcWires,
+                           shape2ShapeMap, _src2tgtNodes, is1DComputed );
   }
   if ( !done )
   {
     // projection in case if the faces are similar in 2D space
-    done = projectBy2DSimilarity( tgtFace, srcFace, tgtMesh, srcMesh, shape2ShapeMap, is1DComputed);
+    done = projectBy2DSimilarity( tgtFace, srcFace, tgtWires, srcWires,
+                                  shape2ShapeMap, _src2tgtNodes, is1DComputed);
   }
 
   SMESH_MesherHelper helper( theMesh );
@@ -984,6 +1093,7 @@ bool StdMeshers_Projection_2D::Compute(SMESH_Mesh& theMesh, const TopoDS_Shape&
 
   if ( !done )
   {
+    _src2tgtNodes.clear();
     // --------------------
     // Prepare to mapping 
     // --------------------
@@ -1065,7 +1175,7 @@ bool StdMeshers_Projection_2D::Compute(SMESH_Mesh& theMesh, const TopoDS_Shape&
       return error(COMPERR_BAD_INPUT_MESH,"Can't load mesh pattern from the source face");
 
     // --------------------
-    // Perform 2D mapping 
+    // Perform 2D mapping
     // --------------------
 
     // Compute mesh on a target face
@@ -1087,7 +1197,7 @@ bool StdMeshers_Projection_2D::Compute(SMESH_Mesh& theMesh, const TopoDS_Shape&
 
     // -------------------------------------------------------------------------
     // mapper doesn't take care of nodes already existing on edges and vertices,
-    // so we must merge nodes created by it with existing ones 
+    // so we must merge nodes created by it with existing ones
     // -------------------------------------------------------------------------
 
     SMESH_MeshEditor::TListOfListOfNodes groupsOfNodes;
@@ -1095,7 +1205,8 @@ bool StdMeshers_Projection_2D::Compute(SMESH_Mesh& theMesh, const TopoDS_Shape&
     // Make groups of nodes to merge
 
     // loop on EDGE and VERTEX sub-meshes of a target FACE
-    smIt = tgtSubMesh->getDependsOnIterator(/*includeSelf=*/false,/*complexShapeFirst=*/false);
+    SMESH_subMeshIteratorPtr smIt = tgtSubMesh->getDependsOnIterator(/*includeSelf=*/false,
+                                                                     /*complexShapeFirst=*/false);
     while ( smIt->more() )
     {
       SMESH_subMesh*     sm = smIt->next();
@@ -1103,7 +1214,7 @@ bool StdMeshers_Projection_2D::Compute(SMESH_Mesh& theMesh, const TopoDS_Shape&
       if ( !smDS || smDS->NbNodes() == 0 )
         continue;
       //if ( !is1DComputed && sm->GetSubShape().ShapeType() == TopAbs_EDGE )
-      //break;
+      //  break;
 
       if ( helper.IsDegenShape( sm->GetId() ) ) // to merge all nodes on degenerated
       {
@@ -1243,6 +1354,14 @@ bool StdMeshers_Projection_2D::Compute(SMESH_Mesh& theMesh, const TopoDS_Shape&
     if ( nbFaceBeforeMerge != nbFaceAtferMerge && !helper.HasDegeneratedEdges() )
       return error(COMPERR_BAD_INPUT_MESH, "Probably invalid node parameters on geom faces");
 
+
+    // ----------------------------------------------------------------
+    // The mapper can create distorted faces by placing nodes out of the FACE
+    // boundary -- fix bad faces by smoothing
+    // ----------------------------------------------------------------
+
+    fixDistortedFaces( helper, tgtWires );
+
     // ----------------------------------------------------------------
     // The mapper can't create quadratic elements, so convert if needed
     // ----------------------------------------------------------------