First integration of a new PV3D viewer.

[modules/smesh.git] / src / SMESHUtils / SMESH_Block.cxx

diff --git a/src/SMESHUtils/SMESH_Block.cxx b/src/SMESHUtils/SMESH_Block.cxx
index 90bd9bce65db5a18b5a9f9cc02d526287948bf65..03b1bf20c3ca07dd3bc63f799f49a29d35c1ad40 100644 (file)
--- a/src/SMESHUtils/SMESH_Block.cxx
+++ b/src/SMESHUtils/SMESH_Block.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2016  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2022  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
@@ -720,7 +720,7 @@ bool SMESH_Block::ComputeParameters(const gp_Pnt& thePoint,
   const bool isOnFace = IsFaceID( theShapeID );
   double * coef = GetShapeCoef( theShapeID );
 
-  // Find the first guess paremeters
+  // Find the first guess parameters
 
   gp_XYZ start(0, 0, 0);
 
@@ -1029,7 +1029,7 @@ bool SMESH_Block::findUVByHalfDivision( const gp_Pnt&             thePoint,
       dy *= 1.2;
       xSol = 0.5 * (xMax + xMin) ;
       ySol = 0.5 * (yMax + yMin) ;
-      if ( xMin == 0. && yMin == 0. && xMax == 1. && yMax == 1. ) // avoid infinit loop
+      if ( xMin == 0. && yMin == 0. && xMax == 1. && yMax == 1. ) // avoid infinite loop
       {
 #ifdef _DEBUG_REFINE_
         cout << "SMESH_Block::refineParametersOnFace(): tface.IsUVInQuad() fails" << endl;
@@ -1040,7 +1040,7 @@ bool SMESH_Block::findUVByHalfDivision( const gp_Pnt&             thePoint,
     }
   }
 
-  // refine solution using half-division technic
+  // refine solution using half-division technique
 
   gp_XYZ sol = theParams;
 
@@ -1114,7 +1114,7 @@ bool SMESH_Block::findUVByHalfDivision( const gp_Pnt&             thePoint,
     if ( saveBetterSolution( sol, theParams, thePoint.SquareDistance( tface.Point( sol ))))
     {
 #ifdef _DEBUG_REFINE_
-      cout << "SMESH_Block::refineParametersOnFace(): dividing suceeded" << endl;
+      cout << "SMESH_Block::refineParametersOnFace(): dividing succeeded" << endl;
       cout << " nbGetUV = " << nbGetUV << endl;
 #endif
         return true;
@@ -1130,8 +1130,8 @@ bool SMESH_Block::findUVByHalfDivision( const gp_Pnt&             thePoint,
 
 //================================================================================
 /*!
- * \brief Finds parameters corresponding to a given UV of a given face by searching 
- * around the starting solution
+ * \brief Find parameters corresponding to a given UV of a given face by searching
+ *        around the starting solution
  *  \param [in] theUV - the UV to locate
  *  \param [in] tface - the face
  *  \param [in,out] theParams - the starting parameters to improve 
@@ -1142,7 +1142,7 @@ bool SMESH_Block::findUVByHalfDivision( const gp_Pnt&             thePoint,
 //================================================================================
 
 bool SMESH_Block::findUVAround( const gp_Pnt&             thePoint,
-                                const gp_XY&              theUV,
+                                const gp_XY&              /*theUV*/,
                                 const SMESH_Block::TFace& tface,
                                 gp_XYZ&                   theParams,
                                 int                       nbGetWorstLimit )
@@ -1557,23 +1557,26 @@ int SMESH_Block::GetOrderedEdges (const TopoDS_Face&   theFace,
                           theEdges.begin(), ++theEdges.begin());
           TopExp::Vertices( theEdges.front(), vv[0], vv[1], true );
           if ( iE++ > theNbEdgesInWires.back() ) {
-#ifdef _DEBUG_
-            gp_Pnt p = BRep_Tool::Pnt( theFirstVertex );
-            MESSAGE ( " : Warning : vertex "<< theFirstVertex.TShape().operator->()
-                   << " ( " << p.X() << " " << p.Y() << " " << p.Z() << " )" 
-                   << " not found in outer wire of face "<< theFace.TShape().operator->()
-                   << " with vertices: " );
-            wExp.Init( *wlIt, theFace );
-            for ( int i = 0; wExp.More(); wExp.Next(), i++ )
+
+            if (SALOME::VerbosityActivated())
             {
-              TopoDS_Edge edge = wExp.Current();
-              edge = TopoDS::Edge( edge.Oriented( wExp.Orientation() ));
-              TopoDS_Vertex v = TopExp::FirstVertex( edge, true );
-              gp_Pnt p = BRep_Tool::Pnt( v );
-              MESSAGE_ADD ( i << " " << v.TShape().operator->() << " "
-                            << p.X() << " " << p.Y() << " " << p.Z() << " " << std::endl );
+              gp_Pnt p = BRep_Tool::Pnt( theFirstVertex );
+              MESSAGE ( " : Warning : vertex "<< theFirstVertex.TShape().operator->()
+                    << " ( " << p.X() << " " << p.Y() << " " << p.Z() << " )" 
+                    << " not found in outer wire of face "<< theFace.TShape().operator->()
+                    << " with vertices: " );
+              wExp.Init( *wlIt, theFace );
+              for ( int i = 0; wExp.More(); wExp.Next(), i++ )
+              {
+                TopoDS_Edge edge = wExp.Current();
+                edge = TopoDS::Edge( edge.Oriented( wExp.Orientation() ));
+                TopoDS_Vertex v = TopExp::FirstVertex( edge, true );
+                gp_Pnt p = BRep_Tool::Pnt( v );
+                MESSAGE_ADD ( i << " " << v.TShape().operator->() << " "
+                              << p.X() << " " << p.Y() << " " << p.Z() << " " << std::endl );
+              }
             }
-#endif
+
             break; // break infinite loop
           }
         }
@@ -1585,7 +1588,7 @@ int SMESH_Block::GetOrderedEdges (const TopoDS_Face&   theFace,
 }
 //================================================================================
 /*!
- * \brief Call it after geometry initialisation
+ * \brief Call it after geometry initialization
  */
 //================================================================================
 
@@ -1608,7 +1611,6 @@ bool SMESH_Block::LoadMeshBlock(const SMDS_MeshVolume*        theVolume,
                                 const int                     theNode001Index,
                                 vector<const SMDS_MeshNode*>& theOrderedNodes)
 {
-  MESSAGE(" ::LoadMeshBlock()");
   init();
 
   SMDS_VolumeTool vTool;
@@ -1728,7 +1730,7 @@ bool SMESH_Block::LoadMeshBlock(const SMDS_MeshVolume*        theVolume,
 //function : LoadBlockShapes
 //purpose  : Initialize block geometry with theShell,
 //           add sub-shapes of theBlock to theShapeIDMap so that they get
-//           IDs acoording to enum TShapeID
+//           IDs according to enum TShapeID
 //=======================================================================
 
 bool SMESH_Block::LoadBlockShapes(const TopoDS_Shell&         theShell,
@@ -1736,7 +1738,6 @@ bool SMESH_Block::LoadBlockShapes(const TopoDS_Shell&         theShell,
                                   const TopoDS_Vertex&        theVertex001,
                                   TopTools_IndexedMapOfOrientedShape& theShapeIDMap )
 {
-  MESSAGE(" ::LoadBlockShapes()");
   return ( FindBlockShapes( theShell, theVertex000, theVertex001, theShapeIDMap ) &&
            LoadBlockShapes( theShapeIDMap ));
 }
@@ -1744,7 +1745,7 @@ bool SMESH_Block::LoadBlockShapes(const TopoDS_Shell&         theShell,
 //=======================================================================
 //function : LoadBlockShapes
 //purpose  : add sub-shapes of theBlock to theShapeIDMap so that they get
-//           IDs acoording to enum TShapeID
+//           IDs according to enum TShapeID
 //=======================================================================
 
 bool SMESH_Block::FindBlockShapes(const TopoDS_Shell&         theShell,
@@ -1752,8 +1753,6 @@ bool SMESH_Block::FindBlockShapes(const TopoDS_Shell&         theShell,
                                   const TopoDS_Vertex&        theVertex001,
                                   TopTools_IndexedMapOfOrientedShape& theShapeIDMap )
 {
-  MESSAGE(" ::FindBlockShapes()");
-
   // 8 vertices
   TopoDS_Shape V000, V100, V010, V110, V001, V101, V011, V111;
   // 12 edges