X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSMESH%2FSMESH_Pattern.cxx;h=51564bf7820973b8b05f420c17d2a7144fdfb93e;hb=90e0893c89027a434e832eb72eeac85391b909e9;hp=7b4fa74c08bb60aeed2d02c02300dd90a7ab14a4;hpb=e74c29b7867ca230102fc580d831dda6b81b3b4c;p=modules%2Fsmesh.git

diff --git a/src/SMESH/SMESH_Pattern.cxx b/src/SMESH/SMESH_Pattern.cxx
index 7b4fa74c0..51564bf78 100644
--- a/src/SMESH/SMESH_Pattern.cxx
+++ b/src/SMESH/SMESH_Pattern.cxx
@@ -75,8 +75,6 @@
 #include <gp_XY.hxx>
 #include <gp_XYZ.hxx>
 
-#include <Basics_OCCTVersion.hxx>
-
 #include <Basics_Utils.hxx>
 #include "utilities.h"
 
@@ -602,8 +600,7 @@ bool SMESH_Pattern::Load (SMESH_Mesh*        theMesh,
 
   Extrema_GenExtPS projector;
   GeomAdaptor_Surface aSurface( BRep_Tool::Surface( face ));
-  if ( theProject || needProject )
-    projector.Initialize( aSurface, 20,20, 1e-5,1e-5 );
+  projector.Initialize( aSurface, 20,20, 1e-5,1e-5 );
 
   int iPoint = 0;
   TNodePointIDMap nodePointIDMap;
@@ -690,8 +687,28 @@ bool SMESH_Pattern::Load (SMESH_Mesh*        theMesh,
 
     myPoints.resize( nbNodes );
 
+    // care of INTERNAL VERTEXes
+    TopExp_Explorer vExp( face, TopAbs_VERTEX, TopAbs_EDGE );
+    for ( ; vExp.More(); vExp.Next() )
+    {
+      const SMDS_MeshNode* node =
+        SMESH_Algo::VertexNode( TopoDS::Vertex( vExp.Current()), aMeshDS );
+      if ( !node || node->NbInverseElements( SMDSAbs_Face ) == 0 )
+        continue;
+      myPoints.resize( ++nbNodes );
+      list< TPoint* > & fPoints = getShapePoints( face );
+      nodePointIDMap.insert( make_pair( node, iPoint ));
+      TPoint* p = &myPoints[ iPoint++ ];
+      fPoints.push_back( p );
+      gp_XY uv = helper.GetNodeUV( face, node );
+      p->myInitUV.SetCoord( uv.X(), uv.Y() );
+      p->myInitXYZ.SetCoord( p->myInitUV.X(), p->myInitUV.Y(), 0 );
+    }
+
     // Load U of points on edges
 
+    Bnd_Box2d edgesUVBox;
+
     list<int>::iterator nbEinW = myNbKeyPntInBoundary.begin();
     int iE = 0;
     vector< TopoDS_Edge > eVec;
@@ -762,6 +779,7 @@ bool SMESH_Pattern::Load (SMESH_Mesh*        theMesh,
           else
             keyPoint->myInitUV = C2d->Value( isForward ? f : l ).XY();
           keyPoint->myInitXYZ.SetCoord (keyPoint->myInitUV.X(), keyPoint->myInitUV.Y(), 0);
+          edgesUVBox.Add( gp_Pnt2d( keyPoint->myInitUV ));
         }
       }
       if ( !vPoint->empty() )
@@ -841,6 +859,7 @@ bool SMESH_Pattern::Load (SMESH_Mesh*        theMesh,
             p->myInitUV = C2d->Value( u ).XY();
           }
           p->myInitXYZ.SetCoord( p->myInitUV.X(), p->myInitUV.Y(), 0 );
+          edgesUVBox.Add( gp_Pnt2d( p->myInitUV ));
           unIt++; unRIt++;
           iPoint++;
         }
@@ -866,6 +885,7 @@ bool SMESH_Pattern::Load (SMESH_Mesh*        theMesh,
           else
             keyPoint->myInitUV = C2d->Value( isForward ? l : f ).XY();
           keyPoint->myInitXYZ.SetCoord( keyPoint->myInitUV.X(), keyPoint->myInitUV.Y(), 0 );
+          edgesUVBox.Add( gp_Pnt2d( keyPoint->myInitUV ));
         }
       }
       if ( !vPoint->empty() )
@@ -906,7 +926,7 @@ bool SMESH_Pattern::Load (SMESH_Mesh*        theMesh,
         nodePointIDMap.insert( make_pair( node, iPoint ));
         TPoint* p = &myPoints[ iPoint++ ];
         fPoints.push_back( p );
-        if ( theProject )
+        if ( theProject || edgesUVBox.IsOut( p->myInitUV ) )
           p->myInitUV = project( node, projector );
         else {
           const SMDS_FacePosition* pos =
@@ -1194,7 +1214,7 @@ bool SMESH_Pattern::compUVByIsoIntersection (const list< list< TPoint* > >& theB
   }
   if ( !intersectIsolines( uv1[0], uv2[0], ratio[0],
                           uv1[1], uv2[1], ratio[1], theUV, theIsDeformed )) {
-    MESSAGE(" Cant intersect isolines for a point "<<theInitUV.X()<<", "<<theInitUV.Y());
+    MESSAGE(" Can't intersect isolines for a point "<<theInitUV.X()<<", "<<theInitUV.Y());
     return setErrorCode( ERR_APPLF_BAD_TOPOLOGY );
   }
 
@@ -1464,7 +1484,7 @@ static bool checkQuads (const TIsoNode* node,
         return false;
       }
       else {
-        //MESSAGE(" Cant improve UV, uv: "<<uv.X()<<" "<<uv.Y());
+        //MESSAGE(" Can't improve UV, uv: "<<uv.X()<<" "<<uv.Y());
       }
     }
     if ( !oldIsIn && nbOldFix ) {
@@ -1479,7 +1499,7 @@ static bool checkQuads (const TIsoNode* node,
         return false;
       }
       else {
-        //MESSAGE(" Cant fix UV, uv: "<<uv.X()<<" "<<uv.Y());
+        //MESSAGE(" Can't fix UV, uv: "<<uv.X()<<" "<<uv.Y());
       }
     }
     if ( newIsIn && oldIsIn )
@@ -2297,7 +2317,7 @@ bool SMESH_Pattern::sortSameSizeWires (TListOfEdgesList &                theWire
       list< TPoint* > & ePoints = getShapePoints( eID++ );
       TPoint* p = ePoints.front();
       if ( !compUVByIsoIntersection( theEdgesPointsList, p->myInitUV, p->myUV, aBool )) {
-        MESSAGE("cant sortSameSizeWires()");
+        MESSAGE("can't sortSameSizeWires()");
         return false;
       }
       gcVec[iW] += p->myUV;
@@ -2482,7 +2502,7 @@ bool SMESH_Pattern::Apply (const TopoDS_Face&   theFace,
         for (  pIt++; pIt != ePoints.end(); pIt++ ) {
           TPoint* p = (*pIt);
           if ( !compUVByIsoIntersection( edgesPointsList, p->myInitUV, p->myUV, aBool )) {
-            MESSAGE("cant Apply(face)");
+            MESSAGE("can't Apply(face)");
             return false;
           }
           // keep the computed UV to compare against by setFirstEdge()
@@ -2601,7 +2621,7 @@ bool SMESH_Pattern::Apply (const TopoDS_Face&   theFace,
   for ( pIt = fPoints.begin(); !isDeformed && pIt != fPoints.end(); pIt++ )
     if ( !compUVByIsoIntersection( edgesPointsList, (*pIt)->myInitUV,
                                   (*pIt)->myUV, isDeformed )) {
-      MESSAGE("cant Apply(face)");
+      MESSAGE("can't Apply(face)");
       return false;
     }
   // try to use a complex algo if it is a difficult case
@@ -2610,7 +2630,7 @@ bool SMESH_Pattern::Apply (const TopoDS_Face&   theFace,
     for ( ; pIt != fPoints.end(); pIt++ ) // continue with the simple algo
       if ( !compUVByIsoIntersection( edgesPointsList, (*pIt)->myInitUV,
                                     (*pIt)->myUV, isDeformed )) {
-        MESSAGE("cant Apply(face)");
+        MESSAGE("can't Apply(face)");
         return false;
       }
   }
@@ -2750,7 +2770,7 @@ bool SMESH_Pattern::Apply (const SMDS_MeshFace* theFace,
   for ( pIt = fPoints.begin(); !isDeformed && pIt != fPoints.end(); pIt++ )
     if ( !compUVByIsoIntersection( edgesPointsList, (*pIt)->myInitUV,
                                   (*pIt)->myUV, isDeformed )) {
-      MESSAGE("cant Apply(face)");
+      MESSAGE("can't Apply(face)");
       return false;
     }
   // try to use a complex algo if it is a difficult case
@@ -2759,7 +2779,7 @@ bool SMESH_Pattern::Apply (const SMDS_MeshFace* theFace,
     for ( ; pIt != fPoints.end(); pIt++ ) // continue with the simple algo
       if ( !compUVByIsoIntersection( edgesPointsList, (*pIt)->myInitUV,
                                     (*pIt)->myUV, isDeformed )) {
-        MESSAGE("cant Apply(face)");
+        MESSAGE("can't Apply(face)");
         return false;
       }
   }
@@ -2903,7 +2923,7 @@ bool SMESH_Pattern::Apply (SMESH_Mesh*          theMesh,
   for ( pIt = fPoints.begin(); !isDeformed && pIt != fPoints.end(); pIt++ )
     if ( !compUVByIsoIntersection( edgesPointsList, (*pIt)->myInitUV,
                                   (*pIt)->myUV, isDeformed )) {
-      MESSAGE("cant Apply(face)");
+      MESSAGE("can't Apply(face)");
       return false;
     }
   // try to use a complex algo if it is a difficult case
@@ -2912,7 +2932,7 @@ bool SMESH_Pattern::Apply (SMESH_Mesh*          theMesh,
     for ( ; pIt != fPoints.end(); pIt++ ) // continue with the simple algo
       if ( !compUVByIsoIntersection( edgesPointsList, (*pIt)->myInitUV,
                                     (*pIt)->myUV, isDeformed )) {
-        MESSAGE("cant Apply(face)");
+        MESSAGE("can't Apply(face)");
         return false;
       }
   }