From 2bcd50a8b609c6eb1b36bfdabdb3e7191504e820 Mon Sep 17 00:00:00 2001 From: ana Date: Fri, 13 Jan 2012 14:51:43 +0000 Subject: [PATCH] Fix for the bug IPAL22851: Sub-shapes spelling --- idl/SMESH_Gen.idl | 10 +++++----- idl/SMESH_Mesh.idl | 20 ++++++++++---------- src/SMDS/SMDS_Mesh.hxx | 4 ++-- src/SMDS/SMDS_UnstructuredGrid.cxx | 2 +- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/idl/SMESH_Gen.idl b/idl/SMESH_Gen.idl index a2a596418..8941de1c1 100644 --- a/idl/SMESH_Gen.idl +++ b/idl/SMESH_Gen.idl @@ -106,7 +106,7 @@ module SMESH short code; // ComputeErrorName or, if negative, algo specific code string comment; // textual problem description string algoName; - short subShapeID; // id of subshape of a shape to mesh + short subShapeID; // id of sub-shape of a shape to mesh boolean hasBadMesh; // there are elements preventing computation available for visualization }; typedef sequence compute_error_array; @@ -278,7 +278,7 @@ module SMESH /*! * Mesh a subShape. - * First, verify list of hypothesis associated with the subShape, + * First, verify list of hypothesis associated with the Sub-shape, * return NOK if hypothesis are not sufficient */ boolean Compute( in SMESH_Mesh theMesh, @@ -307,7 +307,7 @@ module SMESH /*! * Calculate Mesh as preview till indicated dimension - * First, verify list of hypothesis associated with the subShape. + * First, verify list of hypothesis associated with the Sub-shape. * Return mesh preview structure */ MeshPreviewStruct Precompute( in SMESH_Mesh theMesh, @@ -333,14 +333,14 @@ module SMESH raises ( SALOME::SALOME_Exception ); /*! - * Return mesh elements preventing computation of a subshape + * Return mesh elements preventing computation of a sub-shape */ MeshPreviewStruct GetBadInputElements( in SMESH_Mesh theMesh, in short theSubShapeID ) raises ( SALOME::SALOME_Exception ); /*! - * Return indeces of faces, edges and vertices of given subshapes + * Return indeces of faces, edges and vertices of given sub-shapes * within theMainObject */ long_array GetSubShapesId( in GEOM::GEOM_Object theMainObject, diff --git a/idl/SMESH_Mesh.idl b/idl/SMESH_Mesh.idl index ed4ba369b..59f373909 100644 --- a/idl/SMESH_Mesh.idl +++ b/idl/SMESH_Mesh.idl @@ -201,7 +201,7 @@ module SMESH HYP_NOTCONFORM, // not conform mesh is produced appling 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 subshape, nor a group + HYP_BAD_SUBSHAPE, // shape is neither the main one, nor its sub-shape, nor a group HYP_BAD_GEOMETRY, // geometry mismatches algorithm's expectation HYP_NEED_SHAPE // algorithm can work on shape only }; @@ -326,9 +326,9 @@ module SMESH raises (SALOME::SALOME_Exception); /*! - * Get the subMesh object associated to a subShape. The subMesh object + * 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 SubShape in a next idl version to + * SubMesh will be used instead of Sub-shape in a next idl version to * adress a specific subMesh... */ SMESH_subMesh GetSubMesh(in GEOM::GEOM_Object aSubObject, in string name) @@ -464,20 +464,20 @@ module SMESH raises (SALOME::SALOME_Exception); /*! - * Add hypothesis to the mesh, under a particular subShape + * Add hypothesis to the mesh, under a particular Sub-shape * (or the main shape itself) * The Add method is only used to prepare the build of the mesh and store * the algorithms and associated parameters. * Actual job of mesh the shape is done by MESH_Gen. * @params - * - aSubShape : subShape obtained by a shape explode in GEOM + * - aSubShape : sub-shape obtained by a shape explode in GEOM * (or main shape) * - anHyp : hypothesis object * @return - * - OK if the hypothesis is compatible with the subShape - * (and all previous hypothesis on the subShape) - * - NOK if the hypothesis is not compatible with the subShape - * (or one previous hypothesis on the subShape) + * - OK if the hypothesis is compatible with the sub-shape + * (and all previous hypothesis on the sub-shape) + * - NOK if the hypothesis is not compatible with the sub-shape + * (or one previous hypothesis on the sub-shape) * raises exception if hypothesis has not been created */ Hypothesis_Status AddHypothesis(in GEOM::GEOM_Object aSubObject, @@ -497,7 +497,7 @@ module SMESH // raises (SALOME::SALOME_Exception); /*! - * Get the list of hypothesis added on a subShape + * Get the list of hypothesis added on a sub-shape */ ListOfHypothesis GetHypothesisList(in GEOM::GEOM_Object aSubObject) raises (SALOME::SALOME_Exception); diff --git a/src/SMDS/SMDS_Mesh.hxx b/src/SMDS/SMDS_Mesh.hxx index 7dbdf325c..91f75d9b7 100644 --- a/src/SMDS/SMDS_Mesh.hxx +++ b/src/SMDS/SMDS_Mesh.hxx @@ -776,10 +776,10 @@ protected: ObjectPool* myFacePool; ObjectPool* myEdgePool; - //! SMDS_MeshNodes refer to vtk nodes (vtk id = index in myNodes),store reference to this mesh, and subshape + //! SMDS_MeshNodes refer to vtk nodes (vtk id = index in myNodes),store reference to this mesh, and sub-shape SetOfNodes myNodes; - //! SMDS_MeshCells refer to vtk cells (vtk id != index in myCells),store reference to this mesh, and subshape + //! SMDS_MeshCells refer to vtk cells (vtk id != index in myCells),store reference to this mesh, and sub-shape SetOfCells myCells; //! for cells only: index = ID for SMDS users, value = ID in vtkUnstructuredGrid diff --git a/src/SMDS/SMDS_UnstructuredGrid.cxx b/src/SMDS/SMDS_UnstructuredGrid.cxx index 8015105e7..2902856bc 100644 --- a/src/SMDS/SMDS_UnstructuredGrid.cxx +++ b/src/SMDS/SMDS_UnstructuredGrid.cxx @@ -1043,6 +1043,6 @@ SMDS_MeshVolume* SMDS_UnstructuredGrid::extrudeVolumeFromFace(int vtkVolId, SMDS_MeshVolume *vol = _mesh->AddVolumeFromVtkIds(orderedNodes); - // TODO update subshape list of elements and nodes + // TODO update sub-shape list of elements and nodes return vol; }