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 'OCCT780'
[modules/smesh.git]
/
idl
/
SMESH_Filter.idl
diff --git
a/idl/SMESH_Filter.idl
b/idl/SMESH_Filter.idl
index 283aa1b297b1a83e6c852eb2991b2a8401470a77..05cfa6dc43a1c3e7f6d193944f233abdff67f5d1 100644
(file)
--- a/
idl/SMESH_Filter.idl
+++ b/
idl/SMESH_Filter.idl
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-20
16 CEA/DEN, EDF R&D
, OPEN CASCADE
+// Copyright (C) 2007-20
24 CEA, EDF
, 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
@@
-30,6
+30,7
@@
#include "SALOME_GenericObj.idl"
#include "GEOM_Gen.idl"
#include "SMESH_Mesh.idl"
#include "SALOME_GenericObj.idl"
#include "GEOM_Gen.idl"
#include "SMESH_Mesh.idl"
+#include "SMESH_smIdType.idl"
module SMESH
{
module SMESH
{
@@
-41,12
+42,14
@@
module SMESH
{
FT_AspectRatio,
FT_AspectRatio3D,
{
FT_AspectRatio,
FT_AspectRatio3D,
- FT_Warping,
+ FT_Warping,
+ FT_Warping3D,
FT_MinimumAngle,
FT_Taper,
FT_Skew,
FT_Area,
FT_MinimumAngle,
FT_Taper,
FT_Skew,
FT_Area,
- FT_Volume3D,
+ FT_Volume3D,
+ FT_ScaledJacobian,
FT_MaxElementLength2D,
FT_MaxElementLength3D,
FT_FreeBorders,
FT_MaxElementLength2D,
FT_MaxElementLength3D,
FT_FreeBorders,
@@
-61,6
+64,7
@@
module SMESH
FT_MultiConnection2D,
FT_Length,
FT_Length2D,
FT_MultiConnection2D,
FT_Length,
FT_Length2D,
+ FT_Length3D,
FT_Deflection2D,
FT_NodeConnectivityNumber,
FT_BelongToMeshGroup,
FT_Deflection2D,
FT_NodeConnectivityNumber,
FT_BelongToMeshGroup,
@@
-118,7
+122,8
@@
module SMESH
*/
interface NumericalFunctor: Functor
{
*/
interface NumericalFunctor: Functor
{
- double GetValue( 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,
Histogram GetHistogram ( in short nbIntervals, in boolean isLogarithmic );
Histogram GetLocalHistogram( in short nbIntervals, in boolean isLogarithmic,
@@
-134,6
+139,7
@@
module SMESH
interface AspectRatio : NumericalFunctor{};
interface AspectRatio3D : NumericalFunctor{};
interface Warping : NumericalFunctor{};
interface AspectRatio : NumericalFunctor{};
interface AspectRatio3D : NumericalFunctor{};
interface Warping : NumericalFunctor{};
+ interface Warping3D : NumericalFunctor {};
interface Taper : NumericalFunctor{};
interface Skew : NumericalFunctor{};
interface Area : NumericalFunctor{};
interface Taper : NumericalFunctor{};
interface Skew : NumericalFunctor{};
interface Area : NumericalFunctor{};
@@
-151,6
+157,7
@@
module SMESH
typedef sequence<Value> Values;
Values GetValues();
};
typedef sequence<Value> Values;
Values GetValues();
};
+ interface Length3D : NumericalFunctor{};
interface Deflection2D : NumericalFunctor{};
interface MultiConnection : NumericalFunctor{};
interface MultiConnection2D : NumericalFunctor
interface Deflection2D : NumericalFunctor{};
interface MultiConnection : NumericalFunctor{};
interface MultiConnection2D : NumericalFunctor
@@
-166,6
+173,7
@@
module SMESH
};
interface BallDiameter : NumericalFunctor{};
interface NodeConnectivityNumber : NumericalFunctor{};
};
interface BallDiameter : NumericalFunctor{};
interface NodeConnectivityNumber : NumericalFunctor{};
+ interface ScaledJacobian : NumericalFunctor{};
/*!
/*!
@@
-371,7
+379,7
@@
module SMESH
*/
interface RangeOfIds: Predicate
{
*/
interface RangeOfIds: Predicate
{
- void SetRange( in
long
_array theIds );
+ void SetRange( in
smIdType
_array theIds );
boolean SetRangeStr( in string theRange );
string GetRangeStr();
boolean SetRangeStr( in string theRange );
string GetRangeStr();
@@
-471,7
+479,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 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);
string GetThreshold ( out ThresholdType type );
void SetThreshold ( in string threshold, in ThresholdType type )
raises (SALOME::SALOME_Exception);
@@
-480,7
+488,7
@@
module SMESH
/*!
* Filter
*/
/*!
* Filter
*/
- interface Filter: S
ALOME::GenericObj, S
MESH_IDSource
+ interface Filter: SMESH_IDSource
{
/*!
* Structure containing information about one criterion
{
/*!
* Structure containing information about one criterion
@@
-519,15
+527,16
@@
module SMESH
typedef sequence<Criterion> Criteria;
typedef sequence<Criterion> Criteria;
- void SetPredicate( in Predicate thePredicate );
- void SetMesh( in SMESH_Mesh theMesh );
+ void
SetPredicate( in Predicate thePredicate );
+ void
SetMesh( in SMESH_Mesh theMesh );
- long_array GetElementsId( in SMESH_Mesh theMesh );
- ElementType GetElementType();
- Predicate GetPredicate();
+ smIdType_array GetElementsId( in SMESH_Mesh theMesh );
+ smIdType_array GetElementsIdFromParts( in ListOfIDSources theParts );
+ ElementType GetElementType();
+ Predicate GetPredicate();
- boolean GetCriteria( out Criteria theCriteria );
- boolean SetCriteria( in Criteria theCriteria );
+ boolean
GetCriteria( out Criteria theCriteria );
+ boolean
SetCriteria( in Criteria theCriteria );
};
};
@@
-579,6
+588,7
@@
module SMESH
AspectRatio CreateAspectRatio();
AspectRatio3D CreateAspectRatio3D();
Warping CreateWarping();
AspectRatio CreateAspectRatio();
AspectRatio3D CreateAspectRatio3D();
Warping CreateWarping();
+ Warping3D CreateWarping3D();
Taper CreateTaper();
Skew CreateSkew();
Area CreateArea();
Taper CreateTaper();
Skew CreateSkew();
Area CreateArea();
@@
-587,11
+597,13
@@
module SMESH
MaxElementLength3D CreateMaxElementLength3D();
Length CreateLength();
Length2D CreateLength2D();
MaxElementLength3D CreateMaxElementLength3D();
Length CreateLength();
Length2D CreateLength2D();
+ Length3D CreateLength3D();
Deflection2D CreateDeflection2D();
MultiConnection CreateMultiConnection();
MultiConnection2D CreateMultiConnection2D();
BallDiameter CreateBallDiameter();
NodeConnectivityNumber CreateNodeConnectivityNumber();
Deflection2D CreateDeflection2D();
MultiConnection CreateMultiConnection();
MultiConnection2D CreateMultiConnection2D();
BallDiameter CreateBallDiameter();
NodeConnectivityNumber CreateNodeConnectivityNumber();
+ ScaledJacobian CreateScaledJacobian();
/*!
* Create logical functors ( predicates )
*/
/*!
* Create logical functors ( predicates )
*/