From: eap Date: Tue, 19 Jun 2018 16:58:29 +0000 (+0300) Subject: Typo-fix by Kunda + fix user doc generation X-Git-Tag: SHAPER_V9_1_0RC1~27 X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=commitdiff_plain;h=24412178e1a7c741a73d5b23822c43e08c353b97 Typo-fix by Kunda + fix user doc generation --- diff --git a/CMakeLists.txt b/CMakeLists.txt index 8e28516e7..c0b93cdd6 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -55,7 +55,7 @@ SET(KERNEL_ROOT_DIR $ENV{KERNEL_ROOT_DIR} CACHE PATH "Path to the Salome KERNEL" IF(EXISTS ${KERNEL_ROOT_DIR}) LIST(APPEND CMAKE_MODULE_PATH "${KERNEL_ROOT_DIR}/salome_adm/cmake_files") FIND_PACKAGE(SalomeKERNEL REQUIRED) - KERNEL_WITH_CORBA() #check whether KERNEL builded with CORBA + KERNEL_WITH_CORBA() #check whether KERNEL built with CORBA ADD_DEFINITIONS(${KERNEL_DEFINITIONS}) INCLUDE_DIRECTORIES(${KERNEL_INCLUDE_DIRS}) ELSE(EXISTS ${KERNEL_ROOT_DIR}) @@ -144,7 +144,7 @@ IF(SALOME_BUILD_GUI) IF(EXISTS ${GUI_ROOT_DIR}) LIST(APPEND CMAKE_MODULE_PATH "${GUI_ROOT_DIR}/adm_local/cmake_files") FIND_PACKAGE(SalomeGUI) - SALOME_GUI_WITH_CORBA() #check whether GUI builded with CORBA + SALOME_GUI_WITH_CORBA() #check whether GUI built with CORBA SALOME_GUI_MODE(SALOME_USE_VTKVIEWER SALOME_USE_SALOMEOBJECT OPTIONAL SALOME_USE_PLOT2DVIEWER SALOME_USE_PYCONSOLE) ## diff --git a/doc/salome/examples/defining_hypotheses_ex10.py b/doc/salome/examples/defining_hypotheses_ex10.py index 9fea80b14..c55af79df 100644 --- a/doc/salome/examples/defining_hypotheses_ex10.py +++ b/doc/salome/examples/defining_hypotheses_ex10.py @@ -80,5 +80,5 @@ proj3D = tgt_mesh.Projection3D() proj3D.SourceShape3D( box, src_mesh, v1F1, v1F2, v2F1, v2F2 ) tgt_mesh.Compute() -# Move the source mesh to visualy compare the two meshes +# Move the source mesh to visually compare the two meshes src_mesh.TranslateObject( src_mesh, smesh.MakeDirStruct( 210, 0, 0 ), Copy=False) diff --git a/doc/salome/examples/filters_ex34.py b/doc/salome/examples/filters_ex34.py index 4f20b299d..9e29e97d3 100644 --- a/doc/salome/examples/filters_ex34.py +++ b/doc/salome/examples/filters_ex34.py @@ -11,4 +11,4 @@ grp.SetColor(c) # get number of the edges not belonging to the group with the given color filter = smesh.GetFilter(SMESH.EDGE, SMESH.FT_GroupColor, c, SMESH.FT_LogicalNOT) ids = mesh.GetIdsFromFilter(filter) -print("Number of edges not beloging to the group with color (0.1, 0.5, 1.0):", len(ids)) +print ("Number of edges not belonging to the group with color (0.1, 0.5, 1.0):", len(ids)) diff --git a/doc/salome/examples/transforming_meshes_ex03.py b/doc/salome/examples/transforming_meshes_ex03.py index 8184e2450..cf0999c5b 100644 --- a/doc/salome/examples/transforming_meshes_ex03.py +++ b/doc/salome/examples/transforming_meshes_ex03.py @@ -20,14 +20,14 @@ Nb_Segments_1.SetDistrType( 0 ) Quadrangle_2D = Mesh1.Quadrangle() isDone = Mesh1.Compute() -#Perform scale opration for the whole mesh and creation of a new mesh +#Perform scale operation for the whole mesh and creation of a new mesh newMesh = Mesh1.ScaleMakeMesh(Mesh1,SMESH.PointStruct(100,100,200),[0.5,0.3,0.7],True,"ScaledMesh") #Perform scale operation for the whole mesh and copy elements Mesh1.Scale(Mesh1,SMESH.PointStruct(200,100,100),[0.5,0.5,0.5],True,True) -#Perform scale opration for two edges and move elements +#Perform scale operation for two edges and move elements Mesh1.Scale([1,2],SMESH.PointStruct(-100,100,100),[0.8,1.0,0.7],False) -#Perform scale opration for one face and move elements +#Perform scale operation for one face and move elements Mesh1.Scale([21],SMESH.PointStruct(0,200,200),[0.7,0.7,0.7],False) diff --git a/doc/salome/gui/SMESH/collect_mesh_methods.py b/doc/salome/gui/SMESH/collect_mesh_methods.py index 99457030c..3566741ad 100755 --- a/doc/salome/gui/SMESH/collect_mesh_methods.py +++ b/doc/salome/gui/SMESH/collect_mesh_methods.py @@ -184,8 +184,8 @@ if __name__ == "__main__": action="store_true", default=False, help=h) h = "Format of the documentation strings in the output file. Possible values are: " - h+= "'doxygen' - documentation strings are generated in the doxygen format, before a method defenition." - h+= "'sphinx' - documentation strings are generated in the sphinx format, after a method defenition." + h+= "'doxygen' - documentation strings are generated in the doxygen format, before a method definition." + h+= "'sphinx' - documentation strings are generated in the sphinx format, after a method definition." parser.add_argument("-f", "--format", dest="format", action="store", default="doxygen", help=h) diff --git a/doc/salome/gui/SMESH/input/pattern_mapping.rst b/doc/salome/gui/SMESH/input/pattern_mapping.rst index d505dca6f..e88a2912c 100644 --- a/doc/salome/gui/SMESH/input/pattern_mapping.rst +++ b/doc/salome/gui/SMESH/input/pattern_mapping.rst @@ -18,7 +18,7 @@ The smp file contains 4 sections: #. The first line indicates the total number of pattern nodes (N). #. The next N lines describe nodes coordinates. Each line contains 2 node coordinates for a 2D pattern or 3 node coordinates for a 3D pattern. Note, that node coordinates of a 3D pattern can be defined only by relative values in range [0;1]. #. The key-points line contains the indices of the nodes to be mapped on geometrical vertices (for a 2D pattern only). Index n refers to the node described on the n-th line of section 2. The index of the first node is zero. For a 3D pattern the key points are not specified. - #. The remaining lines describe nodal connectivity of elements, one line for each element. Each line holds indices of nodes forming an element. Index n refers to the node described on the n-th line of section 2. The first node index is zero. There must be 3 or 4 indices on each line for a 2D pattern (only liner 2d elements are allowed) and 4, 5, 6 or 8 indices for a 3D pattern (only linear 3d elements are allowed). + #. The remaining lines describe nodal connectivity of elements, one line for each element. Each line holds indices of nodes forming an element. Index n refers to the node described on the n-th line of section 2. The first node index is zero. There must be 3 or 4 indices on each line for a 2D pattern (only linear 2D elements are allowed) and 4, 5, 6 or 8 indices for a 3D pattern (only linear 3D elements are allowed). A 2D pattern must contain at least one element and at least one key-point. All key-points must lie on boundaries. @@ -165,8 +165,8 @@ In this dialog you should specify: When a pattern is created from an existing mesh, two cases are possible: -* A sub-mesh on a face/solid is selected. The pattern is created from the 2d/3d elements bound to the face/solid by the mesher. For a 2D pattern, the node coordinates are either "positions on face" computed by the mesher, or coordinates got by node projection on a geometrical surface, according to the user choice. For a 3D pattern, the node coordinates correspond to the nodes computed by the mesher. -* A mesh, where the main shape is a face/solid, is selected. The pattern is created from all 2d/3d elements in a mesh. In addition, if all mesh elements of a 2D pattern are built by the mesher, the user can select how to get node coordinates, otherwise all nodes are projected on a face surface. +* A sub-mesh on a face/solid is selected. The pattern is created from the 2D/3D elements bound to the face/solid by the mesher. For a 2D pattern, the node coordinates are either "positions on face" computed by the mesher, or coordinates got by node projection on a geometrical surface, according to the user choice. For a 3D pattern, the node coordinates correspond to the nodes computed by the mesher. +* A mesh, where the main shape is a face/solid, is selected. The pattern is created from all 2D/3D elements in a mesh. In addition, if all mesh elements of a 2D pattern are built by the mesher, the user can select how to get node coordinates, otherwise all nodes are projected on a face surface. Mapping algorithm diff --git a/doc/salome/gui/SMESH/input/rotation.rst b/doc/salome/gui/SMESH/input/rotation.rst index 85eb11d12..4d38caeb1 100644 --- a/doc/salome/gui/SMESH/input/rotation.rst +++ b/doc/salome/gui/SMESH/input/rotation.rst @@ -26,7 +26,7 @@ This operation allows to rotate in space the mesh or some of its elements. * apply Filters. **Set filter** button allows to apply a filter to the selection of elements. See more about filters in the :ref:`selection_filter_library_page` page. * specify the axis of rotation: - * specify the cooordinates of the start **Point** of the vector of rotation; + * specify the coordinates of the start **Point** of the vector of rotation; * specify the **Vector** of rotation through the coordinates of its end point with respect to the coordinates of the start point; * specify the **Angle** of rotation diff --git a/doc/salome/gui/SMESH/input/smesh_migration.rst b/doc/salome/gui/SMESH/input/smesh_migration.rst index 59487da2f..228622b77 100644 --- a/doc/salome/gui/SMESH/input/smesh_migration.rst +++ b/doc/salome/gui/SMESH/input/smesh_migration.rst @@ -84,7 +84,7 @@ The compatibility mode allows old scripts to work in almost all cases, but with Compound1 = smesh.Concatenate([Mesh_inf.GetMesh(), Mesh_sup.GetMesh()], 0, 1, 1e-05) -* If you need to **import a SMESH Plugin** explicitly, keep in mind that they are now located in separate namespaces. +* If you need to **import a SMESH Plugin** explicitly, keep in mind that they are now located in separate namespaces. For instance:: diff --git a/doc/salome/gui/SMESH/input/smeshpy_interface.rst b/doc/salome/gui/SMESH/input/smeshpy_interface.rst index 7094b6592..cee154d03 100644 --- a/doc/salome/gui/SMESH/input/smeshpy_interface.rst +++ b/doc/salome/gui/SMESH/input/smeshpy_interface.rst @@ -32,7 +32,7 @@ A usual workflow to generate a mesh on geometry is following: :linenos: from salome.smesh import smeshBuilder - smesh = smeshBuilder.New( salome.myStudy ) + smesh = smeshBuilder.New() #. Create a :class:`smeshBuilder.Mesh` object: diff --git a/doc/salome/gui/SMESH/input/split_biquad_to_linear.rst b/doc/salome/gui/SMESH/input/split_biquad_to_linear.rst index 8b27124c1..4778ec4f7 100644 --- a/doc/salome/gui/SMESH/input/split_biquad_to_linear.rst +++ b/doc/salome/gui/SMESH/input/split_biquad_to_linear.rst @@ -12,7 +12,7 @@ So that * bi-quadratic triangle will be split into 3 linear quadrangles; * bi-quadratic quadrangle will be split into 4 linear quadrangles; * tri-quadratic hexahedron will be split into 8 linear hexahedra; -* quadratic segments adjacent to the split bi-quadratic element will be split into 2 liner segments. +* quadratic segments adjacent to the split bi-quadratic element will be split into 2 linear segments. .. image:: ../images/split_biquad_to_linear_mesh.png :align: center diff --git a/doc/salome/gui/SMESH/input/symmetry.rst b/doc/salome/gui/SMESH/input/symmetry.rst index c20875a60..c80b4890e 100644 --- a/doc/salome/gui/SMESH/input/symmetry.rst +++ b/doc/salome/gui/SMESH/input/symmetry.rst @@ -49,7 +49,7 @@ This geometrical operation allows to perform a symmetrical copy of your mesh or * if the mesh is mirrored through a plane: - * specify the cooordinates of the **Point** lying on the plane, either directly or by picking a mesh node; + * specify the coordinates of the **Point** lying on the plane, either directly or by picking a mesh node; * specify the components of plane **Normal**, either directly or by picking a mesh node, in which case **Normal** is defined as a shift between the **Point** and the node. * specify the conditions of symmetry operation: diff --git a/doc/salome/gui/SMESH/input/translation.rst b/doc/salome/gui/SMESH/input/translation.rst index ab9a96643..ff477ac31 100644 --- a/doc/salome/gui/SMESH/input/translation.rst +++ b/doc/salome/gui/SMESH/input/translation.rst @@ -34,7 +34,7 @@ This geometrical operation allows to translate in space your mesh or some of its * specify the vector of translation: - * specify the cooordinates of the start and end **Points** of the vector of translation; or + * specify the coordinates of the start and end **Points** of the vector of translation; or * specify the end point of the **Vector** of rotation starting at the origin of coordinates. * specify the conditions of translation: diff --git a/doc/salome/gui/SMESH/input/tui_filters.rst b/doc/salome/gui/SMESH/input/tui_filters.rst index ac88a3450..1e64974d9 100644 --- a/doc/salome/gui/SMESH/input/tui_filters.rst +++ b/doc/salome/gui/SMESH/input/tui_filters.rst @@ -317,7 +317,7 @@ Double edges, Double faces, Double volumes filters mesh elements basing on the same set of nodes: -* element type is either *SMESH.EGDE*, *SMESH.FACE* or *SMESH.VOLUME* +* element type is either *SMESH.EDGE*, *SMESH.FACE* or *SMESH.VOLUME* * functor type is either *SMESH.FT_EqualEdges*, *SMESH.FT_EqualFaces* or *SMESH.FT_EqualVolumes*, * threshold value is not required diff --git a/doc/salome/gui/SMESH/merge_mesh_class.py b/doc/salome/gui/SMESH/merge_mesh_class.py index 19ce22fc5..2436100e4 100644 --- a/doc/salome/gui/SMESH/merge_mesh_class.py +++ b/doc/salome/gui/SMESH/merge_mesh_class.py @@ -12,14 +12,14 @@ def main(module_name, output_file = "smeshBuilder.py"): dynamic_module_name = module_name + DYNAMIC_MODULE_SUFFIX try: exec( "import %s" % oringin_module_name ) - exec( "origin_module = %s" % oringin_module_name ) + origin_module = locals()[ oringin_module_name ] origin_module_lines = inspect.getsourcelines( origin_module )[0] origin_meshClass_lines = inspect.getsourcelines(origin_module.Mesh)[0] origin_module_text = "".join( origin_module_lines ) origin_meshClass_text = "".join( origin_meshClass_lines ) exec( "import %s" % dynamic_module_name ) - exec( "dynanmic_module = %s" % dynamic_module_name ) + dynanmic_module = locals()[ dynamic_module_name ] dynanmic_meshClass = dynanmic_module.Mesh new_meshClass_lines = copy.copy(origin_meshClass_lines) @@ -30,7 +30,7 @@ def main(module_name, output_file = "smeshBuilder.py"): dynanmic_meshClass_methods = [x for x, y in dynanmic_meshClass.__dict__.items() if type(y) == FunctionType] for method in dynanmic_meshClass_methods: exec( "method_lines = inspect.getsourcelines(dynanmic_module.Mesh.%s)[0]" % method) - new_meshClass_lines+=method_lines + new_meshClass_lines+=locals()['method_lines'] pass new_meshClass_text = "".join( new_meshClass_lines ) diff --git a/idl/SMESH_Mesh.idl b/idl/SMESH_Mesh.idl index 3e8e2ca2e..b8cc0b387 100644 --- a/idl/SMESH_Mesh.idl +++ b/idl/SMESH_Mesh.idl @@ -213,7 +213,7 @@ module SMESH HYP_UNKNOWN_FATAL,// --- all statuses below should be considered as fatal // for Add/RemoveHypothesis operations HYP_INCOMPATIBLE, // hypothesis does not fit algo - HYP_NOTCONFORM, // not conform mesh is produced appling a hypothesis + HYP_NOTCONFORM, // not conform mesh is produced applying a hypothesis HYP_ALREADY_EXIST,// such hypothesis already exist HYP_BAD_DIM, // bad dimension HYP_BAD_SUBSHAPE, // shape is neither the main one, nor its sub-shape, nor a group diff --git a/idl/SMESH_MeshEditor.idl b/idl/SMESH_MeshEditor.idl index 62dd62c91..21a6374c1 100644 --- a/idl/SMESH_MeshEditor.idl +++ b/idl/SMESH_MeshEditor.idl @@ -480,7 +480,7 @@ module SMESH * \param NbOfSteps - number of elements to generate from one element * \param ToMakeGroups - if true, new elements will be included into new groups * corresponding to groups the input elements included in. - * \return ListOfGroups - new groups craeted if \a ToMakeGroups is true + * \return ListOfGroups - new groups created if \a ToMakeGroups is true */ ListOfGroups RotationSweepObjects(in ListOfIDSources Nodes, in ListOfIDSources Edges, @@ -501,7 +501,7 @@ module SMESH * \param nbOfSteps - number of elements to generate from one element * \param toMakeGroups - if true, new elements will be included into new groups * corresponding to groups the input elements included in. - * \return ListOfGroups - new groups craeted if \a toMakeGroups is true + * \return ListOfGroups - new groups created if \a toMakeGroups is true */ ListOfGroups ExtrusionSweepObjects(in ListOfIDSources nodes, in ListOfIDSources edges, @@ -533,7 +533,7 @@ module SMESH * EXTRUSION_FLAG_SEW is set * \param ToMakeGroups - if true, new elements will be included into new groups * corresponding to groups the input elements included in. - * \return ListOfGroups - new groups craeted if \a ToMakeGroups is true + * \return ListOfGroups - new groups created if \a ToMakeGroups is true */ ListOfGroups AdvancedExtrusion(in long_array IDsOfElements, in DirStruct StepVector, diff --git a/idl/SMESH_Pattern.idl b/idl/SMESH_Pattern.idl index 4229c0345..5e4e8b0a8 100644 --- a/idl/SMESH_Pattern.idl +++ b/idl/SMESH_Pattern.idl @@ -182,7 +182,7 @@ module SMESH /*! * Return nodal connectivity of the elements of the pattern - * or of all elements to be crated + * or of all elements to be created */ array_of_long_array GetElementPoints(in boolean all); }; diff --git a/src/SMDS/SMDS_MemoryLimit.cxx b/src/SMDS/SMDS_MemoryLimit.cxx index 3086a8f7b..f513d82a0 100644 --- a/src/SMDS/SMDS_MemoryLimit.cxx +++ b/src/SMDS/SMDS_MemoryLimit.cxx @@ -43,10 +43,10 @@ int main (int argc, char ** argv) return -1; unsigned long freeRamKb = ( si.freeram * si.mem_unit ) / 1024; - // totat RAM size in Gb, float is in order not to have 1 instead of 1.9 + // total RAM size in Gb, float is in order not to have 1 instead of 1.9 float totalramGb = float( si.totalram * si.mem_unit ) / 1024 / 1024 / 1024; - // nb Kbites to allocate at one step. Small nb leads to hung up + // nb Kbytes to allocate at one step. Small nb leads to hung up const int stepKb = int( 5 * totalramGb ); unsigned long nbSteps = freeRamKb / stepKb * 2; diff --git a/src/SMDS/SMDS_Mesh.cxx b/src/SMDS/SMDS_Mesh.cxx index bb3ecb80f..790ff1bb3 100644 --- a/src/SMDS/SMDS_Mesh.cxx +++ b/src/SMDS/SMDS_Mesh.cxx @@ -63,7 +63,7 @@ int SMDS_Mesh::chunkSize = 1024; //================================================================================ /*! * \brief Raise an exception if free memory (ram+swap) too low - * \param doNotRaise - if true, suppres exception, just return free memory size + * \param doNotRaise - if true, suppress exception, just return free memory size * \retval int - amount of available memory in MB or negative number in failure case */ //================================================================================ diff --git a/src/SMDS/SMDS_Mesh.hxx b/src/SMDS/SMDS_Mesh.hxx index 38952f78c..e81735e44 100644 --- a/src/SMDS/SMDS_Mesh.hxx +++ b/src/SMDS/SMDS_Mesh.hxx @@ -668,7 +668,7 @@ public: /*! * \brief Raise an exception if free memory (ram+swap) too low - * \param doNotRaise - if true, suppres exception, just return free memory size + * \param doNotRaise - if true, suppress exception, just return free memory size * \retval int - amount of available memory in MB or negative number in failure case */ static int CheckMemory(const bool doNotRaise=false) throw (std::bad_alloc); diff --git a/src/SMESH/SMESH_Algo.cxx b/src/SMESH/SMESH_Algo.cxx index 62f77de4a..8b2d1c5d2 100644 --- a/src/SMESH/SMESH_Algo.cxx +++ b/src/SMESH/SMESH_Algo.cxx @@ -751,7 +751,7 @@ SMESH_Algo::EMeshError SMESH_Algo::GetMeshError(SMESH_subMesh* subMesh) if ( !fIt->more() ) return MEr_EMPTY; - // We check that only links on EDGEs encouter once, the rest links, twice + // We check that only links on EDGEs encounter once, the rest links, twice set< SMESH_TLink > links; while ( fIt->more() ) { diff --git a/src/SMESH/SMESH_Gen.cxx b/src/SMESH/SMESH_Gen.cxx index 71365d197..4b5814c1f 100644 --- a/src/SMESH/SMESH_Gen.cxx +++ b/src/SMESH/SMESH_Gen.cxx @@ -1170,7 +1170,7 @@ int SMESH_Gen::GetShapeDim(const TopAbs_ShapeEnum & aShapeType) //============================================================================= /*! - * Genarate a new id unique within this Gen + * Generate a new id unique within this Gen */ //============================================================================= diff --git a/src/SMESH/SMESH_Group.cxx b/src/SMESH/SMESH_Group.cxx index 5ab9b683d..23a4955c2 100644 --- a/src/SMESH/SMESH_Group.cxx +++ b/src/SMESH/SMESH_Group.cxx @@ -64,7 +64,7 @@ SMESH_Group::SMESH_Group (int theID, //================================================================================ /*! - * \brief Constructor accesible to SMESH_Mesh only + * \brief Constructor accessible to SMESH_Mesh only */ //================================================================================ diff --git a/src/SMESH/SMESH_Hypothesis.hxx b/src/SMESH/SMESH_Hypothesis.hxx index 9bf01b9c6..b6ec54ad9 100644 --- a/src/SMESH/SMESH_Hypothesis.hxx +++ b/src/SMESH/SMESH_Hypothesis.hxx @@ -58,7 +58,7 @@ public: HYP_UNKNOWN_FATAL,// --- all statuses below should be considered as fatal // for Add/RemoveHypothesis operations HYP_INCOMPATIBLE, // hypothesis does not fit algo - HYP_NOTCONFORM, // not conform mesh is produced appling a hypothesis + HYP_NOTCONFORM, // not conform mesh is produced applying a hypothesis HYP_ALREADY_EXIST,// several applicable hypothesis of same priority assigned HYP_BAD_DIM, // bad dimension HYP_BAD_SUBSHAPE, // shape is neither the main one, nor its sub-shape, nor a group diff --git a/src/SMESH/SMESH_MeshEditor.cxx b/src/SMESH/SMESH_MeshEditor.cxx index 06e3133e3..49ba0635e 100644 --- a/src/SMESH/SMESH_MeshEditor.cxx +++ b/src/SMESH/SMESH_MeshEditor.cxx @@ -1423,7 +1423,7 @@ bool SMESH_MeshEditor::QuadToTri (TIDSortedElemSet & theElems, const SMDS_MeshElement* newElem1 = 0; const SMDS_MeshElement* newElem2 = 0; - if ( !elem->IsQuadratic() ) // split liner quadrangle + if ( !elem->IsQuadratic() ) // split linear quadrangle { // for MaxElementLength2D functor we return minimum diagonal for splitting, // because aBadRate1=2*len(diagonal 1-3); aBadRate2=2*len(diagonal 2-4) diff --git a/src/SMESH/SMESH_MesherHelper.cxx b/src/SMESH/SMESH_MesherHelper.cxx index ad48bd49d..aaf07a4cd 100644 --- a/src/SMESH/SMESH_MesherHelper.cxx +++ b/src/SMESH/SMESH_MesherHelper.cxx @@ -854,7 +854,7 @@ bool SMESH_MesherHelper::CheckNodeUV(const TopoDS_Face& F, //======================================================================= //function : GetProjector -//purpose : Return projector intitialized by given face without location, which is returned +//purpose : Return projector initialized by given face without location, which is returned //======================================================================= GeomAPI_ProjectPointOnSurf& SMESH_MesherHelper::GetProjector(const TopoDS_Face& F, @@ -2903,7 +2903,7 @@ bool SMESH_MesherHelper::IsDistorted2D( SMESH_subMesh* faceSM, for ( size_t i = 0; i < nodes.size(); ++n, ++i ) nodes[ i ] = *n; - // avoid elems on degenarate shapes as UV on them can be wrong + // avoid elems on degenerate shapes as UV on them can be wrong if ( helper.HasDegeneratedEdges() ) { bool isOnDegen = false; diff --git a/src/SMESH/SMESH_MesherHelper.hxx b/src/SMESH/SMESH_MesherHelper.hxx index d4f54833a..3b516baa0 100644 --- a/src/SMESH/SMESH_MesherHelper.hxx +++ b/src/SMESH/SMESH_MesherHelper.hxx @@ -300,7 +300,7 @@ public: /*! * \brief To set created elements on the shape set by IsQuadraticSubMesh() - * or the next methods. By defaul elements are set on the shape if + * or the next methods. By default elements are set on the shape if * a mesh has no shape to be meshed */ bool SetElementsOnShape(bool toSet) @@ -539,7 +539,7 @@ public: bool GetNodeUVneedInFaceNode(const TopoDS_Face& F = TopoDS_Face()) const; /*! - * \brief Return projector intitialized by given face without location, which is returned + * \brief Return projector initialized by given face without location, which is returned */ GeomAPI_ProjectPointOnSurf& GetProjector(const TopoDS_Face& F, TopLoc_Location& loc, @@ -577,7 +577,7 @@ public: * \retval bool - true if subShape is a seam shape * * It works only if IsQuadraticSubMesh() or SetSubShape() has been called. - * Seam shape has two 2D alternative represenations on the face + * Seam shape has two 2D alternative representations on the face */ bool IsSeamShape(const int subShape) const { return mySeamShapeIds.find( subShape ) != mySeamShapeIds.end(); } @@ -587,7 +587,7 @@ public: * \retval bool - true if subShape is a seam shape * * It works only if IsQuadraticSubMesh() or SetSubShape() has been called. - * Seam shape has two 2D alternative represenations on the face + * Seam shape has two 2D alternative representations on the face */ bool IsSeamShape(const TopoDS_Shape& subShape) const { return IsSeamShape( ShapeToIndex( subShape )); } diff --git a/src/SMESH/SMESH_Pattern.hxx b/src/SMESH/SMESH_Pattern.hxx index 836cd1790..9acf59847 100644 --- a/src/SMESH/SMESH_Pattern.hxx +++ b/src/SMESH/SMESH_Pattern.hxx @@ -195,7 +195,7 @@ class SMESH_EXPORT SMESH_Pattern { // MakeMesh ERR_MAKEM_NOT_COMPUTED, // mapping failed //Unexpected error - ERR_UNEXPECTED // Unexpected of the pattern mapping alorithm + ERR_UNEXPECTED // Unexpected of the pattern mapping algorithm }; ErrorCode GetErrorCode() const { return myErrorCode; } diff --git a/src/SMESHGUI/SMESHGUI_FilterDlg.cxx b/src/SMESHGUI/SMESHGUI_FilterDlg.cxx index 567ba381f..23e450253 100755 --- a/src/SMESHGUI/SMESHGUI_FilterDlg.cxx +++ b/src/SMESHGUI/SMESHGUI_FilterDlg.cxx @@ -856,7 +856,7 @@ QList SMESHGUI_FilterTable::Table::selectedRows() /* Class : SMESHGUI_FilterTable - Description : Frame containig + Description : Frame containing - Button group for switching entity type - Table for displaying filter criterions - Buttons for editing table and filter libraries diff --git a/src/SMESHGUI/SMESHGUI_FilterDlg.h b/src/SMESHGUI/SMESHGUI_FilterDlg.h index 4068c057b..2cb9067fd 100755 --- a/src/SMESHGUI/SMESHGUI_FilterDlg.h +++ b/src/SMESHGUI/SMESHGUI_FilterDlg.h @@ -61,7 +61,7 @@ class SVTK_Selector; /*! * Class : SMESHGUI_FilterTable - * Description : Frame containig + * Description : Frame containing * - Button group for switching entity type * - Table for displaying filter criterions * - Buttons for editing table diff --git a/src/SMESHGUI/SMESHGUI_GroupOpDlg.cxx b/src/SMESHGUI/SMESHGUI_GroupOpDlg.cxx index f74cd803c..408546d46 100644 --- a/src/SMESHGUI/SMESHGUI_GroupOpDlg.cxx +++ b/src/SMESHGUI/SMESHGUI_GroupOpDlg.cxx @@ -510,7 +510,7 @@ void SMESHGUI_GroupOpDlg::enterEvent(QEvent*) /*! \brief Resets state of the dialog, initializes its fields with default value, etc. Usually called by onApply() slot to reinitialize dialog fields. This virtual method - should be redefined in derived class to update its own fileds + should be redefined in derived class to update its own fields */ void SMESHGUI_GroupOpDlg::reset() { diff --git a/src/SMESHGUI/SMESHGUI_MeshInfo.cxx b/src/SMESHGUI/SMESHGUI_MeshInfo.cxx index f69cc76b8..07066bf46 100644 --- a/src/SMESHGUI/SMESHGUI_MeshInfo.cxx +++ b/src/SMESHGUI/SMESHGUI_MeshInfo.cxx @@ -610,11 +610,11 @@ void SMESHGUI_MeshInfo::showInfo( SMESH::SMESH_IDSource_ptr obj ) myWidgets[i3DHexaPrisms][iTotal] ->setProperty( "text", QString::number( info[SMDSEntity_Hexagonal_Prism] )); myWidgets[i3DPolyhedrons][iTotal] ->setProperty( "text", QString::number( info[SMDSEntity_Polyhedra] )); long nbElemTotal = info[SMDSEntity_0D] + info[SMDSEntity_Ball] + nbEdges + nb2DTotal + nb3DTotal; - long nbElemLinerial = info[SMDSEntity_Edge] + nb2DLinear + nb3DLinear; + long nbElemLinearial = info[SMDSEntity_Edge] + nb2DLinear + nb3DLinear; long nbElemQuadratic = info[SMDSEntity_Quad_Edge] + nb2DQuadratic + nb3DQuadratic; long nbElemBiQuadratic = nb2DBiQuadratic + nb3DBiQuadratic; myWidgets[iNb][iTotal] ->setProperty( "text", QString::number( nbElemTotal )); - myWidgets[iNb][iLinear] ->setProperty( "text", QString::number( nbElemLinerial )); + myWidgets[iNb][iLinear] ->setProperty( "text", QString::number( nbElemLinearial )); myWidgets[iNb][iQuadratic] ->setProperty( "text", QString::number( nbElemQuadratic )); myWidgets[iNb][iBiQuadratic]->setProperty( "text", QString::number( nbElemBiQuadratic )); // before full loading from study file, type of elements in a sub-mesh can't be defined diff --git a/src/SMESHGUI/SMESHGUI_ReorientFacesDlg.cxx b/src/SMESHGUI/SMESHGUI_ReorientFacesDlg.cxx index b09abbaf4..0f84e9a19 100644 --- a/src/SMESHGUI/SMESHGUI_ReorientFacesDlg.cxx +++ b/src/SMESHGUI/SMESHGUI_ReorientFacesDlg.cxx @@ -96,7 +96,7 @@ enum { CONSTRUCTOR_POINT=0, CONSTRUCTOR_FACE, CONSTRUCTOR_VOLUME, //======================================================================= /*! - * \brief Dialog to reorient faces acoording to vector + * \brief Dialog to reorient faces according to vector */ //======================================================================= diff --git a/src/SMESHGUI/SMESHGUI_ReorientFacesDlg.h b/src/SMESHGUI/SMESHGUI_ReorientFacesDlg.h index e09462483..ed697247b 100644 --- a/src/SMESHGUI/SMESHGUI_ReorientFacesDlg.h +++ b/src/SMESHGUI/SMESHGUI_ReorientFacesDlg.h @@ -39,7 +39,7 @@ class SMESHGUI_SpinBox; class SMESHGUI_ReorientFacesDlg; /*! - * \brief Operation to reorient faces acoording to some criterion + * \brief Operation to reorient faces according to some criterion */ class SMESHGUI_EXPORT SMESHGUI_ReorientFacesOp: public SMESHGUI_SelectionOp { @@ -81,7 +81,7 @@ private: }; /*! - * \brief Dialog to reorient faces acoording to vector + * \brief Dialog to reorient faces according to vector */ class SMESHGUI_EXPORT SMESHGUI_ReorientFacesDlg : public SMESHGUI_Dialog diff --git a/src/SMESHGUI/SMESHGUI_ShapeByMeshDlg.cxx b/src/SMESHGUI/SMESHGUI_ShapeByMeshDlg.cxx index 5d82de8be..b17fed16f 100644 --- a/src/SMESHGUI/SMESHGUI_ShapeByMeshDlg.cxx +++ b/src/SMESHGUI/SMESHGUI_ShapeByMeshDlg.cxx @@ -287,7 +287,7 @@ void SMESHGUI_ShapeByMeshOp::SetMesh (SMESH::SMESH_Mesh_ptr thePtr) myHasSolids = nbShapes[ TopAbs_SOLID ]; } - // disable inexistant elem types + // disable inexistent elem types for ( int i = 0; i < myDlg->myElemTypeGroup->buttons().count(); ++i ) { if ( QAbstractButton* button = myDlg->myElemTypeGroup->button( i ) ) button->setEnabled( hasElement[ i ] ); diff --git a/src/SMESHGUI/SMESHGUI_VTKUtils.cxx b/src/SMESHGUI/SMESHGUI_VTKUtils.cxx index 98549bdc8..5b4a50483 100644 --- a/src/SMESHGUI/SMESHGUI_VTKUtils.cxx +++ b/src/SMESHGUI/SMESHGUI_VTKUtils.cxx @@ -789,7 +789,7 @@ namespace SMESH if(SMESH_Actor *anActor = dynamic_cast(anAct)){ if(anActor->hasIO()) if (!Update(anActor->getIO(),anActor->GetVisibility())) - break; // avoid multiple warinings if visu failed + break; // avoid multiple warnings if visu failed } } } @@ -800,7 +800,7 @@ namespace SMESH { Handle(SALOME_InteractiveObject) anIO = anIter.Value(); if ( !Update( anIO, true )) - break; // avoid multiple warinings if visu failed + break; // avoid multiple warnings if visu failed if ( withChildrenOfSelected ) // update all visible children { @@ -1422,7 +1422,7 @@ namespace SMESH //================================================================================ /*! * \brief Find all SMESH_Actor's in the View Window. - * If actor constains Plot2d_Histogram object remove it from each Plot2d Viewer. + * If actor contains Plot2d_Histogram object remove it from each Plot2d Viewer. */ //================================================================================ diff --git a/src/SMESHUtils/SMESH_Block.cxx b/src/SMESHUtils/SMESH_Block.cxx index 5ff01e3ab..597a360f6 100644 --- a/src/SMESHUtils/SMESH_Block.cxx +++ b/src/SMESHUtils/SMESH_Block.cxx @@ -1040,7 +1040,7 @@ bool SMESH_Block::findUVByHalfDivision( const gp_Pnt& thePoint, } } - // refine solution using half-division technic + // refine solution using half-division technique gp_XYZ sol = theParams; @@ -1727,7 +1727,7 @@ bool SMESH_Block::LoadMeshBlock(const SMDS_MeshVolume* theVolume, //function : LoadBlockShapes //purpose : Initialize block geometry with theShell, // add sub-shapes of theBlock to theShapeIDMap so that they get -// IDs acoording to enum TShapeID +// IDs according to enum TShapeID //======================================================================= bool SMESH_Block::LoadBlockShapes(const TopoDS_Shell& theShell, @@ -1742,7 +1742,7 @@ bool SMESH_Block::LoadBlockShapes(const TopoDS_Shell& theShell, //======================================================================= //function : LoadBlockShapes //purpose : add sub-shapes of theBlock to theShapeIDMap so that they get -// IDs acoording to enum TShapeID +// IDs according to enum TShapeID //======================================================================= bool SMESH_Block::FindBlockShapes(const TopoDS_Shell& theShell, diff --git a/src/SMESHUtils/SMESH_Block.hxx b/src/SMESHUtils/SMESH_Block.hxx index 6b0caabbb..36c3a6838 100644 --- a/src/SMESHUtils/SMESH_Block.hxx +++ b/src/SMESHUtils/SMESH_Block.hxx @@ -154,7 +154,7 @@ class SMESHUtils_EXPORT SMESH_Block: public math_FunctionSetWithDerivatives TopTools_IndexedMapOfOrientedShape& theShapeIDMap ); // Initialize block geometry with theShell, // add sub-shapes of theBlock to theShapeIDMap so that they get - // IDs acoording to enum TShapeID + // IDs according to enum TShapeID bool LoadBlockShapes(const TopTools_IndexedMapOfOrientedShape& theShapeIDMap); // Initialize block geometry with shapes from theShapeIDMap @@ -185,7 +185,7 @@ class SMESHUtils_EXPORT SMESH_Block: public math_FunctionSetWithDerivatives const TopoDS_Vertex& theVertex001, TopTools_IndexedMapOfOrientedShape& theShapeIDMap ); // add sub-shapes of theBlock to theShapeIDMap so that they get - // IDs acoording to enum TShapeID + // IDs according to enum TShapeID public: // --------------------------------- diff --git a/src/SMESH_I/SMESH_2smeshpy.cxx b/src/SMESH_I/SMESH_2smeshpy.cxx index 28b641e3a..565089b15 100644 --- a/src/SMESH_I/SMESH_2smeshpy.cxx +++ b/src/SMESH_I/SMESH_2smeshpy.cxx @@ -360,7 +360,7 @@ namespace { //================================================================================ /*! * \brief Replaces "SMESH.PointStruct(x,y,z)" and "SMESH.DirStruct( SMESH.PointStruct(x,y,z))" - * arguments of a given command by a list "[x,y,z]" if the list is accesible + * arguments of a given command by a list "[x,y,z]" if the list is accessible * type of argument. */ //================================================================================ @@ -412,7 +412,7 @@ namespace { //================================================================================ /*! * \brief Replaces "mesh.GetIDSource([id1,id2])" argument of a given command by - * a list "[id1,id2]" if the list is an accesible type of argument. + * a list "[id1,id2]" if the list is an accessible type of argument. */ //================================================================================ diff --git a/src/SMESH_I/SMESH_Gen_i.cxx b/src/SMESH_I/SMESH_Gen_i.cxx index 25f0c2c7f..d1d807741 100644 --- a/src/SMESH_I/SMESH_Gen_i.cxx +++ b/src/SMESH_I/SMESH_Gen_i.cxx @@ -1930,7 +1930,7 @@ CORBA::Boolean SMESH_Gen_i::Compute( SMESH::SMESH_Mesh_ptr theMesh, ASSERT( meshServant ); if ( meshServant ) { meshServant->Load(); - // NPAL16168: "geometrical group edition from a submesh don't modifiy mesh computation" + // NPAL16168: "geometrical group edition from a submesh don't modify mesh computation" meshServant->CheckGeomModif(); // get local TopoDS_Shape TopoDS_Shape myLocShape; @@ -2015,7 +2015,7 @@ SMESH::MeshPreviewStruct* SMESH_Gen_i::Precompute( SMESH::SMESH_Mesh_ptr theMesh meshServant->Load(); ASSERT( meshServant ); if ( meshServant ) { - // NPAL16168: "geometrical group edition from a submesh don't modifiy mesh computation" + // NPAL16168: "geometrical group edition from a submesh don't modify mesh computation" meshServant->CheckGeomModif(); // get local TopoDS_Shape TopoDS_Shape myLocShape; @@ -2212,7 +2212,7 @@ SMESH::long_array* SMESH_Gen_i::Evaluate(SMESH::SMESH_Mesh_ptr theMesh, ASSERT( meshServant ); if ( meshServant ) { meshServant->Load(); - // NPAL16168: "geometrical group edition from a submesh don't modifiy mesh computation" + // NPAL16168: "geometrical group edition from a submesh don't modify mesh computation" meshServant->CheckGeomModif(); // get local TopoDS_Shape TopoDS_Shape myLocShape; diff --git a/src/SMESH_I/SMESH_Hypothesis_i.cxx b/src/SMESH_I/SMESH_Hypothesis_i.cxx index 9b9779d68..d6e6dc0cd 100644 --- a/src/SMESH_I/SMESH_Hypothesis_i.cxx +++ b/src/SMESH_I/SMESH_Hypothesis_i.cxx @@ -126,7 +126,7 @@ CORBA::Long SMESH_Hypothesis_i::GetId() bool SMESH_Hypothesis_i::IsPublished() { bool res = false; - if ( SMESH_Gen_i *gen = SMESH_Gen_i::GetSMESHGen()) + if ( SMESH_Gen_i::GetSMESHGen() ) { SALOMEDS::SObject_wrap SO = SMESH_Gen_i::ObjectToSObject( _this()); res = !SO->_is_nil(); diff --git a/src/SMESH_I/SMESH_MeshEditor_i.cxx b/src/SMESH_I/SMESH_MeshEditor_i.cxx index e49fa3e5d..3d1a120a8 100644 --- a/src/SMESH_I/SMESH_MeshEditor_i.cxx +++ b/src/SMESH_I/SMESH_MeshEditor_i.cxx @@ -2597,7 +2597,7 @@ namespace MeshEditor_I * \param [in] nbOfSteps - number of elements to generate from one element * \param [in] toMakeGroups - if true, new elements will be included into new groups * corresponding to groups the input elements included in. - * \return ListOfGroups - new groups craeted if \a toMakeGroups is true + * \return ListOfGroups - new groups created if \a toMakeGroups is true */ //======================================================================= @@ -4088,10 +4088,9 @@ SMESH::SMESH_Mesh_ptr SMESH_MeshEditor_i::Offset( SMESH::SMESH_IDSource_ptr theO if ( *theMeshName && mesh_var->NbFaces() == 0 ) { // new mesh empty, remove it - SMESH_Gen_i* smesh = SMESH_Gen_i::GetSMESHGen(); - SALOMEDS::Study_var study = smesh->GetCurrentStudy(); + SALOMEDS::Study_var study = SMESH_Gen_i::getStudyServant(); SALOMEDS::StudyBuilder_var builder = study->NewBuilder(); - SALOMEDS::SObject_wrap meshSO = smesh->ObjectToSObject( study, mesh_var ); + SALOMEDS::SObject_wrap meshSO = SMESH_Gen_i::ObjectToSObject( mesh_var ); builder->RemoveObjectWithChildren( meshSO ); THROW_SALOME_CORBA_EXCEPTION("Offset failed", SALOME::INTERNAL_ERROR); } diff --git a/src/SMESH_I/SMESH_Mesh_i.cxx b/src/SMESH_I/SMESH_Mesh_i.cxx index d8ddcf6b9..5110e337b 100644 --- a/src/SMESH_I/SMESH_Mesh_i.cxx +++ b/src/SMESH_I/SMESH_Mesh_i.cxx @@ -2085,7 +2085,7 @@ void SMESH_Mesh_i::CheckGeomModif() /*! * \brief Update objects depending on changed geom groups * - * NPAL16168: geometrical group edition from a submesh don't modifiy mesh computation + * NPAL16168: geometrical group edition from a submesh don't modify mesh computation * issue 0020210: Update of a smesh group after modification of the associated geom group */ //============================================================================= @@ -5514,7 +5514,7 @@ TopAbs_ShapeEnum shapeTypeByDim(const int theDim) class SMESH_DimHyp { public: - //! fileds + //! fields int _dim; //!< a dimension the algo can build (concurrent dimension) int _ownDim; //!< dimension of shape of _subMesh (>=_dim) TopTools_MapOfShape _shapeMap; diff --git a/src/SMESH_I/SMESH_Mesh_i.hxx b/src/SMESH_I/SMESH_Mesh_i.hxx index d92889eb5..8cddc28e2 100644 --- a/src/SMESH_I/SMESH_Mesh_i.hxx +++ b/src/SMESH_I/SMESH_Mesh_i.hxx @@ -444,7 +444,7 @@ public: /*! * \brief Update hypotheses assigned to geom groups if the latter change * - * NPAL16168: "geometrical group edition from a submesh don't modifiy mesh computation" + * NPAL16168: "geometrical group edition from a submesh don't modify mesh computation" */ void CheckGeomGroupModif(); diff --git a/src/SMESH_SWIG/SMESH_Nut.py b/src/SMESH_SWIG/SMESH_Nut.py index 77055838d..9ed361399 100755 --- a/src/SMESH_SWIG/SMESH_Nut.py +++ b/src/SMESH_SWIG/SMESH_Nut.py @@ -23,7 +23,7 @@ ##################################################################### #Created :17/02/2005 -#Auhtor :MASLOV Eugeny, KOVALTCHUK Alexey +#Author :MASLOV Eugeny, KOVALTCHUK Alexey ##################################################################### # import salome diff --git a/src/SMESH_SWIG/SMESH_Sphere.py b/src/SMESH_SWIG/SMESH_Sphere.py index be5e1e24e..08294eb5e 100644 --- a/src/SMESH_SWIG/SMESH_Sphere.py +++ b/src/SMESH_SWIG/SMESH_Sphere.py @@ -21,7 +21,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -# GEOM GEOM_SWIG : binding of C++ omplementaion with Python +# GEOM GEOM_SWIG : binding of C++ implementation with Python # File : GEOM_Sphere.py # Author : Damien COQUERET, Open CASCADE # Module : GEOM diff --git a/src/SMESH_SWIG/StdMeshersBuilder.py b/src/SMESH_SWIG/StdMeshersBuilder.py index a7d0a908d..8b741895a 100644 --- a/src/SMESH_SWIG/StdMeshersBuilder.py +++ b/src/SMESH_SWIG/StdMeshersBuilder.py @@ -566,8 +566,8 @@ class StdMeshersBuilder_CompositeSegment(StdMeshersBuilder_Segment): class StdMeshersBuilder_Segment_Python(Mesh_Algorithm): """ - Defines a segment 1D algorithm for discretization of edges with Python function - It is created by calling smeshBuilder.Mesh.Segment(smeshBuilder.PYTHON,geom=0) + Defines a segment 1D algorithm for discretization of edges with Python function. + It is created by calling smeshBuilder.Mesh.Segment(smeshBuilder.PYTHON,geom=0) """ @@ -619,7 +619,7 @@ class StdMeshersBuilder_Segment_Python(Mesh_Algorithm): class StdMeshersBuilder_Triangle_MEFISTO(Mesh_Algorithm): """ - Triangle MEFISTO 2D algorithm + Triangle MEFISTO 2D algorithm. It is created by calling smeshBuilder.Mesh.Triangle(smeshBuilder.MEFISTO,geom=0) """ @@ -685,7 +685,7 @@ class StdMeshersBuilder_Triangle_MEFISTO(Mesh_Algorithm): class StdMeshersBuilder_Quadrangle(Mesh_Algorithm): """ - Defines a quadrangle 2D algorithm + Defines a quadrangle 2D algorithm. It is created by calling smeshBuilder.Mesh.Quadrangle(geom=0) """ @@ -863,7 +863,7 @@ class StdMeshersBuilder_Quadrangle(Mesh_Algorithm): class StdMeshersBuilder_Hexahedron(Mesh_Algorithm): """ - Defines a hexahedron 3D algorithm + Defines a hexahedron 3D algorithm. It is created by calling smeshBuilder.Mesh.Hexahedron(geom=0) """ @@ -903,7 +903,7 @@ class StdMeshersBuilder_Hexahedron(Mesh_Algorithm): class StdMeshersBuilder_Projection1D(Mesh_Algorithm): """ - Defines a projection 1D algorithm + Defines a projection 1D algorithm. It is created by calling smeshBuilder.Mesh.Projection1D(geom=0) """ @@ -971,7 +971,7 @@ class StdMeshersBuilder_Projection1D(Mesh_Algorithm): class StdMeshersBuilder_Projection2D(Mesh_Algorithm): """ - Defines a projection 2D algorithm + Defines a projection 2D algorithm. It is created by calling smeshBuilder.Mesh.Projection2D(geom=0) """ @@ -1048,7 +1048,7 @@ class StdMeshersBuilder_Projection2D(Mesh_Algorithm): class StdMeshersBuilder_Projection1D2D(StdMeshersBuilder_Projection2D): """ - Defines a projection 1D-2D algorithm + Defines a projection 1D-2D algorithm. It is created by calling smeshBuilder.Mesh.Projection1D2D(geom=0) """ @@ -1082,7 +1082,7 @@ class StdMeshersBuilder_Projection1D2D(StdMeshersBuilder_Projection2D): class StdMeshersBuilder_Projection3D(Mesh_Algorithm): """ - Defines a projection 3D algorithm + Defines a projection 3D algorithm. It is created by calling smeshBuilder.Mesh.Projection3D(geom=0) """ @@ -1551,7 +1551,7 @@ class StdMeshersBuilder_RadialAlgorithm(Mesh_Algorithm): class StdMeshersBuilder_RadialQuadrangle1D2D(StdMeshersBuilder_RadialAlgorithm): """ - Defines a Radial Quadrangle 1D-2D algorithm + Defines a Radial Quadrangle 1D-2D algorithm. It is created by calling smeshBuilder.Mesh.Quadrangle(smeshBuilder.RADIAL_QUAD,geom=0) """ @@ -1587,7 +1587,7 @@ class StdMeshersBuilder_RadialQuadrangle1D2D(StdMeshersBuilder_RadialAlgorithm): class StdMeshersBuilder_QuadMA_1D2D(StdMeshersBuilder_RadialAlgorithm): """ - Defines a Quadrangle (Medial Axis Projection) 1D-2D algorithm + Defines a Quadrangle (Medial Axis Projection) 1D-2D algorithm . It is created by calling smeshBuilder.Mesh.Quadrangle(smeshBuilder.QUAD_MA_PROJ,geom=0) """ @@ -1620,7 +1620,7 @@ class StdMeshersBuilder_QuadMA_1D2D(StdMeshersBuilder_RadialAlgorithm): pass class StdMeshersBuilder_PolygonPerFace(Mesh_Algorithm): - """ Defines a Polygon Per Face 2D algorithm + """ Defines a Polygon Per Face 2D algorithm. It is created by calling smeshBuilder.Mesh.Polygon(geom=0) """ @@ -1658,7 +1658,7 @@ class StdMeshersBuilder_PolygonPerFace(Mesh_Algorithm): pass class StdMeshersBuilder_UseExistingElements_1D(Mesh_Algorithm): - """ Defines a Use Existing Elements 1D algorithm + """ Defines a Use Existing Elements 1D algorithm. It is created by calling smeshBuilder.Mesh.UseExisting1DElements(geom=0) """ @@ -1720,7 +1720,7 @@ class StdMeshersBuilder_UseExistingElements_1D(Mesh_Algorithm): pass # end of StdMeshersBuilder_UseExistingElements_1D class class StdMeshersBuilder_UseExistingElements_1D2D(Mesh_Algorithm): - """ Defines a Use Existing Elements 1D-2D algorithm + """ Defines a Use Existing Elements 1D-2D algorithm. It is created by calling smeshBuilder.Mesh.UseExisting2DElements(geom=0) """ @@ -1783,7 +1783,7 @@ class StdMeshersBuilder_UseExistingElements_1D2D(Mesh_Algorithm): pass # end of StdMeshersBuilder_UseExistingElements_1D2D class class StdMeshersBuilder_Cartesian_3D(Mesh_Algorithm): - """ Defines a Body Fitting 3D algorithm + """ Defines a Body Fitting 3D algorithm. It is created by calling smeshBuilder.Mesh.BodyFitted(geom=0) """ @@ -1945,7 +1945,7 @@ class StdMeshersBuilder_Cartesian_3D(Mesh_Algorithm): class StdMeshersBuilder_UseExisting_1D(Mesh_Algorithm): """ Defines a stub 1D algorithm, which enables "manual" creation of nodes and - segments usable by 2D algorithms + segments usable by 2D algorithms. It is created by calling smeshBuilder.Mesh.UseExistingSegments(geom=0) """ @@ -1980,7 +1980,7 @@ class StdMeshersBuilder_UseExisting_1D(Mesh_Algorithm): class StdMeshersBuilder_UseExisting_2D(Mesh_Algorithm): """ Defines a stub 2D algorithm, which enables "manual" creation of nodes and - faces usable by 3D algorithms + faces usable by 3D algorithms. It is created by calling smeshBuilder.Mesh.UseExistingFaces(geom=0) """ diff --git a/src/SMESH_SWIG/ex13_hole1partial.py b/src/SMESH_SWIG/ex13_hole1partial.py index 6982aa606..726043dfe 100644 --- a/src/SMESH_SWIG/ex13_hole1partial.py +++ b/src/SMESH_SWIG/ex13_hole1partial.py @@ -198,7 +198,7 @@ full.append(geompy.MakeCut(geompy.MakeCommon(full_solid_2, full_internal), box)) full.append(geompy.MakeCut(geompy.MakeCommon(full_solid_3, full_internal), box)) full.append(geompy.MakeCut(geompy.MakeCommon(full_solid_4, full_internal), box)) -# Cut the cylinder thikness +# Cut the cylinder thickness # ------------------------- full_plan = geompy.MakePlane(geompy.MakeVertex(0, 0, cyl_dz+cyl_thick), cyl_dir, 5000) diff --git a/src/SMESH_SWIG/smeshBuilder.py b/src/SMESH_SWIG/smeshBuilder.py index 841dacbdb..88c59b729 100644 --- a/src/SMESH_SWIG/smeshBuilder.py +++ b/src/SMESH_SWIG/smeshBuilder.py @@ -611,33 +611,33 @@ class smeshBuilder( SMESH._objref_SMESH_Gen, object ): return SMESH._objref_SMESH_Gen.IsEmbeddedMode(self) def UpdateStudy( self, geompyD = None ): - """ - Update the current study. Calling UpdateStudy() allows to - update meshes at switching GEOM->SMESH - """ + """ + Update the current study. Calling UpdateStudy() allows to + update meshes at switching GEOM->SMESH + """ #self.UpdateStudy() - if not geompyD: + if not geompyD: from salome.geom import geomBuilder geompyD = geomBuilder.geom pass - self.geompyD=geompyD - self.SetGeomEngine(geompyD) - SMESH._objref_SMESH_Gen.UpdateStudy(self) - sb = salome.myStudy.NewBuilder() - sc = salome.myStudy.FindComponent("SMESH") - if sc: + self.geompyD=geompyD + self.SetGeomEngine(geompyD) + SMESH._objref_SMESH_Gen.UpdateStudy(self) + sb = salome.myStudy.NewBuilder() + sc = salome.myStudy.FindComponent("SMESH") + if sc: sb.LoadWith(sc, self) - pass + pass def SetEnablePublish( self, theIsEnablePublish ): - """ - Sets enable publishing in the study. Calling SetEnablePublish( false ) allows to - switch OFF publishing in the Study of mesh objects. - """ - #self.SetEnablePublish(theIsEnablePublish) - SMESH._objref_SMESH_Gen.SetEnablePublish(self,theIsEnablePublish) - global notebook - notebook = salome_notebook.NoteBook( theIsEnablePublish ) + """ + Set enable publishing in the study. Calling SetEnablePublish( False ) allows to + switch **off** publishing in the Study of mesh objects. + """ + #self.SetEnablePublish(theIsEnablePublish) + SMESH._objref_SMESH_Gen.SetEnablePublish(self,theIsEnablePublish) + global notebook + notebook = salome_notebook.NoteBook( theIsEnablePublish ) def CreateMeshesFromUNV( self,theFileName ): @@ -1406,7 +1406,7 @@ def New( instance=None, instanceGeom=None): Create a new smeshBuilder instance. The smeshBuilder class provides the Python interface to create or load meshes. - Typical use is: + Typical use is:: import salome salome.salome_init() @@ -1414,8 +1414,9 @@ def New( instance=None, instanceGeom=None): smesh = smeshBuilder.New() Parameters: - isPublished If False, the notebool will not be used. - instance CORBA proxy of SMESH Engine. If None, the default Engine is used. + study: SALOME study, generally obtained by salome.myStudy. + instance: CORBA proxy of SMESH Engine. If None, the default Engine is used. + instanceGeom: CORBA proxy of GEOM Engine. If None, the default Engine is used. Returns: :class:`smeshBuilder` instance """ @@ -1875,6 +1876,7 @@ class Mesh(metaclass = MeshMeta): continue if ids == subShapeID: shapeText = '"%s"' % subSO.GetName() + break if not shapeText: shape = self.geompyD.GetSubShape( self.GetShape(), [subShapeID]) if shape: @@ -2157,14 +2159,16 @@ class Mesh(metaclass = MeshMeta): Parameters: fileName: is the file name auto_groups (boolean): parameter for creating/not creating - the groups Group_On_All_Nodes, Group_On_All_Faces, ... ; - the typical use is auto_groups=False. + the groups Group_On_All_Nodes, Group_On_All_Faces, ... ; + the typical use is auto_groups=False. overwrite (boolean): parameter for overwriting/not overwriting the file - meshPart: a part of mesh (group, sub-mesh) to export instead of the mesh - autoDimension if @c True (default), a space dimension of a MED mesh can be either - - 1D if all mesh nodes lie on OX coordinate axis, or - - 2D if all mesh nodes lie on XOY coordinate plane, or - - 3D in the rest cases. + meshPart: a part of mesh (:class:`sub-mesh, group or filter `) to export instead of the mesh + autoDimension: if *True* (default), a space dimension of a MED mesh can be either + + - 1D if all mesh nodes lie on OX coordinate axis, or + - 2D if all mesh nodes lie on XOY coordinate plane, or + - 3D in the rest cases. + If *autoDimension* is *False*, the space dimension is always 3. fields: list of GEOM fields defined on the shape to mesh. geomAssocFields: each character of this string means a need to export a @@ -2366,7 +2370,7 @@ class Mesh(metaclass = MeshMeta): - 3D in the rest cases. If **autoDimension** is *False*, the space dimension is always 3. - """ + """ print("WARNING: ExportToMEDX() is deprecated, use ExportMED() instead") # process positional arguments @@ -6311,7 +6315,7 @@ class Mesh(metaclass = MeshMeta): a :class:`Mesh`, elements of highest dimension are duplicated theGroupName: a name of group to contain the generated elements. If a group with such a name already exists, the new elements - are added to the existng group, else a new group is created. + are added to the existing group, else a new group is created. If *theGroupName* is empty, new elements are not added in any group. @@ -7053,7 +7057,6 @@ class algoCreator: algoType = sorted( self.algoTypeToClass.keys() )[0] if algoType in self.algoTypeToClass: #print("Create algo",algoType) - return self.algoTypeToClass[ algoType ]( self.mesh, shape ) raise RuntimeError( "No class found for algo type %s" % algoType) return None diff --git a/src/SMESH_SWIG/smesh_algorithm.py b/src/SMESH_SWIG/smesh_algorithm.py index b8c12430e..45841d000 100644 --- a/src/SMESH_SWIG/smesh_algorithm.py +++ b/src/SMESH_SWIG/smesh_algorithm.py @@ -31,43 +31,38 @@ class Mesh_Algorithm: Note: This class should not be used directly, it is supposed to be sub-classed - for implementing Python API for specific meshing algorithms + for implementing Python API for specific meshing algorithms - For each meshing algorithm, a python class inheriting from class %Mesh_Algorithm + For each meshing algorithm, a python class inheriting from class *Mesh_Algorithm* should be defined. This descendant class should have two attributes defining the way - it is created by class Mesh (see e.g. class :class:`~StdMeshersBuilder.StdMeshersBuilder_Segment` - in StdMeshersBuilder package): + it is created by class :class:`~smeshBuilder.Mesh` (see e.g. class :class:`~StdMeshersBuilder.StdMeshersBuilder_Segment`): - - :code:`meshMethod` attribute defines name of method of class smesh.Mesh by calling which the - python class of algorithm is created; this method is dynamically added to the smesh.Mesh class - in runtime. For example, if in :code:`class MyPlugin_Algorithm` this attribute is defined as - :: + - :code:`meshMethod` attribute defines name of method of class :class:`~smeshBuilder.Mesh` by calling which the + python class of algorithm is created; this method is dynamically added to the :class:`~smeshBuilder.Mesh` class + in runtime. For example, if in :code:`class MyPlugin_Algorithm` this attribute is defined as:: - meshMethod = "MyAlgorithm" + meshMethod = "MyAlgorithm" - then an instance of :code:`MyPlugin_Algorithm` can be created by the direct invocation of the function - of smesh.Mesh class: - :: + then an instance of :code:`MyPlugin_Algorithm` can be created by the direct invocation of the function + of :class:`~smeshBuilder.Mesh` class:: - my_algo = mesh.MyAlgorithm() + my_algo = mesh.MyAlgorithm() - - :code:`algoType` defines type of algorithm and is used mostly to discriminate - algorithms that are created by the same method of class smesh.Mesh. For example, if this attribute - is specified in :code:`MyPlugin_Algorithm` class as - :: + - :code:`algoType` defines type of algorithm and is used mostly to discriminate + algorithms that are created by the same method of class :class:`~smeshBuilder.Mesh`. For example, if this attribute + is specified in :code:`MyPlugin_Algorithm` class as:: - algoType = "MyPLUGIN" + algoType = "MyPLUGIN" - then it's creation code can be: - :: + then it's creation code can be:: - my_algo = mesh.MyAlgorithm(algo="MyPLUGIN") + my_algo = mesh.MyAlgorithm(algo="MyPLUGIN") """ def __init__(self): """ - Private constuctor + Private constructor """ self.mesh = None self.geom = None @@ -78,9 +73,9 @@ class Mesh_Algorithm: def FindHypothesis (self, hypname, args, CompareMethod, smeshpyD): """ Finds a hypothesis in the study by its type name and parameters. - Finds only the hypotheses created in smeshpyD engine. + Finds only the hypotheses created in smeshBuilder engine. Returns: - SMESH.SMESH_Hypothesis + :class:`~SMESH.SMESH_Hypothesis` """ study = salome.myStudy if not study: return None @@ -125,7 +120,7 @@ class Mesh_Algorithm: def FindAlgorithm (self, algoname, smeshpyD): """ Finds the algorithm in the study by its type name. - Finds only the algorithms, which have been created in smeshpyD engine. + Finds only the algorithms, which have been created in smeshBuilder engine. Returns: SMESH.SMESH_Algo @@ -170,7 +165,7 @@ class Mesh_Algorithm: def GetSubMesh(self): """ If the algorithm is global, returns 0; - else returns the submesh associated to this algorithm. + else returns the :class:`~SMESH.SMESH_subMesh` associated to this algorithm. """ return self.subm diff --git a/src/StdMeshers/StdMeshers_CompositeHexa_3D.cxx b/src/StdMeshers/StdMeshers_CompositeHexa_3D.cxx index 7dff14e7e..ec02f71e1 100644 --- a/src/StdMeshers/StdMeshers_CompositeHexa_3D.cxx +++ b/src/StdMeshers/StdMeshers_CompositeHexa_3D.cxx @@ -802,7 +802,7 @@ bool StdMeshers_CompositeHexa_3D::Evaluate(SMESH_Mesh& theMesh, nbSeg1 += Max( nbElems[ SMDSEntity_Edge ], nbElems[ SMDSEntity_Quad_Edge ]); } - // Get an 1D size of a box side ortogonal to lessComplexSide + // Get an 1D size of a box side orthogonal to lessComplexSide int nbSeg2 = 0; _QuadFaceGrid* ortoSide = lessComplexSide->FindAdjacentForSide( Q_LEFT, boxFaceContainer, B_UNDEFINED ); @@ -815,7 +815,7 @@ bool StdMeshers_CompositeHexa_3D::Evaluate(SMESH_Mesh& theMesh, nbSeg2 += Max( nbElems[ SMDSEntity_Edge ], nbElems[ SMDSEntity_Quad_Edge ]); } - // Get an 2D size of a box side ortogonal to lessComplexSide + // Get an 2D size of a box side orthogonal to lessComplexSide int nbFaces = 0, nbQuadFace = 0; list< TopoDS_Face > sideFaces; if ( ortoSide->IsComplex() ) diff --git a/src/StdMeshers/StdMeshers_HexaFromSkin_3D.hxx b/src/StdMeshers/StdMeshers_HexaFromSkin_3D.hxx index e530ffeb1..c3a08c080 100644 --- a/src/StdMeshers/StdMeshers_HexaFromSkin_3D.hxx +++ b/src/StdMeshers/StdMeshers_HexaFromSkin_3D.hxx @@ -28,7 +28,7 @@ #include "SMESH_Algo.hxx" /*! - * \brief Alorithm generating hexahedral mesh from 2D skin of block + * \brief Algorithm generating hexahedral mesh from 2D skin of block */ class STDMESHERS_EXPORT StdMeshers_HexaFromSkin_3D : public SMESH_3D_Algo diff --git a/src/StdMeshers/StdMeshers_NumberOfSegments.cxx b/src/StdMeshers/StdMeshers_NumberOfSegments.cxx index b6785f2ed..5ba6e47d9 100644 --- a/src/StdMeshers/StdMeshers_NumberOfSegments.cxx +++ b/src/StdMeshers/StdMeshers_NumberOfSegments.cxx @@ -551,7 +551,7 @@ istream & StdMeshers_NumberOfSegments::LoadFrom(istream & load) isOK = static_cast(load >> scale_factor); a = (int)scale_factor; - // try to interprete ditribution type, + // try to interpret ditribution type, // supposing that this hypothesis was written in the new format if (isOK) { diff --git a/src/StdMeshers/StdMeshers_Prism_3D.cxx b/src/StdMeshers/StdMeshers_Prism_3D.cxx index a6e7b0f62..7fd35f0c8 100644 --- a/src/StdMeshers/StdMeshers_Prism_3D.cxx +++ b/src/StdMeshers/StdMeshers_Prism_3D.cxx @@ -2589,7 +2589,7 @@ double StdMeshers_Prism_3D::getSweepTolerance( const Prism_3D::TPrismTopo& thePr //======================================================================= //function : isSimpleQuad //purpose : check if the bottom FACE is meshable with nice quadrangles, -// if so the block aproach can work rather fast. +// if so the block approach can work rather fast. // This is a temporary mean caused by problems in StdMeshers_Sweeper //======================================================================= diff --git a/src/StdMeshers/StdMeshers_Prism_3D.hxx b/src/StdMeshers/StdMeshers_Prism_3D.hxx index b216d2029..e3410fe2b 100644 --- a/src/StdMeshers/StdMeshers_Prism_3D.hxx +++ b/src/StdMeshers/StdMeshers_Prism_3D.hxx @@ -278,7 +278,7 @@ private: PSurface mySurface; TopoDS_Edge myBaseEdge; std::map< int, PSurface > myShapeID2Surf; - // first and last normalized params and orientaion for each component or it-self + // first and last normalized params and orientation for each component or it-self std::vector< std::pair< double, double> > myParams; // select my columns in myParamToColumnMap bool myIsForward; std::vector< TSideFace* > myComponents; diff --git a/src/StdMeshers/StdMeshers_QuadToTriaAdaptor.cxx b/src/StdMeshers/StdMeshers_QuadToTriaAdaptor.cxx index fd3a5bb10..d19b8234d 100644 --- a/src/StdMeshers/StdMeshers_QuadToTriaAdaptor.cxx +++ b/src/StdMeshers/StdMeshers_QuadToTriaAdaptor.cxx @@ -667,7 +667,7 @@ bool StdMeshers_QuadToTriaAdaptor::LimitHeight (gp_Pnt& //================================================================================ /*! - * \brief Prepare data for the given face + * \brief Retrieve data of the given face * \param PN - coordinates of face nodes * \param VN - cross products of vectors (PC-PN(i)) ^ (PC-PN(i+1)) * \param FNodes - face nodes @@ -706,7 +706,8 @@ int StdMeshers_QuadToTriaAdaptor::Preparation(const SMDS_MeshElement* face int nbp = 4; int j = 0; - for(i=1; i<4; i++) { + for ( i = 1; i < 4; i++ ) + { j = i+1; for(; j<=4; j++) { if( PN(i).Distance(PN(j)) < 1.e-6 ) @@ -714,11 +715,10 @@ int StdMeshers_QuadToTriaAdaptor::Preparation(const SMDS_MeshElement* face } if(j<=4) break; } - //int deg_num = IsDegenarate(PN); - //if(deg_num>0) { + bool hasdeg = false; - if(i<4) { - //cout<<"find degeneration"<X(),N->Y(),N->Z()); if(Pdeg.Distance(Ptmp)<1.e-6) { DegNode = N; - //DegNode = const_cast(N); break; } } @@ -749,6 +748,7 @@ int StdMeshers_QuadToTriaAdaptor::Preparation(const SMDS_MeshElement* face PN.SetValue(nbp+1,PN(1)); FNodes[nbp] = FNodes[0]; + // find normal direction gp_Vec V1(PC,PN(nbp)); gp_Vec V2(PC,PN(1)); @@ -790,7 +790,6 @@ int StdMeshers_QuadToTriaAdaptor::Preparation(const SMDS_MeshElement* face } } - //cout<<" VNorm("< 0 && - step < stepLimit ) // smooth w/o chech of validity + step < stepLimit ) // smooth w/o check of validity { dumpFunctionEnd(); dumpFunction(SMESH_Comment("smoothWoCheck")<