Remove useless MESSAGEs

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

diff --git a/src/SMESH/SMESH_Pattern.cxx b/src/SMESH/SMESH_Pattern.cxx
index c317869bc546c079aec808ccd951790a3d054784..f08831acd341ae80ffd05961a73e798127c94a6b 100644 (file)
--- a/src/SMESH/SMESH_Pattern.cxx
+++ b/src/SMESH/SMESH_Pattern.cxx
@@ -256,7 +256,7 @@ int loadVE( const list< TopoDS_Edge > &          eList,
 //purpose  :
 //=======================================================================
 
-SMESH_Pattern::SMESH_Pattern ()
+SMESH_Pattern::SMESH_Pattern (): myToKeepNodes(false)
 {
 }
 
@@ -267,8 +267,6 @@ SMESH_Pattern::SMESH_Pattern ()
 
 bool SMESH_Pattern::Load (const char* theFileContents)
 {
-  MESSAGE("Load( file ) ");
-
   Kernel_Utils::Localizer loc;
   
   // file structure:
@@ -413,8 +411,6 @@ bool SMESH_Pattern::Load (const char* theFileContents)
 
 bool SMESH_Pattern::Save (ostream& theFile)
 {
-  MESSAGE(" ::Save(file) " );
-  
   Kernel_Utils::Localizer loc;
     
   if ( !IsLoaded() ) {
@@ -565,11 +561,12 @@ static bool isMeshBoundToShape(SMESHDS_Mesh *     aMeshDS,
 bool SMESH_Pattern::Load (SMESH_Mesh*        theMesh,
                           const TopoDS_Face& theFace,
                           bool               theProject,
-                          TopoDS_Vertex      the1stVertex)
+                          TopoDS_Vertex      the1stVertex,
+                          bool               theKeepNodes)
 {
-  MESSAGE(" ::Load(face) " );
   Clear();
   myIs2D = true;
+  myToKeepNodes = theKeepNodes;
 
   SMESHDS_Mesh * aMeshDS = theMesh->GetMeshDS();
   SMESHDS_SubMesh * fSubMesh = aMeshDS->MeshElements( theFace );
@@ -614,7 +611,6 @@ bool SMESH_Pattern::Load (SMESH_Mesh*        theMesh,
 
   if ( needProject )
   {
-    MESSAGE("Project the submesh");
     // ---------------------------------------------------------------
     // The case where the submesh is projected to theFace
     // ---------------------------------------------------------------
@@ -792,7 +788,7 @@ bool SMESH_Pattern::Load (SMESH_Mesh*        theMesh,
           double u = epos->GetUParameter();
           paramNodeMap.insert( make_pair( u, node ));
         }
-        if ((int) paramNodeMap.size() != eSubMesh->NbNodes() ) {
+        if ((int) paramNodeMap.size() != eSubMesh->NbNodes() - nbMeduimNodes ) {
           // wrong U on edge, project
           Extrema_ExtPC proj;
           BRepAdaptor_Curve aCurve( edge );
@@ -966,6 +962,19 @@ bool SMESH_Pattern::Load (SMESH_Mesh*        theMesh,
     myIsBoundaryPointsFound = true;
   }
 
+  if ( myToKeepNodes )
+  {
+    myInNodes.resize( nodePointIDMap.size() + closeNodePointIDMap.size() );
+
+    TNodePointIDMap::iterator nIdIt = nodePointIDMap.begin();
+    for ( ; nIdIt != nodePointIDMap.end(); nIdIt++ )
+      myInNodes[ nIdIt->second ] = smdsNode( nIdIt->first );
+
+    nIdIt = closeNodePointIDMap.begin();
+    for ( ; nIdIt != closeNodePointIDMap.end(); nIdIt++ )
+      myInNodes[ nIdIt->second ] = smdsNode( nIdIt->first );
+  }
+
   // Assure that U range is proportional to V range
 
   Bnd_Box2d bndBox;
@@ -1089,10 +1098,10 @@ static bool intersectIsolines(const gp_XY& uv11, const gp_XY& uv12, const double
 
 //   resUV /= 2.;
 //     }
-  if ( isDeformed ) {
-    MESSAGE("intersectIsolines(), d1 = " << d1 << ", d2 = " << d2 << ", delta = " << delta <<
-            ", " << (loc1 - loc2).SquareModulus() << " > " << delta * delta);
-  }
+  // if ( isDeformed ) {
+  //   MESSAGE("intersectIsolines(), d1 = " << d1 << ", d2 = " << d2 << ", delta = " << delta <<
+  //           ", " << (loc1 - loc2).SquareModulus() << " > " << delta * delta);
+  // }
   return true;
 }
 
@@ -1887,7 +1896,7 @@ bool SMESH_Pattern::
   list < TIsoNode* > internNodes;
   bool needIteration = true;
   if ( startNodes.empty() ) {
-    MESSAGE( " Starting UV by compUVByIsoIntersection()");
+    //MESSAGE( " Starting UV by compUVByIsoIntersection()");
     needIteration = false;
     map < double, TIsoLine >& isos = isoMap[ 0 ];
     map < double, TIsoLine >::iterator isoIt = isos.begin();
@@ -2107,7 +2116,7 @@ bool SMESH_Pattern::
 #endif
   } while ( maxMove > 1e-8 && nbIter++ < maxNbIter );
 
-  MESSAGE( "compUVByElasticIsolines(): Nb iterations " << nbIter << " dist: " << sqrt( maxMove ));
+  //MESSAGE( "compUVByElasticIsolines(): Nb iterations " << nbIter << " dist: " << sqrt( maxMove ));
 
   if ( nbIter >= maxNbIter && sqrt(maxMove) > minUvSize * 0.05 ) {
     MESSAGE( "compUVByElasticIsolines() failed: "<<sqrt(maxMove)<<">"<<minUvSize * 0.05);
@@ -2392,7 +2401,6 @@ bool SMESH_Pattern::Apply (const TopoDS_Face&   theFace,
                            const TopoDS_Vertex& theVertexOnKeyPoint1,
                            const bool           theReverse)
 {
-  MESSAGE(" ::Apply(face) " );
   TopoDS_Face face  = theReverse ? TopoDS::Face( theFace.Reversed() ) : theFace;
   if ( !setShapeToMesh( face ))
     return false;
@@ -3075,8 +3083,6 @@ bool SMESH_Pattern::Apply (std::set<const SMDS_MeshVolume*> & theVolumes,
                            const int                          theNode000Index,
                            const int                          theNode001Index)
 {
-  MESSAGE(" ::Apply(set<MeshVolumes>) " );
-
   if ( !IsLoaded() ) {
     MESSAGE( "Pattern not loaded" );
     return setErrorCode( ERR_APPL_NOT_LOADED );
@@ -3181,11 +3187,12 @@ bool SMESH_Pattern::Apply (std::set<const SMDS_MeshVolume*> & theVolumes,
 //=======================================================================
 
 bool SMESH_Pattern::Load (SMESH_Mesh*         theMesh,
-                          const TopoDS_Shell& theBlock)
+                          const TopoDS_Shell& theBlock,
+                          bool                theKeepNodes)
 {
-  MESSAGE(" ::Load(volume) " );
   Clear();
   myIs2D = false;
+  myToKeepNodes = theKeepNodes;
   SMESHDS_SubMesh * aSubMesh;
 
   const bool isQuadMesh = theMesh->NbVolumes( ORDER_QUADRATIC );
@@ -3219,7 +3226,7 @@ bool SMESH_Pattern::Load (SMESH_Mesh*         theMesh,
     SMDS_NodeIteratorPtr nIt = aSubMesh->GetNodes();
     if ( !nIt->more() ) continue;
 
-      // store a node and a point
+    // store a node and a point
     while ( nIt->more() ) {
       const SMDS_MeshNode* node = smdsNode( nIt->next() );
       if ( isQuadMesh && SMESH_MeshEditor::IsMedium( node, SMDSAbs_Volume ))
@@ -3297,6 +3304,14 @@ bool SMESH_Pattern::Load (SMESH_Mesh*         theMesh,
 
   myIsBoundaryPointsFound = true;
 
+  if ( myToKeepNodes )
+  {
+    myInNodes.resize( nodePointIDMap.size() );
+    TNodePointIDMap::iterator nIdIt = nodePointIDMap.begin();
+    for ( ; nIdIt != nodePointIDMap.end(); nIdIt++ )
+      myInNodes[ nIdIt->second ] = smdsNode( nIdIt->first );
+  }
+
   return setErrorCode( ERR_OK );
 }
 
@@ -3338,8 +3353,6 @@ bool SMESH_Pattern::Apply (const TopoDS_Shell&  theBlock,
                            const TopoDS_Vertex& theVertex000,
                            const TopoDS_Vertex& theVertex001)
 {
-  MESSAGE(" ::Apply(volume) " );
-
   if (!findBoundaryPoints()     || // bind ID to points
       !setShapeToMesh( theBlock )) // check theBlock is a suitable shape
     return false;
@@ -3399,8 +3412,6 @@ bool SMESH_Pattern::Apply (const SMDS_MeshVolume* theVolume,
                            const int              theNode000Index,
                            const int              theNode001Index)
 {
-  //MESSAGE(" ::Apply(MeshVolume) " );
-
   if (!findBoundaryPoints()) // bind ID to points
     return false;
 
@@ -3991,7 +4002,6 @@ bool SMESH_Pattern::MakeMesh(SMESH_Mesh* theMesh,
                              const bool  toCreatePolygons,
                              const bool  toCreatePolyedrs)
 {
-  MESSAGE(" ::MakeMesh() " );
   if ( !myIsComputed )
     return setErrorCode( ERR_MAKEM_NOT_COMPUTED );
 
@@ -4144,6 +4154,9 @@ bool SMESH_Pattern::MakeMesh(SMESH_Mesh* theMesh,
 
   aMeshDS->compactMesh();
 
+  if ( myToKeepNodes )
+    myOutNodes.swap( nodesVector );
+
 //   const map<int,SMESHDS_SubMesh*>& sm = aMeshDS->SubMeshes();
 //   map<int,SMESHDS_SubMesh*>::const_iterator i_sm = sm.begin();
 //   for ( ; i_sm != sm.end(); i_sm++ )
@@ -4524,8 +4537,6 @@ bool SMESH_Pattern::findBoundaryPoints()
 {
   if ( myIsBoundaryPointsFound ) return true;
 
-  MESSAGE(" findBoundaryPoints() ");
-
   myNbKeyPntInBoundary.clear();
 
   if ( myIs2D )