long to smIdType in idl-files

[modules/smesh.git] / idl / SMESH_Filter.idl

diff --git a/idl/SMESH_Filter.idl b/idl/SMESH_Filter.idl
index 2784e4591bb747fb6074da7de4c241105f8207c5..47d071f07a345912ba9709fe094555ac0af63d4b 100644 (file)
--- a/idl/SMESH_Filter.idl
+++ b/idl/SMESH_Filter.idl
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2016  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2020  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
@@ -30,6 +30,7 @@
 #include "SALOME_GenericObj.idl"
 #include "GEOM_Gen.idl"
 #include "SMESH_Mesh.idl"
+#include "SMESH_smIdType.idl"
 
 module SMESH
 {
@@ -61,6 +62,7 @@ module SMESH
     FT_MultiConnection2D,
     FT_Length,
     FT_Length2D,
+    FT_Length3D,
     FT_Deflection2D,
     FT_NodeConnectivityNumber,
     FT_BelongToMeshGroup,
@@ -96,7 +98,7 @@ module SMESH
   */
   struct HistogramRectangle
   {
-    long nbEvents;
+    smIdType nbEvents;
     double min;
     double max;
   };
@@ -118,7 +120,8 @@ module SMESH
   */
   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,
@@ -127,8 +130,8 @@ module SMESH
     * Set precision for calculation. It is a position after point which is
     * used to functor value after calculation.
     */
-    void   SetPrecision( in long thePrecision );
-    long   GetPrecision();
+    void   SetPrecision( in smIdType thePrecision );
+    smIdType   GetPrecision();
   };
   interface MinimumAngle    : NumericalFunctor{};
   interface AspectRatio     : NumericalFunctor{};
@@ -146,19 +149,20 @@ module SMESH
     struct Value
     {
       double myLength;
-      long myPnt1, myPnt2;
+      smIdType myPnt1, myPnt2;
     };
     typedef sequence<Value> Values;
     Values GetValues();
   };
+  interface Length3D          : NumericalFunctor{};
   interface Deflection2D      : NumericalFunctor{};
   interface MultiConnection   : NumericalFunctor{};
   interface MultiConnection2D : NumericalFunctor
   {
     struct Value
     {
-      long myNbConnects;
-      long myPnt1, myPnt2;
+      smIdType myNbConnects;
+      smIdType myPnt1, myPnt2;
     };
     
     typedef sequence<Value> Values;
@@ -174,8 +178,8 @@ module SMESH
   */
   interface Predicate: Functor
   {
-    boolean IsSatisfy( in long thEntityId );
-    long    NbSatisfying( in SMESH::SMESH_IDSource obj );
+    boolean IsSatisfy( in smIdType thEntityId );
+    smIdType    NbSatisfying( in SMESH::SMESH_IDSource obj );
   };
 
   /*!
@@ -346,8 +350,8 @@ module SMESH
   {
     struct Border
     {
-      long myElemId;
-      long myPnt1, myPnt2;
+      smIdType myElemId;
+      smIdType myPnt1, myPnt2;
     };
     typedef sequence<Border> Borders;
     Borders GetBorders();
@@ -457,7 +461,7 @@ module SMESH
   * if normal of a face has angle with the threshold face less than a tolerance.
   */
   interface CoplanarFaces : Predicate {
-    void            SetFace ( in long theFaceID );
+    void            SetFace ( in smIdType theFaceID );
     void            SetTolerance( in double theToler );
   };
 
@@ -471,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);
@@ -505,16 +509,16 @@ module SMESH
     */
     struct Criterion
     {
-      long        Type;
-      long        Compare;
+      smIdType    Type;
+      smIdType    Compare;
       double      Threshold;
       string      ThresholdStr;
       string      ThresholdID;
-      long        UnaryOp;
-      long        BinaryOp;
+      smIdType    UnaryOp;
+      smIdType    BinaryOp;
       double      Tolerance;
       ElementType TypeOfElement;
-      long        Precision;
+      smIdType    Precision;
     };
 
     typedef sequence<Criterion> Criteria;
@@ -523,6 +527,7 @@ module SMESH
     void          SetMesh( in SMESH_Mesh theMesh );
 
     long_array    GetElementsId( in SMESH_Mesh theMesh );
+    long_array    GetElementsIdFromParts( in ListOfIDSources theParts );
     ElementType   GetElementType();
     Predicate     GetPredicate();
 
@@ -559,7 +564,7 @@ module SMESH
     * Query methods
     */
     boolean       IsPresent( in string aFilterName );
-    long          NbFilters( in ElementType aType );
+    smIdType      NbFilters( in ElementType aType );
     string_array  GetNames( in ElementType aType );
     string_array  GetAllNames();
     void          SetFileName( in string aFilterName );
@@ -587,6 +592,7 @@ module SMESH
     MaxElementLength3D CreateMaxElementLength3D();
     Length             CreateLength();
     Length2D           CreateLength2D();
+    Length3D           CreateLength3D();
     Deflection2D       CreateDeflection2D();
     MultiConnection    CreateMultiConnection();
     MultiConnection2D  CreateMultiConnection2D();