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

Fix for the bug IPAL22851: Sub-shapes spelling

Browse Source
This commit is contained in:
ana 2012-01-13 14:51:43 +00:00
parent 61b2416dce
commit 2bcd50a8b6
4 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
idl/SMESH_Gen.idl
View File

@ -106,7 +106,7 @@ module SMESH
short code; // ComputeErrorName or, if negative, algo specific code short code; // ComputeErrorName or, if negative, algo specific code
string comment; // textual problem description string comment; // textual problem description
string algoName; 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 boolean hasBadMesh; // there are elements preventing computation available for visualization
}; };
typedef sequence<ComputeError> compute_error_array; typedef sequence<ComputeError> compute_error_array;
@ -278,7 +278,7 @@ module SMESH
/*! /*!
* Mesh a subShape. * 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 * return NOK if hypothesis are not sufficient
*/ */
boolean Compute( in SMESH_Mesh theMesh, boolean Compute( in SMESH_Mesh theMesh,
@ -307,7 +307,7 @@ module SMESH
/*! /*!
* Calculate Mesh as preview till indicated dimension * 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 * Return mesh preview structure
*/ */
MeshPreviewStruct Precompute( in SMESH_Mesh theMesh, MeshPreviewStruct Precompute( in SMESH_Mesh theMesh,
@ -333,14 +333,14 @@ module SMESH
raises ( SALOME::SALOME_Exception ); 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, MeshPreviewStruct GetBadInputElements( in SMESH_Mesh theMesh,
in short theSubShapeID ) in short theSubShapeID )
raises ( SALOME::SALOME_Exception ); 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 * within theMainObject
*/ */
long_array GetSubShapesId( in GEOM::GEOM_Object theMainObject, long_array GetSubShapesId( in GEOM::GEOM_Object theMainObject,

20
idl/SMESH_Mesh.idl
View File

@ -201,7 +201,7 @@ module SMESH
HYP_NOTCONFORM, // not conform mesh is produced appling a hypothesis HYP_NOTCONFORM, // not conform mesh is produced appling a hypothesis
HYP_ALREADY_EXIST,// such hypothesis already exist HYP_ALREADY_EXIST,// such hypothesis already exist
HYP_BAD_DIM, // bad dimension 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_BAD_GEOMETRY, // geometry mismatches algorithm's expectation
HYP_NEED_SHAPE // algorithm can work on shape only HYP_NEED_SHAPE // algorithm can work on shape only
}; };
@ -326,9 +326,9 @@ module SMESH
raises (SALOME::SALOME_Exception); 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. * 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... * adress a specific subMesh...
*/ */
SMESH_subMesh GetSubMesh(in GEOM::GEOM_Object aSubObject, in string name) SMESH_subMesh GetSubMesh(in GEOM::GEOM_Object aSubObject, in string name)
@ -464,20 +464,20 @@ module SMESH
raises (SALOME::SALOME_Exception); 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) * (or the main shape itself)
* The Add method is only used to prepare the build of the mesh and store * The Add method is only used to prepare the build of the mesh and store
* the algorithms and associated parameters. * the algorithms and associated parameters.
* Actual job of mesh the shape is done by MESH_Gen. * Actual job of mesh the shape is done by MESH_Gen.
* @params * @params
* - aSubShape : subShape obtained by a shape explode in GEOM * - aSubShape : sub-shape obtained by a shape explode in GEOM
* (or main shape) * (or main shape)
* - anHyp : hypothesis object * - anHyp : hypothesis object
* @return * @return
* - OK if the hypothesis is compatible with the subShape * - OK if the hypothesis is compatible with the sub-shape
* (and all previous hypothesis on the subShape) * (and all previous hypothesis on the sub-shape)
* - NOK if the hypothesis is not compatible with the subShape * - NOK if the hypothesis is not compatible with the sub-shape
* (or one previous hypothesis on the subShape) * (or one previous hypothesis on the sub-shape)
* raises exception if hypothesis has not been created * raises exception if hypothesis has not been created
*/ */
Hypothesis_Status AddHypothesis(in GEOM::GEOM_Object aSubObject, Hypothesis_Status AddHypothesis(in GEOM::GEOM_Object aSubObject,
@ -497,7 +497,7 @@ module SMESH
// raises (SALOME::SALOME_Exception); // 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) ListOfHypothesis GetHypothesisList(in GEOM::GEOM_Object aSubObject)
raises (SALOME::SALOME_Exception); raises (SALOME::SALOME_Exception);

4
src/SMDS/SMDS_Mesh.hxx
View File

@ -776,10 +776,10 @@ protected:
ObjectPool<SMDS_VtkFace>* myFacePool; ObjectPool<SMDS_VtkFace>* myFacePool;
ObjectPool<SMDS_VtkEdge>* myEdgePool; ObjectPool<SMDS_VtkEdge>* 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; 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; SetOfCells myCells;
//! for cells only: index = ID for SMDS users, value = ID in vtkUnstructuredGrid //! for cells only: index = ID for SMDS users, value = ID in vtkUnstructuredGrid

2
src/SMDS/SMDS_UnstructuredGrid.cxx
View File

@ -1043,6 +1043,6 @@ SMDS_MeshVolume* SMDS_UnstructuredGrid::extrudeVolumeFromFace(int vtkVolId,
SMDS_MeshVolume *vol = _mesh->AddVolumeFromVtkIds(orderedNodes); 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; return vol;
} }