Salome HOME
projects
/
modules
/
smesh.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into V9_dev
[modules/smesh.git]
/
idl
/
SMESH_Mesh.idl
diff --git
a/idl/SMESH_Mesh.idl
b/idl/SMESH_Mesh.idl
index bb193bcc15e2a26f3eea69c7811851f8417953e3..28f0f7e903e18bc04ae9aaa4602b0edbbadf6229 100644
(file)
--- a/
idl/SMESH_Mesh.idl
+++ b/
idl/SMESH_Mesh.idl
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
5
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
6
CEA/DEN, EDF R&D, OPEN CASCADE
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@
-66,6
+66,7
@@
module SMESH
ADD_QUADEDGE,
ADD_QUADTRIANGLE,
ADD_QUADQUADRANGLE,
ADD_QUADEDGE,
ADD_QUADTRIANGLE,
ADD_QUADQUADRANGLE,
+ ADD_QUADPOLYGON,
ADD_QUADTETRAHEDRON,
ADD_QUADPYRAMID,
ADD_QUADPENTAHEDRON,
ADD_QUADTETRAHEDRON,
ADD_QUADPYRAMID,
ADD_QUADPENTAHEDRON,
@@
-89,18
+90,18
@@
module SMESH
struct PointStruct { double x;
double y;
struct PointStruct { double x;
double y;
- double z; }
;
+ double z; };
typedef sequence<PointStruct> nodes_array;
typedef sequence<PointStruct> nodes_array;
- struct DirStruct { PointStruct PS
; }
; // analog to OCCT gp_Vec
+ struct DirStruct { PointStruct PS
; }
; // analog to OCCT gp_Vec
struct AxisStruct { double x;
double y;
double z;
double vx;
double vy;
struct AxisStruct { double x;
double y;
double z;
double vx;
double vy;
- double vz; }
;
+ double vz; };
/*!
* Node location on a shape
*/
/*!
* Node location on a shape
*/
@@
-132,7
+133,7
@@
module SMESH
BALL,
NB_ELEMENT_TYPES
};
BALL,
NB_ELEMENT_TYPES
};
- typedef sequence<ElementType> array_of_ElementType
;
+ typedef sequence<ElementType> array_of_ElementType;
/*!
* Enumeration for element geometry type, like SMDSAbs_GeometryType in SMDSAbs_ElementType.hxx
/*!
* Enumeration for element geometry type, like SMDSAbs_GeometryType in SMDSAbs_ElementType.hxx
@@
-262,7
+263,7
@@
module SMESH
};
/*!
};
/*!
- * Auxilary flags for advanced extrusion.
+ * Auxil
i
ary flags for advanced extrusion.
* BOUNDARY: create or not boundary for result of extrusion
* SEW: try to use existing nodes or create new nodes in any case
*/
* BOUNDARY: create or not boundary for result of extrusion
* SEW: try to use existing nodes or create new nodes in any case
*/
@@
-339,7
+340,7
@@
module SMESH
typedef sequence<SMESH_subMesh> submesh_array;
typedef sequence<submesh_array> submesh_array_array;
typedef sequence<SMESH_subMesh> submesh_array;
typedef sequence<submesh_array> submesh_array_array;
- interface SMESH_Mesh : S
ALOME::GenericObj, S
MESH_IDSource
+ interface SMESH_Mesh : SMESH_IDSource
{
/*!
* Return true if there is a geometry to be meshed
{
/*!
* Return true if there is a geometry to be meshed
@@
-348,7
+349,7
@@
module SMESH
raises (SALOME::SALOME_Exception);
/*!
raises (SALOME::SALOME_Exception);
/*!
- * Get geom shape to mesh. A result sould not be nil. Use HasShapeToMesh()
+ * Get geom shape to mesh. A result s
h
ould not be nil. Use HasShapeToMesh()
* to know if a returned shape
*/
GEOM::GEOM_Object GetShapeToMesh()
* to know if a returned shape
*/
GEOM::GEOM_Object GetShapeToMesh()
@@
-388,7
+389,7
@@
module SMESH
* Get the subMesh object associated to a Sub-shape. The subMesh object
* gives access to nodes and elements IDs.
* SubMesh will be used instead of Sub-shape in a next idl version to
* Get the subMesh object associated to a Sub-shape. The subMesh object
* gives access to nodes and elements IDs.
* SubMesh will be used instead of Sub-shape in a next idl version to
- * adress a specific subMesh...
+ * ad
d
ress a specific subMesh...
*/
SMESH_subMesh GetSubMesh(in GEOM::GEOM_Object aSubObject, in string name)
raises (SALOME::SALOME_Exception);
*/
SMESH_subMesh GetSubMesh(in GEOM::GEOM_Object aSubObject, in string name)
raises (SALOME::SALOME_Exception);
@@
-596,11
+597,6
@@
module SMESH
*/
long GetId();
*/
long GetId();
- /*!
- * Get the study Id
- */
- long GetStudyId();
-
/*!
* Obtain instance of SMESH_MeshEditor
*/
/*!
* Obtain instance of SMESH_MeshEditor
*/
@@
-778,6
+774,9
@@
module SMESH
long NbPolygons()
raises (SALOME::SALOME_Exception);
long NbPolygons()
raises (SALOME::SALOME_Exception);
+ long NbPolygonsOfOrder(in ElementOrder order)
+ raises (SALOME::SALOME_Exception);
+
long NbVolumes()
raises (SALOME::SALOME_Exception);
long NbVolumes()
raises (SALOME::SALOME_Exception);
@@
-971,6
+970,11
@@
module SMESH
*/
long FindElementByNodes(in long_array nodes);
*/
long FindElementByNodes(in long_array nodes);
+ /*!
+ * Return elements including all given nodes.
+ */
+ long_array GetElementsByNodes(in long_array nodes, in ElementType elem_type);
+
/*!
* Returns true if given element is polygon
*/
/*!
* Returns true if given element is polygon
*/
@@
-1013,7
+1017,7
@@
module SMESH
string_array GetLastParameters();
};
string_array GetLastParameters();
};
- interface SMESH_subMesh : S
ALOME::GenericObj, S
MESH_IDSource
+ interface SMESH_subMesh : SMESH_IDSource
{
/*!
*
{
/*!
*
@@
-1040,7
+1044,7
@@
module SMESH
raises (SALOME::SALOME_Exception);
/*!
raises (SALOME::SALOME_Exception);
/*!
- * Return
type of submesh element
+ * Return
s type of mesh element (same as SMESH_Mesh::GetElementType() )
*/
ElementType GetElementType( in long id, in boolean iselem )
raises (SALOME::SALOME_Exception);
*/
ElementType GetElementType( in long id, in boolean iselem )
raises (SALOME::SALOME_Exception);