Replace Descret by Discrete in variable and method names.

[modules/smesh.git] / src / SMESH_I / SMESH_Mesh_i.hxx

diff --git a/src/SMESH_I/SMESH_Mesh_i.hxx b/src/SMESH_I/SMESH_Mesh_i.hxx
index 399659d2a833615f9b08006505e352c463d52fba..6e384bc7f03b6f6fb24a754dc77d367d7928cf37 100644 (file)
--- a/src/SMESH_I/SMESH_Mesh_i.hxx
+++ b/src/SMESH_I/SMESH_Mesh_i.hxx
@@ -88,6 +88,9 @@ public:
   SMESH::ListOfHypothesis* GetHypothesisList(GEOM::GEOM_Object_ptr aSubShapeObject)
     throw (SALOME::SALOME_Exception);
 
+  SMESH::submesh_array* GetSubMeshes()
+    throw (SALOME::SALOME_Exception);
+
   SMESH::SMESH_subMesh_ptr GetSubMesh(GEOM::GEOM_Object_ptr aSubShapeObject, const char* theName)
     throw (SALOME::SALOME_Exception);
 
@@ -102,6 +105,11 @@ public:
                                                    GEOM::GEOM_Object_ptr theGeomObj )
     throw (SALOME::SALOME_Exception);
 
+  SMESH::SMESH_GroupOnFilter_ptr CreateGroupFromFilter(SMESH::ElementType theElemType,
+                                                       const char*        theName,
+                                                       SMESH::Filter_ptr  theFilter )
+    throw (SALOME::SALOME_Exception);
+
   void RemoveGroup( SMESH::SMESH_GroupBase_ptr theGroup )
     throw (SALOME::SALOME_Exception);
 
@@ -148,7 +156,7 @@ public:
   throw (SALOME::SALOME_Exception);
 
 
-  SMESH::SMESH_Group_ptr ConvertToStandalone( SMESH::SMESH_GroupOnGeom_ptr theGeomGroup );
+  SMESH::SMESH_Group_ptr ConvertToStandalone( SMESH::SMESH_GroupBase_ptr theGroupOn );
 
 //    SMESH::string_array* GetLog(CORBA::Boolean clearAfterGet)
 //      throw (SALOME::SALOME_Exception);
@@ -189,6 +197,11 @@ public:
   SMESH::DriverMED_ReadStatus ImportMEDFile( const char* theFileName, const char* theMeshName )
     throw (SALOME::SALOME_Exception);
 
+  SMESH::DriverMED_ReadStatus ImportCGNSFile( const char*  theFileName,
+                                              const int    theMeshIndex,
+                                              std::string& theMeshName)
+    throw (SALOME::SALOME_Exception);
+
   /*!
    *  Auto color
    */
@@ -217,9 +230,14 @@ public:
   void ExportMED   ( const char*        file,
                      CORBA::Boolean     auto_groups ) throw (SALOME::SALOME_Exception);
 
+  void ExportSAUV( const char* file, CORBA::Boolean auto_groups ) throw (SALOME::SALOME_Exception);
+
   void ExportDAT( const char* file ) throw (SALOME::SALOME_Exception);
   void ExportUNV( const char* file ) throw (SALOME::SALOME_Exception);
   void ExportSTL( const char* file, bool isascii ) throw (SALOME::SALOME_Exception);
+  void ExportCGNS(SMESH::SMESH_IDSource_ptr meshPart,
+                  const char*               file,
+                  CORBA::Boolean            overwrite) throw (SALOME::SALOME_Exception);
 
   void ExportPartToMED(SMESH::SMESH_IDSource_ptr meshPart,
                        const char*               file,
@@ -270,6 +288,9 @@ public:
   CORBA::Long NbQuadranglesOfOrder(SMESH::ElementOrder order)
     throw (SALOME::SALOME_Exception);
 
+  CORBA::Long NbBiQuadQuadrangles()
+    throw (SALOME::SALOME_Exception);
+
   CORBA::Long NbPolygons()
     throw (SALOME::SALOME_Exception);
 
@@ -291,6 +312,9 @@ public:
   CORBA::Long NbHexasOfOrder(SMESH::ElementOrder order)
     throw (SALOME::SALOME_Exception);
 
+  CORBA::Long NbTriQuadraticHexas()
+    throw (SALOME::SALOME_Exception);
+
   CORBA::Long NbPyramids()
     throw (SALOME::SALOME_Exception);
 
@@ -303,6 +327,9 @@ public:
   CORBA::Long NbPrismsOfOrder(SMESH::ElementOrder order)
     throw (SALOME::SALOME_Exception);
 
+  CORBA::Long NbHexagonalPrisms()
+    throw (SALOME::SALOME_Exception);
+
   CORBA::Long NbPolyhedrons()
     throw (SALOME::SALOME_Exception);
 
@@ -366,9 +393,10 @@ public:
   void removeSubMesh(SMESH::SMESH_subMesh_ptr theSubMesh,
                      GEOM::GEOM_Object_ptr theSubShapeObject );
 
-  SMESH::SMESH_GroupBase_ptr createGroup(SMESH::ElementType  theElemType,
-                                         const char*         theName,
-                                         const TopoDS_Shape& theShape = TopoDS_Shape());
+  SMESH::SMESH_GroupBase_ptr createGroup(SMESH::ElementType        theElemType,
+                                         const char*               theName,
+                                         const TopoDS_Shape&       theShape = TopoDS_Shape(),
+                                         const SMESH_PredicatePtr& thePred = SMESH_PredicatePtr());
 
   void removeGroup( const int theId );
 
@@ -553,6 +581,8 @@ public:
   std::map<int, ::SMESH_subMesh*> _mapSubMesh;   //NRI
 
 private:
+  std::string PrepareMeshNameAndGroups( const char* file, CORBA::Boolean overwrite );
+
   /*!
    * Check and correct names of mesh groups
    */