Merge master branch into V9_dev.

[modules/geom.git] / idl / GEOM_Superv.idl

diff --git a/idl/GEOM_Superv.idl b/idl/GEOM_Superv.idl
index 3bf0fea3f9cdd9dfba6259fbe70ea820bfc4bb35..568946fb7d61f2efc60b1939252f0c14151e76e8 100644 (file)
--- a/idl/GEOM_Superv.idl
+++ b/idl/GEOM_Superv.idl
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2014  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2016  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
@@ -35,11 +35,6 @@ module GEOM
 
   interface GEOM_Superv : Engines::EngineComponent,SALOMEDS::Driver
   {
-    //-----------------------------------------------------------//
-    // Set current study ID                                      //
-    //-----------------------------------------------------------//
-    void SetStudyID (in long theStudyID) ;
-
     //-----------------------------------------------------------//
     // Create ListOfGO and add items to it                       //
     //-----------------------------------------------------------//
@@ -391,10 +386,13 @@ module GEOM
                           in boolean     isPlanarWanted) ;
     GEOM_Object MakeFaceWires (in GEOM_List theWires,
                                in boolean   isPlanarWanted) ;
+    GEOM_Object MakeFaceWithConstraints(in GEOM_List theConstraints);
     GEOM_Object MakeShell (in GEOM_List theFacesAndShells) ;
     GEOM_Object MakeSolidShell (in GEOM_Object theShell) ;
     GEOM_Object MakeSolidShells (in GEOM_List theShells) ;
     GEOM_Object MakeCompound (in GEOM_List theShapes) ;
+    GEOM_Object MakeSolidFromConnectedFaces (in GEOM_List theFacesOrShells,
+                                            in boolean isIntersect);
     GEOM_Object MakeGlueFaces (in GEOM_Object theShape,
                                in double theTolerance,
                                in boolean doKeepNonSolids);
@@ -665,7 +663,8 @@ module GEOM
                            in ListOfGO groups, 
                            in ListOfFields fields,
                            in string author, 
-                           in string fileName );
+                           in string fileName,
+                           in string shapeFileName );
     boolean     ImportXAO( in string fileName, 
                            out GEOM_Object shape,
                            out ListOfGO subShapes,