change var and array to smIdType

This commit is contained in:
Viktor UZLOV 2021-02-04 15:54:53 +03:00
parent 04d164afa2
commit 0db656e423
8 changed files with 211 additions and 210 deletions

View File

@ -120,8 +120,8 @@ module SMESH
*/
interface NumericalFunctor: Functor
{
double GetValue ( in long theElementId );
boolean IsApplicable( in long theElementId );
double GetValue ( in smIdType theElementId );
boolean IsApplicable( in smIdType theElementId );
Histogram GetHistogram ( in short nbIntervals, in boolean isLogarithmic );
Histogram GetLocalHistogram( in short nbIntervals, in boolean isLogarithmic,
@ -375,7 +375,7 @@ module SMESH
*/
interface RangeOfIds: Predicate
{
void SetRange( in long_array theIds );
void SetRange( in smIdType_array theIds );
boolean SetRangeStr( in string theRange );
string GetRangeStr();
@ -475,7 +475,7 @@ module SMESH
void SetElementType( in ElementType type );
void SetPoint ( in double x, in double y, in double z );
void SetVertex ( in GEOM::GEOM_Object vertex );
void SetNode ( in long nodeID );
void SetNode ( in smIdType nodeID );
string GetThreshold ( out ThresholdType type );
void SetThreshold ( in string threshold, in ThresholdType type )
raises (SALOME::SALOME_Exception);
@ -526,8 +526,8 @@ module SMESH
void SetPredicate( in Predicate thePredicate );
void SetMesh( in SMESH_Mesh theMesh );
long_array GetElementsId( in SMESH_Mesh theMesh );
long_array GetElementsIdFromParts( in ListOfIDSources theParts );
smIdType_array GetElementsId( in SMESH_Mesh theMesh );
smIdType_array GetElementsIdFromParts( in ListOfIDSources theParts );
ElementType GetElementType();
Predicate GetPredicate();

View File

@ -446,7 +446,7 @@ module SMESH
* study or is published by this method with the given name
*/
GEOM::GEOM_Object GetGeometryByMeshElement( in SMESH_Mesh theMesh,
in long theElementID,
in smIdType theElementID,
in string theGeomName)
raises ( SALOME::SALOME_Exception );
@ -455,7 +455,7 @@ module SMESH
* The returned geometrical object not published in study by this method.
*/
GEOM::GEOM_Object FindGeometryByMeshElement( in SMESH_Mesh theMesh,
in long theElementID)
in smIdType theElementID)
raises ( SALOME::SALOME_Exception );
/*!
@ -463,7 +463,7 @@ module SMESH
*
* Can be used to check if the object was created in the same container, as this engine.
*/
long GetObjectId(in Object theObject);
smIdType GetObjectId(in Object theObject);
/*!
* \brief Get version of MED format being used.

View File

@ -72,29 +72,29 @@ module SMESH
/*!
* returns true if the group contains an element with ID == <elem_id>
*/
boolean Contains( in long elem_id );
boolean Contains( in smIdType elem_id );
/*!
* Returns ID of an element at position <elem_index> counted from 1
*/
long GetID( in long elem_index );
smIdType GetID( in smIdType elem_index );
/*!
* Returns a sequence of all element IDs in the group
*/
long_array GetListOfID();
smIdType_array GetListOfID();
/*!
* Get the number of nodes of cells included to the group
* For a nodal group returns the same value as Size() function
*/
long GetNumberOfNodes();
smIdType GetNumberOfNodes();
/*!
* Get IDs of nodes of cells included to the group
* For a nodal group returns result of GetListOfID() function
*/
long_array GetNodeIDs();
smIdType_array GetNodeIDs();
/*!
* Return true if GetNumberOfNodes() won't take a long time for computation
@ -143,11 +143,11 @@ module SMESH
/*!
* Adds elements or nodes with specified identifiers to the group
*/
long Add( in long_array elem_ids );
smIdType Add( in smIdType_array elem_ids );
/*!
* Adds elements or nodes that match specified predicate to the group
*/
long AddByPredicate( in Predicate thePredicate );
smIdType AddByPredicate( in Predicate thePredicate );
/*!
* Add all elements or nodes from the specified source to the group
*/
@ -156,11 +156,11 @@ module SMESH
/*!
* Removes elements or nodes with specified identifiers from the group
*/
long Remove( in long_array elem_ids );
smIdType Remove( in smIdType_array elem_ids );
/*!
* Removes elements or nodes that match specified predicate from the group
*/
long RemoveByPredicate( in Predicate thePredicate );
smIdType RemoveByPredicate( in Predicate thePredicate );
};

View File

@ -58,7 +58,7 @@ module SMESH
/*!
* Get the internal Id
*/
long GetId();
smIdType GetId();
/*!
* Set the variable parameter

View File

@ -38,8 +38,8 @@ module SMESH
struct Measure {
double minX, minY, minZ;
double maxX, maxY, maxZ;
long node1, node2;
long elem1, elem2;
smIdType node1, node2;
smIdType elem1, elem2;
double value;
};

View File

@ -42,6 +42,7 @@ module SMESH
typedef sequence<double > double_array ;
typedef sequence<long > long_array ;
typedef sequence<smIdType > smIdType_array ;
typedef sequence<string > string_array ;
typedef sequence<long_array> array_of_long_array ;
@ -107,7 +108,7 @@ module SMESH
* Node location on a shape
*/
struct NodePosition {
long shapeID;
smIdType shapeID;
GEOM::shape_type shapeType;
double_array params; // [U] on EDGE, [U,V] on FACE, [] on the rest shapes
};
@ -116,7 +117,7 @@ module SMESH
* Element location on a shape
*/
struct ElementPosition {
long shapeID;
smIdType shapeID;
GEOM::shape_type shapeType;
};
@ -268,7 +269,7 @@ module SMESH
*/
struct ElementSubType { ElementType SMDS_ElementType;
boolean isPoly;
long nbNodesInElement; };
smIdType nbNodesInElement; };
typedef sequence<ElementSubType> types_array;
@ -286,19 +287,19 @@ module SMESH
/*!
* Returns a sequence of all element IDs
*/
long_array GetIDs();
smIdType_array GetIDs();
/*!
* Returns number of mesh elements of each \a EntityType
* @return array of number of elements per \a EntityType
*/
long_array GetMeshInfo();
smIdType_array GetMeshInfo();
/*!
* Returns number of mesh elements of each \a ElementType
* @return array of number of elements per \a ElementType
*/
long_array GetNbElementsByType();
smIdType_array GetNbElementsByType();
/*!
* Returns types of elements it contains.
@ -381,7 +382,7 @@ module SMESH
/*!
* Remove all nodes and elements of submesh
*/
void ClearSubMesh(in long ShapeID)
void ClearSubMesh(in smIdType ShapeID)
raises (SALOME::SALOME_Exception);
/*!
@ -608,7 +609,7 @@ module SMESH
/*!
* Get the internal Id
*/
long GetId();
smIdType GetId();
/*!
* Obtain instance of SMESH_MeshEditor
@ -748,124 +749,124 @@ module SMESH
/*!
* Get information about mesh contents
*/
long NbNodes()
smIdType NbNodes()
raises (SALOME::SALOME_Exception);
long NbElements()
smIdType NbElements()
raises (SALOME::SALOME_Exception);
long Nb0DElements()
smIdType Nb0DElements()
raises (SALOME::SALOME_Exception);
long NbBalls()
smIdType NbBalls()
raises (SALOME::SALOME_Exception);
long NbEdges()
smIdType NbEdges()
raises (SALOME::SALOME_Exception);
long NbEdgesOfOrder(in ElementOrder order)
smIdType NbEdgesOfOrder(in ElementOrder order)
raises (SALOME::SALOME_Exception);
long NbFaces()
smIdType NbFaces()
raises (SALOME::SALOME_Exception);
long NbFacesOfOrder(in ElementOrder order)
smIdType NbFacesOfOrder(in ElementOrder order)
raises (SALOME::SALOME_Exception);
long NbTriangles()
smIdType NbTriangles()
raises (SALOME::SALOME_Exception);
long NbTrianglesOfOrder(in ElementOrder order)
smIdType NbTrianglesOfOrder(in ElementOrder order)
raises (SALOME::SALOME_Exception);
long NbBiQuadTriangles()
smIdType NbBiQuadTriangles()
raises (SALOME::SALOME_Exception);
long NbQuadrangles()
smIdType NbQuadrangles()
raises (SALOME::SALOME_Exception);
long NbQuadranglesOfOrder(in ElementOrder order)
smIdType NbQuadranglesOfOrder(in ElementOrder order)
raises (SALOME::SALOME_Exception);
long NbBiQuadQuadrangles()
smIdType NbBiQuadQuadrangles()
raises (SALOME::SALOME_Exception);
long NbPolygons()
smIdType NbPolygons()
raises (SALOME::SALOME_Exception);
long NbPolygonsOfOrder(in ElementOrder order)
smIdType NbPolygonsOfOrder(in ElementOrder order)
raises (SALOME::SALOME_Exception);
long NbVolumes()
smIdType NbVolumes()
raises (SALOME::SALOME_Exception);
long NbVolumesOfOrder(in ElementOrder order)
smIdType NbVolumesOfOrder(in ElementOrder order)
raises (SALOME::SALOME_Exception);
long NbTetras()
smIdType NbTetras()
raises (SALOME::SALOME_Exception);
long NbTetrasOfOrder(in ElementOrder order)
smIdType NbTetrasOfOrder(in ElementOrder order)
raises (SALOME::SALOME_Exception);
long NbHexas()
smIdType NbHexas()
raises (SALOME::SALOME_Exception);
long NbHexasOfOrder(in ElementOrder order)
smIdType NbHexasOfOrder(in ElementOrder order)
raises (SALOME::SALOME_Exception);
long NbTriQuadraticHexas()
smIdType NbTriQuadraticHexas()
raises (SALOME::SALOME_Exception);
long NbPyramids()
smIdType NbPyramids()
raises (SALOME::SALOME_Exception);
long NbPyramidsOfOrder(in ElementOrder order)
smIdType NbPyramidsOfOrder(in ElementOrder order)
raises (SALOME::SALOME_Exception);
long NbPrisms()
smIdType NbPrisms()
raises (SALOME::SALOME_Exception);
long NbPrismsOfOrder(in ElementOrder order)
smIdType NbPrismsOfOrder(in ElementOrder order)
raises (SALOME::SALOME_Exception);
long NbHexagonalPrisms()
smIdType NbHexagonalPrisms()
raises (SALOME::SALOME_Exception);
long NbPolyhedrons()
smIdType NbPolyhedrons()
raises (SALOME::SALOME_Exception);
long NbSubMesh()
smIdType NbSubMesh()
raises (SALOME::SALOME_Exception);
long_array GetElementsId()
smIdType_array GetElementsId()
raises (SALOME::SALOME_Exception);
long_array GetElementsByType( in ElementType theType )
smIdType_array GetElementsByType( in ElementType theType )
raises (SALOME::SALOME_Exception);
long_array GetNodesId()
smIdType_array GetNodesId()
raises (SALOME::SALOME_Exception);
/*!
* Returns type of mesh element
*/
ElementType GetElementType( in long id, in boolean iselem )
ElementType GetElementType( in smIdType id, in boolean iselem )
raises (SALOME::SALOME_Exception);
EntityType GetElementGeomType( in long id )
EntityType GetElementGeomType( in smIdType id )
raises (SALOME::SALOME_Exception);
GeometryType GetElementShape( in long id )
GeometryType GetElementShape( in smIdType id )
raises (SALOME::SALOME_Exception);
long_array GetSubMeshElementsId(in long ShapeID)
smIdType_array GetSubMeshElementsId(in smIdType ShapeID)
raises (SALOME::SALOME_Exception);
long_array GetSubMeshNodesId(in long ShapeID, in boolean all )
smIdType_array GetSubMeshNodesId(in smIdType ShapeID, in boolean all )
raises (SALOME::SALOME_Exception);
ElementType GetSubMeshElementType(in long ShapeID)
ElementType GetSubMeshElementType(in smIdType ShapeID)
raises (SALOME::SALOME_Exception);
@ -903,81 +904,81 @@ module SMESH
* Get XYZ coordinates of node as list of double
* If there is not node for given ID - returns empty list
*/
double_array GetNodeXYZ(in long id);
double_array GetNodeXYZ(in smIdType id);
/*!
* For given node returns list of IDs of inverse elements
* If there is not node for given ID - returns empty list
*/
long_array GetNodeInverseElements(in long id, in ElementType elemType);
smIdType_array GetNodeInverseElements(in smIdType id, in ElementType elemType);
/*!
* \brief Return position of a node on shape
*/
NodePosition GetNodePosition(in long NodeID);
NodePosition GetNodePosition(in smIdType NodeID);
/*!
* \brief Return position of an element on shape
*/
ElementPosition GetElementPosition(in long ElemID);
ElementPosition GetElementPosition(in smIdType ElemID);
/*!
* If given element is node returns IDs of shape from position
* If there is not node for given ID - returns -1
*/
long GetShapeID(in long id);
smIdType GetShapeID(in smIdType id);
/*!
* For given element returns ID of result shape after
* ::FindShape() from SMESH_MeshEditor
* If there is not element for given ID - returns -1
*/
long GetShapeIDForElem(in long id);
smIdType GetShapeIDForElem(in smIdType id);
/*!
* Returns number of nodes for given element
* If there is not element for given ID - returns -1
*/
long GetElemNbNodes(in long id);
smIdType GetElemNbNodes(in smIdType id);
/*!
* Returns IDs of nodes of given element
*/
long_array GetElemNodes(in long id);
smIdType_array GetElemNodes(in smIdType id);
/*!
* Returns ID of node by given index for given element
* If there is not element for given ID - returns -1
* If there is not node for given index - returns -2
*/
long GetElemNode(in long id, in long index);
smIdType GetElemNode(in smIdType id, in smIdType index);
/*!
* Returns true if given node is medium node
* in given quadratic element
*/
boolean IsMediumNode(in long ide, in long idn);
boolean IsMediumNode(in smIdType ide, in smIdType idn);
/*!
* Returns true if given node is medium node
* in one of quadratic elements
*/
boolean IsMediumNodeOfAnyElem(in long idn, in ElementType elem_type);
boolean IsMediumNodeOfAnyElem(in smIdType idn, in ElementType elem_type);
/*!
* Returns number of edges for given element
*/
long ElemNbEdges(in long id);
long ElemNbEdges(in smIdType id);
/*!
* Returns number of faces for given element
*/
long ElemNbFaces(in long id);
long ElemNbFaces(in smIdType id);
/*!
* Returns nodes of given face (counted from zero) for given volumic element.
*/
long_array GetElemFaceNodes(in long elemId, in short faceIndex);
smIdType_array GetElemFaceNodes(in smIdType elemId, in short faceIndex);
/*!
* Returns three components of normal of given mesh face (or an empty array in KO case)
@ -987,34 +988,34 @@ module SMESH
/*!
* Returns an element based on all given nodes.
*/
long FindElementByNodes(in long_array nodes);
smIdType FindElementByNodes(in smIdType_array nodes);
/*!
* Return elements including all given nodes.
*/
long_array GetElementsByNodes(in long_array nodes, in ElementType elem_type);
smIdType_array GetElementsByNodes(in smIdType_array nodes, in ElementType elem_type);
/*!
* Returns true if given element is polygon
*/
boolean IsPoly(in long id);
boolean IsPoly(in smIdType id);
/*!
* Returns true if given element is quadratic
*/
boolean IsQuadratic(in long id);
boolean IsQuadratic(in smIdType id);
/*!
* Returns diameter of a ball discrete element or zero in case of an invalid \a id
*/
double GetBallDiameter(in long id);
double GetBallDiameter(in smIdType id);
/*!
* Returns XYZ coordinates of bary center for given element
* as list of double
* If there is not element for given ID - returns empty list
*/
double_array BaryCenter(in long id);
double_array BaryCenter(in smIdType id);
/*! Gets information about imported MED file */
MedFileInfo GetMEDFileInfo();
@ -1041,37 +1042,37 @@ module SMESH
/*!
*
*/
long GetNumberOfElements()
smIdType GetNumberOfElements()
raises (SALOME::SALOME_Exception);
/*!
*
*/
long GetNumberOfNodes( in boolean all )
smIdType GetNumberOfNodes( in boolean all )
raises (SALOME::SALOME_Exception);
/*!
*
*/
long_array GetElementsId()
smIdType_array GetElementsId()
raises (SALOME::SALOME_Exception);
/*!
*
*/
long_array GetElementsByType( in ElementType theType )
smIdType_array GetElementsByType( in ElementType theType )
raises (SALOME::SALOME_Exception);
/*!
* Returns type of mesh element (same as SMESH_Mesh::GetElementType() )
*/
ElementType GetElementType( in long id, in boolean iselem )
ElementType GetElementType( in smIdType id, in boolean iselem )
raises (SALOME::SALOME_Exception);
/*!
*
*/
long_array GetNodesId()
smIdType_array GetNodesId()
raises (SALOME::SALOME_Exception);
/*!
@ -1089,7 +1090,7 @@ module SMESH
/*!
* Get the internal Id
*/
long GetId();
smIdType GetId();
};
};

View File

@ -37,15 +37,15 @@ module SMESH
struct FreeBorder
{
SMESH::long_array nodeIDs; // all nodes defining a free border
SMESH::smIdType_array nodeIDs; // all nodes defining a free border
// 1st and last node is same in a closed border
};
struct FreeBorderPart
{
short border; // border index within a sequence<FreeBorder>
long node1; // node index within the border-th FreeBorder
long node2;
long nodeLast;
smIdType node1; // node index within the border-th FreeBorder
smIdType node2;
smIdType nodeLast;
};
typedef sequence<FreeBorder> ListOfFreeBorders;
typedef sequence<FreeBorderPart> FreeBordersGroup;
@ -67,13 +67,13 @@ module SMESH
// else ==> point is at xyz*
// point 1
long node1ID1;
long node1ID2;
smIdType node1ID1;
smIdType node1ID2;
PointStruct xyz1;
// point 2
long node2ID1;
long node2ID2;
smIdType node2ID1;
smIdType node2ID2;
PointStruct xyz2;
// vector on the plane; to use a default plane set vector = (0,0,0)
@ -84,9 +84,9 @@ module SMESH
// face edge defined by two nodes + optional medium node
struct FaceEdge
{
long node1;
long node2;
long medium;
smIdType node1;
smIdType node2;
smIdType medium;
};
typedef sequence<FaceEdge> ListOfEdges;
@ -113,14 +113,14 @@ module SMESH
* created, this method returns list of their IDs, if new nodes
* not created - returns empty list
*/
long_array GetLastCreatedNodes() raises (SALOME::SALOME_Exception);
smIdType_array GetLastCreatedNodes() raises (SALOME::SALOME_Exception);
/*!
* If during last operation of MeshEditor some elements were
* created, this method returns list of their IDs, if new elements
* not created - returns empty list
*/
long_array GetLastCreatedElems() raises (SALOME::SALOME_Exception);
smIdType_array GetLastCreatedElems() raises (SALOME::SALOME_Exception);
/*!
* \brief Clears sequences of last created elements and nodes
@ -137,27 +137,27 @@ module SMESH
* \param IDsOfElements list of mesh elements identifiers
* \return new ID source object
*/
SMESH_IDSource MakeIDSource(in long_array IDsOfElements, in ElementType type);
SMESH_IDSource MakeIDSource(in smIdType_array IDsOfElements, in ElementType type);
/*!
* \brief Remove mesh elements specified by their identifiers.
* \param IDsOfElements list of mesh elements identifiers
* \return \c true if elements are correctly removed or \c false otherwise
*/
boolean RemoveElements(in long_array IDsOfElements) raises (SALOME::SALOME_Exception);
boolean RemoveElements(in smIdType_array IDsOfElements) raises (SALOME::SALOME_Exception);
/*!
* \brief Remove mesh nodes specified by their identifiers.
* \param IDsOfNodes list of mesh nodes identifiers
* \return \c true if nodes are correctly removed or \c false otherwise
*/
boolean RemoveNodes(in long_array IDsOfNodes) raises (SALOME::SALOME_Exception);
boolean RemoveNodes(in smIdType_array IDsOfNodes) raises (SALOME::SALOME_Exception);
/*!
* \brief Remove all orphan nodes.
* \return number of removed nodes
*/
long RemoveOrphanNodes() raises (SALOME::SALOME_Exception);
smIdType RemoveOrphanNodes() raises (SALOME::SALOME_Exception);
/*!
* \brief Add a new node.
@ -166,21 +166,21 @@ module SMESH
* \param z Z coordinate of new node
* \return integer identifier of new node
*/
long AddNode(in double x, in double y, in double z) raises (SALOME::SALOME_Exception);
smIdType AddNode(in double x, in double y, in double z) raises (SALOME::SALOME_Exception);
/*!
* Create a 0D element on the given node.
* \param IdOfNode Node IDs for creation of element.
* \param DuplicateElements to add one more 0D element to a node or not
*/
long Add0DElement(in long IDOfNode,
smIdType Add0DElement(in smIdType IDOfNode,
in boolean DuplicateElements) raises (SALOME::SALOME_Exception);
/*!
* Create a ball element on the given node.
* \param IdOfNode Node IDs for creation of element.
*/
long AddBall(in long IDOfNode, in double diameter) raises (SALOME::SALOME_Exception);
smIdType AddBall(in smIdType IDOfNode, in double diameter) raises (SALOME::SALOME_Exception);
/*!
* Create an edge, either linear and quadratic (this is determed
@ -190,7 +190,7 @@ module SMESH
* of MED. This description is located by the following link:
* http://www.salome-platform.org/salome2/web_med_internet/logiciels/medV2.2.2_doc_html/html/modele_de_donnees.html#3.
*/
long AddEdge(in long_array IDsOfNodes) raises (SALOME::SALOME_Exception);
smIdType AddEdge(in smIdType_array IDsOfNodes) raises (SALOME::SALOME_Exception);
/*!
* Create face, either linear and quadratic (this is determed
@ -200,16 +200,16 @@ module SMESH
* of MED. This description is located by the following link:
* http://www.salome-platform.org/salome2/web_med_internet/logiciels/medV2.2.2_doc_html/html/modele_de_donnees.html#3.
*/
long AddFace(in long_array IDsOfNodes) raises (SALOME::SALOME_Exception);
smIdType AddFace(in smIdType_array IDsOfNodes) raises (SALOME::SALOME_Exception);
long AddPolygonalFace(in long_array IdsOfNodes) raises (SALOME::SALOME_Exception);
smIdType AddPolygonalFace(in smIdType_array IdsOfNodes) raises (SALOME::SALOME_Exception);
/*!
* Create a quadratic polygonal face
* \param IdsOfNodes - nodes of the polygon; corner nodes follow first
* \return long- ID of a new polygon
* \return smIdType- ID of a new polygon
*/
long AddQuadPolygonalFace(in long_array IdsOfNodes) raises (SALOME::SALOME_Exception);
smIdType AddQuadPolygonalFace(in smIdType_array IdsOfNodes) raises (SALOME::SALOME_Exception);
/*!
* Create volume, either linear and quadratic (this is determed
@ -219,7 +219,7 @@ module SMESH
* of MED. This description is located by the following link:
* http://www.salome-platform.org/salome2/web_med_internet/logiciels/medV2.2.2_doc_html/html/modele_de_donnees.html#3.
*/
long AddVolume(in long_array IDsOfNodes) raises (SALOME::SALOME_Exception);
smIdType AddVolume(in smIdType_array IDsOfNodes) raises (SALOME::SALOME_Exception);
/*!
* Create volume of many faces, giving nodes for each face.
@ -227,7 +227,7 @@ module SMESH
* \param Quantities List of integer values, Quantities[i]
* gives quantity of nodes in face number i.
*/
long AddPolyhedralVolume (in long_array IdsOfNodes,
smIdType AddPolyhedralVolume (in smIdType_array IdsOfNodes,
in long_array Quantities) raises (SALOME::SALOME_Exception);
/*!
* Create volume of many faces, giving IDs of existing faces.
@ -235,7 +235,7 @@ module SMESH
* \note The created volume will refer only to nodes
* of the given faces, not to the faces itself.
*/
long AddPolyhedralVolumeByFaces (in long_array IdsOfFaces) raises (SALOME::SALOME_Exception);
smIdType AddPolyhedralVolumeByFaces (in smIdType_array IdsOfFaces) raises (SALOME::SALOME_Exception);
/*!
* Create 0D elements on all nodes of the given object.
@ -256,7 +256,7 @@ module SMESH
* \param NodeID - node ID
* \param VertexID - vertex ID available through GEOM_Object.GetSubShapeIndices()[0]
*/
void SetNodeOnVertex(in long NodeID, in long VertexID)
void SetNodeOnVertex(in smIdType NodeID, in long VertexID)
raises (SALOME::SALOME_Exception);
/*!
* \brief Store node position on an edge
@ -264,7 +264,7 @@ module SMESH
* \param EdgeID - edge ID available through GEOM_Object.GetSubShapeIndices()[0]
* \param paramOnEdge - parameter on edge where the node is located
*/
void SetNodeOnEdge(in long NodeID, in long EdgeID, in double paramOnEdge)
void SetNodeOnEdge(in smIdType NodeID, in long EdgeID, in double paramOnEdge)
raises (SALOME::SALOME_Exception);
/*!
* \brief Store node position on a face
@ -273,34 +273,34 @@ module SMESH
* \param u - U parameter on face where the node is located
* \param v - V parameter on face where the node is located
*/
void SetNodeOnFace(in long NodeID, in long FaceID, in double u, in double v)
void SetNodeOnFace(in smIdType NodeID, in long FaceID, in double u, in double v)
raises (SALOME::SALOME_Exception);
/*!
* \brief Bind a node to a solid
* \param NodeID - node ID
* \param SolidID - vertex ID available through GEOM_Object.GetSubShapeIndices()[0]
*/
void SetNodeInVolume(in long NodeID, in long SolidID)
void SetNodeInVolume(in smIdType NodeID, in long SolidID)
raises (SALOME::SALOME_Exception);
/*!
* \brief Bind an element to a shape
* \param ElementID - element ID
* \param ShapeID - shape ID available through GEOM_Object.GetSubShapeIndices()[0]
*/
void SetMeshElementOnShape(in long ElementID, in long ShapeID)
void SetMeshElementOnShape(in smIdType ElementID, in smIdType ShapeID)
raises (SALOME::SALOME_Exception);
boolean MoveNode(in long NodeID, in double x, in double y, in double z)
boolean MoveNode(in smIdType NodeID, in double x, in double y, in double z)
raises (SALOME::SALOME_Exception);
boolean InverseDiag(in long NodeID1, in long NodeID2)
boolean InverseDiag(in smIdType NodeID1, in smIdType NodeID2)
raises (SALOME::SALOME_Exception);
boolean DeleteDiag(in long NodeID1, in long NodeID2)
boolean DeleteDiag(in smIdType NodeID1, in smIdType NodeID2)
raises (SALOME::SALOME_Exception);
boolean Reorient(in long_array IDsOfElements)
boolean Reorient(in smIdType_array IDsOfElements)
raises (SALOME::SALOME_Exception);
boolean ReorientObject(in SMESH_IDSource theObject)
@ -338,7 +338,7 @@ module SMESH
* is still performed; theMaxAngle is measured in radians.
* \return \c true in case of success, FALSE otherwise.
*/
boolean TriToQuad (in long_array IDsOfElements,
boolean TriToQuad (in smIdType_array IDsOfElements,
in NumericalFunctor Criterion,
in double MaxAngle) raises (SALOME::SALOME_Exception);
/*!
@ -356,7 +356,7 @@ module SMESH
* \param theCriterion Is used to choose a diagonal for splitting.
* \return TRUE in case of success, FALSE otherwise.
*/
boolean QuadToTri (in long_array IDsOfElements,
boolean QuadToTri (in smIdType_array IDsOfElements,
in NumericalFunctor Criterion) raises (SALOME::SALOME_Exception);
/*!
* \brief Split quadrangles into triangles.
@ -377,7 +377,7 @@ module SMESH
* \param the13Diag Is used to choose a diagonal for splitting.
* \return TRUE in case of success, FALSE otherwise.
*/
boolean SplitQuad (in long_array IDsOfElements,
boolean SplitQuad (in smIdType_array IDsOfElements,
in boolean Diag13) raises (SALOME::SALOME_Exception);
/*!
* \brief Split quadrangles into triangles.
@ -444,27 +444,27 @@ module SMESH
enum Smooth_Method { LAPLACIAN_SMOOTH, CENTROIDAL_SMOOTH };
boolean Smooth(in long_array IDsOfElements,
in long_array IDsOfFixedNodes,
in long MaxNbOfIterations,
boolean Smooth(in smIdType_array IDsOfElements,
in smIdType_array IDsOfFixedNodes,
in smIdType MaxNbOfIterations,
in double MaxAspectRatio,
in Smooth_Method Method) raises (SALOME::SALOME_Exception);
boolean SmoothObject(in SMESH_IDSource theObject,
in long_array IDsOfFixedNodes,
in long MaxNbOfIterations,
in smIdType_array IDsOfFixedNodes,
in smIdType MaxNbOfIterations,
in double MaxAspectRatio,
in Smooth_Method Method) raises (SALOME::SALOME_Exception);
boolean SmoothParametric(in long_array IDsOfElements,
in long_array IDsOfFixedNodes,
in long MaxNbOfIterations,
boolean SmoothParametric(in smIdType_array IDsOfElements,
in smIdType_array IDsOfFixedNodes,
in smIdType MaxNbOfIterations,
in double MaxAspectRatio,
in Smooth_Method Method) raises (SALOME::SALOME_Exception);
boolean SmoothParametricObject(in SMESH_IDSource theObject,
in long_array IDsOfFixedNodes,
in long MaxNbOfIterations,
in smIdType_array IDsOfFixedNodes,
in smIdType MaxNbOfIterations,
in double MaxAspectRatio,
in Smooth_Method Method) raises (SALOME::SALOME_Exception);
@ -562,7 +562,7 @@ module SMESH
* corresponding to groups the input elements included in.
* \return ListOfGroups - new groups created if \a ToMakeGroups is true
*/
ListOfGroups AdvancedExtrusion(in long_array IDsOfElements,
ListOfGroups AdvancedExtrusion(in smIdType_array IDsOfElements,
in DirStruct StepVector,
in long NbOfSteps,
in long ExtrFlags,
@ -585,7 +585,7 @@ module SMESH
in ListOfIDSources Faces,
in SMESH_IDSource Path,
in GEOM::GEOM_Object PathShape,
in long NodeStart,
in smIdType NodeStart,
in boolean HasAngles,
in double_array Angles,
in boolean AnglesVariation,
@ -611,16 +611,16 @@ module SMESH
enum MirrorType { POINT, AXIS, PLANE };
void Mirror (in long_array IDsOfElements,
void Mirror (in smIdType_array IDsOfElements,
in AxisStruct Mirror,
in MirrorType Type,
in boolean Copy)
raises (SALOME::SALOME_Exception);
ListOfGroups MirrorMakeGroups (in long_array IDsOfElements,
ListOfGroups MirrorMakeGroups (in smIdType_array IDsOfElements,
in AxisStruct Mirror,
in MirrorType Type)
raises (SALOME::SALOME_Exception);
SMESH_Mesh MirrorMakeMesh (in long_array IDsOfElements,
SMESH_Mesh MirrorMakeMesh (in smIdType_array IDsOfElements,
in AxisStruct Mirror,
in MirrorType Type,
in boolean CopyGroups,
@ -643,14 +643,14 @@ module SMESH
in string MeshName)
raises (SALOME::SALOME_Exception);
void Translate (in long_array IDsOfElements,
void Translate (in smIdType_array IDsOfElements,
in DirStruct Vector,
in boolean Copy)
raises (SALOME::SALOME_Exception);
ListOfGroups TranslateMakeGroups (in long_array IDsOfElements,
ListOfGroups TranslateMakeGroups (in smIdType_array IDsOfElements,
in DirStruct Vector)
raises (SALOME::SALOME_Exception);
SMESH_Mesh TranslateMakeMesh (in long_array IDsOfElements,
SMESH_Mesh TranslateMakeMesh (in smIdType_array IDsOfElements,
in DirStruct Vector,
in boolean CopyGroups,
in string MeshName)
@ -685,16 +685,16 @@ module SMESH
in string MeshName)
raises (SALOME::SALOME_Exception);
void Rotate (in long_array IDsOfElements,
void Rotate (in smIdType_array IDsOfElements,
in AxisStruct Axis,
in double AngleInRadians,
in boolean Copy)
raises (SALOME::SALOME_Exception);
ListOfGroups RotateMakeGroups (in long_array IDsOfElements,
ListOfGroups RotateMakeGroups (in smIdType_array IDsOfElements,
in AxisStruct Axis,
in double AngleInRadians)
raises (SALOME::SALOME_Exception);
SMESH_Mesh RotateMakeMesh (in long_array IDsOfElements,
SMESH_Mesh RotateMakeMesh (in smIdType_array IDsOfElements,
in AxisStruct Axis,
in double AngleInRadians,
in boolean CopyGroups,
@ -776,13 +776,13 @@ module SMESH
* If the given ID is a valid node ID (nodeID > 0), just move this node, else
* move the node closest to the point to point's location and return ID of the node
*/
long MoveClosestNodeToPoint(in double x, in double y, in double z, in long nodeID)
smIdType MoveClosestNodeToPoint(in double x, in double y, in double z, in smIdType nodeID)
raises (SALOME::SALOME_Exception);
/*!
* Return ID of node closest to a given point
*/
long FindNodeClosestTo(in double x, in double y, in double z)
smIdType FindNodeClosestTo(in double x, in double y, in double z)
raises (SALOME::SALOME_Exception);
/*!
@ -790,7 +790,7 @@ module SMESH
*
* 'ALL' type means elements of any type excluding nodes and 0D elements
*/
long_array FindElementsByPoint(in double x, in double y, in double z, in ElementType type)
smIdType_array FindElementsByPoint(in double x, in double y, in double z, in ElementType type)
raises (SALOME::SALOME_Exception);
/*!
@ -799,7 +799,7 @@ module SMESH
*
* 'ALL' type means elements of any type excluding nodes and 0D elements
*/
long_array FindAmongElementsByPoint(in SMESH_IDSource elements,
smIdType_array FindAmongElementsByPoint(in SMESH_IDSource elements,
in double x, in double y, in double z,
in ElementType type)
raises (SALOME::SALOME_Exception);
@ -810,7 +810,7 @@ module SMESH
* and coordinates of the projection point.
* In the case if nothing found, return -1 and []
*/
long ProjectPoint(in double x,
smIdType ProjectPoint(in double x,
in double y,
in double z,
in ElementType type,
@ -845,7 +845,7 @@ module SMESH
* If a group is closed, the first and last nodes of the group are same.
*/
array_of_long_array Get1DBranches( in SMESH_IDSource edges,
in long startNode,
in smIdType startNode,
out array_of_long_array nodeGroups)
raises (SALOME::SALOME_Exception);
@ -899,38 +899,38 @@ module SMESH
SEW_INTERNAL_ERROR
};
Sew_Error SewFreeBorders (in long FirstNodeID1,
in long SecondNodeID1,
in long LastNodeID1,
in long FirstNodeID2,
in long SecondNodeID2,
in long LastNodeID2,
Sew_Error SewFreeBorders (in smIdType FirstNodeID1,
in smIdType SecondNodeID1,
in smIdType LastNodeID1,
in smIdType FirstNodeID2,
in smIdType SecondNodeID2,
in smIdType LastNodeID2,
in boolean CreatePolygons,
in boolean CreatePolyedrs)
raises (SALOME::SALOME_Exception);
Sew_Error SewConformFreeBorders (in long FirstNodeID1,
in long SecondNodeID1,
in long LastNodeID1,
in long FirstNodeID2,
in long SecondNodeID2)
Sew_Error SewConformFreeBorders (in smIdType FirstNodeID1,
in smIdType SecondNodeID1,
in smIdType LastNodeID1,
in smIdType FirstNodeID2,
in smIdType SecondNodeID2)
raises (SALOME::SALOME_Exception);
Sew_Error SewBorderToSide (in long FirstNodeIDOnFreeBorder,
in long SecondNodeIDOnFreeBorder,
in long LastNodeIDOnFreeBorder,
in long FirstNodeIDOnSide,
in long LastNodeIDOnSide,
Sew_Error SewBorderToSide (in smIdType FirstNodeIDOnFreeBorder,
in smIdType SecondNodeIDOnFreeBorder,
in smIdType LastNodeIDOnFreeBorder,
in smIdType FirstNodeIDOnSide,
in smIdType LastNodeIDOnSide,
in boolean CreatePolygons,
in boolean CreatePolyedrs)
raises (SALOME::SALOME_Exception);
Sew_Error SewSideElements (in long_array IDsOfSide1Elements,
in long_array IDsOfSide2Elements,
in long NodeID1OfSide1ToMerge,
in long NodeID1OfSide2ToMerge,
in long NodeID2OfSide1ToMerge,
in long NodeID2OfSide2ToMerge)
Sew_Error SewSideElements (in smIdType_array IDsOfSide1Elements,
in smIdType_array IDsOfSide2Elements,
in smIdType NodeID1OfSide1ToMerge,
in smIdType NodeID1OfSide2ToMerge,
in smIdType NodeID2OfSide1ToMerge,
in smIdType NodeID2OfSide2ToMerge)
raises (SALOME::SALOME_Exception);
/*!
@ -938,7 +938,7 @@ module SMESH
* If number of nodes is not corresponded to type of
* element - returns false
*/
boolean ChangeElemNodes(in long ide, in long_array newIDs)
boolean ChangeElemNodes(in smIdType ide, in smIdType_array newIDs)
raises (SALOME::SALOME_Exception);
/*!
@ -966,7 +966,7 @@ module SMESH
* \return TRUE if operation has been completed successfully, FALSE otherwise
* \sa DoubleNode(), DoubleNodeGroup(), DoubleNodeGroups()
*/
boolean DoubleNodes( in long_array theNodes, in long_array theModifiedElems )
boolean DoubleNodes( in smIdType_array theNodes, in smIdType_array theModifiedElems )
raises (SALOME::SALOME_Exception);
/*!
@ -977,7 +977,7 @@ module SMESH
* \return TRUE if operation has been completed successfully, FALSE otherwise
* \sa DoubleNodes(), DoubleNodeGroup(), DoubleNodeGroups()
*/
boolean DoubleNode( in long theNodeId, in long_array theModifiedElems )
boolean DoubleNode( in smIdType theNodeId, in smIdType_array theModifiedElems )
raises (SALOME::SALOME_Exception);
/*!
@ -1038,9 +1038,9 @@ module SMESH
* \return TRUE if operation has been completed successfully, FALSE otherwise
* \sa DoubleNodeGroup(), DoubleNodeGroups()
*/
boolean DoubleNodeElem( in long_array theElems,
in long_array theNodesNot,
in long_array theAffectedElems )
boolean DoubleNodeElem( in smIdType_array theElems,
in smIdType_array theNodesNot,
in smIdType_array theAffectedElems )
raises (SALOME::SALOME_Exception);
/*!
@ -1054,8 +1054,8 @@ module SMESH
* \return TRUE if operation has been completed successfully, FALSE otherwise
* \sa DoubleNodeGroupInRegion(), DoubleNodeGroupsInRegion()
*/
boolean DoubleNodeElemInRegion( in long_array theElems,
in long_array theNodesNot,
boolean DoubleNodeElemInRegion( in smIdType_array theElems,
in smIdType_array theNodesNot,
in GEOM::GEOM_Object theShape )
raises (SALOME::SALOME_Exception);

View File

@ -87,8 +87,8 @@ module SMESH
* will be mapped into <theNodeIndexOnKeyPoint1>-th node of each face
*/
point_array ApplyToMeshFaces(in SMESH_Mesh theMesh,
in long_array theFacesIDs,
in long theNodeIndexOnKeyPoint1,
in smIdType_array theFacesIDs,
in smIdType theNodeIndexOnKeyPoint1,
in boolean theReverse);
/*!
@ -99,9 +99,9 @@ module SMESH
* node of each volume.
*/
point_array ApplyToHexahedrons(in SMESH_Mesh theMesh,
in long_array theVolumesIDs,
in long theNode000Index,
in long theNode001Index);
in smIdType_array theVolumesIDs,
in smIdType theNode000Index,
in smIdType theNode001Index);
/*!
* Create nodes and elements in <theMesh> using nodes