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

http://www.salome-platform.org/forum/forum_10/652417125/447386016
This commit is contained in:
eap 2017-03-02 21:41:15 +03:00
parent 8f8c86b463
commit b3c311b4d9
11 changed files with 26 additions and 26 deletions

View File

@ -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 SET(BAD_TESTS
3dmesh.py 3dmesh.py
a3DmeshOnModified2Dmesh.py a3DmeshOnModified2Dmesh.py

View File

@ -144,7 +144,7 @@ module SMESH
ERR_LOADF_CANT_PROJECT, // impossible to project nodes ERR_LOADF_CANT_PROJECT, // impossible to project nodes
// Load(volume) // Load(volume)
ERR_LOADV_BAD_SHAPE, // volume is not a brick of 6 faces 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) // Apply(shape)
ERR_APPL_NOT_LOADED, // pattern was not loaded ERR_APPL_NOT_LOADED, // pattern was not loaded
ERR_APPL_BAD_DIMENTION, // wrong shape dimension ERR_APPL_BAD_DIMENTION, // wrong shape dimension

View File

@ -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; typedef map<const SMDS_MeshNode*, gp_XYZ> TNodeXYZMap;
TNodeXYZMap nBordXYZ; TNodeXYZMap nBordXYZ;
list< const SMDS_MeshNode* >& bordNodes = nSide[ 0 ]; list< const SMDS_MeshNode* >& bordNodes = nSide[ 0 ];
@ -8404,7 +8404,7 @@ SMESH_MeshEditor::SewFreeBorder (const SMDS_MeshNode* theBordFirstNode,
} // loop on inverse elements of prevSideNode } // loop on inverse elements of prevSideNode
if ( !sideNode ) { 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; return SEW_BAD_SIDE_NODES;
} }
sideNodes.push_back( sideNode ); sideNodes.push_back( sideNode );

View File

@ -187,7 +187,7 @@ class SMESH_EXPORT SMESH_MesherHelper
* \brief Count nb of sub-shapes * \brief Count nb of sub-shapes
* \param shape - the shape * \param shape - the shape
* \param type - the type of sub-shapes to count * \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 * \retval int - the calculated number
*/ */
static int Count(const TopoDS_Shape& shape, static int Count(const TopoDS_Shape& shape,

View File

@ -1194,7 +1194,7 @@ bool SMESH_Pattern::compUVByIsoIntersection (const list< list< TPoint* > >& theB
} }
if ( !intersectIsolines( uv1[0], uv2[0], ratio[0], if ( !intersectIsolines( uv1[0], uv2[0], ratio[0],
uv1[1], uv2[1], ratio[1], theUV, theIsDeformed )) { 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; return false;
} }
else { 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; return false;
} }
else { 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++ ); list< TPoint* > & ePoints = getShapePoints( eID++ );
TPoint* p = ePoints.front(); TPoint* p = ePoints.front();
if ( !compUVByIsoIntersection( theEdgesPointsList, p->myInitUV, p->myUV, aBool )) { if ( !compUVByIsoIntersection( theEdgesPointsList, p->myInitUV, p->myUV, aBool )) {
MESSAGE("cant sortSameSizeWires()"); MESSAGE("can't sortSameSizeWires()");
return false; return false;
} }
gcVec[iW] += p->myUV; gcVec[iW] += p->myUV;
@ -2482,7 +2482,7 @@ bool SMESH_Pattern::Apply (const TopoDS_Face& theFace,
for ( pIt++; pIt != ePoints.end(); pIt++ ) { for ( pIt++; pIt != ePoints.end(); pIt++ ) {
TPoint* p = (*pIt); TPoint* p = (*pIt);
if ( !compUVByIsoIntersection( edgesPointsList, p->myInitUV, p->myUV, aBool )) { if ( !compUVByIsoIntersection( edgesPointsList, p->myInitUV, p->myUV, aBool )) {
MESSAGE("cant Apply(face)"); MESSAGE("can't Apply(face)");
return false; return false;
} }
// keep the computed UV to compare against by setFirstEdge() // 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++ ) for ( pIt = fPoints.begin(); !isDeformed && pIt != fPoints.end(); pIt++ )
if ( !compUVByIsoIntersection( edgesPointsList, (*pIt)->myInitUV, if ( !compUVByIsoIntersection( edgesPointsList, (*pIt)->myInitUV,
(*pIt)->myUV, isDeformed )) { (*pIt)->myUV, isDeformed )) {
MESSAGE("cant Apply(face)"); MESSAGE("can't Apply(face)");
return false; return false;
} }
// try to use a complex algo if it is a difficult case // 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 for ( ; pIt != fPoints.end(); pIt++ ) // continue with the simple algo
if ( !compUVByIsoIntersection( edgesPointsList, (*pIt)->myInitUV, if ( !compUVByIsoIntersection( edgesPointsList, (*pIt)->myInitUV,
(*pIt)->myUV, isDeformed )) { (*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++ ) for ( pIt = fPoints.begin(); !isDeformed && pIt != fPoints.end(); pIt++ )
if ( !compUVByIsoIntersection( edgesPointsList, (*pIt)->myInitUV, if ( !compUVByIsoIntersection( edgesPointsList, (*pIt)->myInitUV,
(*pIt)->myUV, isDeformed )) { (*pIt)->myUV, isDeformed )) {
MESSAGE("cant Apply(face)"); MESSAGE("can't Apply(face)");
return false; return false;
} }
// try to use a complex algo if it is a difficult case // 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 for ( ; pIt != fPoints.end(); pIt++ ) // continue with the simple algo
if ( !compUVByIsoIntersection( edgesPointsList, (*pIt)->myInitUV, if ( !compUVByIsoIntersection( edgesPointsList, (*pIt)->myInitUV,
(*pIt)->myUV, isDeformed )) { (*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++ ) for ( pIt = fPoints.begin(); !isDeformed && pIt != fPoints.end(); pIt++ )
if ( !compUVByIsoIntersection( edgesPointsList, (*pIt)->myInitUV, if ( !compUVByIsoIntersection( edgesPointsList, (*pIt)->myInitUV,
(*pIt)->myUV, isDeformed )) { (*pIt)->myUV, isDeformed )) {
MESSAGE("cant Apply(face)"); MESSAGE("can't Apply(face)");
return false; return false;
} }
// try to use a complex algo if it is a difficult case // 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 for ( ; pIt != fPoints.end(); pIt++ ) // continue with the simple algo
if ( !compUVByIsoIntersection( edgesPointsList, (*pIt)->myInitUV, if ( !compUVByIsoIntersection( edgesPointsList, (*pIt)->myInitUV,
(*pIt)->myUV, isDeformed )) { (*pIt)->myUV, isDeformed )) {
MESSAGE("cant Apply(face)"); MESSAGE("can't Apply(face)");
return false; return false;
} }
} }

View File

@ -178,7 +178,7 @@ class SMESH_EXPORT SMESH_Pattern {
ERR_LOADF_CANT_PROJECT, // impossible to project nodes ERR_LOADF_CANT_PROJECT, // impossible to project nodes
// Load(volume) // Load(volume)
ERR_LOADV_BAD_SHAPE, // volume is not a brick of 6 faces 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) // Apply(shape)
ERR_APPL_NOT_COMPUTED, // mapping failed ERR_APPL_NOT_COMPUTED, // mapping failed
ERR_APPL_NOT_LOADED, // pattern was not loaded ERR_APPL_NOT_LOADED, // pattern was not loaded
@ -260,8 +260,8 @@ private:
std::list< TPoint* > & getShapePoints(const TopoDS_Shape& theShape); std::list< TPoint* > & getShapePoints(const TopoDS_Shape& theShape);
// Return list of points located on theShape. // Return list of points located on theShape.
// A list of edge-points include vertex-points (for 2D pattern only). // A list of edge-points include vertex-points (for 2D pattern only).
// A list of face-points doesnt include edge-points. // A list of face-points doesn't include edge-points.
// A list of volume-points doesnt include face-points. // A list of volume-points doesn't include face-points.
std::list< TPoint* > & getShapePoints(const int theShapeID); std::list< TPoint* > & getShapePoints(const int theShapeID);
// Return list of points located on the shape // Return list of points located on the shape

View File

@ -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 */ SMESHGUI* mySMESHGUI; /* Current SMESHGUI object */
LightApp_SelectionMgr* mySelectionMgr; /* User shape selection */ LightApp_SelectionMgr* mySelectionMgr; /* User shape selection */

View File

@ -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 ); if ( idLess( n1, ListOfCoincidentNodes.front() )) ListOfCoincidentNodes.push_front( n1 );
else ListOfCoincidentNodes.push_back ( n1 ); else ListOfCoincidentNodes.push_back ( n1 );
ListOfCoincidentNodes.sort( idLess ); ListOfCoincidentNodes.sort( idLess );

View File

@ -2724,7 +2724,7 @@ bool _pyHypothesis::IsWrappable(const _pyID& theMesh) const
* \brief Convert the command adding a hypothesis to mesh into a smesh command * \brief Convert the command adding a hypothesis to mesh into a smesh command
* \param theCmd - The command like mesh.AddHypothesis( geom, hypo ) * \param theCmd - The command like mesh.AddHypothesis( geom, hypo )
* \param theAlgo - The algo that can create this 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 ) * into regular1D.LengthNearVertex( length, vertex )
* \param theCmd - The command like mesh.AddHypothesis( vertex, SegmentLengthAroundVertex ) * \param theCmd - The command like mesh.AddHypothesis( vertex, SegmentLengthAroundVertex )
* \param theMesh - The mesh needing this hypo * \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 * \brief Convert the command adding an algorithm to mesh
* \param theCmd - The command like mesh.AddHypothesis( geom, algo ) * \param theCmd - The command like mesh.AddHypothesis( geom, algo )
* \param theMesh - The mesh needing this 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
*/ */
//================================================================================ //================================================================================

View File

@ -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(); TNo2SmooNoMap::iterator n2sn = smooNoMap.begin();
for ( ; n2sn != smooNoMap.end(); ++n2sn ) for ( ; n2sn != smooNoMap.end(); ++n2sn )
if ( !n2sn->second._triangles.empty() ) if ( !n2sn->second._triangles.empty() )

View File

@ -281,7 +281,7 @@ class MacObject:
def PrincipleBoxes (self): def PrincipleBoxes (self):
""" """
This function returns all possible combination rectangular shape objects that can contain at least 3 of the principle vertices 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 from itertools import combinations
Boxes = [] Boxes = []