Merge from V6_main 13/12/2012

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

diff --git a/idl/SMESH_Gen.idl b/idl/SMESH_Gen.idl
index f6e9f89adb4a842a1e94907e9249353c52121fd9..8385a9030eb75a5095e8a3f1451c1b269b1b41b0 100644 (file)
--- a/idl/SMESH_Gen.idl
+++ b/idl/SMESH_Gen.idl
@@ -101,7 +101,8 @@ module SMESH
     COMPERR_ALGO_FAILED   ,  // computation failed
     COMPERR_BAD_SHAPE     ,  // bad geometry
     COMPERR_WARNING       ,  // algo reports error but sub-mesh is computed anyway
     COMPERR_ALGO_FAILED   ,  // computation failed
     COMPERR_BAD_SHAPE     ,  // bad geometry
     COMPERR_WARNING       ,  // algo reports error but sub-mesh is computed anyway

-    COMPERR_CANCELED         // compute canceled
+    COMPERR_CANCELED      ,  // compute canceled
+    COMPERR_NO_MESH_ON_SHAPE // no mesh elements assigned to sub-mesh

   };
   struct ComputeError
   {
   };
   struct ComputeError
   {


@@ -237,6 +238,16 @@ module SMESH
                                      out SMESH::DriverMED_ReadStatus theStatus )
       raises ( SALOME::SALOME_Exception );
 
                                      out SMESH::DriverMED_ReadStatus theStatus )
       raises ( SALOME::SALOME_Exception );
 

+    /*!
+     * Create Mesh object importing data from given GMF file
+     *  \param theFileName - a name of file to import
+     *  \param theMakeRequiredGroups - if true, groups of required entities will be created
+     */
+    SMESH_Mesh CreateMeshesFromGMF( in string               theFileName,
+                                    in boolean              theMakeRequiredGroups,
+                                    out SMESH::ComputeError theError)
+      raises ( SALOME::SALOME_Exception );
+

     /*!
      * Create a mesh by copying a part of another mesh
      *  \param meshPart - a part of mesh to copy
     /*!
      * Create a mesh by copying a part of another mesh
      *  \param meshPart - a part of mesh to copy