Fix types in idl interfaces

This commit is contained in:
eap 2021-02-04 17:03:55 +03:00
parent 0db656e423
commit dd3be60637
8 changed files with 110 additions and 112 deletions

View File

@ -29,7 +29,6 @@
#include "SALOME_Exception.idl"
#include "SMESH_Hypothesis.idl"
#include "SMESH_Mesh.idl"
#include "SMESH_smIdType.idl"
/*!
* StdMeshers: interfaces to standard hypotheses and algorithms

View File

@ -463,7 +463,7 @@ module SMESH
*
* Can be used to check if the object was created in the same container, as this engine.
*/
smIdType GetObjectId(in Object theObject);
long GetObjectId(in Object theObject);
/*!
* \brief Get version of MED format being used.

View File

@ -151,7 +151,7 @@ module SMESH
/*!
* Add all elements or nodes from the specified source to the group
*/
long AddFrom( in SMESH_IDSource theSource );
smIdType AddFrom( in SMESH_IDSource theSource );
/*!
* Removes elements or nodes with specified identifiers from the group

View File

@ -28,7 +28,6 @@
#include "SALOME_Exception.idl"
#include "SALOME_GenericObj.idl"
#include "SMESH_smIdType.idl"
module SMESH
{
@ -58,7 +57,7 @@ module SMESH
/*!
* Get the internal Id
*/
smIdType GetId();
short GetId();
/*!
* Set the variable parameter

View File

@ -108,7 +108,7 @@ module SMESH
* Node location on a shape
*/
struct NodePosition {
smIdType shapeID;
long shapeID;
GEOM::shape_type shapeType;
double_array params; // [U] on EDGE, [U,V] on FACE, [] on the rest shapes
};
@ -117,7 +117,7 @@ module SMESH
* Element location on a shape
*/
struct ElementPosition {
smIdType shapeID;
long shapeID;
GEOM::shape_type shapeType;
};
@ -269,7 +269,7 @@ module SMESH
*/
struct ElementSubType { ElementType SMDS_ElementType;
boolean isPoly;
smIdType nbNodesInElement; };
short nbNodesInElement; };
typedef sequence<ElementSubType> types_array;
@ -382,7 +382,7 @@ module SMESH
/*!
* Remove all nodes and elements of submesh
*/
void ClearSubMesh(in smIdType ShapeID)
void ClearSubMesh(in long ShapeID)
raises (SALOME::SALOME_Exception);
/*!
@ -609,7 +609,7 @@ module SMESH
/*!
* Get the internal Id
*/
smIdType GetId();
long GetId();
/*!
* Obtain instance of SMESH_MeshEditor
@ -860,13 +860,13 @@ module SMESH
GeometryType GetElementShape( in smIdType id )
raises (SALOME::SALOME_Exception);
smIdType_array GetSubMeshElementsId(in smIdType ShapeID)
smIdType_array GetSubMeshElementsId(in long ShapeID)
raises (SALOME::SALOME_Exception);
smIdType_array GetSubMeshNodesId(in smIdType ShapeID, in boolean all )
smIdType_array GetSubMeshNodesId(in long ShapeID, in boolean all )
raises (SALOME::SALOME_Exception);
ElementType GetSubMeshElementType(in smIdType ShapeID)
ElementType GetSubMeshElementType(in long ShapeID)
raises (SALOME::SALOME_Exception);
@ -926,20 +926,20 @@ module SMESH
* If given element is node returns IDs of shape from position
* If there is not node for given ID - returns -1
*/
smIdType GetShapeID(in smIdType id);
long 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
*/
smIdType GetShapeIDForElem(in smIdType id);
long GetShapeIDForElem(in smIdType id);
/*!
* Returns number of nodes for given element
* If there is not element for given ID - returns -1
*/
smIdType GetElemNbNodes(in smIdType id);
short GetElemNbNodes(in smIdType id);
/*!
* Returns IDs of nodes of given element
@ -951,7 +951,7 @@ module SMESH
* If there is not element for given ID - returns -1
* If there is not node for given index - returns -2
*/
smIdType GetElemNode(in smIdType id, in smIdType index);
smIdType GetElemNode(in smIdType id, in short index);
/*!
* Returns true if given node is medium node
@ -1090,7 +1090,7 @@ module SMESH
/*!
* Get the internal Id
*/
smIdType GetId();
long GetId();
};
};

View File

@ -43,9 +43,9 @@ module SMESH
struct FreeBorderPart
{
short border; // border index within a sequence<FreeBorder>
smIdType node1; // node index within the border-th FreeBorder
smIdType node2;
smIdType nodeLast;
long node1; // node index within the border-th FreeBorder
long node2;
long nodeLast;
};
typedef sequence<FreeBorder> ListOfFreeBorders;
typedef sequence<FreeBorderPart> FreeBordersGroup;
@ -287,7 +287,7 @@ module SMESH
* \param ElementID - element ID
* \param ShapeID - shape ID available through GEOM_Object.GetSubShapeIndices()[0]
*/
void SetMeshElementOnShape(in smIdType ElementID, in smIdType ShapeID)
void SetMeshElementOnShape(in smIdType ElementID, in long ShapeID)
raises (SALOME::SALOME_Exception);
@ -446,25 +446,25 @@ module SMESH
boolean Smooth(in smIdType_array IDsOfElements,
in smIdType_array IDsOfFixedNodes,
in smIdType MaxNbOfIterations,
in short MaxNbOfIterations,
in double MaxAspectRatio,
in Smooth_Method Method) raises (SALOME::SALOME_Exception);
boolean SmoothObject(in SMESH_IDSource theObject,
in smIdType_array IDsOfFixedNodes,
in smIdType MaxNbOfIterations,
in short MaxNbOfIterations,
in double MaxAspectRatio,
in Smooth_Method Method) raises (SALOME::SALOME_Exception);
boolean SmoothParametric(in smIdType_array IDsOfElements,
in smIdType_array IDsOfFixedNodes,
in smIdType MaxNbOfIterations,
in short MaxNbOfIterations,
in double MaxAspectRatio,
in Smooth_Method Method) raises (SALOME::SALOME_Exception);
boolean SmoothParametricObject(in SMESH_IDSource theObject,
in smIdType_array IDsOfFixedNodes,
in smIdType MaxNbOfIterations,
in short MaxNbOfIterations,
in double MaxAspectRatio,
in Smooth_Method Method) 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 smIdType ide, in smIdType_array newIDs)
boolean ChangeElemNodes(in smIdType id, in smIdType_array newIDs)
raises (SALOME::SALOME_Exception);
/*!

View File

@ -88,7 +88,7 @@ module SMESH
*/
point_array ApplyToMeshFaces(in SMESH_Mesh theMesh,
in smIdType_array theFacesIDs,
in smIdType theNodeIndexOnKeyPoint1,
in short theNodeIndexOnKeyPoint1,
in boolean theReverse);
/*!
@ -100,8 +100,8 @@ module SMESH
*/
point_array ApplyToHexahedrons(in SMESH_Mesh theMesh,
in smIdType_array theVolumesIDs,
in smIdType theNode000Index,
in smIdType theNode001Index);
in short theNode000Index,
in short theNode001Index);
/*!
* Create nodes and elements in <theMesh> using nodes