Re: Patch modules/smesh.git for Doxygen typos/grammar + misc. typos

http://www.salome-platform.org/forum/forum_10/652417125/447386016

diff --git a/doc/salome/examples/CMakeLists.txt b/doc/salome/examples/CMakeLists.txt
index 4e35dc4968c3432fa03d539e7f5c30a2f557488d..552a9d1b2d2f6684a87c961a83e414fd3886bb11 100644 (file)
--- a/doc/salome/examples/CMakeLists.txt
+++ b/doc/salome/examples/CMakeLists.txt
@@ -17,7 +17,7 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 

-# examples that cant be used for testing because they use external mesher plug-ins
+# examples that can't be used for testing because they use external mesher plug-ins

 SET(BAD_TESTS
   3dmesh.py
   a3DmeshOnModified2Dmesh.py
 SET(BAD_TESTS
   3dmesh.py
   a3DmeshOnModified2Dmesh.py

diff --git a/idl/SMESH_Pattern.idl b/idl/SMESH_Pattern.idl
index 555c8058f5030d7dedcce98dfc9fee2b403c357b..4229c0345eaded6d86128b6841c6532f2a356e55 100644 (file)
--- a/idl/SMESH_Pattern.idl
+++ b/idl/SMESH_Pattern.idl
@@ -144,7 +144,7 @@ module SMESH
       ERR_LOADF_CANT_PROJECT, // impossible to project nodes
       // Load(volume)
       ERR_LOADV_BAD_SHAPE, // volume is not a brick of 6 faces
       ERR_LOADF_CANT_PROJECT, // impossible to project nodes
       // Load(volume)
       ERR_LOADV_BAD_SHAPE, // volume is not a brick of 6 faces

-      ERR_LOADV_COMPUTE_PARAMS, // cant compute point parameters
+      ERR_LOADV_COMPUTE_PARAMS, // can't compute point parameters

       // Apply(shape)
       ERR_APPL_NOT_LOADED, // pattern was not loaded
       ERR_APPL_BAD_DIMENTION, // wrong shape dimension
       // Apply(shape)
       ERR_APPL_NOT_LOADED, // pattern was not loaded
       ERR_APPL_BAD_DIMENTION, // wrong shape dimension

diff --git a/src/SMESH/SMESH_MeshEditor.cxx b/src/SMESH/SMESH_MeshEditor.cxx
index 03a5012d22c031ea3c8176ae101b5713a4ab2e3b..f4dd0d7db9f71c2179dbb311c8bb46550fe630d6 100644 (file)
--- a/src/SMESH/SMESH_MeshEditor.cxx
+++ b/src/SMESH/SMESH_MeshEditor.cxx
@@ -8240,7 +8240,7 @@ SMESH_MeshEditor::SewFreeBorder (const SMDS_MeshNode* theBordFirstNode,
     // -------------------------------------------------------------------------
 
     // 1. Since sewing may break if there are volumes to split on the side 2,
     // -------------------------------------------------------------------------
 
     // 1. Since sewing may break if there are volumes to split on the side 2,

-    //    we wont move nodes but just compute new coordinates for them
+    //    we won't move nodes but just compute new coordinates for them

     typedef map<const SMDS_MeshNode*, gp_XYZ> TNodeXYZMap;
     TNodeXYZMap nBordXYZ;
     list< const SMDS_MeshNode* >& bordNodes = nSide[ 0 ];
     typedef map<const SMDS_MeshNode*, gp_XYZ> TNodeXYZMap;
     TNodeXYZMap nBordXYZ;
     list< const SMDS_MeshNode* >& bordNodes = nSide[ 0 ];


@@ -8404,7 +8404,7 @@ SMESH_MeshEditor::SewFreeBorder (const SMDS_MeshNode* theBordFirstNode,
       } // loop on inverse elements of prevSideNode
 
       if ( !sideNode ) {
       } // loop on inverse elements of prevSideNode
 
       if ( !sideNode ) {

-        MESSAGE(" Cant find path by links of the Side 2 ");
+        MESSAGE(" Can't find path by links of the Side 2 ");

         return SEW_BAD_SIDE_NODES;
       }
       sideNodes.push_back( sideNode );
         return SEW_BAD_SIDE_NODES;
       }
       sideNodes.push_back( sideNode );

diff --git a/src/SMESH/SMESH_MesherHelper.hxx b/src/SMESH/SMESH_MesherHelper.hxx
index ecf63db36f67d6759b90dd9afe9181b424cfe3ae..7e60e6d250adf341f0c0c65791d8e23b6f156053 100644 (file)
--- a/src/SMESH/SMESH_MesherHelper.hxx
+++ b/src/SMESH/SMESH_MesherHelper.hxx
@@ -187,7 +187,7 @@ class SMESH_EXPORT SMESH_MesherHelper
    * \brief Count nb of sub-shapes
     * \param shape - the shape
     * \param type - the type of sub-shapes to count
    * \brief Count nb of sub-shapes
     * \param shape - the shape
     * \param type - the type of sub-shapes to count

-    * \param ignoreSame - if true, use map not to count same shapes, esle use explorer
+    * \param ignoreSame - if true, use map not to count same shapes, else use explorer

     * \retval int - the calculated number
    */
   static int Count(const TopoDS_Shape&    shape,
     * \retval int - the calculated number
    */
   static int Count(const TopoDS_Shape&    shape,

diff --git a/src/SMESH/SMESH_Pattern.cxx b/src/SMESH/SMESH_Pattern.cxx
index 7b4fa74c08bb60aeed2d02c02300dd90a7ab14a4..0f14f5ef68d24f82f1e1c50bde6bd90a93e10de9 100644 (file)
--- a/src/SMESH/SMESH_Pattern.cxx
+++ b/src/SMESH/SMESH_Pattern.cxx
@@ -1194,7 +1194,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 )) {
   }
   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 );
   }
 
     return setErrorCode( ERR_APPLF_BAD_TOPOLOGY );
   }
 


@@ -1464,7 +1464,7 @@ static bool checkQuads (const TIsoNode* node,
         return false;
       }
       else {
         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 ) {
       }
     }
     if ( !oldIsIn && nbOldFix ) {


@@ -1479,7 +1479,7 @@ static bool checkQuads (const TIsoNode* node,
         return false;
       }
       else {
         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 )
       }
     }
     if ( newIsIn && oldIsIn )


@@ -2297,7 +2297,7 @@ bool SMESH_Pattern::sortSameSizeWires (TListOfEdgesList &                theWire
       list< TPoint* > & ePoints = getShapePoints( eID++ );
       TPoint* p = ePoints.front();
       if ( !compUVByIsoIntersection( theEdgesPointsList, p->myInitUV, p->myUV, aBool )) {
       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;
         return false;
       }
       gcVec[iW] += p->myUV;


@@ -2482,7 +2482,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 )) {
         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()
             return false;
           }
           // keep the computed UV to compare against by setFirstEdge()


@@ -2601,7 +2601,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 )) {
   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
       return false;
     }
   // try to use a complex algo if it is a difficult case


@@ -2610,7 +2610,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 )) {
     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;
       }
   }
         return false;
       }
   }


@@ -2750,7 +2750,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 )) {
   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
       return false;
     }
   // try to use a complex algo if it is a difficult case


@@ -2759,7 +2759,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 )) {
     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;
       }
   }
         return false;
       }
   }


@@ -2903,7 +2903,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 )) {
   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
       return false;
     }
   // try to use a complex algo if it is a difficult case


@@ -2912,7 +2912,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 )) {
     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;
       }
   }
         return false;
       }
   }

diff --git a/src/SMESH/SMESH_Pattern.hxx b/src/SMESH/SMESH_Pattern.hxx
index d3cb43e574157f140eb3cef18ea270f15fb367ee..836cd179041360a585e80bf59de44cd0422f9754 100644 (file)
--- a/src/SMESH/SMESH_Pattern.hxx
+++ b/src/SMESH/SMESH_Pattern.hxx
@@ -178,7 +178,7 @@ class SMESH_EXPORT SMESH_Pattern {
     ERR_LOADF_CANT_PROJECT, // impossible to project nodes
     // Load(volume)
     ERR_LOADV_BAD_SHAPE, // volume is not a brick of 6 faces
     ERR_LOADF_CANT_PROJECT, // impossible to project nodes
     // Load(volume)
     ERR_LOADV_BAD_SHAPE, // volume is not a brick of 6 faces

-    ERR_LOADV_COMPUTE_PARAMS, // cant compute point parameters
+    ERR_LOADV_COMPUTE_PARAMS, // can't compute point parameters

     // Apply(shape)
     ERR_APPL_NOT_COMPUTED, // mapping failed
     ERR_APPL_NOT_LOADED, // pattern was not loaded
     // Apply(shape)
     ERR_APPL_NOT_COMPUTED, // mapping failed
     ERR_APPL_NOT_LOADED, // pattern was not loaded


@@ -260,8 +260,8 @@ private:
   std::list< TPoint* > & getShapePoints(const TopoDS_Shape& theShape);
   // Return list of points located on theShape.
   // A list of edge-points include vertex-points (for 2D pattern only).
   std::list< TPoint* > & getShapePoints(const TopoDS_Shape& theShape);
   // Return list of points located on theShape.
   // A list of edge-points include vertex-points (for 2D pattern only).

-  // A list of face-points doesnt include edge-points.
-  // A list of volume-points doesnt include face-points.
+  // A list of face-points doesn't include edge-points.
+  // A list of volume-points doesn't include face-points.

 
   std::list< TPoint* > & getShapePoints(const int theShapeID);
   // Return list of points located on the shape
 
   std::list< TPoint* > & getShapePoints(const int theShapeID);
   // Return list of points located on the shape

diff --git a/src/SMESHGUI/SMESHGUI_CreatePolyhedralVolumeDlg.h b/src/SMESHGUI/SMESHGUI_CreatePolyhedralVolumeDlg.h
index 330bd429ec731a54f8ad19cafa02155c20d35223..e0fe05b0185c24ec099db350231db20e33403ac6 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_CreatePolyhedralVolumeDlg.h
+++ b/src/SMESHGUI/SMESHGUI_CreatePolyhedralVolumeDlg.h
@@ -79,7 +79,7 @@ private:
     
   bool                     isValid();
   
     
   bool                     isValid();
   

-  int                      checkEditLine( bool = true ); /*! Checking for indices, return 1 if all ok, esle -1*/
+  int                      checkEditLine( bool = true ); /*! Checking for indices, return 1 if all ok, else -1*/

     
   SMESHGUI*                mySMESHGUI;                   /* Current SMESHGUI object */
   LightApp_SelectionMgr*   mySelectionMgr;               /* User shape selection */
     
   SMESHGUI*                mySMESHGUI;                   /* Current SMESHGUI object */
   LightApp_SelectionMgr*   mySelectionMgr;               /* User shape selection */

diff --git a/src/SMESHUtils/SMESH_OctreeNode.cxx b/src/SMESHUtils/SMESH_OctreeNode.cxx
index 1832462509f0866639a4e2a9cdb0d9c7f07571da..03e99b50f99d2b207ba40008698350284c3deb68 100644 (file)
--- a/src/SMESHUtils/SMESH_OctreeNode.cxx
+++ b/src/SMESHUtils/SMESH_OctreeNode.cxx
@@ -334,7 +334,7 @@ void SMESH_OctreeNode::FindCoincidentNodes ( TIDSortedNodeSet*
 
     if ( !ListOfCoincidentNodes.empty() )
     {
 
     if ( !ListOfCoincidentNodes.empty() )
     {

-      // We build a list {n1 + his neigbours} and add this list in theGroupsOfNodes
+      // We build a list {n1 + his neighbors} and add this list in theGroupsOfNodes

       if ( idLess( n1, ListOfCoincidentNodes.front() )) ListOfCoincidentNodes.push_front( n1 );
       else                                              ListOfCoincidentNodes.push_back ( n1 );
       ListOfCoincidentNodes.sort( idLess );
       if ( idLess( n1, ListOfCoincidentNodes.front() )) ListOfCoincidentNodes.push_front( n1 );
       else                                              ListOfCoincidentNodes.push_back ( n1 );
       ListOfCoincidentNodes.sort( idLess );

diff --git a/src/SMESH_I/SMESH_2smeshpy.cxx b/src/SMESH_I/SMESH_2smeshpy.cxx
index 868a5f2588c4b77ed376ed3755aa42352349d5af..f3a0a556cf1f207d763f09df3900c39a2aa20d0a 100644 (file)
--- a/src/SMESH_I/SMESH_2smeshpy.cxx
+++ b/src/SMESH_I/SMESH_2smeshpy.cxx
@@ -2724,7 +2724,7 @@ bool _pyHypothesis::IsWrappable(const _pyID& theMesh) const
  * \brief Convert the command adding a hypothesis to mesh into a smesh command
   * \param theCmd - The command like mesh.AddHypothesis( geom, hypo )
   * \param theAlgo - The algo that can create this hypo
  * \brief Convert the command adding a hypothesis to mesh into a smesh command
   * \param theCmd - The command like mesh.AddHypothesis( geom, hypo )
   * \param theAlgo - The algo that can create this hypo

-  * \retval bool - false if the command cant be converted
+  * \retval bool - false if the command can't be converted

  */
 //================================================================================
 
  */
 //================================================================================
 


@@ -3465,7 +3465,7 @@ void _pyNumberOfSegmentsHyp::Flush()
  * into regular1D.LengthNearVertex( length, vertex )
   * \param theCmd - The command like mesh.AddHypothesis( vertex, SegmentLengthAroundVertex )
   * \param theMesh - The mesh needing this hypo
  * into regular1D.LengthNearVertex( length, vertex )
   * \param theCmd - The command like mesh.AddHypothesis( vertex, SegmentLengthAroundVertex )
   * \param theMesh - The mesh needing this hypo

-  * \retval bool - false if the command cant be converted
+  * \retval bool - false if the command can't be converted

  */
 //================================================================================
 
  */
 //================================================================================
 


@@ -3523,7 +3523,7 @@ _pyAlgorithm::_pyAlgorithm(const Handle(_pyCommand)& theCreationCmd)
  * \brief Convert the command adding an algorithm to mesh
   * \param theCmd - The command like mesh.AddHypothesis( geom, algo )
   * \param theMesh - The mesh needing this algo
  * \brief Convert the command adding an algorithm to mesh
   * \param theCmd - The command like mesh.AddHypothesis( geom, algo )
   * \param theMesh - The mesh needing this algo

-  * \retval bool - false if the command cant be converted
+  * \retval bool - false if the command can't be converted

  */
 //================================================================================
 
  */
 //================================================================================
 

diff --git a/src/StdMeshers/StdMeshers_Quadrangle_2D.cxx b/src/StdMeshers/StdMeshers_Quadrangle_2D.cxx
index e2df2ddd7951e245565f47b93260f9513380df51..8f909f21473b8813a73081bbd5940db45f662027 100644 (file)
--- a/src/StdMeshers/StdMeshers_Quadrangle_2D.cxx
+++ b/src/StdMeshers/StdMeshers_Quadrangle_2D.cxx
@@ -3986,7 +3986,7 @@ void StdMeshers_Quadrangle_2D::smooth (FaceQuadStruct::Ptr quad)
         }
       }
 
         }
       }
 

-  // define refernce orientation in 2D
+  // define reference orientation in 2D

   TNo2SmooNoMap::iterator n2sn = smooNoMap.begin();
   for ( ; n2sn != smooNoMap.end(); ++n2sn )
     if ( !n2sn->second._triangles.empty() )
   TNo2SmooNoMap::iterator n2sn = smooNoMap.begin();
   for ( ; n2sn != smooNoMap.end(); ++n2sn )
     if ( !n2sn->second._triangles.empty() )

diff --git a/src/Tools/MacMesh/MacMesh/MacObject.py b/src/Tools/MacMesh/MacMesh/MacObject.py
index db3fb2b77298653590cac8ffacabecdb7bc9b8bf..6589ac8b01e85d0849796f74804ce5b95717df92 100644 (file)
--- a/src/Tools/MacMesh/MacMesh/MacObject.py
+++ b/src/Tools/MacMesh/MacMesh/MacObject.py
@@ -281,7 +281,7 @@ class MacObject:
         def PrincipleBoxes (self):
                 """
                 This function returns all possible combination rectangular shape objects that can contain at least 3 of the principle vertices
         def PrincipleBoxes (self):
                 """
                 This function returns all possible combination rectangular shape objects that can contain at least 3 of the principle vertices

-                constituting the MacObject. This is indispensible for the Non-ortho types and shall return a number of 24 possible combinations
+                constituting the MacObject. This is indispensable for the Non-ortho types and shall return a number of 24 possible combinations

                 """
                 from itertools import combinations
                 Boxes = []
                 """
                 from itertools import combinations
                 Boxes = []