X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=idl%2FSMESH_Filter.idl;h=4376a66a4686e5746a56a78cc5210d94547033d7;hp=c66a90ea05998d56f916ad456db1be5be90f8cca;hb=d9a6e9d9f3e844703bbeb5cd6806bed6c2e9b615;hpb=090aff07266d376ae028ae43434bdea7c0a0f9bb

diff --git a/idl/SMESH_Filter.idl b/idl/SMESH_Filter.idl
index c66a90ea0..4376a66a4 100644
--- a/idl/SMESH_Filter.idl
+++ b/idl/SMESH_Filter.idl
@@ -27,15 +27,9 @@
 
 #include "SALOME_Exception.idl"
 #include "SALOME_GenericObj.idl"
+#include "GEOM_Gen.idl"
 #include "SMESH_Mesh.idl"
 
-
-module GEOM
-{
-  interface GEOM_Object;
-};
-
-
 module SMESH
 {
 
@@ -51,6 +45,7 @@ module SMESH
     FT_Taper,       
     FT_Skew,         
     FT_Area,          
+    FT_Volume3D,          
     FT_FreeBorders,
     FT_FreeEdges,
     FT_MultiConnection,
@@ -62,6 +57,7 @@ module SMESH
     FT_BelongToCylinder,
     FT_LyingOnGeom,
     FT_RangeOfIds,
+    FT_BadOrientedVolume,
     FT_LessThan,
     FT_MoreThan,
     FT_EqualTo,
@@ -104,6 +100,7 @@ module SMESH
   interface Taper           : NumericalFunctor{};
   interface Skew            : NumericalFunctor{};
   interface Area            : NumericalFunctor{};
+  interface Volume3D        : NumericalFunctor{};
   interface Length          : NumericalFunctor{};
   interface Length2D        : NumericalFunctor
   {
@@ -137,6 +134,13 @@ module SMESH
     boolean IsSatisfy( in long thEntityId );
   };
 
+  /*!
+  * Logical functor (predicate) "Bad Oriented Volume".
+  * Verify whether a mesh volume is incorrectly oriented from
+  * the point of view of MED convention
+  */
+  interface BadOrientedVolume: Predicate {};
+
   /*!
   * Logical functor (predicate) "Belong To Geometry".
   * Verify whether mesh element or node belong to pointed Geom Object
@@ -147,7 +151,9 @@ module SMESH
     void SetElementType( in ElementType theType );
 
     void   SetShapeName( in string theName );
-    string GetShapeName();    
+    void   SetShape( in string theID, in string theName );
+    string GetShapeName();
+    string GetShapeID();
   };
 
   /*!
@@ -159,7 +165,9 @@ module SMESH
     void   SetTolerance( in double theToler );
     double GetTolerance();
     void   SetShapeName( in string theName, in ElementType theType );
+    void   SetShape( in string theID, in string theName, in ElementType theType );
     string GetShapeName();
+    string GetShapeID();
   };
 
 
@@ -191,7 +199,9 @@ module SMESH
     void SetElementType( in ElementType theType );
 
     void   SetShapeName( in string theName );
+    void   SetShape( in string theID, in string theName );
     string GetShapeName();    
+    string GetShapeID(); 
   };
  
   /*!
@@ -270,7 +280,7 @@ module SMESH
   /*!
   *  Filter
   */
-  interface Filter: SALOME::GenericObj
+  interface Filter: SALOME::GenericObj, SMESH_IDSource
   {
     /*!
     * Structure containing information about one criterion
@@ -283,6 +293,8 @@ module SMESH
     *   ThresholdStr  - Threshold value defined as string. Used for:
     *                   1. Diaposon of identifiers. Example: "1,2,3,5-10,12,27-29"
     *                   2. BelongToGeom predicate for storing name of shape
+    *   ThresholdID   - One more threshold value defined as string. Used for:
+    *                   1. BelongToGeom predicate for storing id of shape
     *   Tolerance     - Tolerance is used for comparators (EqualTo comparision) and for
     *                   "Belong to plane" and "Belong to cylinder" predicates
     *   TypeOfElement - type of element SMESH::NODE, SMESH::FACE (used by BelongToGeom predicate only)
@@ -294,6 +306,7 @@ module SMESH
       long        Compare;
       double      Threshold;
       string      ThresholdStr;
+      string      ThresholdID;
       long        UnaryOp;
       long        BinaryOp;
       double      Tolerance;
@@ -304,6 +317,8 @@ module SMESH
     typedef sequence<Criterion> Criteria;
 
     void          SetPredicate( in Predicate thePredicate );
+    void          SetMesh( in SMESH_Mesh theMesh );
+
     long_array    GetElementsId( in SMESH_Mesh theMesh );
     ElementType   GetElementType();
     Predicate     GetPredicate();
@@ -364,6 +379,7 @@ module SMESH
     Taper             CreateTaper();
     Skew              CreateSkew();
     Area              CreateArea();
+    Volume3D          CreateVolume3D();
     Length            CreateLength();
     Length2D          CreateLength2D();
     MultiConnection   CreateMultiConnection();
@@ -383,6 +399,8 @@ module SMESH
 
     RangeOfIds        CreateRangeOfIds();
 
+    BadOrientedVolume CreateBadOrientedVolume();
+
     /*!
     *  Create comparators ( predicates )
     */