From b3c311b4d9295b449274c44d73035b66e438b612 Mon Sep 17 00:00:00 2001 From: eap Date: Thu, 2 Mar 2017 21:41:15 +0300 Subject: [PATCH] Re: Patch modules/smesh.git for Doxygen typos/grammar + misc. typos http://www.salome-platform.org/forum/forum_10/652417125/447386016 --- doc/salome/examples/CMakeLists.txt | 2 +- idl/SMESH_Pattern.idl | 2 +- src/SMESH/SMESH_MeshEditor.cxx | 4 ++-- src/SMESH/SMESH_MesherHelper.hxx | 2 +- src/SMESH/SMESH_Pattern.cxx | 22 +++++++++---------- src/SMESH/SMESH_Pattern.hxx | 6 ++--- .../SMESHGUI_CreatePolyhedralVolumeDlg.h | 2 +- src/SMESHUtils/SMESH_OctreeNode.cxx | 2 +- src/SMESH_I/SMESH_2smeshpy.cxx | 6 ++--- src/StdMeshers/StdMeshers_Quadrangle_2D.cxx | 2 +- src/Tools/MacMesh/MacMesh/MacObject.py | 2 +- 11 files changed, 26 insertions(+), 26 deletions(-) diff --git a/doc/salome/examples/CMakeLists.txt b/doc/salome/examples/CMakeLists.txt index 4e35dc496..552a9d1b2 100644 --- 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 # -# 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 diff --git a/idl/SMESH_Pattern.idl b/idl/SMESH_Pattern.idl index 555c8058f..4229c0345 100644 --- 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_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 diff --git a/src/SMESH/SMESH_MeshEditor.cxx b/src/SMESH/SMESH_MeshEditor.cxx index 03a5012d2..f4dd0d7db 100644 --- 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, - // 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 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 ) { - 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 ); diff --git a/src/SMESH/SMESH_MesherHelper.hxx b/src/SMESH/SMESH_MesherHelper.hxx index ecf63db36..7e60e6d25 100644 --- 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 - * \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, diff --git a/src/SMESH/SMESH_Pattern.cxx b/src/SMESH/SMESH_Pattern.cxx index 7b4fa74c0..0f14f5ef6 100644 --- 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 )) { - MESSAGE(" Cant intersect isolines for a point "< & 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 +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 )) { - MESSAGE("cant Apply(face)"); + MESSAGE("can't Apply(face)"); 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 )) { - 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 +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 )) { - MESSAGE("cant Apply(face)"); + MESSAGE("can't Apply(face)"); 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 )) { - 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 +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 )) { - MESSAGE("cant Apply(face)"); + MESSAGE("can't Apply(face)"); 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 )) { - 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 +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 )) { - MESSAGE("cant Apply(face)"); + MESSAGE("can't Apply(face)"); return false; } } diff --git a/src/SMESH/SMESH_Pattern.hxx b/src/SMESH/SMESH_Pattern.hxx index d3cb43e57..836cd1790 100644 --- 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_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 @@ -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). - // 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 diff --git a/src/SMESHGUI/SMESHGUI_CreatePolyhedralVolumeDlg.h b/src/SMESHGUI/SMESHGUI_CreatePolyhedralVolumeDlg.h index 330bd429e..e0fe05b01 100644 --- a/src/SMESHGUI/SMESHGUI_CreatePolyhedralVolumeDlg.h +++ b/src/SMESHGUI/SMESHGUI_CreatePolyhedralVolumeDlg.h @@ -79,7 +79,7 @@ private: 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 */ diff --git a/src/SMESHUtils/SMESH_OctreeNode.cxx b/src/SMESHUtils/SMESH_OctreeNode.cxx index 183246250..03e99b50f 100644 --- a/src/SMESHUtils/SMESH_OctreeNode.cxx +++ b/src/SMESHUtils/SMESH_OctreeNode.cxx @@ -334,7 +334,7 @@ void SMESH_OctreeNode::FindCoincidentNodes ( TIDSortedNodeSet* 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 ); diff --git a/src/SMESH_I/SMESH_2smeshpy.cxx b/src/SMESH_I/SMESH_2smeshpy.cxx index 868a5f258..f3a0a556c 100644 --- 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 - * \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 - * \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 - * \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 e2df2ddd7..8f909f214 100644 --- 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() ) diff --git a/src/Tools/MacMesh/MacMesh/MacObject.py b/src/Tools/MacMesh/MacMesh/MacObject.py index db3fb2b77..6589ac8b0 100644 --- 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 - 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 = []