IPAL52439: 3D Extrusion creates distorted volumes

[modules/smesh.git] / src / SMESH / SMESH_Pattern.cxx

diff --git a/src/SMESH/SMESH_Pattern.cxx b/src/SMESH/SMESH_Pattern.cxx
index 5d0f5e536984c7ffdf44aedda7ba2f0a95feb98c..0ae35919aa30d2e14d919f188e891dc72a7287b9 100644 (file)
--- a/src/SMESH/SMESH_Pattern.cxx
+++ b/src/SMESH/SMESH_Pattern.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2013  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2014  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
@@ -6,7 +6,7 @@
 // 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.
+// version 2.1 of the License, or (at your option) any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -4018,25 +4018,41 @@ bool SMESH_Pattern::MakeMesh(SMESH_Mesh* theMesh,
           map< double, const SMDS_MeshNode* >::iterator u2n    = ++paramsOfNodes.begin();
           map< double, const SMDS_MeshNode* >::iterator u2nEnd = --paramsOfNodes.end();
           TPoint* p;
-          while ( u2n != u2nEnd && pItF != points.end() )
+          if ( paramsOfNodes.size() == points.size() )
           {
-            const double         u = u2n->first;
-            const SMDS_MeshNode* n = u2n->second;
-            const double       tol = ( (++u2n)->first - u ) / 20;
-            do
+            for ( ; u2n != u2nEnd; ++u2n )
             {
               p = ( isForward ? *pItF : *pItR );
-              if ( Abs( u - p->myU ) < tol )
+              int pIndex = p - &myPoints[0];
+              if ( !nodesVector [ pIndex ] )
+                nodesVector [ pIndex ] = u2n->second;
+              ++pItF;
+              ++pItR;
+            }
+          }
+          else
+          {
+            const double tolFact = 0.05;
+            while ( u2n != u2nEnd && pItF != points.end() )
+            {
+              const double         u = u2n->first;
+              const SMDS_MeshNode* n = u2n->second;
+              const double       tol = ( (++u2n)->first - u ) * tolFact;
+              do
               {
-                int pIndex = p - &myPoints[0];
-                if ( !nodesVector [ pIndex ] )
-                  nodesVector [ pIndex ] = n;
-                ++pItF;
-                ++pItR;
-                break;
+                p = ( isForward ? *pItF : *pItR );
+                if ( Abs( u - p->myU ) < tol )
+                {
+                  int pIndex = p - &myPoints[0];
+                  if ( !nodesVector [ pIndex ] )
+                    nodesVector [ pIndex ] = n;
+                  ++pItF;
+                  ++pItR;
+                  break;
+                }
               }
+              while ( p->myU < u && ( ++pItF, ++pItR != points.rend() ));
             }
-            while ( p->myU < u && ( ++pItF, ++pItR != points.rend() ));
           }
           break;
         }