ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2024-11-11 16:19:16 +05:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
http://www.salome-platform.org/forum/forum_10/652417125
This commit is contained in:
eap 2017-03-02 19:51:35 +03:00
parent 3957e28e35
commit e74c29b786
104 changed files with 235 additions and 235 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -100,7 +100,7 @@
2003-12-09 14:13 Nadir Bouhamou <nadir.bouhamou@cea.fr>
* src/SMESH/Makefile.in: Correcting a problem araising when
building the SMESH module whithout Netgen.
building the SMESH module without Netgen.
2003-12-09 10:00 Nadir Bouhamou <nadir.bouhamou@cea.fr>

2
adm_local/unix/config_files/check_qwt.m4
View File

@ -57,7 +57,7 @@ if test -z $QWTHOME; then
QWTHOME=$d
AC_MSG_RESULT(lib${extension}.so detected in $d/lib)
libqwt_name=${extension}
dnl break, libqwt-qt4.so is choosen before libqwt.so since it is surely the Qt4 version.
dnl break, libqwt-qt4.so is chosen before libqwt.so since it is surely the Qt4 version.
break
fi
done

4
doc/salome/examples/defining_hypotheses_ex06.py
View File

@ -32,6 +32,6 @@ algo3D.MaxElementVolume(200.)
# compute the mesh
ret = tetra.Compute()
if ret == 0:
print "probleme when computing the mesh"
print "problem when computing the mesh"
else:
print "Computation succeded"
print "Computation succeeded"

2
doc/salome/examples/defining_hypotheses_ex10.py
View File

@ -52,7 +52,7 @@ src_mesh.Triangle(f1) # triangular sub-mesh
src_mesh.Compute()
# Mesh the box using projection algoritms
# Mesh the box using projection algorithms
# Define the same global 1D and 2D hypotheses
tgt_mesh = smesh.Mesh(box, "Target mesh")

2
doc/salome/examples/defining_hypotheses_ex11.py
View File

@ -34,7 +34,7 @@ src_mesh.Segment().NumberOfSegments(15)
src_mesh.Triangle()
src_mesh.Compute()
# Mesh the target mesh using the algoritm Projection1D2D
# Mesh the target mesh using the algorithm Projection1D2D
tgt_mesh = smesh.Mesh(Face_2, "Target mesh")
tgt_mesh.Projection1D2D().SourceFace(Face_1,src_mesh)
tgt_mesh.Compute()

2
doc/salome/gui/SMESH/input/adding_quadratic_elements.doc
View File

@ -41,7 +41,7 @@ to the specified group or to create the group anew using
<b>Add to group</b> box, that allows choosing an existing group for
the created node or element or giving the name to a new group. By
default, the <b>Add to group</b> check box is switched off. If the user
swiches this check box on, the combo box listing all currently
switches this check box on, the combo box listing all currently
existing groups of the corresponding type becomes available. By
default, no group is selected. In this case, when the user presses
<b>Apply</b> or <b>Apply & Close</b> button, the warning message box

2
doc/salome/gui/SMESH/input/over_constrained_faces.doc
View File

@ -3,7 +3,7 @@
\page over_constrained_faces_page Over-constrained faces
\n This mesh quality control highlights faces sharing only one border
with other faces. In other words, the faces having all thier nodes on
with other faces. In other words, the faces having all their nodes on
the free border of the 2D mesh are highlighted.
\note The highlighted faces are actually over-constrained only if, at

2
doc/salome/gui/SMESH/input/smesh_migration.doc
View File

@ -42,7 +42,7 @@ is replaced by:
\code
MEFISTO_2D_1 = Mesh_1.Triangle(algo=smeshBuilder.MEFISTO,geom=Face_1)
\endcode
\n StdMeshers algoritms concerned are <em>REGULAR, PYTHON, COMPOSITE, MEFISTO, Hexa, QUADRANGLE, RADIAL_QUAD</em>.
\n StdMeshers algorithms concerned are <em>REGULAR, PYTHON, COMPOSITE, MEFISTO, Hexa, QUADRANGLE, RADIAL_QUAD</em>.
\n SMESH Plugins provide such algorithms as: <em> NETGEN, NETGEN_FULL, FULL_NETGEN, NETGEN_1D2D3D, NETGEN_1D2D, NETGEN_2D, NETGEN_3D</em>.
\n If you use DISTENE plugins, you also have <em>BLSURF, GHS3D, GHS3DPRL, Hexotic</em>.

4
idl/SMESH_BasicHypothesis.idl
View File

@ -994,8 +994,8 @@ module StdMeshers
* \param internalPoints - points dividing a grid into parts along an axis
* \param axis - index of an axis counterd from zero, i.e. 0==X, 1==Y, 2==Z
*
* Parameter t of spaceFunction f(t) is a position [0,1] withing bounding box of
* the shape to mesh or withing an interval defined by internal points
* Parameter t of spaceFunction f(t) is a position [0,1] within bounding box of
* the shape to mesh or within an interval defined by internal points
*/
void SetGridSpacing(in SMESH::string_array spaceFunctions,
in SMESH::double_array internalPoints,

2
idl/SMESH_Filter.idl
View File

@ -645,7 +645,7 @@ module SMESH
Filter CreateFilter();
/*!
* Load filter library. If libary does not exist it is created
* Load filter library. If library does not exist it is created
*/
FilterLibrary LoadLibrary( in string aFileName );

2
idl/SMESH_Hypothesis.idl
View File

@ -91,7 +91,7 @@ module SMESH
/*!
* Return true if a hypothesis has parameters.
*
* This method is intended for GUI to know if "Edit" menu item sould be available
* This method is intended for GUI to know if "Edit" menu item should be available
*/
boolean HasParameters();
};

6
idl/SMESH_Mesh.idl
View File

@ -263,7 +263,7 @@ module SMESH
};
/*!
* Auxilary flags for advanced extrusion.
* Auxiliary flags for advanced extrusion.
* BOUNDARY: create or not boundary for result of extrusion
* SEW: try to use existing nodes or create new nodes in any case
*/
@ -349,7 +349,7 @@ module SMESH
raises (SALOME::SALOME_Exception);
/*!
* Get geom shape to mesh. A result sould not be nil. Use HasShapeToMesh()
* Get geom shape to mesh. A result should not be nil. Use HasShapeToMesh()
* to know if a returned shape
*/
GEOM::GEOM_Object GetShapeToMesh()
@ -389,7 +389,7 @@ module SMESH
* Get the subMesh object associated to a Sub-shape. The subMesh object
* gives access to nodes and elements IDs.
* SubMesh will be used instead of Sub-shape in a next idl version to
* adress a specific subMesh...
* address a specific subMesh...
*/
SMESH_subMesh GetSubMesh(in GEOM::GEOM_Object aSubObject, in string name)
raises (SALOME::SALOME_Exception);

2
idl/SMESH_MeshEditor.idl
View File

@ -93,7 +93,7 @@ module SMESH
void ClearLastCreated() raises (SALOME::SALOME_Exception);
/*!
* \brief Returns description of an error/warning occured during the last operation
* \brief Returns description of an error/warning occurred during the last operation
*/
ComputeError GetLastError() raises (SALOME::SALOME_Exception);

2
idl/SMESH_Pattern.idl
View File

@ -147,7 +147,7 @@ module SMESH
ERR_LOADV_COMPUTE_PARAMS, // cant compute point parameters
// Apply(shape)
ERR_APPL_NOT_LOADED, // pattern was not loaded
ERR_APPL_BAD_DIMENTION, // wrong shape dimention
ERR_APPL_BAD_DIMENTION, // wrong shape dimension
ERR_APPL_BAD_NB_VERTICES, // keypoints - vertices mismatch
// Apply(face)
ERR_APPLF_BAD_TOPOLOGY, // bad pattern topology

6
src/Controls/SMESH_Controls.cxx
View File

@ -134,7 +134,7 @@ namespace {
// +-----+------+ +-----+------+
// | | | |
// | | | |
// result sould be 2 in both cases
// result should be 2 in both cases
//
int aResult0 = 0, aResult1 = 0;
// last node, it is a medium one in a quadratic edge
@ -2650,7 +2650,7 @@ bool FreeFaces::IsSatisfy( long theId )
for ( ; volItr != volEnd; ++volItr )
if ( (*volItr).second >= nbNode )
nbVol++;
// face is not free if number of volumes constructed on thier nodes more than one
// face is not free if number of volumes constructed on their nodes more than one
return (nbVol < 2);
}
@ -2698,7 +2698,7 @@ SMDSAbs_ElementType LinearOrQuadratic::GetType() const
//================================================================================
/*
Class : GroupColor
Description : Functor for check color of group to whic mesh element belongs to
Description : Functor for check color of group to which mesh element belongs to
*/
//================================================================================

2
src/Controls/SMESH_ControlsDef.hxx
View File

@ -1041,7 +1041,7 @@ namespace SMESH{
/*
Class : GroupColor
Description : Functor for check color of group to whic mesh element belongs to
Description : Functor for check color of group to which mesh element belongs to
*/
class SMESHCONTROLS_EXPORT GroupColor: public virtual Predicate{
public:

2
src/DriverCGNS/DriverCGNS_Read.cxx
View File

@ -766,7 +766,7 @@ Driver_Mesh::Status DriverCGNS_Read::Perform()
}
// Read connectivity between zones. Nodes of the zone interface will be
// replaced withing the zones read later
// replaced within the zones read later
string err = zone.ReadZonesConnection( _fn, cgnsBase, zonesByName, myMesh );
if ( !err.empty() )
addMessage( err );

4
src/DriverUNV/UNV_Utilities.hxx
View File

@ -48,7 +48,7 @@ namespace UNV{
};
/**
* @returns \p false when error occured, \p true otherwise.
* @returns \p false when error occurred, \p true otherwise.
* Adjusts the \p in_stream to the beginning of the
* dataset \p ds_name.
*/
@ -95,7 +95,7 @@ namespace UNV{
{
/* find "D" in string, start looking at
* 6th element, to improve speed.
* We dont expect a "D" earlier
* We don't expect a "D" earlier
*/
const size_t position = number.find("D",6);
if ( position != std::string::npos )

18
src/MEDWrapper/Base/MED_SliceArray.hxx
View File

@ -22,7 +22,7 @@
#ifndef MED_SliceArray_HeaderFile
#define MED_SliceArray_HeaderFile
#ifdef WIN32 // for correctly compiling "valarray" in modules, which are includes this file
#ifdef WIN32 // for correctly compiling "valarray" in modules, which includes this file
#undef max
#undef min
#endif
@ -37,17 +37,17 @@
namespace MED
{
//---------------------------------------------------------------
//! This class intends to provide an uniform way to handle multy-dimention data (const version)
//! This class intends to provide a uniform way to handle multidimensional data (const version)
/*!
It just contains pointer to real sequence and implement proper calcultion of its indexes.
This class deal with constant pointer to the sources data and provide const method to
read the them (data).
It just contains a pointer to real sequence and implement proper calculation of its indexes.
This class deals with constant pointer to the sources data and provides const method to
read them (data).
*/
template<class TValueType>
class TCSlice
{
const TValueType* myCValuePtr; //!< Reference to source multy-dimension data
size_t mySourceSize; //!< Size of the source multy-dimension data
const TValueType* myCValuePtr; //!< Reference to source multidimensional data
size_t mySourceSize; //!< Size of the source multidimensional data
std::slice mySlice; //!< Defines algorithm of index calculation
protected:
@ -63,7 +63,7 @@ namespace MED
throw std::out_of_range("TCSlice::check_id");
}
//! Calculate internal index to get proper element from the source multy-dimension data
//! Calculate internal index to get proper element from the source multidimensional data
size_t
calculate_id(size_t theId) const
{
@ -134,7 +134,7 @@ namespace MED
//---------------------------------------------------------------
//! This class extend TCSlice functionality for non-constant case
//! This class extends TCSlice functionality for non-constant case
template<class TValueType>
class TSlice: public TCSlice<TValueType>
{

42
src/MEDWrapper/Base/MED_Structures.hxx
View File

@ -283,15 +283,15 @@ namespace MED
virtual TModeSwitchInfo
{
EEntiteMaillage myEntity; //!< Defines the MED Entity where the mesh cells belongs to
//! Let known what MED ENTITY the cells belong to
//! Find out what MED ENTITY the cells belong to
EEntiteMaillage GetEntity() const { return myEntity;}
EGeometrieElement myGeom; //!< Defines the MED Geometric type of the instance
//! Let known what MED geometrical type the cells belong to
//! Find out what MED geometrical type the cells belong to
EGeometrieElement GetGeom() const { return myGeom;}
EConnectivite myConnMode; //!< Defines connectivity mode
//! Let known in what connectivity the cells are writen
//! Find out in what connectivity the cells are written
EConnectivite GetConnMode() const { return myConnMode;}
virtual TInt GetConnDim() const = 0; //!< Gives step in the connectivity sequence
@ -311,17 +311,17 @@ namespace MED
{
//! Defines the MED Entity where the polygons belongs to
EEntiteMaillage myEntity; // MED_FACE|MED_MAILLE
//! Let known what MED ENTITY the MED Polygons belong to
//! Find out what MED ENTITY the MED Polygons belong to
EEntiteMaillage GetEntity() const { return myEntity;}
//! Defines the MED Geometric type of the instance
EGeometrieElement myGeom; // ePOLYGONE
//! Let known what MED geometrical type the MED Polygons belong to
//! Find out what MED geometrical type the MED Polygons belong to
EGeometrieElement GetGeom() const { return ePOLYGONE;}
//! Defines connectivity mode
EConnectivite myConnMode; // eNOD|eDESC(eDESC not used)
//! Let known in what connectivity the cells are writen
//! Find out in what connectivity the cells are written
EConnectivite GetConnMode() const { return myConnMode;}
PElemNum myConn; //!< Table de connectivities
@ -359,17 +359,17 @@ namespace MED
{
//! Defines the MED Entity where the polyedres belongs to
EEntiteMaillage myEntity; // MED_FACE|MED_MAILLE
//! Let known what MED ENTITY the MED Polyedres belong to
//! Find out what MED ENTITY the MED Polyedres belong to
EEntiteMaillage GetEntity() const { return myEntity;}
//! Defines the MED Geometric type of the instance
EGeometrieElement myGeom; // ePOLYEDRE
//! Let known what MED geometrical type the MED Polyedres belong to
//! Find out what MED geometrical type the MED Polyedres belong to
EGeometrieElement GetGeom() const { return ePOLYEDRE;}
//! Defines connectivity mode
EConnectivite myConnMode; // eNOD|eDESC(eDESC not used)
//! Let known in what connectivity the cells are writen
//! Find out in what connectivity the cells are written
EConnectivite GetConnMode() const { return myConnMode;}
PElemNum myConn; //!< Table de connectivities
@ -392,24 +392,24 @@ namespace MED
struct MEDWRAPPER_EXPORT TFieldInfo:
virtual TNameInfo
{
PMeshInfo myMeshInfo; //!< A reference to correspondig MED Mesh
PMeshInfo myMeshInfo; //!< A reference to corresponding MED Mesh
//! Get a reference to corresponding MED Mesh
const PMeshInfo& GetMeshInfo() const { return myMeshInfo;}
ETypeChamp myType; //!< Defines type of the MED Field
//! Let known what type of the MED FIELD is used
ETypeChamp myType; //!< Defines type of MED Field
//! Find out what type of MED FIELD is used
ETypeChamp GetType() const { return myType;}
TInt myNbComp; //!< Defines number of components stored in the field
//! Get number of components for the MED FIELD
//! Get number of components for MED FIELD
TInt GetNbComp() const { return myNbComp;}
EBooleen myIsLocal; //!< Defines if the MED Field is local
//! Let known is the MED FIELD is local or not
//! Find out if MED FIELD is local or not
EBooleen GetIsLocal() const { return myIsLocal;}
TInt myNbRef; //!< Defines number of refereces of the field
//! Let known number of references for the MED FIELD
TInt myNbRef; //!< Defines number of references of the field
//! Find out number of references for the MED FIELD
TInt GetNbRef() const { return myNbRef;}
TString myCompNames; //!< Contains names for each of MED Field components
@ -458,7 +458,7 @@ namespace MED
//! Defines, which geometrical type the MED Gauss entity belongs to
EGeometrieElement myGeom;
//! Let known what MED geometrical type the MED GAUSS entity belong to
//! Find out what MED geometrical type the MED GAUSS entity belong to
EGeometrieElement GetGeom() const { return myGeom;}
//! Contains coordinates for the refereced nodes
@ -505,7 +505,7 @@ namespace MED
//! Defines the MED Entity where the MED TimeStamp belongs to
EEntiteMaillage myEntity;
//! Let known to what MED Entity the MED TimeStamp belong to
//! Find out to what MED Entity the MED TimeStamp belong to
EEntiteMaillage GetEntity() const { return myEntity;}
//! Keeps map of number of cells per geometric type where the MED TimeStamp belongs to
@ -547,7 +547,7 @@ namespace MED
typedef boost::tuple<TKey,TInt> TInfo;
EModeProfil myMode; //!< Keeps mode for the MED Profile
//! Let known what mode of MED Profile is used
//! Find out what mode of MED Profile is used
EModeProfil GetMode() const { return myMode;}
//! Set mode for the MED Profile
void SetMode(EModeProfil theMode) { myMode = theMode;}
@ -558,10 +558,10 @@ namespace MED
//! Set number of mesh elelemts by its order number
void SetElemNum(TInt theId, TInt theVal);
//! Let known is the MED Profile defined
//! Find out if the MED Profile defined
bool IsPresent() const { return GetName() != "";}
//! Let known size of the MED Profile
//! Find out size of the MED Profile
TInt GetSize() const { return (TInt)myElemNum->size();}
};

2
src/MEDWrapper/Base/MED_Wrapper.hxx
View File

@ -38,7 +38,7 @@ namespace MED
struct MEDWRAPPER_EXPORT TWrapper
{
typedef boost::mutex TMutex;
//! This is a syncronization primitive which allow to support thread safety for the MED access
//! This is a synchronization primitive which allow to support thread safety for the MED access
TMutex myMutex;
virtual

2
src/OBJECT/SMESH_Object.cxx
View File

@ -463,7 +463,7 @@ void SMESH_VisualObjDef::buildElemPrs()
SMDS_ElemIteratorPtr aNodesIter = anElem->nodesIterator();
{
// Convertions connectivities from SMDS to VTK
// Convert connectivities from SMDS to VTK
if (aType == SMDSAbs_Volume && anElem->IsPoly() && aNbNodes > 3) { // POLYEDRE
anIdList->Reset();

2
src/SMDS/SMDS_Mesh.cxx
View File

@ -383,7 +383,7 @@ SMDS_MeshEdge* SMDS_Mesh::AddEdgeWithID(const SMDS_MeshNode * n1,
if ( !n1 || !n2 ) return 0;
SMDS_MeshEdge * edge = 0;
// --- retreive nodes ID
// --- retrieve nodes ID
vector<vtkIdType> nodeIds;
nodeIds.clear();
nodeIds.push_back(n1->getVtkId());

2
src/SMDS/SMDS_Mesh.hxx
View File

@ -69,7 +69,7 @@ public:
SMDS_Mesh();
//! to retreive this SMDS_Mesh instance from its elements (index stored in SMDS_Elements)
//! to retrieve this SMDS_Mesh instance from its elements (index stored in SMDS_Elements)
static std::vector<SMDS_Mesh*> _meshList;
//! actual nodes coordinates, cells definition and reverse connectivity are stored in a vtkUnstructuredGrid

2
src/SMDS/SMDS_TypeOfPosition.hxx
View File

@ -27,7 +27,7 @@
#ifndef _SMDS_TypeOfPosition_HeaderFile
#define _SMDS_TypeOfPosition_HeaderFile
enum SMDS_TypeOfPosition // Value is equal to shape dimention
enum SMDS_TypeOfPosition // Value is equal to shape dimension
{
SMDS_TOP_UNSPEC = -1,
SMDS_TOP_VERTEX = 0,

4
src/SMESH/SMESH_Algo.cxx
View File

@ -231,7 +231,7 @@ SMESH_3D_Algo::SMESH_3D_Algo(int hypId, int studyId, SMESH_Gen* gen)
//=============================================================================
/*!
* Usually an algoritm has nothing to save
* Usually an algorithm has nothing to save
*/
//=============================================================================
@ -751,7 +751,7 @@ SMESH_Algo::EMeshError SMESH_Algo::GetMeshError(SMESH_subMesh* subMesh)
if ( !fIt->more() )
return MEr_EMPTY;
// We check that olny links on EDGEs encouter once, the rest links, twice
// We check that only links on EDGEs encouter once, the rest links, twice
set< SMESH_TLink > links;
while ( fIt->more() )
{

4
src/SMESH/SMESH_Algo.hxx
View File

@ -255,7 +255,7 @@ public:
// ==================================================================
// SMESH_Hypothesis::GetDim();
// 1 - dimention of target mesh
// 1 - dimension of target mesh
bool OnlyUnaryInput() const { return _onlyUnaryInput; }
// 2 - is collection of tesselatable shapes inacceptable as input;
@ -269,7 +269,7 @@ public:
// 3 - is a Dim-1 mesh prerequisite
bool NeedShape() const { return _requireShape; }
// 4 - is shape existance required
// 4 - is shape existence required
bool SupportSubmeshes() const { return _supportSubmeshes; }
// 5 - whether supports submeshes if !NeedDiscreteBoundary()

2
src/SMESH/SMESH_Gen.cxx
View File

@ -1168,7 +1168,7 @@ int SMESH_Gen::GetShapeDim(const TopAbs_ShapeEnum & aShapeType)
//=============================================================================
/*!
* Genarate a new id unique withing this Gen
* Genarate a new id unique within this Gen
*/
//=============================================================================

2
src/SMESH/SMESH_Hypothesis.hxx
View File

@ -114,7 +114,7 @@ public:
*
* An auxiliary hypothesis is optional, i.e. an algorithm
* can work without it and another hypothesis of the same
* dimention can be assigned to the shape
* dimension can be assigned to the shape
*/
virtual bool IsAuxiliary() const
{ return GetType() == PARAM_ALGO && _param_algo_dim < 0; }

8
src/SMESH/SMESH_Mesh.cxx
View File

@ -1080,7 +1080,7 @@ SMESH_subMesh * SMESH_Mesh::GetSubMesh(const TopoDS_Shape & aSubShape)
//=============================================================================
/*!
* Get the SMESH_subMesh object implementation. Dont create it, return null
* Get the SMESH_subMesh object implementation. Don't create it, return null
* if it does not exist.
*/
//=============================================================================
@ -1094,7 +1094,7 @@ SMESH_subMesh *SMESH_Mesh::GetSubMeshContaining(const TopoDS_Shape & aSubShape)
//=============================================================================
/*!
* Get the SMESH_subMesh object implementation. Dont create it, return null
* Get the SMESH_subMesh object implementation. Don't create it, return null
* if it does not exist.
*/
//=============================================================================
@ -1929,7 +1929,7 @@ int SMESH_Mesh::NbMeshes() const // nb meshes in the Study
//=======================================================================
//function : IsNotConformAllowed
//purpose : check if a hypothesis alowing notconform mesh is present
//purpose : check if a hypothesis allowing notconform mesh is present
//=======================================================================
bool SMESH_Mesh::IsNotConformAllowed() const
@ -2101,7 +2101,7 @@ bool SMESH_Mesh::RemoveGroup( const int theGroupID )
//=======================================================================
//function : GetAncestors
//purpose : return list of ancestors of theSubShape in the order
// that lower dimention shapes come first.
// that lower dimension shapes come first.
//=======================================================================
const TopTools_ListOfShape& SMESH_Mesh::GetAncestors(const TopoDS_Shape& theS) const

4
src/SMESH/SMESH_Mesh.hxx
View File

@ -206,14 +206,14 @@ class SMESH_EXPORT SMESH_Mesh
bool IsUsedHypothesis(SMESHDS_Hypothesis * anHyp,
const SMESH_subMesh * aSubMesh);
/*!
* \brief check if a hypothesis alowing notconform mesh is present
* \brief check if a hypothesis allowing notconform mesh is present
*/
bool IsNotConformAllowed() const;
bool IsMainShape(const TopoDS_Shape& theShape) const;
/*!
* \brief Return list of ancestors of theSubShape in the order
* that lower dimention shapes come first
* that lower dimension shapes come first
*/
const TopTools_ListOfShape& GetAncestors(const TopoDS_Shape& theSubShape) const;

16
src/SMESH/SMESH_MeshEditor.cxx
View File

@ -1168,7 +1168,7 @@ bool SMESH_MeshEditor::Reorient (const SMDS_MeshElement * theElem)
* \brief Reorient faces.
* \param theFaces - the faces to reorient. If empty the whole mesh is meant
* \param theDirection - desired direction of normal of \a theFace
* \param theFace - one of \a theFaces that sould be oriented according to
* \param theFace - one of \a theFaces that should be oriented according to
* \a theDirection and whose orientation defines orientation of other faces
* \return number of reoriented faces.
*/
@ -2398,7 +2398,7 @@ void SMESH_MeshEditor::SplitVolumes (const TFacetOfElem & theElems,
}
else
{
// among possible triangles create ones discribed by split method
// among possible triangles create ones described by split method
const int* nInd = volTool.GetFaceNodesIndices( iF );
int nbVariants = ( nbNodes == 4 ? 2 : nbNodes );
int iCom = 0; // common node of triangle faces to split into
@ -2524,7 +2524,7 @@ void SMESH_MeshEditor::GetHexaFacetsToSplit( TIDSortedElemSet& theHexas,
// Fill theFacets starting from facetID of startHex
// facets used for seach of volumes adjacent to already treated ones
// facets used for searching of volumes adjacent to already treated ones
typedef pair< TFacetOfElem::iterator, int > TElemFacets;
typedef map< TVolumeFaceKey, TElemFacets > TFacetMap;
TFacetMap facetsToCheck;
@ -4342,7 +4342,7 @@ void SMESH_MeshEditor::Smooth (TIDSortedElemSet & theElems,
}
}
if ( maxRatio <= theTgtAspectRatio ) {
//MESSAGE("-- quality achived --");
//MESSAGE("-- quality achieved --");
break;
}
if (it+1 == theNbIterations) {
@ -6482,7 +6482,7 @@ SMESH_MeshEditor::ExtrusionAlongTrack (TIDSortedElemSet theElements[2],
//=======================================================================
//function : MakeEdgePathPoints
//purpose : auxilary for ExtrusionAlongTrack
//purpose : auxiliary for ExtrusionAlongTrack
//=======================================================================
SMESH_MeshEditor::Extrusion_Error
SMESH_MeshEditor::MakeEdgePathPoints(std::list<double>& aPrms,
@ -6537,7 +6537,7 @@ SMESH_MeshEditor::MakeEdgePathPoints(std::list<double>& aPrms,
//=======================================================================
//function : MakeExtrElements
//purpose : auxilary for ExtrusionAlongTrack
//purpose : auxiliary for ExtrusionAlongTrack
//=======================================================================
SMESH_MeshEditor::Extrusion_Error
SMESH_MeshEditor::MakeExtrElements(TIDSortedElemSet theElemSets[2],
@ -9202,7 +9202,7 @@ int SMESH_MeshEditor::convertElemToQuadratic(SMESHDS_SubMesh * theSm,
// remove a linear element
GetMeshDS()->RemoveFreeElement(elem, theSm, /*fromGroups=*/false);
// remove central nodes of biquadratic elements (biquad->quad convertion)
// remove central nodes of biquadratic elements (biquad->quad conversion)
if ( hasCentralNodes )
for ( size_t i = nbNodes * 2; i < nodes.size(); ++i )
if ( nodes[i]->NbInverseElements() == 0 )
@ -9850,7 +9850,7 @@ SMESH_MeshEditor::SewSideElements (TIDSortedElemSet& theSide1,
// face does not exist
SMESHDS_Mesh* aMesh = GetMeshDS();
// TODO algoritm not OK with vtkUnstructuredGrid: 2 meshes can't share nodes
// TODO algorithm not OK with vtkUnstructuredGrid: 2 meshes can't share nodes
//SMDS_Mesh aTmpFacesMesh; // try to use the same mesh
TIDSortedElemSet faceSet1, faceSet2;
set<const SMDS_MeshElement*> volSet1, volSet2;

4
src/SMESH/SMESH_MeshEditor.hxx
View File

@ -541,7 +541,7 @@ public:
// additional nodes are inserted on a link provided that no
// volume elements share the splitted link.
// The side 2 is a free border if theSide2IsFreeBorder == true.
// Sewing is peformed between the given first, second and last
// Sewing is performed between the given first, second and last
// nodes on the sides.
// theBorderFirstNode is merged with theSide2FirstNode.
// if (!theSide2IsFreeBorder) then theSide2SecondNode gives
@ -813,7 +813,7 @@ private:
// Nodes and elements created during last operation
SMESH_SequenceOfElemPtr myLastCreatedNodes, myLastCreatedElems;
// Description of error/warning occured during last operation
// Description of error/warning occurred during last operation
SMESH_ComputeErrorPtr myError;
};

14
src/SMESH/SMESH_MesherHelper.cxx
View File

@ -1889,7 +1889,7 @@ const SMDS_MeshNode* SMESH_MesherHelper::getMediumNodeOnComposedWire(const SMDS_
if ( !bestEdge.IsNull() )
{
// move n12 to position of a successfull projection
// move n12 to position of a successful projection
//double tol = BRep_Tool::Tolerance(edges[ iOkEdge ]);
if ( !force3d /*&& distMiddleProj > 2*tol*/ )
{
@ -3185,7 +3185,7 @@ double SMESH_MesherHelper::getFaceMaxTol( const TopoDS_Shape& face ) const
* of the FACE normal
* \return double - the angle (between -Pi and Pi), negative if the angle is concave,
* 1e100 in case of failure
* \waring Care about order of the EDGEs and their orientation to be as they are
* \warning Care about order of the EDGEs and their orientation to be as they are
* within the FACE! Don't pass degenerated EDGEs neither!
*/
//================================================================================
@ -3733,7 +3733,7 @@ namespace { // Structures used by FixQuadraticElements()
* \brief Make up a chain of links
* \param iSide - link to add first
* \param chain - chain to fill in
* \param pos - postion of medium nodes the links should have
* \param pos - position of medium nodes the links should have
* \param error - out, specifies what is wrong
* \retval bool - false if valid chain can't be built; "valid" means that links
* of the chain belongs to rectangles bounding hexahedrons
@ -3747,7 +3747,7 @@ namespace { // Structures used by FixQuadraticElements()
if ( _sideIsAdded[ iSide ]) // already in chain
return true;
if ( _sides.size() != 4 ) { // triangle - visit all my continous faces
if ( _sides.size() != 4 ) { // triangle - visit all my continuous faces
MSGBEG( *this );
TLinkSet links;
list< const QFace* > faces( 1, this );
@ -3793,7 +3793,7 @@ namespace { // Structures used by FixQuadraticElements()
if ( link->MediumPos() >= pos ) {
int nbLinkFaces = link->_faces.size();
if ( nbLinkFaces == 4 || (/*nbLinkFaces < 4 && */link->OnBoundary())) {
// hexahedral mesh or boundary quadrangles - goto a continous face
// hexahedral mesh or boundary quadrangles - goto a continuous face
if ( const QFace* f = link->GetContinuesFace( this ))
if ( f->_sides.size() == 4 )
return f->GetLinkChain( *chLink, chain, pos, error );
@ -3921,7 +3921,7 @@ namespace { // Structures used by FixQuadraticElements()
* \brief Move medium node of theLink according to its distance from boundary
* \param theLink - link to fix
* \param theRefVec - movement of boundary
* \param theLinks - all adjacent links of continous triangles
* \param theLinks - all adjacent links of continuous triangles
* \param theFaceHelper - helper is not used so far
* \param thePrevLen - distance from the boundary
* \param theStep - number of steps till movement propagation limit
@ -4652,7 +4652,7 @@ namespace { // Structures used by FixQuadraticElements()
< const SMDS_MeshElement*, vector< SMDS_ElemIteratorPtr > > TIterOnIter;
SMDS_ElemIteratorPtr faceIter( new TIterOnIter( faceIterVec ));
// a seacher to check if a volume is close to a concave face
// search to check if a volume is close to a concave face
SMESHUtils::Deleter< SMESH_ElementSearcher > faceSearcher
( SMESH_MeshAlgos::GetElementSearcher( *theHelper.GetMeshDS(), faceIter ));

2
src/SMESH/SMESH_MesherHelper.hxx
View File

@ -711,7 +711,7 @@ public:
private:
// Forbiden copy constructor
// forbidden copy constructor
SMESH_MesherHelper (const SMESH_MesherHelper& theOther);
// key of a map of bi-quadratic face to it's central node

8
src/SMESH/SMESH_Pattern.cxx
View File

@ -274,7 +274,7 @@ bool SMESH_Pattern::Load (const char* theFileContents)
// ! This is a comment
// NB_POINTS ! 1 integer - the number of points in the pattern.
// X1 Y1 [Z1] ! 2 or 3 reals - nodes coordinates within 2D or 3D domain:
// X2 Y2 [Z2] ! the pattern dimention is defined by the number of coordinates
// X2 Y2 [Z2] ! the pattern dimension is defined by the number of coordinates
// ...
// [ ID1 ID2 ... IDn ] ! Indices of key-points for a 2D pattern (only).
// ! elements description goes after all
@ -297,7 +297,7 @@ bool SMESH_Pattern::Load (const char* theFileContents)
// X1 Y1 [Z1] ! 2 or 3 reals - nodes coordinates within 2D or 3D domain:
// read the first point coordinates to define pattern dimention
// read the first point coordinates to define pattern dimension
int dim = readLine( fields, lineBeg, clearFields );
if ( dim == 2 )
myIs2D = true;
@ -2465,7 +2465,7 @@ bool SMESH_Pattern::Apply (const TopoDS_Face& theFace,
if ( nbWires > 1 )
{
// compute UV of inner edge-points using the method for in-face points
// and devide eList into a list of separate wires
// and divide eList into a list of separate wires
bool aBool;
list< list< TopoDS_Edge > > wireList;
list<TopoDS_Edge>::iterator eIt = elIt;
@ -4778,7 +4778,7 @@ bool SMESH_Pattern::setShapeToMesh(const TopoDS_Shape& theShape)
TopAbs_ShapeEnum aType = theShape.ShapeType();
bool dimOk = ( myIs2D ? aType == TopAbs_FACE : aType == TopAbs_SHELL );
if ( !dimOk ) {
MESSAGE( "Pattern dimention mismatch" );
MESSAGE( "Pattern dimension mismatch" );
return setErrorCode( ERR_APPL_BAD_DIMENTION );
}

4
src/SMESH/SMESH_Pattern.hxx
View File

@ -182,7 +182,7 @@ class SMESH_EXPORT SMESH_Pattern {
// Apply(shape)
ERR_APPL_NOT_COMPUTED, // mapping failed
ERR_APPL_NOT_LOADED, // pattern was not loaded
ERR_APPL_BAD_DIMENTION, // wrong shape dimention
ERR_APPL_BAD_DIMENTION, // wrong shape dimension
ERR_APPL_BAD_NB_VERTICES, // keypoints - vertices mismatch
// Apply(face)
ERR_APPLF_BAD_TOPOLOGY, // bad pattern topology
@ -241,7 +241,7 @@ private:
// private methods
struct TPoint {
gp_XYZ myInitXYZ; // loaded postion
gp_XYZ myInitXYZ; // loaded position
gp_XY myInitUV;
double myInitU; // [0,1]
gp_Pnt myXYZ; // position to compute

8
src/SMESH/SMESH_subMesh.cxx
View File

@ -493,7 +493,7 @@ const TopoDS_Shape & SMESH_subMesh::GetSubShape() const
//=======================================================================
//function : CanAddHypothesis
//purpose : return true if theHypothesis can be attached to me:
// its dimention is checked
// its dimension is checked
//=======================================================================
bool SMESH_subMesh::CanAddHypothesis(const SMESH_Hypothesis* theHypothesis) const
@ -1768,7 +1768,7 @@ bool SMESH_subMesh::ComputeStateEngine(compute_event event)
case COMPUTE_CANCELED: // nothing to do
break;
case CLEAN:
cleanDependants(); // clean sub-meshes, dependant on this one, with event CLEAN
cleanDependants(); // clean sub-meshes, dependent on this one, with event CLEAN
removeSubMeshElementsAndNodes();
_computeState = NOT_READY;
if ( _algoState == HYP_OK )
@ -2386,7 +2386,7 @@ EventListenerData* SMESH_subMesh::GetEventListenerData(const string& listenerNam
//================================================================================
/*!
* \brief Notify stored event listeners on the occured event
* \brief Notify stored event listeners on the occurred event
* \param event - algo_event or compute_event itself
* \param eventType - algo_event or compute_event
* \param hyp - hypothesis, if eventType is algo_event
@ -2492,7 +2492,7 @@ void SMESH_subMesh::loadDependentMeshes()
* \brief Do something on a certain event
* \param event - algo_event or compute_event itself
* \param eventType - algo_event or compute_event
* \param subMesh - the submesh where the event occures
* \param subMesh - the submesh where the event occurs
* \param data - listener data stored in the subMesh
* \param hyp - hypothesis, if eventType is algo_event
*

4
src/SMESH/SMESH_subMesh.hxx
View File

@ -190,7 +190,7 @@ protected:
void setEventListener(EventListener* listener, EventListenerData* data);
/*!
* \brief Notify stored event listeners on the occured event
* \brief Notify stored event listeners on the occurred event
* \param event - algo_event or compute_event itself
* \param eventType - algo_event or compute_event
* \param hyp - hypothesis, if eventType is algo_event
@ -236,7 +236,7 @@ public:
bool CanAddHypothesis(const SMESH_Hypothesis* theHypothesis) const;
// return true if theHypothesis can be attached to me:
// its dimention is checked
// its dimension is checked
static bool IsApplicableHypotesis(const SMESH_Hypothesis* theHypothesis,
const TopAbs_ShapeEnum theShapeType);

2
src/SMESH/SMESH_subMeshEventListener.hxx
View File

@ -62,7 +62,7 @@ class SMESH_EXPORT SMESH_subMeshEventListener
* \brief Do something on a certain event
* \param event - algo_event or compute_event itself (of SMESH_subMesh)
* \param eventType - ALGO_EVENT or COMPUTE_EVENT (of SMESH_subMesh)
* \param subMesh - the submesh where the event occures
* \param subMesh - the submesh where the event occurs
* \param data - listener data stored in the subMesh
* \param hyp - hypothesis, if eventType is algo_event
*

6
src/SMESHGUI/SMESHGUI.cxx
View File

@ -5488,7 +5488,7 @@ void SMESHGUI::update( const int flags )
/*!
* \brief Set default selection mode
*
* SLOT called when operation commited. Sets default selection mode
* SLOT called when operation committed. Sets default selection mode
*/
//================================================================================
void SMESHGUI::onOperationCommited( SUIT_Operation* )
@ -5810,7 +5810,7 @@ void SMESHGUI::storeVisualParameters (int savePoint)
Handle(SALOME_InteractiveObject) io = aSmeshActor->getIO();
if (io->hasEntry())
{
// entry is "encoded" = it does NOT contain component adress,
// entry is "encoded" = it does NOT contain component address,
// since it is a subject to change on next component loading
std::string entry = ip->encodeEntry(io->getEntry(), componentName);
@ -6211,7 +6211,7 @@ void SMESHGUI::restoreVisualParameters (int savePoint)
for (std::vector<std::string>::iterator entIt = entries.begin(); entIt != entries.end(); ++entIt)
{
// entry is a normal entry - it should be "decoded" (setting base adress of component)
// entry is a normal entry - it should be "decoded" (setting base address of component)
QString entry (ip->decodeEntry(*entIt).c_str());
// Check that the entry corresponds to a real object in the Study

2
src/SMESHGUI/SMESHGUI_ComputeDlg.cxx
View File

@ -1772,7 +1772,7 @@ void SMESHGUI_PrecomputeOp::initDialog()
//================================================================================
/*!
* \brief detect asigned mesh algorithms
* \brief detect assigned mesh algorithms
*/
//================================================================================

4
src/SMESHGUI/SMESHGUI_CreatePatternDlg.cxx
View File

@ -244,7 +244,7 @@ SMESHGUI_CreatePatternDlg::~SMESHGUI_CreatePatternDlg()
//=======================================================================
// function : onProject()
// purpose : SLOT. Called when state of "Project nodes on ther face"
// purpose : SLOT. Called when state of "Project nodes on other face"
// checkbox is changed
//=======================================================================
void SMESHGUI_CreatePatternDlg::onProject( bool )
@ -636,7 +636,7 @@ void SMESHGUI_CreatePatternDlg::onDeactivate()
//=======================================================================
void SMESHGUI_CreatePatternDlg::enterEvent( QEvent* )
{
// there is a stange problem that enterEvent() comes after onSave()
// there is a strange problem that enterEvent() comes after onSave()
if ( isVisible () ) {
mySMESHGUI->EmitSignalDeactivateDialog();
setEnabled( true );

4
src/SMESHGUI/SMESHGUI_FilterDlg.cxx
View File

@ -1546,7 +1546,7 @@ void SMESHGUI_FilterTable::onRemoveBtn()
//=======================================================================
// name : SMESHGUI_FilterTable::updateAdditionalWidget
// Purpose : Enable/Disable widget with additonal parameters
// Purpose : Enable/Disable widget with additional parameters
//=======================================================================
void SMESHGUI_FilterTable::updateAdditionalWidget()
{
@ -2116,7 +2116,7 @@ QTableWidgetItem* SMESHGUI_FilterTable::getCriterionItem (const int theType) con
//=======================================================================
// name : SMESHGUI_FilterTable::getCompareItem
// Purpose : Get combo table item for operation of comparision
// Purpose : Get combo table item for operation of comparison
//=======================================================================
QTableWidgetItem* SMESHGUI_FilterTable::getCompareItem () const
{

2
src/SMESHGUI/SMESHGUI_GroupOpDlg.cxx
View File

@ -258,7 +258,7 @@ bool SMESHGUI_GroupOpDlg::isValid( const QList<SMESH::SMESH_GroupBase_var>& theL
{
SMESH::SMESH_GroupBase_var aGrp = *anIter;
if ( CORBA::is_nil( aGrp ) )
continue; // nonsence
continue; // nonsense
SMESH::SMESH_Mesh_var aMesh = aGrp->GetMesh();
if ( CORBA::is_nil( aMesh ) )

2
src/SMESHGUI/SMESHGUI_HypothesesUtils.cxx
View File

@ -519,7 +519,7 @@ namespace SMESH
if(MYDEBUG) MESSAGE("Loading client meshers plugin library ...");
LibHandle libHandle = LoadLib( aClientLibName.toLatin1().data() );
if (!libHandle) {
// report any error, if occured
// report any error, if occurred
{
#ifdef WIN32
const char* anError = "Can't load client meshers plugin library";

4
src/SMESHGUI/SMESHGUI_MeshDlg.cxx
View File

@ -703,7 +703,7 @@ void SMESHGUI_MeshDlg::setCurrentTab( const int theId )
//================================================================================
/*!
* \brief Enable/disable tabs
* \param int - maximum possible dimention
* \param int - maximum possible dimension
*/
//================================================================================
void SMESHGUI_MeshDlg::setMaxHypoDim( const int maxDim )
@ -841,7 +841,7 @@ void SMESHGUI_MeshDlg::onGeomSelectionButton(bool isBtnOn)
//================================================================================
/*!
* \brief SLOT called when a item of Geom selection popup is choosen
* \brief SLOT called when a item of Geom selection popup is chosen
*/
//================================================================================
void SMESHGUI_MeshDlg::onGeomPopup( QAction* a )

6
src/SMESHGUI/SMESHGUI_MeshDlg.h
View File

@ -136,11 +136,11 @@ public:
signals:
void createHyp( const int, const int );
//!< Emited when "Create hypothesis" button clicked
//!< Emitted when "Create hypothesis" button clicked
void editHyp( const int, const int );
//!< Emited when "Edit hypothesis" button clicked
//!< Emitted when "Edit hypothesis" button clicked
void selectAlgo( const int );
//!< Emited when an algorithm is selected
//!< Emitted when an algorithm is selected
private slots:
void onCreateHyp();

10
src/SMESHGUI/SMESHGUI_MeshOp.cxx
View File

@ -271,7 +271,7 @@ void SMESHGUI_MeshOp::startOperation()
/*!
* \brief Selects a recently created mesh or sub-mesh if necessary
*
* Virtual method redefined from base class called when operation is commited
* Virtual method redefined from base class called when operation is committed
* selects a recently created mesh or sub-mesh if necessary. Allows to perform
* selection when the custom selection filters are removed.
*/
@ -1244,10 +1244,10 @@ void SMESHGUI_MeshOp::initHypCreator( SMESHGUI_GenericHypothesisCreator* theCrea
//================================================================================
/*!
* \Brief Returns tab dimention
* \Brief Returns tab dimension
* \param tab - the tab in the dlg
* \param dlg - my dialogue
* \retval int - dimention
* \retval int - dimension
*/
//================================================================================
static int getTabDim (const QObject* tab, SMESHGUI_MeshDlg* dlg )
@ -2385,7 +2385,7 @@ int SMESHGUI_MeshOp::find( const SMESH::SMESH_Hypothesis_var& theHyp,
/*!
* \brief Edits mesh or sub-mesh
* \param theMess - Output parameter intended for returning error message
* \retval bool - TRUE if mesh is edited succesfully, FALSE otherwise
* \retval bool - TRUE if mesh is edited successfully, FALSE otherwise
*
* Assigns new name hypotheses and algoriths to the mesh or sub-mesh
*/
@ -2555,7 +2555,7 @@ bool SMESHGUI_MeshOp::checkSubMeshConcurrency(SMESH::SMESH_Mesh_ptr mesh,
*
* method redefined from base class verifies whether given operator is valid for
* this one (i.e. can be started "above" this operator). In current implementation method
* retuns false if theOtherOp operation is not intended for deleting objects or mesh
* returns false if theOtherOp operation is not intended for deleting objects or mesh
* elements.
*/
//================================================================================

2
src/SMESHGUI/SMESHGUI_MeshPatternDlg.cxx
View File

@ -1302,7 +1302,7 @@ vtkUnstructuredGrid* SMESHGUI_MeshPatternDlg::getGrid()
for (int i = 0, n = elemPoints->length(); i < n; i++)
aCellsSize += elemPoints[ i ].length();
// Create unstructured grid and other usefull arrays
// Create unstructured grid and other useful arrays
vtkUnstructuredGrid* aGrid = vtkUnstructuredGrid::New();
vtkCellArray* aConnectivity = vtkCellArray::New();

2
src/SMESHGUI/SMESHGUI_Operation.cxx
View File

@ -267,7 +267,7 @@ bool SMESHGUI_Operation::isStudyLocked( const bool theMess ) const
*
* Virtual method redefined from base class verifies whether given operator is valid for
* this one (i.e. can be started "above" this operator). In current implementation method
* retuns false if theOtherOp operation is not intended for deleting objects or mesh
* returns false if theOtherOp operation is not intended for deleting objects or mesh
* elements.
*/
bool SMESHGUI_Operation::isValid( SUIT_Operation* theOtherOp ) const

2
src/SMESHGUI/SMESHGUI_Utils.h
View File

@ -185,7 +185,7 @@ SMESHGUI_EXPORT
typedef SALOME::GenericObj_wrap<SMESH_IDSource> IDSource_wrap;
/*!
* \brief Class usefull to convert a string returned from a CORBA call
* \brief Class useful to convert a string returned from a CORBA call
* to other string types w/o memory leak.
*
* Usage (of instantiations): QString s = toQStr( objVar->GetName() );

2
src/SMESHGUI/SMESHGUI_VTKUtils.cxx
View File

@ -372,7 +372,7 @@ namespace SMESH
if ( freeMB > 0 && usedMB * 5 > freeMB ) {
bool continu = false;
if ( usedMB * 3 > freeMB )
// even dont try to show
// don't even try to show
SUIT_MessageBox::warning(SMESHGUI::desktop(), QObject::tr("SMESH_WRN_WARNING"),
QObject::tr("SMESH_NO_MESH_VISUALIZATION"));
else

2
src/SMESHGUI/SMESH_msg_en.ts
View File

@ -1960,7 +1960,7 @@ Check algorithm documentation for supported geometry</translation>
</message>
<message>
<source>SMESH_HYP_9</source>
<translation>Such dimention hypothesis is already assigned to the shape</translation>
<translation>Such dimension hypothesis is already assigned to the shape</translation>
</message>
<message>
<source>SMESH_ID_DIAGONAL</source>

4
src/SMESHUtils/SMESH_Block.cxx
View File

@ -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;
@ -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;

2
src/SMESHUtils/SMESH_Block.hxx
View File

@ -314,7 +314,7 @@ public:
// TFace, TEdge's and points for that face only
// Note 2: curve adaptors need to have only Value(double), FirstParameter() and
// LastParameter() defined to be used by Block algoritms
// LastParameter() defined to be used by Block algorithms
class SMESHUtils_EXPORT TEdge {
int myCoordInd;

2
src/SMESHUtils/SMESH_ComputeError.hxx
View File

@ -65,7 +65,7 @@ enum SMESH_ComputeErrorName
// =============================================================
/*!
* \brief Contains an algorithm and description of an occured error
* \brief Contains an algorithm and description of an occurred error
*/
// =============================================================

2
src/SMESHUtils/SMESH_MeshAlgos.cxx
View File

@ -689,7 +689,7 @@ void SMESH_ElementSearcherImpl::findOuterBoundary(const SMDS_MeshElement* outerF
outerFace2 = angle2Face.begin()->second;
}
}
// store the found outer face and add its links to continue seaching from
// store the found outer face and add its links to continue searching from
if ( outerFace2 )
{
_outerFaces.insert( outerFace2 );

10
src/SMESH_I/SMESH_2smeshpy.cxx
View File

@ -452,7 +452,7 @@ namespace {
* \param theRemovedObjIDs - entries of objects whose created commands were removed
* \param theHistoricalDump - true means to keep all commands, false means
* to exclude commands relating to objects removed from study
* \retval TCollection_AsciiString - Convertion result
* \retval TCollection_AsciiString - Conversion result
*/
//================================================================================
@ -1336,7 +1336,7 @@ Handle(_pyHypothesis) _pyGen::FindHyp( const _pyID& theHypID )
* \brief Find algorithm able to create a hypothesis
* \param theGeom - The shape ID the algorithm was created on
* \param theMesh - The mesh ID that created the algorithm
* \param theHypothesis - The hypothesis the algorithm sould be able to create
* \param theHypothesis - The hypothesis the algorithm should be able to create
* \retval Handle(_pyHypothesis) - The found algo
*/
//================================================================================
@ -2161,7 +2161,7 @@ void _pyMesh::Flush()
for ( ; m != fatherMeshes.end(); ++m )
addFatherMesh( *m );
// if ( removedGeom )
// SetRemovedFromStudy(); // as reffered geometry not in study
// SetRemovedFromStudy(); // as referred geometry not in study
}
if ( myGeomNotInStudy )
return;
@ -2849,7 +2849,7 @@ void _pyHypothesis::Flush()
//================================================================================
/*!
* \brief clear creation, arg and unkown commands
* \brief clear creation, arg and unknown commands
*/
//================================================================================
@ -3383,7 +3383,7 @@ void _pyLayerDistributionHypo::Flush()
* \brief additionally to Addition2Creation, clears SetDistrType() command
* \param theCmd - AddHypothesis() command
* \param theMesh - mesh to which a hypothesis is added
* \retval bool - convertion result
* \retval bool - conversion result
*/
//================================================================================

2
src/SMESH_I/SMESH_2smeshpy.hxx
View File

@ -105,7 +105,7 @@ class _pyCommand: public Standard_Transient
TColStd_SequenceOfAsciiString myArgs; //!< found arguments
TColStd_SequenceOfAsciiString myResults; //!< found results
TColStd_SequenceOfInteger myBegPos; //!< where myRes, myObj, ... begin
std::list< Handle(_pyCommand) > myDependentCmds; //!< commands that sould follow me in the script
std::list< Handle(_pyCommand) > myDependentCmds; //!< commands that should follow me in the script
enum { UNKNOWN=-1, EMPTY=0, RESULT_IND, OBJECT_IND, METHOD_IND, ARG1_IND };
int GetBegPos( int thePartIndex ) const;

2
src/SMESH_I/SMESH_DumpPython.cxx
View File

@ -1035,7 +1035,7 @@ TCollection_AsciiString SMESH_Gen_i::DumpPython_impl
lines.push_back( theSavedTrace.SubString( from, to - 1 ));
from = to + 1;
}
// For the convertion of IDL API calls -> smeshBuilder.py API, "smesh" standing for SMESH_Gen
// For the conversion of IDL API calls -> smeshBuilder.py API, "smesh" standing for SMESH_Gen
// was replaces with "smeshgen" (==TPythonDump::SMESHGenName()).
// Change "smesh" -> "smeshgen" in the trace saved before passage to smeshBuilder.py API
bool isNewVersion =

2
src/SMESH_I/SMESH_Filter_i.cxx
View File

@ -1429,7 +1429,7 @@ FunctorType LinearOrQuadratic_i::GetFunctorType()
/*
Class : GroupColor_i
Description : Functor for check color of group to whic mesh element belongs to
Description : Functor for check color of group to which mesh element belongs to
*/
GroupColor_i::GroupColor_i()
{

2
src/SMESH_I/SMESH_Filter_i.hxx
View File

@ -704,7 +704,7 @@ namespace SMESH
/*
Class : GroupColor_i
Description : Functor for check color of group to whic mesh element belongs to
Description : Functor for check color of group to which mesh element belongs to
*/
class SMESH_I_EXPORT GroupColor_i: public virtual POA_SMESH::GroupColor,
public virtual Predicate_i

6
src/SMESH_I/SMESH_Gen_i.cxx
View File

@ -421,7 +421,7 @@ GenericHypothesisCreator_i* SMESH_Gen_i::getHypothesisCreator(const char* theHyp
LibHandle libHandle = LoadLib( aPlatformLibName.c_str() );
if (!libHandle)
{
// report any error, if occured
// report any error, if occurred
#ifndef WIN32
const char* anError = dlerror();
throw(SALOME_Exception(anError));
@ -3142,7 +3142,7 @@ SALOMEDS::TMPFile* SMESH_Gen_i::Save( SALOMEDS::SComponent_ptr theComponent,
if( libname_len > 4 )
libname.resize( libname_len - 4 );
#else
// PAL17753 (Regresion: missing hypothesis in restored study)
// PAL17753 (Regression: missing hypothesis in restored study)
// "lib" also should be removed from the beginning
//if( libname_len > 3 )
//libname.resize( libname_len - 3 );
@ -3211,7 +3211,7 @@ SALOMEDS::TMPFile* SMESH_Gen_i::Save( SALOMEDS::SComponent_ptr theComponent,
if( libname_len > 4 )
libname.resize( libname_len - 4 );
#else
// PAL17753 (Regresion: missing hypothesis in restored study)
// PAL17753 (Regression: missing hypothesis in restored study)
// "lib" also should be removed from the beginning
//if( libname_len > 3 )
//libname.resize( libname_len - 3 );

6
src/SMESH_I/SMESH_Gen_i_1.cxx
View File

@ -763,7 +763,7 @@ SALOMEDS::SObject_ptr SMESH_Gen_i::PublishGroup (SALOMEDS::Study_ptr theStudy
"Groups of Faces", "Groups of Volumes", "Groups of 0D Elements",
"Groups of Balls" };
// Currently, groups with heterogenous content are not supported
// Currently, groups with heterogeneous content are not supported
if ( aType != SMESH::ALL )
{
long aRootTag = GetNodeGroupsTag() + aType - 1;
@ -917,7 +917,7 @@ bool SMESH_Gen_i::AddHypothesisToShape(SALOMEDS::Study_ptr theStudy,
if ( aMeshSO->_is_nil() || aHypSO->_is_nil())
return false;
// Find a mesh or submesh refering to theShape
// Find a mesh or submesh referring to theShape
SALOMEDS::SObject_wrap aMeshOrSubMesh =
GetMeshOrSubmeshByShape( theStudy, theMesh, theShape );
if ( aMeshOrSubMesh->_is_nil() )
@ -1093,7 +1093,7 @@ void SMESH_Gen_i::UpdateParameters(CORBA::Object_ptr theObject, const char* theP
if ( pos < varStr.size() )
{
varFound = ( varStr.compare( pos, myLastParameters[i].size(), myLastParameters[i] ) == 0 &&
// same string begining but is length same?
// same string beginning but is length same?
( pos + myLastParameters[i].size() >= varStr.size() ||
separators.find( varStr[ pos+1 ]) != std::string::npos ));
if ( varFound )

16
src/SMESH_I/SMESH_MeshEditor_i.cxx
View File

@ -184,7 +184,7 @@ namespace MeshEditor_I {
//=============================================================================
/*!
* \brief Deleter of theNodeSearcher at any compute event occured
* \brief Deleter of theNodeSearcher at any compute event occurred
*/
//=============================================================================
@ -467,9 +467,9 @@ void SMESH_MeshEditor_i::initData(bool deleteSearchers)
//================================================================================
/*!
* \brief Increment mesh modif time and optionally record that the performed
* modification may influence futher mesh re-compute.
* modification may influence further mesh re-compute.
* \param [in] isReComputeSafe - true if the modification does not influence
* futher mesh re-compute
* further mesh re-compute
*/
//================================================================================
@ -501,7 +501,7 @@ void SMESH_MeshEditor_i::declareMeshModified( bool isReComputeSafe )
* \brief Initialize and return myPreviewMesh
* \param previewElements - type of elements to show in preview
*
* WARNING: call it once par a method!
* WARNING: call it once per method!
*/
//================================================================================
@ -669,7 +669,7 @@ void SMESH_MeshEditor_i::ClearLastCreated() throw (SALOME::SALOME_Exception)
//=======================================================================
/*
* Returns description of an error/warning occured during the last operation
* Returns description of an error/warning occurred during the last operation
* WARNING: ComputeError.code >= 100 and no corresponding enum in IDL API
*/
//=======================================================================
@ -6655,7 +6655,7 @@ SMESH_MeshEditor_i::MakeBoundaryMesh(SMESH::SMESH_IDSource_ptr idSource,
else
pyDump << mesh_var << ", ";
if ( group_var->_is_nil() )
pyDump << "_NoneGroup = "; // assignment to None is forbiden
pyDump << "_NoneGroup = "; // assignment to None is forbidden
else
pyDump << group_var << " = ";
pyDump << this << ".MakeBoundaryMesh( "
@ -6719,7 +6719,7 @@ CORBA::Long SMESH_MeshEditor_i::MakeBoundaryElements(SMESH::Bnd_Dimension dim,
else
groupsOfThisMesh[ nbGroups++ ] = groups[i];
if ( SMESH::DownCast<SMESH_Mesh_i*>( groups[i] ))
THROW_SALOME_CORBA_EXCEPTION("expect a group but recieve a mesh", SALOME::BAD_PARAM);
THROW_SALOME_CORBA_EXCEPTION("expected a group but received a mesh", SALOME::BAD_PARAM);
}
groupsOfThisMesh->length( nbGroups );
groupsOfOtherMesh->length( nbGroupsOfOtherMesh );
@ -6813,7 +6813,7 @@ CORBA::Long SMESH_MeshEditor_i::MakeBoundaryElements(SMESH::Bnd_Dimension dim,
else
pyDump << mesh_var << ", ";
if ( group_var->_is_nil() )
pyDump << "_NoneGroup = "; // assignment to None is forbiden
pyDump << "_NoneGroup = "; // assignment to None is forbidden
else
pyDump << group_var << " = ";
pyDump << this << ".MakeBoundaryElements( "

2
src/SMESH_I/SMESH_MeshEditor_i.hxx
View File

@ -83,7 +83,7 @@ public:
*/
void ClearLastCreated() throw (SALOME::SALOME_Exception);
/*!
* \brief Returns description of an error/warning occured during the last operation
* \brief Returns description of an error/warning occurred during the last operation
*/
SMESH::ComputeError* GetLastError() throw (SALOME::SALOME_Exception);

4
src/SMESH_I/SMESH_Mesh_i.cxx
View File

@ -1125,7 +1125,7 @@ void SMESH_Mesh_i::RemoveGroupWithContents( SMESH::SMESH_GroupBase_ptr theGroup
if ( n->NbInverseElements() == 0 )
_impl->GetMeshDS()->RemoveFreeNode( n, /*sm=*/0 );
TPythonDump pyDump; // Supress dump from RemoveGroup()
TPythonDump pyDump; // Suppress dump from RemoveGroup()
// Update Python script (theGroup must be alive for this)
pyDump << SMESH::SMESH_Mesh_var(_this())
@ -2943,7 +2943,7 @@ void SMESH_Mesh_i::PrepareForWriting (const char* file, bool overwrite)
if ( !aFile.openForWriting() ) {
msg << "You cannot create the file "
<< aFile.getName()
<< ". Check the directory existance and access rights";
<< ". Check the directory existence and access rights";
}
aFile.remove();
}

2
src/SMESH_I/SMESH_NoteBook.cxx
View File

@ -231,7 +231,7 @@ SMESH_NoteBook::~SMESH_NoteBook()
/*!
* \brief Replace parameters of the functions on the Salome NoteBook Variables
* \param theString - Input string
* \retval TCollection_AsciiString - Convertion result
* \retval TCollection_AsciiString - Conversion result
*/
//================================================================================
void SMESH_NoteBook::ReplaceVariables()

2
src/SMESH_I/SMESH_PythonDump.hxx
View File

@ -62,7 +62,7 @@ public:
* \param theRemovedObjIDs - entries of objects whose created commands were removed
* \param theHistoricalDump - true means to keep all commands, false means
* to exclude commands relating to objects removed from study
* \retval TCollection_AsciiString - Convertion result
* \retval TCollection_AsciiString - Conversion result
*/
static void
ConvertScript(std::list< TCollection_AsciiString >& theScriptLines,

2
src/SMESH_SWIG/SMESH_AdvancedEditor.py
View File

@ -35,7 +35,7 @@ import math
def GetNewNodes(mesh,Elems,OldNodes):
"""
Auxilary function, which return list of nodes from
Auxiliary function, which return list of nodes from
given Elems avoided nodes from OldNodes
"""
newnodes = []

8
src/SMESH_SWIG/StdMeshersBuilder.py
View File

@ -382,7 +382,7 @@ class StdMeshersBuilder_Segment(Mesh_Algorithm):
# 0D algorithm
if self.geom is None:
self.geom = store_geom
raise RuntimeError, "Attemp to create SegmentAroundVertex_0D algoritm on None shape"
raise RuntimeError, "Attempt to create SegmentAroundVertex_0D algorithm on None shape"
from salome.smesh.smeshBuilder import AssureGeomPublished, GetName, TreatHypoStatus
AssureGeomPublished( self.mesh, self.geom )
name = GetName(self.geom)
@ -1470,7 +1470,7 @@ class StdMeshersBuilder_Cartesian_3D(Mesh_Algorithm):
# several functions, they must be accompanied by relative coordinates of
# points dividing the whole shape into ranges where the functions apply; points
# coodrinates should vary within (0.0, 1.0) range. Parameter \a t of the spacing
# function f(t) varies from 0.0 to 1.0 witin a shape range.
# function f(t) varies from 0.0 to 1.0 within a shape range.
# Examples:
# - "10.5" - defines a grid with a constant spacing
# - [["1", "1+10*t", "11"] [0.1, 0.6]] - defines different spacing in 3 ranges.
@ -1566,7 +1566,7 @@ class StdMeshersBuilder_Cartesian_3D(Mesh_Algorithm):
pass # end of StdMeshersBuilder_Cartesian_3D class
## Defines a stub 1D algorithm, which enables "manual" creation of nodes and
# segments usable by 2D algoritms
# segments usable by 2D algorithms
#
# It is created by calling smeshBuilder.Mesh.UseExistingSegments(geom=0)
#
@ -1594,7 +1594,7 @@ class StdMeshersBuilder_UseExisting_1D(Mesh_Algorithm):
pass # end of StdMeshersBuilder_UseExisting_1D class
## Defines a stub 2D algorithm, which enables "manual" creation of nodes and
# faces usable by 3D algoritms
# faces usable by 3D algorithms
#
# It is created by calling smeshBuilder.Mesh.UseExistingFaces(geom=0)
#

2
src/SMESH_SWIG/smeshBuilder.py
View File

@ -1630,7 +1630,7 @@ class Mesh:
def GetMeshOrder(self):
return self.mesh.GetMeshOrder()
## Set order in which concurrent sub-meshes sould be meshed
## Set order in which concurrent sub-meshes should be meshed
# @param submeshes list of lists of sub-meshes
# @ingroup l2_construct
def SetMeshOrder(self, submeshes):

4
src/SMESH_SWIG/smesh_algorithm.py
View File

@ -183,7 +183,7 @@ class Mesh_Algorithm:
## Private method.
def Create(self, mesh, geom, hypo, so="libStdMeshersEngine.so"):
if geom is None and mesh.mesh.HasShapeToMesh():
raise RuntimeError, "Attemp to create " + hypo + " algorithm on None shape"
raise RuntimeError, "Attempt to create " + hypo + " algorithm on None shape"
algo = self.FindAlgorithm(hypo, mesh.smeshpyD)
if algo is None:
algo = mesh.smeshpyD.CreateHypothesis(hypo, so)
@ -195,7 +195,7 @@ class Mesh_Algorithm:
def Assign(self, algo, mesh, geom):
from salome.smesh.smeshBuilder import AssureGeomPublished, TreatHypoStatus, GetName
if geom is None and mesh.mesh.HasShapeToMesh():
raise RuntimeError, "Attemp to create " + algo + " algorithm on None shape"
raise RuntimeError, "Attempt to create " + algo + " algorithm on None shape"
self.mesh = mesh
if not geom or geom.IsSame( mesh.geom ):
self.geom = mesh.geom

2
src/StdMeshers/StdMeshers_CartesianParameters3D.hxx
View File

@ -65,7 +65,7 @@ public:
* \param spaceFunctions - functions defining spacing values at given point on axis
* \param internalPoints - points dividing a grid into parts along each direction
*
* Parameter t of spaceFunction f(t) is a position [0,1] withing bounding box of
* Parameter t of spaceFunction f(t) is a position [0,1] within bounding box of
* the shape to mesh
*/
void SetGridSpacing(std::vector<std::string>& spaceFunctions,

2
src/StdMeshers/StdMeshers_Cartesian_3D.cxx
View File

@ -3056,7 +3056,7 @@ namespace
else if ( eMidOut != edges.end() )
edges.splice( edges.end(), edges, edges.begin(), eMidOut );
// sort nodes accoring to the order of edges
// sort nodes according to the order of edges
_Node* orderNodes [20];
//TGeomID orderShapeIDs[20];
size_t nbN = 0;

4
src/StdMeshers/StdMeshers_CompositeSegment_1D.cxx
View File

@ -126,7 +126,7 @@ namespace {
* \brief Restore nodes on internal vertices of a complex side
* \param event - algo_event or compute_event itself (of SMESH_subMesh)
* \param eventType - ALGO_EVENT or COMPUTE_EVENT (of SMESH_subMesh)
* \param subMesh - the submesh where the event occures
* \param subMesh - the submesh where the event occurs
* \param data - listener data stored in the subMesh
* \param hyp - hypothesis, if eventType is algo_event
*/
@ -374,7 +374,7 @@ bool StdMeshers_CompositeSegment_1D::Compute(SMESH_Mesh & aMesh,
if ( side->NbEdges() < 2 )
return StdMeshers_Regular_1D::Compute( aMesh, aShape );
// update segment lenght computed by StdMeshers_AutomaticLength
// update segment length computed by StdMeshers_AutomaticLength
const list <const SMESHDS_Hypothesis * > & hyps = GetUsedHypothesis(aMesh, aShape);
if ( !hyps.empty() ) {
StdMeshers_AutomaticLength * autoLenHyp = const_cast<StdMeshers_AutomaticLength *>

4
src/StdMeshers/StdMeshers_Import_1D.cxx
View File

@ -289,7 +289,7 @@ namespace // INTERNAL STUFF
//--------------------------------------------------------------------------------
/*!
* \brief Remove imported mesh and/or groups if needed
* \param sm - submesh loosing Import algo
* \param sm - submesh losing Import algo
* \param data - data holding imported groups
*/
void _Listener::removeSubmesh( SMESH_subMesh* sm, _ListenerData* data )
@ -311,7 +311,7 @@ namespace // INTERNAL STUFF
//--------------------------------------------------------------------------------
/*!
* \brief Clear _ImportData::_n2n.
* _n2n is usefull within one mesh.Compute() only
* _n2n is useful within one mesh.Compute() only
*/
void _Listener::clearN2N( SMESH_Mesh* tgtMesh )
{

2
src/StdMeshers/StdMeshers_MEFISTO_2D.cxx
View File

@ -824,7 +824,7 @@ void StdMeshers_MEFISTO_2D::StoreResult(Z nbst, R2 * uvst, Z nbt, Z * nust,
bool isDegen = ( _helper->HasDegeneratedEdges() &&
( nn[0] == nn[1] || nn[1] == nn[2] || nn[2] == nn[0] ));
// It was an attemp to fix a problem of a zero area face whose all nodes
// It was an attempt to fix a problem of a zero area face whose all nodes
// are on one staight EDGE. But omitting this face makes a hole in the mesh :(
// if ( !isDegen && allNodesAreOld )
// isDegen = isDegenTria( nn );

2
src/StdMeshers/StdMeshers_Penta_3D.cxx
View File

@ -1045,7 +1045,7 @@ void StdMeshers_Penta_3D::MakeBlock()
if (iCnt>1) {
// \begin{E.A.}
// The current algorithm fails if there is more that one
// face wich contains triangles ...
// face which contains triangles ...
// In that case, replace return by break to try another
// method (coded in "if (iCnt != 1) { ... }")
//

4
src/StdMeshers/StdMeshers_Prism_3D.cxx
View File

@ -872,7 +872,7 @@ bool StdMeshers_Prism_3D::Compute(SMESH_Mesh& theMesh, const TopoDS_Shape& theSh
// TODO. there are other ways to find out the source FACE:
// propagation, topological similarity, ect.
// propagation, topological similarity, etc...
// simply try to mesh all not meshed SOLIDs
if ( meshedFaces.empty() )
@ -1603,7 +1603,7 @@ bool StdMeshers_Prism_3D::computeWalls(const Prism_3D::TPrismTopo& thePrism)
if ( ! fSM->IsMeshComputed() )
{
// Top EDGEs must be projections from the bottom ones
// to compute stuctured quad mesh on wall FACEs
// to compute structured quad mesh on wall FACEs
// ---------------------------------------------------
const TopoDS_Edge& botE = (*quad)->side[ QUAD_BOTTOM_SIDE ].grid->Edge(0);
const TopoDS_Edge& topE = (*quad)->side[ QUAD_TOP_SIDE ].grid->Edge(0);

10
src/StdMeshers/StdMeshers_ProjectionUtils.cxx
View File

@ -1589,7 +1589,7 @@ int StdMeshers_ProjectionUtils::FindFaceAssociation(const TopoDS_Face& face1,
std::advance( edge2End, *nbE2 );
if ( *nbE1 == *nbE2 && iW2 >= iW1 )
{
// rotate edge2 untill coincidence with edge1 in 2D
// rotate edge2 until coincides with edge1 in 2D
int i = *nbE2;
bool sameUV = false;
while ( !( sameUV = sameVertexUV( *edge2Beg, face2, 0, v0f1UV, vTolUV )) && --i > 0 )
@ -1638,7 +1638,7 @@ int StdMeshers_ProjectionUtils::FindFaceAssociation(const TopoDS_Face& face1,
break;
}
}
// prepare to the next wire loop
// prepare for the next wire loop
edge2Beg = edge2End;
}
edge1Beg = edge1End;
@ -2387,7 +2387,7 @@ std::string StdMeshers_ProjectionUtils::SourceNotComputedError( SMESH_subMesh *
if ( !sm || sm->GetAlgoState() != SMESH_subMesh::NO_ALGO )
return usualMessage; // algo is OK, anything else is KO.
// Try to find a type of all-dimentional algorithm that would compute the
// Try to find a type of all-dimensional algorithm that would compute the
// given sub-mesh if it could be launched before projection
const TopoDS_Shape shape = sm->GetSubShape();
const int shapeDim = SMESH_Gen::GetShapeDim( shape );
@ -2568,7 +2568,7 @@ namespace StdMeshers_ProjectionUtils
//================================================================================
/*!
* \brief Computes transformation beween two sets of 2D points using
* \brief Computes transformation between two sets of 2D points using
* a least square approximation
*
* See "Surface Mesh Projection For Hexahedral Mesh Generation By Sweeping"
@ -2651,7 +2651,7 @@ namespace StdMeshers_ProjectionUtils
//================================================================================
/*!
* \brief Computes transformation beween two sets of 3D points using
* \brief Computes transformation between two sets of 3D points using
* a least square approximation
*
* See "Surface Mesh Projection For Hexahedral Mesh Generation By Sweeping"

4
src/StdMeshers/StdMeshers_ProjectionUtils.hxx
View File

@ -92,7 +92,7 @@ namespace StdMeshers_ProjectionUtils
/*!
* \brief Finds transformation beween two sets of 2D points using
* \brief Finds transformation between two sets of 2D points using
* a least square approximation
*/
class TrsfFinder2D
@ -112,7 +112,7 @@ namespace StdMeshers_ProjectionUtils
bool IsIdentity() const { return ( _trsf.Form() == gp_Identity ); }
};
/*!
* \brief Finds transformation beween two sets of 3D points using
* \brief Finds transformation between two sets of 3D points using
* a least square approximation
*/
class TrsfFinder3D

2
src/StdMeshers/StdMeshers_Projection_1D2D.cxx
View File

@ -71,7 +71,7 @@ namespace
/*!
* \brief Structure used to temporary remove EventProparatorToEdges from faceSubMesh
* in order to prevent propagation of CLEAN event from FACE to EDGEs during
* StdMeshers_Projection_1D2D::Compute(). The CLEAN event is emmited by Pattern mapper
* StdMeshers_Projection_1D2D::Compute(). The CLEAN event is emitted by Pattern mapper
* and causes removal of faces generated on adjacent FACEs.
*/
struct UnsetterOfEventProparatorToEdges

8
src/StdMeshers/StdMeshers_Projection_2D.cxx
View File

@ -553,7 +553,7 @@ namespace {
//================================================================================
/*!
* \brief Preform projection in case if tgtFace.IsPartner( srcFace ) and in case
* \brief Perform projection in case if tgtFace.IsPartner( srcFace ) and in case
* if projection by 3D transformation is possible
*/
//================================================================================
@ -803,7 +803,7 @@ namespace {
//================================================================================
/*!
* \brief Preform projection in case if the faces are similar in 2D space
* \brief Perform projection in case if the faces are similar in 2D space
*/
//================================================================================
@ -973,7 +973,7 @@ namespace {
//================================================================================
/*!
* \brief Preform projection in case of quadrilateral faces
* \brief Perform projection in case of quadrilateral faces
*/
//================================================================================
@ -1070,7 +1070,7 @@ namespace {
// }
// else
// {
// // find XY of src node withing the quadrilateral srcFace
// // find XY of src node within the quadrilateral srcFace
// if ( !block.ComputeParameters( SMESH_TNodeXYZ( srcNode ),
// tgtNodeOrXY.second, srcFaceBID ))
// return false;

20
src/StdMeshers/StdMeshers_Quadrangle_2D.cxx
View File

@ -491,7 +491,7 @@ bool StdMeshers_Quadrangle_2D::computeQuadDominant(SMESH_Mesh& aMesh,
int nbright = (int) uv_e1.size();
int nbleft = (int) uv_e3.size();
if (quad->nbNodeOut(0) && nbvertic == 2) // this should not occure
if (quad->nbNodeOut(0) && nbvertic == 2) // this should not occur
{
// Down edge is out
//
@ -721,7 +721,7 @@ bool StdMeshers_Quadrangle_2D::computeQuadDominant(SMESH_Mesh& aMesh,
}
// right or left boundary quadrangles
if (quad->nbNodeOut( QUAD_RIGHT_SIDE ) && nbhoriz == 2) // this should not occure
if (quad->nbNodeOut( QUAD_RIGHT_SIDE ) && nbhoriz == 2) // this should not occur
{
int g = 0; // last processed node in the grid
int stop = nbright - 1;
@ -737,7 +737,7 @@ bool StdMeshers_Quadrangle_2D::computeQuadDominant(SMESH_Mesh& aMesh,
// find node c in the grid, nearest to the b
c = 0;
int near = g;
if (i == stop - 1) { // up bondary reached
if (i == stop - 1) { // up boundary reached
c = quad->uv_grid[nbhoriz*(jup + 1) - 2].node;
near = jup;
} else {
@ -837,7 +837,7 @@ bool StdMeshers_Quadrangle_2D::computeQuadDominant(SMESH_Mesh& aMesh,
// find node c in the grid, nearest to the b
int near = g;
if (i == stop + 1) { // down bondary reached
if (i == stop + 1) { // down boundary reached
c = quad->uv_grid[nbhoriz*jlow + 1].node;
near = jlow;
}
@ -1574,7 +1574,7 @@ bool StdMeshers_Quadrangle_2D::setNormalizedGrid (FaceQuadStruct::Ptr quad)
//=======================================================================
//function : ShiftQuad
//purpose : auxilary function for computeQuadPref
//purpose : auxiliary function for computeQuadPref
//=======================================================================
void StdMeshers_Quadrangle_2D::shiftQuad(FaceQuadStruct::Ptr& quad, const int num )
@ -1658,7 +1658,7 @@ void FaceQuadStruct::shift( size_t nb, bool ori, bool keepGrid )
//=======================================================================
//function : calcUV
//purpose : auxilary function for computeQuadPref
//purpose : auxiliary function for computeQuadPref
//=======================================================================
static gp_UV calcUV(double x0, double x1, double y0, double y1,
@ -1681,7 +1681,7 @@ static gp_UV calcUV(double x0, double x1, double y0, double y1,
//=======================================================================
//function : calcUV2
//purpose : auxilary function for computeQuadPref
//purpose : auxiliary function for computeQuadPref
//=======================================================================
static gp_UV calcUV2(double x, double y,
@ -2158,7 +2158,7 @@ bool StdMeshers_Quadrangle_2D::computeQuadPref (SMESH_Mesh & aMesh,
}
int nnn = Min(nr,nl);
// auxilary sequence of XY for creation nodes
// auxiliary sequence of XY for creation nodes
// in the bottom part of central domain
// Length of UVL and UVR must be == nbv-nnn
TColgp_SequenceOfXY UVL, UVR, UVT;
@ -2516,7 +2516,7 @@ bool StdMeshers_Quadrangle_2D::evaluateQuadPref(SMESH_Mesh & aMesh,
MapShapeNbElems& aResMap,
bool IsQuadratic)
{
// Auxilary key in order to keep old variant
// Auxiliary key in order to keep old variant
// of meshing after implementation new variant
// for bug 0016220 from Mantis.
bool OldVersion = false;
@ -3025,7 +3025,7 @@ bool StdMeshers_Quadrangle_2D::computeReduced (SMESH_Mesh & aMesh,
gp_XY a3 (uv_et.front().u, uv_et.front().v);
int nnn = Min(nr,nl);
// auxilary sequence of XY for creation of nodes
// auxiliary sequence of XY for creation of nodes
// in the bottom part of central domain
// it's length must be == nbv-nnn-1
TColgp_SequenceOfXY UVL;

2
src/StdMeshers/StdMeshers_Regular_1D.cxx
View File

@ -502,7 +502,7 @@ static void compensateError(double a1, double an,
// * \brief Clean mesh on edges
// * \param event - algo_event or compute_event itself (of SMESH_subMesh)
// * \param eventType - ALGO_EVENT or COMPUTE_EVENT (of SMESH_subMesh)
// * \param subMesh - the submesh where the event occures
// * \param subMesh - the submesh where the event occurs
// */
// void ProcessEvent(const int event, const int eventType, SMESH_subMesh* subMesh,
// EventListenerData*, const SMESH_Hypothesis*)

8
src/StdMeshers/StdMeshers_ViscousLayers.cxx
View File

@ -409,7 +409,7 @@ namespace VISCOUS_3D
gp_XYZ _normal; // to boundary of solid
vector<gp_XYZ> _pos; // points computed during inflation
double _len; // length achived with the last inflation step
double _len; // length achieved with the last inflation step
double _maxLen; // maximal possible length
double _cosin; // of angle (_normal ^ surface)
double _minAngle; // of _simplices
@ -2949,7 +2949,7 @@ bool _ViscousBuilder::findShapesToSmooth( _SolidData& data )
//const double tgtThick = /*Min( 0.5 * data._geomSize, */data._maxThickness;
// Find shapes needing smoothing; such a shape has _LayerEdge._normal on it's
// boundry inclined to the shape at a sharp angle
// boundary inclined to the shape at a sharp angle
//list< TGeomID > shapesToSmooth;
TopTools_MapOfShape edgesOfSmooFaces;
@ -8511,7 +8511,7 @@ gp_XYZ _LayerEdge::smoothNefPolygon()
{
gp_XYZ newPos(0,0,0);
// get a plane to seach a solution on
// get a plane to search a solution on
vector< gp_XYZ > vecs( _simplices.size() + 1 );
size_t i;
@ -8702,7 +8702,7 @@ gp_XYZ _LayerEdge::smoothNefPolygon()
{ ////////////////////////////////// NEW
gp_XYZ newPos(0,0,0);
// get a plane to seach a solution on
// get a plane to search a solution on
size_t i;
gp_XYZ center(0,0,0);

2
src/StdMeshers/StdMeshers_ViscousLayers2D.cxx
View File

@ -2187,7 +2187,7 @@ bool _ViscousBuilder2D::refine()
vector< double > segLen( L._lEdges.size() );
segLen[0] = 0.0;
// check if length modification is usefull: look for _LayerEdge's
// check if length modification is useful: look for _LayerEdge's
// with length limited due to collisions
bool lenLimited = false;
for ( size_t iLE = 1; ( iLE < L._lEdges.size()-1 && !lenLimited ); ++iLE )

4
src/StdMeshersGUI/StdMeshersGUI_CartesianParamCreator.cxx
View File

@ -980,7 +980,7 @@ QFrame* StdMeshersGUI_CartesianParamCreator::buildFrame()
//================================================================================
/*!
* \brief Tranfer parameters from hypothesis to widgets
* \brief Transfer parameters from hypothesis to widgets
*/
//================================================================================
@ -1068,7 +1068,7 @@ void StdMeshersGUI_CartesianParamCreator::retrieveParams() const
//================================================================================
/*!
* \brief Tranfer parameters from widgets to hypothesis
* \brief Transfer parameters from widgets to hypothesis
*/
//================================================================================

4
src/StdMeshersGUI/StdMeshersGUI_DistrTable.cxx
View File

@ -331,7 +331,7 @@ StdMeshersGUI_DistrTableFrame::Table::
argMinimum( int r ) const
{
// for the first row the minimum value is always 0.0
// for the other rows the minumum value is the above row's value
// for the other rows the minimum value is the above row's value
double val = 0.0;
if ( r > 0 && r < rowCount() )
val = value( r-1, ArgColumn );
@ -343,7 +343,7 @@ StdMeshersGUI_DistrTableFrame::Table::
argMaximum( int r ) const
{
// for the last row the maximum value is always 1.0
// for the other rows the maxumum value is the below row's value
// for the other rows the maximum value is the below row's value
double val = 1.0;
if ( r >= 0 && r < rowCount()-1 ) {
val = value( r+1, ArgColumn );

2
src/StdMeshersGUI/StdMeshersGUI_RadioButtonsGrpWdg.cxx
View File

@ -45,7 +45,7 @@ StdMeshersGUI_RadioButtonsGrpWdg::StdMeshersGUI_RadioButtonsGrpWdg( const QStrin
//================================================================================
/*!
* \brief Creates a given nubmer of button labels with given labels (QString's)
* \brief Creates a given number of button labels with given labels (QString's)
*/
//================================================================================

4
src/StdMeshers_I/StdMeshers_CartesianParameters3D_i.cxx
View File

@ -167,8 +167,8 @@ CORBA::Double StdMeshers_CartesianParameters3D_i::GetSizeThreshold()
//\brief Set grid spacing along the three axes
// \param spaceFunctions - functions defining spacing values at given point on axis
// \param internalPoints - points dividing a grid into parts along each direction
// Parameter t of spaceFunction f(t) is a position [0,1] withing bounding box of
// the shape to mesh or withing an interval defined by internal points
// Parameter t of spaceFunction f(t) is a position [0,1] within bounding box of
// the shape to mesh or within an interval defined by internal points
//=======================================================================
void StdMeshers_CartesianParameters3D_i::SetGridSpacing(const SMESH::string_array& spaceFunctions,

4
src/StdMeshers_I/StdMeshers_CartesianParameters3D_i.hxx
View File

@ -73,8 +73,8 @@ class STDMESHERS_I_EXPORT StdMeshers_CartesianParameters3D_i:
* \param internalPoints - points dividing a grid into parts along each direction
* \param axis - index of an axis counterd from zero, i.e. 0==X, 1==Y, 2==Z
*
* Parameter t of spaceFunction f(t) is a position [0,1] withing bounding box of
* the shape to mesh or withing an interval defined by internal points
* Parameter t of spaceFunction f(t) is a position [0,1] within bounding box of
* the shape to mesh or within an interval defined by internal points
*/
void SetGridSpacing(const SMESH::string_array& spaceFunctions,
const SMESH::double_array& internalPoints,

2
src/Tools/MGCleanerPlug/MGCleanerMonPlugDialog.py
View File

@ -43,7 +43,7 @@ class MGCleanerMonPlugDialog(Ui_MGCleanerPlugDialog,QWidget):
self.num=1
self.__selectedMesh=None
# complex whith QResources: not used
# complex with QResources: not used
# The icon are supposed to be located in the $SMESH_ROOT_DIR/share/salome/resources/smesh folder,
# other solution could be in the same folder than this python module file:
# iconfolder=os.path.dirname(os.path.abspath(__file__))

4
src/Tools/MacMesh/MacMesh/CutnGroup.py
View File

@ -36,7 +36,7 @@ def Go(GeoObj, CutPlnLst, OutLvlLst, PrefixLst, Publish):
Example 2: [(0,0,0,1,0,0),(50,0,0,0,1,0)]: in addition to the first plane cut, cut through a plane passing by (50,0,0) and normal to the y axis.
Note that the plane size us determined automatically from the size of the geometry in question (using a very big trim size = 100 x length of geometry!)
- OutLvlLst is a list containing integers that represent the inner sectioning level with respect to the original geometry type
A value of 1 means that the section will provide elements of one level lower than the original type. For exemple a solid sectioned at level 1 will produce faces. A Face sectioned at level 1 will produce edges.
A value of 1 means that the section will provide elements of one level lower than the original type. For example a solid sectioned at level 1 will produce faces. A Face sectioned at level 1 will produce edges.
A value of 2 means that a deeper sectioning will be applied. A solid sectioned with level 2 will give faces and edges. A face will give edges and vertices. An edge will give only vertices
The number of elements in this list should be (this is verified in the code) equal to the number of elements in the plane cut list. This is logical.
Example 1: [1]
@ -98,7 +98,7 @@ def GoTrim(GeoObj, CutPlnLst, OutLvlLst, PrefixLst, Publish):
Example 1: [(0,0,0,1,0,0,5)]: cut along a plane passing through the origin and normal to the x-axis with a trim size of 5
Example 2: [(0,0,0,1,0,0,5),(50,0,0,0,1,0,10)]: in addition to the first plane cut, cut through a plane passing by (50,0,0) and normal to the y axis with a trim size of 10
- OutLvlLst is a list containing integers that represent the inner sectioning level with respect to the original geometry type
A value of 1 means that the section will provide elements of one level lower than the original type. For exemple a solid sectioned at level 1 will produce faces. A Face sectioned at level 1 will produce edges.
A value of 1 means that the section will provide elements of one level lower than the original type. For example a solid sectioned at level 1 will produce faces. A Face sectioned at level 1 will produce edges.
A value of 2 means that a deeper sectioning will be applied. A solid sectioned with level 2 will give faces and edges. A face will give edges and vertices. An edge will give only vertices
The number of elements in this list should be (this is verified in the code) equal to the number of elements in the plane cut list. This is logical.
Example 1: [1]

4
src/Tools/YamsPlug/YamsPlugDialog.ui
View File

@ -703,7 +703,7 @@ the edge common to the faces is a ridge.</string>
<property name="toolTip">
<string>This parameter allows the user to prescribe a maximal size hmax
for the mesh elements i.e., the lengths of the edges with respect to the specified
size map. The corresponding values are either relative or absolute depending on the choosen parameter.
size map. The corresponding values are either relative or absolute depending on the chosen parameter.
The default values are automatically set based on the surface geometry (curvature dependent) and its
bounding box size.
Please note that, as it is not strictly possible to obey the given or computed size map, the actual maximal
@ -748,7 +748,7 @@ the lengths of the edges with respect to the specified size map.</string>
<property name="toolTip">
<string>This parameter allows the user to prescribe a maximal size hmax
for the mesh elements i.e., the lengths of the edges with respect to the specified
size map. The corresponding values are either relative or absolute depending on the choosen parameter.
size map. The corresponding values are either relative or absolute depending on the chosen parameter.
The default values are automatically set based on the surface geometry (curvature dependent) and its
bounding box size.
Please note that, as it is not strictly possible to obey the given or computed size map, the actual maximal

2
src/Tools/YamsPlug/monYamsPlugDialog.py
View File

@ -43,7 +43,7 @@ class MonYamsPlugDialog(Ui_YamsPlugDialog,QWidget):
self.num=1
self.__selectedMesh=None
# complex whith QResources: not used
# complex with QResources: not used
# The icon are supposed to be located in the $SMESH_ROOT_DIR/share/salome/resources/smesh folder,
# other solution could be in the same folder than this python module file:
# iconfolder=os.path.dirname(os.path.abspath(__file__))

6
src/Tools/ZCracksPlug/zcracks.ui
View File

@ -90,7 +90,7 @@
</size>
</property>
<property name="toolTip">
<string>Clear all paramters</string>
<string>Clear all parameters</string>
</property>
<property name="text">
<string>Reset</string>
@ -310,7 +310,7 @@
</size>
</property>
<property name="toolTip">
<string>file adress (ex: /home/A123456/cracked.med)</string>
<string>file address (ex: /home/A123456/cracked.med)</string>
</property>
<property name="autoFillBackground">
<bool>true</bool>
@ -336,7 +336,7 @@
<item row="1" column="1">
<widget class="QLineEdit" name="valSaneName">
<property name="toolTip">
<string notr="true">file adress (ex: /home/A123456/cuve.med)</string>
<string notr="true">file address (ex: /home/A123456/cuve.med)</string>
</property>
<property name="autoFillBackground">
<bool>true</bool>

6
src/Tools/ZCracksPlug/zcracks_ui.py
View File

@ -116,7 +116,7 @@ class Ui_Zui(object):
self.txtSaneName.setObjectName(_fromUtf8("txtSaneName"))
self.gridLayout.addWidget(self.txtSaneName, 1, 0, 1, 1)
self.valSaneName = QtGui.QLineEdit(self.gridLayoutWidget)
self.valSaneName.setToolTip(_fromUtf8("file adress (ex: /home/A123456/cuve.med)"))
self.valSaneName.setToolTip(_fromUtf8("file address (ex: /home/A123456/cuve.med)"))
self.valSaneName.setAutoFillBackground(True)
self.valSaneName.setInputMask(_fromUtf8(""))
self.valSaneName.setText(_fromUtf8(""))
@ -591,7 +591,7 @@ class Ui_Zui(object):
def retranslateUi(self, Zui):
Zui.setWindowTitle(_translate("Zui", "Zcracks interface - version dev", None))
self.btReset.setToolTip(_translate("Zui", "Clear all paramters", None))
self.btReset.setToolTip(_translate("Zui", "Clear all parameters", None))
self.btReset.setText(_translate("Zui", "Reset", None))
self.btSave.setToolTip(_translate("Zui", "Save parameters in a file", None))
self.btSave.setText(_translate("Zui", "Save", None))
@ -605,7 +605,7 @@ class Ui_Zui(object):
self.btApplyClose.setText(_translate("Zui", "Apply and close", None))
self.txtCrackedName.setToolTip(_translate("Zui", "Name of the resulting cracked mesh", None))
self.txtCrackedName.setText(_translate("Zui", "Cracked name", None))
self.valCrackedName.setToolTip(_translate("Zui", "file adress (ex: /home/A123456/cracked.med)", None))
self.valCrackedName.setToolTip(_translate("Zui", "file address (ex: /home/A123456/cracked.med)", None))
self.txtSaneName.setToolTip(_translate("Zui", "Name of the sane mesh", None))
self.txtSaneName.setText(_translate("Zui", "Sane mesh", None))
self.btLoadCracked.setText(_translate("Zui", "...", None))

Some files were not shown because too many files have changed in this diff Show More