long to smIdType in idl-files

This commit is contained in:
Viktor UZLOV 2021-02-03 11:03:57 +03:00
parent 3176814024
commit 1d40781fa6
9 changed files with 242 additions and 234 deletions

View File

@ -29,6 +29,7 @@
#include "SALOME_Exception.idl" #include "SALOME_Exception.idl"
#include "SMESH_Hypothesis.idl" #include "SMESH_Hypothesis.idl"
#include "SMESH_Mesh.idl" #include "SMESH_Mesh.idl"
#include "SMESH_smIdType.idl"
/*! /*!
* StdMeshers: interfaces to standard hypotheses and algorithms * StdMeshers: interfaces to standard hypotheses and algorithms
@ -161,32 +162,32 @@ module StdMeshers
/*! /*!
* Builds and returns point distribution according to passed density function * Builds and returns point distribution according to passed density function
*/ */
SMESH::double_array BuildDistributionExpr( in string func, in long nbSeg, in long conv ) SMESH::double_array BuildDistributionExpr( in string func, in SMESH::smIdType nbSeg, in SMESH::smIdType conv )
raises (SALOME::SALOME_Exception); raises (SALOME::SALOME_Exception);
SMESH::double_array BuildDistributionTab( in SMESH::double_array func, in long nbSeg, in long conv ) SMESH::double_array BuildDistributionTab( in SMESH::double_array func, in SMESH::smIdType nbSeg, in SMESH::smIdType conv )
raises (SALOME::SALOME_Exception); raises (SALOME::SALOME_Exception);
/*! /*!
* Sets <number of segments> parameter value * Sets <number of segments> parameter value
*/ */
void SetNumberOfSegments(in long segmentsNumber) void SetNumberOfSegments(in SMESH::smIdType segmentsNumber)
raises (SALOME::SALOME_Exception); raises (SALOME::SALOME_Exception);
/*! /*!
* Returns <number of segments> parameter value * Returns <number of segments> parameter value
*/ */
long GetNumberOfSegments(); SMESH::smIdType GetNumberOfSegments();
/*! /*!
* Sets <distribution type> parameter value * Sets <distribution type> parameter value
*/ */
void SetDistrType(in long typ) void SetDistrType(in SMESH::smIdType typ)
raises (SALOME::SALOME_Exception); raises (SALOME::SALOME_Exception);
/*! /*!
* Returns <distribution type> parameter value * Returns <distribution type> parameter value
*/ */
long GetDistrType(); SMESH::smIdType GetDistrType();
/*! /*!
* Sets <scale factor> parameter value * Sets <scale factor> parameter value
@ -227,13 +228,13 @@ module StdMeshers
/*! /*!
* Sets <conversion mode> parameter value for functional distributions * Sets <conversion mode> parameter value for functional distributions
*/ */
void SetConversionMode(in long conv ) void SetConversionMode(in SMESH::smIdType conv )
raises (SALOME::SALOME_Exception); raises (SALOME::SALOME_Exception);
/*! /*!
* Returns <conversion mode> parameter value for functional distributions * Returns <conversion mode> parameter value for functional distributions
*/ */
long ConversionMode() SMESH::smIdType ConversionMode()
raises (SALOME::SALOME_Exception); raises (SALOME::SALOME_Exception);
}; };
@ -323,13 +324,13 @@ module StdMeshers
/*! /*!
* Sets <mode> parameter value * Sets <mode> parameter value
*/ */
void SetMode(in long mode) void SetMode(in SMESH::smIdType mode)
raises (SALOME::SALOME_Exception); raises (SALOME::SALOME_Exception);
/*! /*!
* Returns <mode> parameter value * Returns <mode> parameter value
*/ */
long GetMode(); SMESH::smIdType GetMode();
}; };
/*! /*!
@ -519,13 +520,13 @@ module StdMeshers
/*! /*!
* Sets <number of segments> parameter value * Sets <number of segments> parameter value
*/ */
void SetNumberOfLayers(in long numberOfLayers) void SetNumberOfLayers(in SMESH::smIdType numberOfLayers)
raises (SALOME::SALOME_Exception); raises (SALOME::SALOME_Exception);
/*! /*!
* Returns <number of layers> parameter value * Returns <number of layers> parameter value
*/ */
long GetNumberOfLayers(); SMESH::smIdType GetNumberOfLayers();
}; };
@ -665,7 +666,7 @@ module StdMeshers
* Result may be nil if association not set. * Result may be nil if association not set.
* Valid indices are 1 and 2 * Valid indices are 1 and 2
*/ */
GEOM::GEOM_Object GetSourceVertex(in long i) GEOM::GEOM_Object GetSourceVertex(in SMESH::smIdType i)
raises (SALOME::SALOME_Exception); raises (SALOME::SALOME_Exception);
/*! /*!
@ -673,7 +674,7 @@ module StdMeshers
* Result may be nil if association not set. * Result may be nil if association not set.
* Valid indices are 1 and 2 * Valid indices are 1 and 2
*/ */
GEOM::GEOM_Object GetTargetVertex(in long i) GEOM::GEOM_Object GetTargetVertex(in SMESH::smIdType i)
raises (SALOME::SALOME_Exception); raises (SALOME::SALOME_Exception);
}; };
@ -722,7 +723,7 @@ module StdMeshers
* Result may be nil if association not set. * Result may be nil if association not set.
* Valid indices are 1 and 2 * Valid indices are 1 and 2
*/ */
GEOM::GEOM_Object GetSourceVertex(in long i) GEOM::GEOM_Object GetSourceVertex(in SMESH::smIdType i)
raises (SALOME::SALOME_Exception); raises (SALOME::SALOME_Exception);
/*! /*!
@ -730,7 +731,7 @@ module StdMeshers
* Result may be nil if association not set. * Result may be nil if association not set.
* Valid indices are 1 and 2 * Valid indices are 1 and 2
*/ */
GEOM::GEOM_Object GetTargetVertex(in long i) GEOM::GEOM_Object GetTargetVertex(in SMESH::smIdType i)
raises (SALOME::SALOME_Exception); raises (SALOME::SALOME_Exception);
}; };
@ -771,12 +772,12 @@ module StdMeshers
/*! /*!
* Set base vertex for triangles * Set base vertex for triangles
*/ */
void SetTriaVertex( in long vertID ); void SetTriaVertex( in SMESH::smIdType vertID );
/*! /*!
* Returns base vertex for triangles * Returns base vertex for triangles
*/ */
long GetTriaVertex(); SMESH::smIdType GetTriaVertex();
/*! /*!
* Set entry of the main object * Set entry of the main object

View File

@ -30,6 +30,7 @@
#include "SALOME_GenericObj.idl" #include "SALOME_GenericObj.idl"
#include "GEOM_Gen.idl" #include "GEOM_Gen.idl"
#include "SMESH_Mesh.idl" #include "SMESH_Mesh.idl"
#include "SMESH_smIdType.idl"
module SMESH module SMESH
{ {
@ -97,7 +98,7 @@ module SMESH
*/ */
struct HistogramRectangle struct HistogramRectangle
{ {
long nbEvents; smIdType nbEvents;
double min; double min;
double max; double max;
}; };
@ -119,8 +120,8 @@ module SMESH
*/ */
interface NumericalFunctor: Functor interface NumericalFunctor: Functor
{ {
double GetValue ( in long theElementId ); double GetValue ( in smIdType theElementId );
boolean IsApplicable( in long theElementId ); boolean IsApplicable( in smIdType theElementId );
Histogram GetHistogram ( in short nbIntervals, in boolean isLogarithmic ); Histogram GetHistogram ( in short nbIntervals, in boolean isLogarithmic );
Histogram GetLocalHistogram( in short nbIntervals, in boolean isLogarithmic, Histogram GetLocalHistogram( in short nbIntervals, in boolean isLogarithmic,
@ -129,8 +130,8 @@ module SMESH
* Set precision for calculation. It is a position after point which is * Set precision for calculation. It is a position after point which is
* used to functor value after calculation. * used to functor value after calculation.
*/ */
void SetPrecision( in long thePrecision ); void SetPrecision( in smIdType thePrecision );
long GetPrecision(); smIdType GetPrecision();
}; };
interface MinimumAngle : NumericalFunctor{}; interface MinimumAngle : NumericalFunctor{};
interface AspectRatio : NumericalFunctor{}; interface AspectRatio : NumericalFunctor{};
@ -148,7 +149,7 @@ module SMESH
struct Value struct Value
{ {
double myLength; double myLength;
long myPnt1, myPnt2; smIdType myPnt1, myPnt2;
}; };
typedef sequence<Value> Values; typedef sequence<Value> Values;
Values GetValues(); Values GetValues();
@ -160,8 +161,8 @@ module SMESH
{ {
struct Value struct Value
{ {
long myNbConnects; smIdType myNbConnects;
long myPnt1, myPnt2; smIdType myPnt1, myPnt2;
}; };
typedef sequence<Value> Values; typedef sequence<Value> Values;
@ -177,8 +178,8 @@ module SMESH
*/ */
interface Predicate: Functor interface Predicate: Functor
{ {
boolean IsSatisfy( in long thEntityId ); boolean IsSatisfy( in smIdType thEntityId );
long NbSatisfying( in SMESH::SMESH_IDSource obj ); smIdType NbSatisfying( in SMESH::SMESH_IDSource obj );
}; };
/*! /*!
@ -349,8 +350,8 @@ module SMESH
{ {
struct Border struct Border
{ {
long myElemId; smIdType myElemId;
long myPnt1, myPnt2; smIdType myPnt1, myPnt2;
}; };
typedef sequence<Border> Borders; typedef sequence<Border> Borders;
Borders GetBorders(); Borders GetBorders();
@ -460,7 +461,7 @@ module SMESH
* if normal of a face has angle with the threshold face less than a tolerance. * if normal of a face has angle with the threshold face less than a tolerance.
*/ */
interface CoplanarFaces : Predicate { interface CoplanarFaces : Predicate {
void SetFace ( in long theFaceID ); void SetFace ( in smIdType theFaceID );
void SetTolerance( in double theToler ); void SetTolerance( in double theToler );
}; };
@ -474,7 +475,7 @@ module SMESH
void SetElementType( in ElementType type ); void SetElementType( in ElementType type );
void SetPoint ( in double x, in double y, in double z ); void SetPoint ( in double x, in double y, in double z );
void SetVertex ( in GEOM::GEOM_Object vertex ); void SetVertex ( in GEOM::GEOM_Object vertex );
void SetNode ( in long nodeID ); void SetNode ( in smIdType nodeID );
string GetThreshold ( out ThresholdType type ); string GetThreshold ( out ThresholdType type );
void SetThreshold ( in string threshold, in ThresholdType type ) void SetThreshold ( in string threshold, in ThresholdType type )
raises (SALOME::SALOME_Exception); raises (SALOME::SALOME_Exception);
@ -508,16 +509,16 @@ module SMESH
*/ */
struct Criterion struct Criterion
{ {
long Type; smIdType Type;
long Compare; smIdType Compare;
double Threshold; double Threshold;
string ThresholdStr; string ThresholdStr;
string ThresholdID; string ThresholdID;
long UnaryOp; smIdType UnaryOp;
long BinaryOp; smIdType BinaryOp;
double Tolerance; double Tolerance;
ElementType TypeOfElement; ElementType TypeOfElement;
long Precision; smIdType Precision;
}; };
typedef sequence<Criterion> Criteria; typedef sequence<Criterion> Criteria;
@ -563,7 +564,7 @@ module SMESH
* Query methods * Query methods
*/ */
boolean IsPresent( in string aFilterName ); boolean IsPresent( in string aFilterName );
long NbFilters( in ElementType aType ); smIdType NbFilters( in ElementType aType );
string_array GetNames( in ElementType aType ); string_array GetNames( in ElementType aType );
string_array GetAllNames(); string_array GetAllNames();
void SetFileName( in string aFilterName ); void SetFileName( in string aFilterName );

View File

@ -33,6 +33,7 @@
#include "SMESH_Mesh.idl" #include "SMESH_Mesh.idl"
#include "SMESH_Hypothesis.idl" #include "SMESH_Hypothesis.idl"
#include "SMESH_smIdType.idl"
module SMESH module SMESH
{ {
@ -48,32 +49,32 @@ module SMESH
* Tags definition * Tags definition
*/ */
// Top level // Top level
const long Tag_HypothesisRoot = 1; // hypotheses root const smIdType Tag_HypothesisRoot = 1; // hypotheses root
const long Tag_AlgorithmsRoot = 2; // algorithms root const smIdType Tag_AlgorithmsRoot = 2; // algorithms root
const long Tag_FirstMeshRoot = 3; // first mesh root const smIdType Tag_FirstMeshRoot = 3; // first mesh root
// Mesh/Submesh // Mesh/Submesh
const long Tag_RefOnShape = 1; // references to shape const smIdType Tag_RefOnShape = 1; // references to shape
const long Tag_RefOnAppliedHypothesis = 2; // applied hypotheses root const smIdType Tag_RefOnAppliedHypothesis = 2; // applied hypotheses root
const long Tag_RefOnAppliedAlgorithms = 3; // applied algorithms root const smIdType Tag_RefOnAppliedAlgorithms = 3; // applied algorithms root
// Mesh only: sub-meshes roots by type // Mesh only: sub-meshes roots by type
const long Tag_FirstSubMesh = 4; const smIdType Tag_FirstSubMesh = 4;
const long Tag_SubMeshOnVertex = 4; const smIdType Tag_SubMeshOnVertex = 4;
const long Tag_SubMeshOnEdge = 5; const smIdType Tag_SubMeshOnEdge = 5;
const long Tag_SubMeshOnWire = 6; const smIdType Tag_SubMeshOnWire = 6;
const long Tag_SubMeshOnFace = 7; const smIdType Tag_SubMeshOnFace = 7;
const long Tag_SubMeshOnShell = 8; const smIdType Tag_SubMeshOnShell = 8;
const long Tag_SubMeshOnSolid = 9; const smIdType Tag_SubMeshOnSolid = 9;
const long Tag_SubMeshOnCompound = 10; const smIdType Tag_SubMeshOnCompound = 10;
const long Tag_LastSubMesh = 10; const smIdType Tag_LastSubMesh = 10;
// Mesh only: group roots by type // Mesh only: group roots by type
const long Tag_FirstGroup = 11; const smIdType Tag_FirstGroup = 11;
const long Tag_NodeGroups = 11; const smIdType Tag_NodeGroups = 11;
const long Tag_EdgeGroups = 12; const smIdType Tag_EdgeGroups = 12;
const long Tag_FaceGroups = 13; const smIdType Tag_FaceGroups = 13;
const long Tag_VolumeGroups = 14; const smIdType Tag_VolumeGroups = 14;
const long Tag_0DElementsGroups = 15; const smIdType Tag_0DElementsGroups = 15;
const long Tag_BallElementsGroups = 16; const smIdType Tag_BallElementsGroups = 16;
const long Tag_LastGroup = 16; const smIdType Tag_LastGroup = 16;
/*! /*!
* Hypothesis definition error * Hypothesis definition error
@ -82,7 +83,7 @@ module SMESH
{ {
Hypothesis_Status state; Hypothesis_Status state;
string algoName; string algoName;
long algoDim; smIdType algoDim;
boolean isGlobalAlgo; boolean isGlobalAlgo;
}; };
typedef sequence<AlgoStateError> algo_error_array; typedef sequence<AlgoStateError> algo_error_array;
@ -211,11 +212,11 @@ module SMESH
* Sets number of segments per diagonal of boundary box of geometry by which * Sets number of segments per diagonal of boundary box of geometry by which
* default segment length of appropriate 1D hypotheses is defined * default segment length of appropriate 1D hypotheses is defined
*/ */
void SetBoundaryBoxSegmentation( in long theNbSegments ) raises ( SALOME::SALOME_Exception ); void SetBoundaryBoxSegmentation( in smIdType theNbSegments ) raises ( SALOME::SALOME_Exception );
/*! /*!
* \brief Sets default number of segments per edge * \brief Sets default number of segments per edge
*/ */
void SetDefaultNbSegments( in long theNbSegments) raises ( SALOME::SALOME_Exception ); void SetDefaultNbSegments( in smIdType theNbSegments) raises ( SALOME::SALOME_Exception );
/*! /*!
* Set the object name * Set the object name
@ -445,7 +446,7 @@ module SMESH
* study or is published by this method with the given name * study or is published by this method with the given name
*/ */
GEOM::GEOM_Object GetGeometryByMeshElement( in SMESH_Mesh theMesh, GEOM::GEOM_Object GetGeometryByMeshElement( in SMESH_Mesh theMesh,
in long theElementID, in smIdType theElementID,
in string theGeomName) in string theGeomName)
raises ( SALOME::SALOME_Exception ); raises ( SALOME::SALOME_Exception );
@ -454,7 +455,7 @@ module SMESH
* The returned geometrical object not published in study by this method. * The returned geometrical object not published in study by this method.
*/ */
GEOM::GEOM_Object FindGeometryByMeshElement( in SMESH_Mesh theMesh, GEOM::GEOM_Object FindGeometryByMeshElement( in SMESH_Mesh theMesh,
in long theElementID) in smIdType theElementID)
raises ( SALOME::SALOME_Exception ); raises ( SALOME::SALOME_Exception );
/*! /*!
@ -462,7 +463,7 @@ module SMESH
* *
* Can be used to check if the object was created in the same container, as this engine. * 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. * \brief Get version of MED format being used.
@ -499,7 +500,7 @@ module SMESH
*/ */
void Move( in sobject_list what, void Move( in sobject_list what,
in SALOMEDS::SObject where, in SALOMEDS::SObject where,
in long row ); in smIdType row );
/*! /*!
* Returns true if algorithm can be used to mesh a given geometry * Returns true if algorithm can be used to mesh a given geometry
* \param theAlgoType - the algorithm type * \param theAlgoType - the algorithm type

View File

@ -32,6 +32,7 @@
#include "SALOMEDS_Attributes.idl" #include "SALOMEDS_Attributes.idl"
#include "SMESH_Mesh.idl" #include "SMESH_Mesh.idl"
#include "SMESH_smIdType.idl"
module SMESH module SMESH
{ {
@ -61,7 +62,7 @@ module SMESH
/*! /*!
* Returns the number of elements in the group * Returns the number of elements in the group
*/ */
long Size(); smIdType Size();
/*! /*!
* Returns true if the group does not contain any elements * Returns true if the group does not contain any elements
@ -71,12 +72,12 @@ module SMESH
/*! /*!
* returns true if the group contains an element with ID == <elem_id> * 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 * 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 * Returns a sequence of all element IDs in the group
@ -87,7 +88,7 @@ module SMESH
* Get the number of nodes of cells included to the group * Get the number of nodes of cells included to the group
* For a nodal group returns the same value as Size() function * 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 * Get IDs of nodes of cells included to the group
@ -114,13 +115,13 @@ module SMESH
* Sets group color number * Sets group color number
* (corresponds to the "hue" parameter of the color - must be in range [0, 360]) * (corresponds to the "hue" parameter of the color - must be in range [0, 360])
*/ */
void SetColorNumber( in long color ); void SetColorNumber( in smIdType color );
/*! /*!
* Returns group color number (obsolete - use GetColor instead) * Returns group color number (obsolete - use GetColor instead)
* (corresponds to the "hue" parameter of the color - must be in range [0, 360]) * (corresponds to the "hue" parameter of the color - must be in range [0, 360])
*/ */
long GetColorNumber(); smIdType GetColorNumber();
/*! /*!
* Returns \c true if \c this group depends on the \a other via * Returns \c true if \c this group depends on the \a other via
@ -142,24 +143,24 @@ module SMESH
/*! /*!
* Adds elements or nodes with specified identifiers to the group * Adds elements or nodes with specified identifiers to the group
*/ */
long Add( in long_array elem_ids ); smIdType Add( in long_array elem_ids );
/*! /*!
* Adds elements or nodes that match specified predicate to the group * 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 * 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 * Removes elements or nodes with specified identifiers from the group
*/ */
long Remove( in long_array elem_ids ); smIdType Remove( in long_array elem_ids );
/*! /*!
* Removes elements or nodes that match specified predicate from the group * Removes elements or nodes that match specified predicate from the group
*/ */
long RemoveByPredicate( in Predicate thePredicate ); smIdType RemoveByPredicate( in Predicate thePredicate );
}; };

View File

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

View File

@ -28,6 +28,7 @@
#include "SALOME_GenericObj.idl" #include "SALOME_GenericObj.idl"
#include "SMESH_Mesh.idl" #include "SMESH_Mesh.idl"
#include "SMESH_smIdType.idl"
module SMESH module SMESH
{ {
@ -37,8 +38,8 @@ module SMESH
struct Measure { struct Measure {
double minX, minY, minZ; double minX, minY, minZ;
double maxX, maxY, maxZ; double maxX, maxY, maxZ;
long node1, node2; smIdType node1, node2;
long elem1, elem2; smIdType elem1, elem2;
double value; double value;
}; };

View File

@ -41,7 +41,7 @@ module SMESH
typedef sequence<SMESH_IDSource> ListOfIDSources; typedef sequence<SMESH_IDSource> ListOfIDSources;
typedef sequence<double > double_array ; typedef sequence<double > double_array ;
typedef sequence<long > long_array ; typedef sequence<smIdType > long_array ;
typedef sequence<string > string_array ; typedef sequence<string > string_array ;
typedef sequence<long_array> array_of_long_array ; typedef sequence<long_array> array_of_long_array ;
@ -82,8 +82,8 @@ module SMESH
struct log_block struct log_block
{ {
long commandType; smIdType commandType;
long number; smIdType number;
double_array coords; double_array coords;
long_array indexes; long_array indexes;
}; };
@ -107,7 +107,7 @@ module SMESH
* Node location on a shape * Node location on a shape
*/ */
struct NodePosition { struct NodePosition {
long shapeID; smIdType shapeID;
GEOM::shape_type shapeType; GEOM::shape_type shapeType;
double_array params; // [U] on EDGE, [U,V] on FACE, [] on the rest shapes double_array params; // [U] on EDGE, [U,V] on FACE, [] on the rest shapes
}; };
@ -116,7 +116,7 @@ module SMESH
* Element location on a shape * Element location on a shape
*/ */
struct ElementPosition { struct ElementPosition {
long shapeID; smIdType shapeID;
GEOM::shape_type shapeType; GEOM::shape_type shapeType;
}; };
@ -243,8 +243,8 @@ module SMESH
struct MedFileInfo struct MedFileInfo
{ {
string fileName; //!< name of file string fileName; //!< name of file
long fileSize; //!< size of file smIdType fileSize; //!< size of file
long major, minor, release; //!< MED file version smIdType major, minor, release; //!< MED file version
}; };
/*! /*!
@ -260,15 +260,15 @@ module SMESH
* BOUNDARY: create or not boundary for result of extrusion * BOUNDARY: create or not boundary for result of extrusion
* SEW: try to use existing nodes or create new nodes in any case * SEW: try to use existing nodes or create new nodes in any case
*/ */
const long EXTRUSION_FLAG_BOUNDARY = 1; const smIdType EXTRUSION_FLAG_BOUNDARY = 1;
const long EXTRUSION_FLAG_SEW = 2; const smIdType EXTRUSION_FLAG_SEW = 2;
/*! /*!
* Structure used in mesh edit preview data (MeshPreviewStruct) * Structure used in mesh edit preview data (MeshPreviewStruct)
*/ */
struct ElementSubType { ElementType SMDS_ElementType; struct ElementSubType { ElementType SMDS_ElementType;
boolean isPoly; boolean isPoly;
long nbNodesInElement; }; smIdType nbNodesInElement; };
typedef sequence<ElementSubType> types_array; typedef sequence<ElementSubType> types_array;
@ -381,7 +381,7 @@ module SMESH
/*! /*!
* Remove all nodes and elements of submesh * Remove all nodes and elements of submesh
*/ */
void ClearSubMesh(in long ShapeID) void ClearSubMesh(in smIdType ShapeID)
raises (SALOME::SALOME_Exception); raises (SALOME::SALOME_Exception);
/*! /*!
@ -444,7 +444,7 @@ module SMESH
/*! /*!
* Get number of groups existing in the mesh * Get number of groups existing in the mesh
*/ */
long NbGroups() smIdType NbGroups()
raises (SALOME::SALOME_Exception); raises (SALOME::SALOME_Exception);
/*! /*!
@ -608,7 +608,7 @@ module SMESH
/*! /*!
* Get the internal Id * Get the internal Id
*/ */
long GetId(); smIdType GetId();
/*! /*!
* Obtain instance of SMESH_MeshEditor * Obtain instance of SMESH_MeshEditor
@ -658,7 +658,7 @@ module SMESH
*/ */
void ExportMED( in string fileName, void ExportMED( in string fileName,
in boolean auto_groups, in boolean auto_groups,
in long version, in smIdType version,
in boolean overwrite, in boolean overwrite,
in boolean autoDimension) raises (SALOME::SALOME_Exception); in boolean autoDimension) raises (SALOME::SALOME_Exception);
@ -693,7 +693,7 @@ module SMESH
void ExportPartToMED( in SMESH_IDSource meshPart, void ExportPartToMED( in SMESH_IDSource meshPart,
in string fileName, in string fileName,
in boolean auto_groups, in boolean auto_groups,
in long version, in smIdType version,
in boolean overwrite, in boolean overwrite,
in boolean autoDimension, in boolean autoDimension,
in GEOM::ListOfFields fields, in GEOM::ListOfFields fields,
@ -710,7 +710,7 @@ module SMESH
/*! /*!
* Return string representation of a MED file version comprising nbDigits * Return string representation of a MED file version comprising nbDigits
*/ */
string GetVersionString(in long minor, in short nbDigits); string GetVersionString(in smIdType minor, in short nbDigits);
/*! /*!
* Return the list of med versions compatibles for write/append, * Return the list of med versions compatibles for write/append,
@ -748,94 +748,94 @@ module SMESH
/*! /*!
* Get information about mesh contents * Get information about mesh contents
*/ */
long NbNodes() smIdType NbNodes()
raises (SALOME::SALOME_Exception); raises (SALOME::SALOME_Exception);
long NbElements() smIdType NbElements()
raises (SALOME::SALOME_Exception); raises (SALOME::SALOME_Exception);
long Nb0DElements() smIdType Nb0DElements()
raises (SALOME::SALOME_Exception); raises (SALOME::SALOME_Exception);
long NbBalls() smIdType NbBalls()
raises (SALOME::SALOME_Exception); raises (SALOME::SALOME_Exception);
long NbEdges() smIdType NbEdges()
raises (SALOME::SALOME_Exception); raises (SALOME::SALOME_Exception);
long NbEdgesOfOrder(in ElementOrder order) smIdType NbEdgesOfOrder(in ElementOrder order)
raises (SALOME::SALOME_Exception); raises (SALOME::SALOME_Exception);
long NbFaces() smIdType NbFaces()
raises (SALOME::SALOME_Exception); raises (SALOME::SALOME_Exception);
long NbFacesOfOrder(in ElementOrder order) smIdType NbFacesOfOrder(in ElementOrder order)
raises (SALOME::SALOME_Exception); raises (SALOME::SALOME_Exception);
long NbTriangles() smIdType NbTriangles()
raises (SALOME::SALOME_Exception); raises (SALOME::SALOME_Exception);
long NbTrianglesOfOrder(in ElementOrder order) smIdType NbTrianglesOfOrder(in ElementOrder order)
raises (SALOME::SALOME_Exception); raises (SALOME::SALOME_Exception);
long NbBiQuadTriangles() smIdType NbBiQuadTriangles()
raises (SALOME::SALOME_Exception); raises (SALOME::SALOME_Exception);
long NbQuadrangles() smIdType NbQuadrangles()
raises (SALOME::SALOME_Exception); raises (SALOME::SALOME_Exception);
long NbQuadranglesOfOrder(in ElementOrder order) smIdType NbQuadranglesOfOrder(in ElementOrder order)
raises (SALOME::SALOME_Exception); raises (SALOME::SALOME_Exception);
long NbBiQuadQuadrangles() smIdType NbBiQuadQuadrangles()
raises (SALOME::SALOME_Exception); raises (SALOME::SALOME_Exception);
long NbPolygons() smIdType NbPolygons()
raises (SALOME::SALOME_Exception); raises (SALOME::SALOME_Exception);
long NbPolygonsOfOrder(in ElementOrder order) smIdType NbPolygonsOfOrder(in ElementOrder order)
raises (SALOME::SALOME_Exception); raises (SALOME::SALOME_Exception);
long NbVolumes() smIdType NbVolumes()
raises (SALOME::SALOME_Exception); raises (SALOME::SALOME_Exception);
long NbVolumesOfOrder(in ElementOrder order) smIdType NbVolumesOfOrder(in ElementOrder order)
raises (SALOME::SALOME_Exception); raises (SALOME::SALOME_Exception);
long NbTetras() smIdType NbTetras()
raises (SALOME::SALOME_Exception); raises (SALOME::SALOME_Exception);
long NbTetrasOfOrder(in ElementOrder order) smIdType NbTetrasOfOrder(in ElementOrder order)
raises (SALOME::SALOME_Exception); raises (SALOME::SALOME_Exception);
long NbHexas() smIdType NbHexas()
raises (SALOME::SALOME_Exception); raises (SALOME::SALOME_Exception);
long NbHexasOfOrder(in ElementOrder order) smIdType NbHexasOfOrder(in ElementOrder order)
raises (SALOME::SALOME_Exception); raises (SALOME::SALOME_Exception);
long NbTriQuadraticHexas() smIdType NbTriQuadraticHexas()
raises (SALOME::SALOME_Exception); raises (SALOME::SALOME_Exception);
long NbPyramids() smIdType NbPyramids()
raises (SALOME::SALOME_Exception); raises (SALOME::SALOME_Exception);
long NbPyramidsOfOrder(in ElementOrder order) smIdType NbPyramidsOfOrder(in ElementOrder order)
raises (SALOME::SALOME_Exception); raises (SALOME::SALOME_Exception);
long NbPrisms() smIdType NbPrisms()
raises (SALOME::SALOME_Exception); raises (SALOME::SALOME_Exception);
long NbPrismsOfOrder(in ElementOrder order) smIdType NbPrismsOfOrder(in ElementOrder order)
raises (SALOME::SALOME_Exception); raises (SALOME::SALOME_Exception);
long NbHexagonalPrisms() smIdType NbHexagonalPrisms()
raises (SALOME::SALOME_Exception); raises (SALOME::SALOME_Exception);
long NbPolyhedrons() smIdType NbPolyhedrons()
raises (SALOME::SALOME_Exception); raises (SALOME::SALOME_Exception);
long NbSubMesh() smIdType NbSubMesh()
raises (SALOME::SALOME_Exception); raises (SALOME::SALOME_Exception);
long_array GetElementsId() long_array GetElementsId()
@ -850,22 +850,22 @@ module SMESH
/*! /*!
* Returns type of mesh element * 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); raises (SALOME::SALOME_Exception);
EntityType GetElementGeomType( in long id ) EntityType GetElementGeomType( in smIdType id )
raises (SALOME::SALOME_Exception); raises (SALOME::SALOME_Exception);
GeometryType GetElementShape( in long id ) GeometryType GetElementShape( in smIdType id )
raises (SALOME::SALOME_Exception); raises (SALOME::SALOME_Exception);
long_array GetSubMeshElementsId(in long ShapeID) long_array GetSubMeshElementsId(in smIdType ShapeID)
raises (SALOME::SALOME_Exception); raises (SALOME::SALOME_Exception);
long_array GetSubMeshNodesId(in long ShapeID, in boolean all ) long_array GetSubMeshNodesId(in smIdType ShapeID, in boolean all )
raises (SALOME::SALOME_Exception); raises (SALOME::SALOME_Exception);
ElementType GetSubMeshElementType(in long ShapeID) ElementType GetSubMeshElementType(in smIdType ShapeID)
raises (SALOME::SALOME_Exception); raises (SALOME::SALOME_Exception);
@ -876,7 +876,7 @@ module SMESH
/*! /*!
* \brief Return \c true if a meshing order not yet set for a concurrent sub-mesh * \brief Return \c true if a meshing order not yet set for a concurrent sub-mesh
*/ */
boolean IsUnorderedSubMesh(in long submeshID); boolean IsUnorderedSubMesh(in smIdType submeshID);
/*! /*!
* \brief Return submesh objects list in meshing order * \brief Return submesh objects list in meshing order
@ -903,91 +903,91 @@ module SMESH
* Get XYZ coordinates of node as list of double * Get XYZ coordinates of node as list of double
* If there is not node for given ID - returns empty list * 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 * For given node returns list of IDs of inverse elements
* If there is not node for given ID - returns empty list * If there is not node for given ID - returns empty list
*/ */
long_array GetNodeInverseElements(in long id, in ElementType elemType); long_array GetNodeInverseElements(in smIdType id, in ElementType elemType);
/*! /*!
* \brief Return position of a node on shape * \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 * \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 given element is node returns IDs of shape from position
* If there is not node for given ID - returns -1 * 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 * For given element returns ID of result shape after
* ::FindShape() from SMESH_MeshEditor * ::FindShape() from SMESH_MeshEditor
* If there is not element for given ID - returns -1 * 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 * Returns number of nodes for given element
* If there is not element for given ID - returns -1 * 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 * Returns IDs of nodes of given element
*/ */
long_array GetElemNodes(in long id); long_array GetElemNodes(in smIdType id);
/*! /*!
* Returns ID of node by given index for given element * Returns ID of node by given index for given element
* If there is not element for given ID - returns -1 * If there is not element for given ID - returns -1
* If there is not node for given index - returns -2 * 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 * Returns true if given node is medium node
* in given quadratic element * 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 * Returns true if given node is medium node
* in one of quadratic elements * 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 * Returns number of edges for given element
*/ */
long ElemNbEdges(in long id); smIdType ElemNbEdges(in smIdType id);
/*! /*!
* Returns number of faces for given element * Returns number of faces for given element
*/ */
long ElemNbFaces(in long id); smIdType ElemNbFaces(in smIdType id);
/*! /*!
* Returns nodes of given face (counted from zero) for given volumic element. * Returns nodes of given face (counted from zero) for given volumic element.
*/ */
long_array GetElemFaceNodes(in long elemId, in short faceIndex); long_array GetElemFaceNodes(in smIdType elemId, in short faceIndex);
/*! /*!
* Returns three components of normal of given mesh face (or an empty array in KO case) * Returns three components of normal of given mesh face (or an empty array in KO case)
*/ */
double_array GetFaceNormal(in long faceId, in boolean normalized); double_array GetFaceNormal(in smIdType faceId, in boolean normalized);
/*! /*!
* Returns an element based on all given nodes. * Returns an element based on all given nodes.
*/ */
long FindElementByNodes(in long_array nodes); smIdType FindElementByNodes(in long_array nodes);
/*! /*!
* Return elements including all given nodes. * Return elements including all given nodes.
@ -997,24 +997,24 @@ module SMESH
/*! /*!
* Returns true if given element is polygon * Returns true if given element is polygon
*/ */
boolean IsPoly(in long id); boolean IsPoly(in smIdType id);
/*! /*!
* Returns true if given element is quadratic * 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 * 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 * Returns XYZ coordinates of bary center for given element
* as list of double * as list of double
* If there is not element for given ID - returns empty list * 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 */ /*! Gets information about imported MED file */
MedFileInfo GetMEDFileInfo(); MedFileInfo GetMEDFileInfo();
@ -1041,13 +1041,13 @@ module SMESH
/*! /*!
* *
*/ */
long GetNumberOfElements() smIdType GetNumberOfElements()
raises (SALOME::SALOME_Exception); raises (SALOME::SALOME_Exception);
/*! /*!
* *
*/ */
long GetNumberOfNodes( in boolean all ) smIdType GetNumberOfNodes( in boolean all )
raises (SALOME::SALOME_Exception); raises (SALOME::SALOME_Exception);
/*! /*!
@ -1065,7 +1065,7 @@ module SMESH
/*! /*!
* Returns type of mesh element (same as SMESH_Mesh::GetElementType() ) * 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); raises (SALOME::SALOME_Exception);
/*! /*!
@ -1089,7 +1089,7 @@ module SMESH
/*! /*!
* Get the internal Id * Get the internal Id
*/ */
long GetId(); smIdType GetId();
}; };
}; };

View File

@ -26,6 +26,7 @@
#include "SMESH_Mesh.idl" #include "SMESH_Mesh.idl"
#include "SMESH_Gen.idl" #include "SMESH_Gen.idl"
#include "SMESH_smIdType.idl"
module SMESH module SMESH
{ {
@ -42,9 +43,9 @@ module SMESH
struct FreeBorderPart struct FreeBorderPart
{ {
short border; // border index within a sequence<FreeBorder> short border; // border index within a sequence<FreeBorder>
long node1; // node index within the border-th FreeBorder smIdType node1; // node index within the border-th FreeBorder
long node2; smIdType node2;
long nodeLast; smIdType nodeLast;
}; };
typedef sequence<FreeBorder> ListOfFreeBorders; typedef sequence<FreeBorder> ListOfFreeBorders;
typedef sequence<FreeBorderPart> FreeBordersGroup; typedef sequence<FreeBorderPart> FreeBordersGroup;
@ -66,13 +67,13 @@ module SMESH
// else ==> point is at xyz* // else ==> point is at xyz*
// point 1 // point 1
long node1ID1; smIdType node1ID1;
long node1ID2; smIdType node1ID2;
PointStruct xyz1; PointStruct xyz1;
// point 2 // point 2
long node2ID1; smIdType node2ID1;
long node2ID2; smIdType node2ID2;
PointStruct xyz2; PointStruct xyz2;
// vector on the plane; to use a default plane set vector = (0,0,0) // vector on the plane; to use a default plane set vector = (0,0,0)
@ -83,9 +84,9 @@ module SMESH
// face edge defined by two nodes + optional medium node // face edge defined by two nodes + optional medium node
struct FaceEdge struct FaceEdge
{ {
long node1; smIdType node1;
long node2; smIdType node2;
long medium; smIdType medium;
}; };
typedef sequence<FaceEdge> ListOfEdges; typedef sequence<FaceEdge> ListOfEdges;
@ -156,7 +157,7 @@ module SMESH
* \brief Remove all orphan nodes. * \brief Remove all orphan nodes.
* \return number of removed nodes * \return number of removed nodes
*/ */
long RemoveOrphanNodes() raises (SALOME::SALOME_Exception); smIdType RemoveOrphanNodes() raises (SALOME::SALOME_Exception);
/*! /*!
* \brief Add a new node. * \brief Add a new node.
@ -165,21 +166,21 @@ module SMESH
* \param z Z coordinate of new node * \param z Z coordinate of new node
* \return integer identifier 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. * Create a 0D element on the given node.
* \param IdOfNode Node IDs for creation of element. * \param IdOfNode Node IDs for creation of element.
* \param DuplicateElements to add one more 0D element to a node or not * \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); in boolean DuplicateElements) raises (SALOME::SALOME_Exception);
/*! /*!
* Create a ball element on the given node. * Create a ball element on the given node.
* \param IdOfNode Node IDs for creation of element. * \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 * Create an edge, either linear and quadratic (this is determed
@ -189,7 +190,7 @@ module SMESH
* of MED. This description is located by the following link: * 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. * 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 long_array IDsOfNodes) raises (SALOME::SALOME_Exception);
/*! /*!
* Create face, either linear and quadratic (this is determed * Create face, either linear and quadratic (this is determed
@ -199,16 +200,16 @@ module SMESH
* of MED. This description is located by the following link: * 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. * 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 long_array IDsOfNodes) raises (SALOME::SALOME_Exception);
long AddPolygonalFace(in long_array IdsOfNodes) raises (SALOME::SALOME_Exception); smIdType AddPolygonalFace(in long_array IdsOfNodes) raises (SALOME::SALOME_Exception);
/*! /*!
* Create a quadratic polygonal face * Create a quadratic polygonal face
* \param IdsOfNodes - nodes of the polygon; corner nodes follow first * \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 long_array IdsOfNodes) raises (SALOME::SALOME_Exception);
/*! /*!
* Create volume, either linear and quadratic (this is determed * Create volume, either linear and quadratic (this is determed
@ -218,7 +219,7 @@ module SMESH
* of MED. This description is located by the following link: * 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. * 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 long_array IDsOfNodes) raises (SALOME::SALOME_Exception);
/*! /*!
* Create volume of many faces, giving nodes for each face. * Create volume of many faces, giving nodes for each face.
@ -226,7 +227,7 @@ module SMESH
* \param Quantities List of integer values, Quantities[i] * \param Quantities List of integer values, Quantities[i]
* gives quantity of nodes in face number i. * gives quantity of nodes in face number i.
*/ */
long AddPolyhedralVolume (in long_array IdsOfNodes, smIdType AddPolyhedralVolume (in long_array IdsOfNodes,
in long_array Quantities) raises (SALOME::SALOME_Exception); in long_array Quantities) raises (SALOME::SALOME_Exception);
/*! /*!
* Create volume of many faces, giving IDs of existing faces. * Create volume of many faces, giving IDs of existing faces.
@ -234,7 +235,7 @@ module SMESH
* \note The created volume will refer only to nodes * \note The created volume will refer only to nodes
* of the given faces, not to the faces itself. * of the given faces, not to the faces itself.
*/ */
long AddPolyhedralVolumeByFaces (in long_array IdsOfFaces) raises (SALOME::SALOME_Exception); smIdType AddPolyhedralVolumeByFaces (in long_array IdsOfFaces) raises (SALOME::SALOME_Exception);
/*! /*!
* Create 0D elements on all nodes of the given object. * Create 0D elements on all nodes of the given object.
@ -255,7 +256,7 @@ module SMESH
* \param NodeID - node ID * \param NodeID - node ID
* \param VertexID - vertex ID available through GEOM_Object.GetSubShapeIndices()[0] * \param VertexID - vertex ID available through GEOM_Object.GetSubShapeIndices()[0]
*/ */
void SetNodeOnVertex(in long NodeID, in long VertexID) void SetNodeOnVertex(in smIdType NodeID, in smIdType VertexID)
raises (SALOME::SALOME_Exception); raises (SALOME::SALOME_Exception);
/*! /*!
* \brief Store node position on an edge * \brief Store node position on an edge
@ -263,7 +264,7 @@ module SMESH
* \param EdgeID - edge ID available through GEOM_Object.GetSubShapeIndices()[0] * \param EdgeID - edge ID available through GEOM_Object.GetSubShapeIndices()[0]
* \param paramOnEdge - parameter on edge where the node is located * \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 smIdType EdgeID, in double paramOnEdge)
raises (SALOME::SALOME_Exception); raises (SALOME::SALOME_Exception);
/*! /*!
* \brief Store node position on a face * \brief Store node position on a face
@ -272,31 +273,31 @@ module SMESH
* \param u - U parameter on face where the node is located * \param u - U parameter on face where the node is located
* \param v - V 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 smIdType FaceID, in double u, in double v)
raises (SALOME::SALOME_Exception); raises (SALOME::SALOME_Exception);
/*! /*!
* \brief Bind a node to a solid * \brief Bind a node to a solid
* \param NodeID - node ID * \param NodeID - node ID
* \param SolidID - vertex ID available through GEOM_Object.GetSubShapeIndices()[0] * \param SolidID - vertex ID available through GEOM_Object.GetSubShapeIndices()[0]
*/ */
void SetNodeInVolume(in long NodeID, in long SolidID) void SetNodeInVolume(in smIdType NodeID, in smIdType SolidID)
raises (SALOME::SALOME_Exception); raises (SALOME::SALOME_Exception);
/*! /*!
* \brief Bind an element to a shape * \brief Bind an element to a shape
* \param ElementID - element ID * \param ElementID - element ID
* \param ShapeID - shape ID available through GEOM_Object.GetSubShapeIndices()[0] * \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); 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); raises (SALOME::SALOME_Exception);
boolean InverseDiag(in long NodeID1, in long NodeID2) boolean InverseDiag(in smIdType NodeID1, in smIdType NodeID2)
raises (SALOME::SALOME_Exception); raises (SALOME::SALOME_Exception);
boolean DeleteDiag(in long NodeID1, in long NodeID2) boolean DeleteDiag(in smIdType NodeID1, in smIdType NodeID2)
raises (SALOME::SALOME_Exception); raises (SALOME::SALOME_Exception);
boolean Reorient(in long_array IDsOfElements) boolean Reorient(in long_array IDsOfElements)
@ -313,9 +314,9 @@ module SMESH
* \param thePoint - is used to find a face if \a theFace < 1. * \param thePoint - is used to find a face if \a theFace < 1.
* \return number of reoriented faces. * \return number of reoriented faces.
*/ */
long Reorient2D(in SMESH_IDSource the2Dgroup, smIdType Reorient2D(in SMESH_IDSource the2Dgroup,
in DirStruct theDirection, in DirStruct theDirection,
in long theFace, in smIdType theFace,
in PointStruct thePoint) raises (SALOME::SALOME_Exception); in PointStruct thePoint) raises (SALOME::SALOME_Exception);
/*! /*!
* \brief Reorient faces basing on orientation of adjacent volumes. * \brief Reorient faces basing on orientation of adjacent volumes.
@ -325,7 +326,7 @@ module SMESH
* pointing either \a outside or \a inside the adjacent volumes. * pointing either \a outside or \a inside the adjacent volumes.
* \return number of reoriented faces. * \return number of reoriented faces.
*/ */
long Reorient2DBy3D(in ListOfIDSources faces, smIdType Reorient2DBy3D(in ListOfIDSources faces,
in SMESH_IDSource volumes, in SMESH_IDSource volumes,
in boolean outsideNormal) raises (SALOME::SALOME_Exception); in boolean outsideNormal) raises (SALOME::SALOME_Exception);
@ -393,7 +394,7 @@ module SMESH
* \return 1 if 1-3 diagonal is better, 2 if 2-4 * \return 1 if 1-3 diagonal is better, 2 if 2-4
* diagonal is better, 0 if error occurs. * diagonal is better, 0 if error occurs.
*/ */
long BestSplit (in long IDOfQuad, smIdType BestSplit (in smIdType IDOfQuad,
in NumericalFunctor Criterion) raises (SALOME::SALOME_Exception); in NumericalFunctor Criterion) raises (SALOME::SALOME_Exception);
/*! /*!
@ -445,25 +446,25 @@ module SMESH
boolean Smooth(in long_array IDsOfElements, boolean Smooth(in long_array IDsOfElements,
in long_array IDsOfFixedNodes, in long_array IDsOfFixedNodes,
in long MaxNbOfIterations, in smIdType MaxNbOfIterations,
in double MaxAspectRatio, in double MaxAspectRatio,
in Smooth_Method Method) raises (SALOME::SALOME_Exception); in Smooth_Method Method) raises (SALOME::SALOME_Exception);
boolean SmoothObject(in SMESH_IDSource theObject, boolean SmoothObject(in SMESH_IDSource theObject,
in long_array IDsOfFixedNodes, in long_array IDsOfFixedNodes,
in long MaxNbOfIterations, in smIdType MaxNbOfIterations,
in double MaxAspectRatio, in double MaxAspectRatio,
in Smooth_Method Method) raises (SALOME::SALOME_Exception); in Smooth_Method Method) raises (SALOME::SALOME_Exception);
boolean SmoothParametric(in long_array IDsOfElements, boolean SmoothParametric(in long_array IDsOfElements,
in long_array IDsOfFixedNodes, in long_array IDsOfFixedNodes,
in long MaxNbOfIterations, in smIdType MaxNbOfIterations,
in double MaxAspectRatio, in double MaxAspectRatio,
in Smooth_Method Method) raises (SALOME::SALOME_Exception); in Smooth_Method Method) raises (SALOME::SALOME_Exception);
boolean SmoothParametricObject(in SMESH_IDSource theObject, boolean SmoothParametricObject(in SMESH_IDSource theObject,
in long_array IDsOfFixedNodes, in long_array IDsOfFixedNodes,
in long MaxNbOfIterations, in smIdType MaxNbOfIterations,
in double MaxAspectRatio, in double MaxAspectRatio,
in Smooth_Method Method) raises (SALOME::SALOME_Exception); in Smooth_Method Method) raises (SALOME::SALOME_Exception);
@ -503,7 +504,7 @@ module SMESH
in ListOfIDSources Faces, in ListOfIDSources Faces,
in AxisStruct Axis, in AxisStruct Axis,
in double AngleInRadians, in double AngleInRadians,
in long NbOfSteps, in smIdType NbOfSteps,
in double Tolerance, in double Tolerance,
in boolean ToMakeGroups) in boolean ToMakeGroups)
raises (SALOME::SALOME_Exception); raises (SALOME::SALOME_Exception);
@ -531,7 +532,7 @@ module SMESH
in ListOfIDSources edges, in ListOfIDSources edges,
in ListOfIDSources faces, in ListOfIDSources faces,
in DirStruct stepVector, in DirStruct stepVector,
in long nbOfSteps, in smIdType nbOfSteps,
in boolean toMakeGroups, in boolean toMakeGroups,
in double_array scaleFactors, in double_array scaleFactors,
in boolean scaleVariation, in boolean scaleVariation,
@ -544,7 +545,7 @@ module SMESH
*/ */
ListOfGroups ExtrusionByNormal(in ListOfIDSources theObjects, ListOfGroups ExtrusionByNormal(in ListOfIDSources theObjects,
in double stepSize, in double stepSize,
in long nbOfSteps, in smIdType nbOfSteps,
in boolean byAverageNormal, in boolean byAverageNormal,
in boolean useInputElemsOnly, in boolean useInputElemsOnly,
in boolean makeGroups, in boolean makeGroups,
@ -563,8 +564,8 @@ module SMESH
*/ */
ListOfGroups AdvancedExtrusion(in long_array IDsOfElements, ListOfGroups AdvancedExtrusion(in long_array IDsOfElements,
in DirStruct StepVector, in DirStruct StepVector,
in long NbOfSteps, in smIdType NbOfSteps,
in long ExtrFlags, in smIdType ExtrFlags,
in double SewTolerance, in double SewTolerance,
in boolean ToMakeGroups) in boolean ToMakeGroups)
raises (SALOME::SALOME_Exception); raises (SALOME::SALOME_Exception);
@ -584,7 +585,7 @@ module SMESH
in ListOfIDSources Faces, in ListOfIDSources Faces,
in SMESH_IDSource Path, in SMESH_IDSource Path,
in GEOM::GEOM_Object PathShape, in GEOM::GEOM_Object PathShape,
in long NodeStart, in smIdType NodeStart,
in boolean HasAngles, in boolean HasAngles,
in double_array Angles, in double_array Angles,
in boolean AnglesVariation, in boolean AnglesVariation,
@ -775,13 +776,13 @@ module SMESH
* If the given ID is a valid node ID (nodeID > 0), just move this node, else * 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 * 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); raises (SALOME::SALOME_Exception);
/*! /*!
* Return ID of node closest to a given point * 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); raises (SALOME::SALOME_Exception);
/*! /*!
@ -809,7 +810,7 @@ module SMESH
* and coordinates of the projection point. * and coordinates of the projection point.
* In the case if nothing found, return -1 and [] * In the case if nothing found, return -1 and []
*/ */
long ProjectPoint(in double x, smIdType ProjectPoint(in double x,
in double y, in double y,
in double z, in double z,
in ElementType type, in ElementType type,
@ -844,7 +845,7 @@ module SMESH
* If a group is closed, the first and last nodes of the group are same. * If a group is closed, the first and last nodes of the group are same.
*/ */
array_of_long_array Get1DBranches( in SMESH_IDSource edges, array_of_long_array Get1DBranches( in SMESH_IDSource edges,
in long startNode, in smIdType startNode,
out array_of_long_array nodeGroups) out array_of_long_array nodeGroups)
raises (SALOME::SALOME_Exception); raises (SALOME::SALOME_Exception);
@ -898,38 +899,38 @@ module SMESH
SEW_INTERNAL_ERROR SEW_INTERNAL_ERROR
}; };
Sew_Error SewFreeBorders (in long FirstNodeID1, Sew_Error SewFreeBorders (in smIdType FirstNodeID1,
in long SecondNodeID1, in smIdType SecondNodeID1,
in long LastNodeID1, in smIdType LastNodeID1,
in long FirstNodeID2, in smIdType FirstNodeID2,
in long SecondNodeID2, in smIdType SecondNodeID2,
in long LastNodeID2, in smIdType LastNodeID2,
in boolean CreatePolygons, in boolean CreatePolygons,
in boolean CreatePolyedrs) in boolean CreatePolyedrs)
raises (SALOME::SALOME_Exception); raises (SALOME::SALOME_Exception);
Sew_Error SewConformFreeBorders (in long FirstNodeID1, Sew_Error SewConformFreeBorders (in smIdType FirstNodeID1,
in long SecondNodeID1, in smIdType SecondNodeID1,
in long LastNodeID1, in smIdType LastNodeID1,
in long FirstNodeID2, in smIdType FirstNodeID2,
in long SecondNodeID2) in smIdType SecondNodeID2)
raises (SALOME::SALOME_Exception); raises (SALOME::SALOME_Exception);
Sew_Error SewBorderToSide (in long FirstNodeIDOnFreeBorder, Sew_Error SewBorderToSide (in smIdType FirstNodeIDOnFreeBorder,
in long SecondNodeIDOnFreeBorder, in smIdType SecondNodeIDOnFreeBorder,
in long LastNodeIDOnFreeBorder, in smIdType LastNodeIDOnFreeBorder,
in long FirstNodeIDOnSide, in smIdType FirstNodeIDOnSide,
in long LastNodeIDOnSide, in smIdType LastNodeIDOnSide,
in boolean CreatePolygons, in boolean CreatePolygons,
in boolean CreatePolyedrs) in boolean CreatePolyedrs)
raises (SALOME::SALOME_Exception); raises (SALOME::SALOME_Exception);
Sew_Error SewSideElements (in long_array IDsOfSide1Elements, Sew_Error SewSideElements (in long_array IDsOfSide1Elements,
in long_array IDsOfSide2Elements, in long_array IDsOfSide2Elements,
in long NodeID1OfSide1ToMerge, in smIdType NodeID1OfSide1ToMerge,
in long NodeID1OfSide2ToMerge, in smIdType NodeID1OfSide2ToMerge,
in long NodeID2OfSide1ToMerge, in smIdType NodeID2OfSide1ToMerge,
in long NodeID2OfSide2ToMerge) in smIdType NodeID2OfSide2ToMerge)
raises (SALOME::SALOME_Exception); raises (SALOME::SALOME_Exception);
/*! /*!
@ -937,7 +938,7 @@ module SMESH
* If number of nodes is not corresponded to type of * If number of nodes is not corresponded to type of
* element - returns false * element - returns false
*/ */
boolean ChangeElemNodes(in long ide, in long_array newIDs) boolean ChangeElemNodes(in smIdType ide, in long_array newIDs)
raises (SALOME::SALOME_Exception); raises (SALOME::SALOME_Exception);
/*! /*!
@ -976,7 +977,7 @@ module SMESH
* \return TRUE if operation has been completed successfully, FALSE otherwise * \return TRUE if operation has been completed successfully, FALSE otherwise
* \sa DoubleNodes(), DoubleNodeGroup(), DoubleNodeGroups() * \sa DoubleNodes(), DoubleNodeGroup(), DoubleNodeGroups()
*/ */
boolean DoubleNode( in long theNodeId, in long_array theModifiedElems ) boolean DoubleNode( in smIdType theNodeId, in long_array theModifiedElems )
raises (SALOME::SALOME_Exception); raises (SALOME::SALOME_Exception);
/*! /*!
@ -1247,9 +1248,9 @@ module SMESH
* \param groups - optional groups of 2D elements to make boundary around * \param groups - optional groups of 2D elements to make boundary around
* \param mesh - returns the mesh where elements were added to * \param mesh - returns the mesh where elements were added to
* \param group - returns the created group, if any * \param group - returns the created group, if any
* \retval long - number of added boundary elements * \retval smIdType - number of added boundary elements
*/ */
long MakeBoundaryElements(in Bnd_Dimension dimension, smIdType MakeBoundaryElements(in Bnd_Dimension dimension,
in string groupName, in string groupName,
in string meshName, in string meshName,
in boolean toCopyAll, in boolean toCopyAll,

View File

@ -29,6 +29,7 @@
#define _SMESH_PATTERN_IDL_ #define _SMESH_PATTERN_IDL_
#include "SMESH_Mesh.idl" #include "SMESH_Mesh.idl"
#include "SMESH_smIdType.idl"
module SMESH module SMESH
{ {
@ -87,7 +88,7 @@ module SMESH
*/ */
point_array ApplyToMeshFaces(in SMESH_Mesh theMesh, point_array ApplyToMeshFaces(in SMESH_Mesh theMesh,
in long_array theFacesIDs, in long_array theFacesIDs,
in long theNodeIndexOnKeyPoint1, in smIdType theNodeIndexOnKeyPoint1,
in boolean theReverse); in boolean theReverse);
/*! /*!
@ -99,8 +100,8 @@ module SMESH
*/ */
point_array ApplyToHexahedrons(in SMESH_Mesh theMesh, point_array ApplyToHexahedrons(in SMESH_Mesh theMesh,
in long_array theVolumesIDs, in long_array theVolumesIDs,
in long theNode000Index, in smIdType theNode000Index,
in long theNode001Index); in smIdType theNode001Index);
/*! /*!
* Create nodes and elements in <theMesh> using nodes * Create nodes and elements in <theMesh> using nodes