X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2FSMESH%2FSMESH_Mesh.hxx;h=fc607868f604a4b6d0476da9419fbc48c65aeeac;hb=b35e752a84d68bf6024e4dcaa8df42588c0afe76;hp=a77498ed5786a60a65b02ae8bc42a637751d5a48;hpb=2c607013a23bd4e7ba07e72e0c04dee2c1209cff;p=modules%2Fsmesh.git

diff --git a/src/SMESH/SMESH_Mesh.hxx b/src/SMESH/SMESH_Mesh.hxx
index a77498ed5..fc607868f 100644
--- a/src/SMESH/SMESH_Mesh.hxx
+++ b/src/SMESH/SMESH_Mesh.hxx
@@ -31,6 +31,7 @@
 #include "SMESH_SMESH.hxx"
 
 #include "SMESH_Hypothesis.hxx"
+#include "SMESH_Controls.hxx"
 
 #include "SMESHDS_Mesh.hxx"
 #include "SMESHDS_Command.hxx"
@@ -107,14 +108,17 @@ public:
    */
   void ClearSubMesh(const int theShapeId);
 
-  int UNVToMesh(const char* theFileName);
   /*!
    * consult DriverMED_R_SMESHDS_Mesh::ReadStatus for returned value
    */
+  int UNVToMesh(const char* theFileName);
+
   int MEDToMesh(const char* theFileName, const char* theMeshName);
   
   int STLToMesh(const char* theFileName);
 
+  int CGNSToMesh(const char* theFileName, const int theMeshIndex, std::string& theMeshName);
+  
   SMESH_Hypothesis::Hypothesis_Status
   AddHypothesis(const TopoDS_Shape & aSubShape, int anHypId)
     throw(SALOME_Exception);
@@ -219,12 +223,22 @@ public:
   void ExportMED(const char *file, 
                  const char* theMeshName = NULL, 
                  bool theAutoGroups = true, 
-                 int theVersion = 0) 
+                 int theVersion = 0,
+                 const SMESHDS_Mesh* meshPart = 0) 
     throw(SALOME_Exception);
 
-  void ExportDAT(const char *file) throw(SALOME_Exception);
-  void ExportUNV(const char *file) throw(SALOME_Exception);
-  void ExportSTL(const char *file, const bool isascii) throw(SALOME_Exception);
+  void ExportDAT(const char *        file,
+                 const SMESHDS_Mesh* meshPart = 0) throw(SALOME_Exception);
+  void ExportUNV(const char *        file,
+                 const SMESHDS_Mesh* meshPart = 0) throw(SALOME_Exception);
+  void ExportSTL(const char *        file,
+                 const bool          isascii,
+                 const SMESHDS_Mesh* meshPart = 0) throw(SALOME_Exception);
+  void ExportCGNS(const char *        file,
+                  const SMESHDS_Mesh* mesh);
+  void ExportSAUV(const char *file, 
+                  const char* theMeshName = NULL, 
+                  bool theAutoGroups = true) throw(SALOME_Exception);
   
   int NbNodes() const throw(SALOME_Exception);
   
@@ -238,6 +252,8 @@ public:
   
   int NbQuadrangles(SMDSAbs_ElementOrder order = ORDER_ANY) const throw(SALOME_Exception);
 
+  int NbBiQuadQuadrangles() const throw(SALOME_Exception);
+  
   int NbPolygons() const throw(SALOME_Exception);
   
   int NbVolumes(SMDSAbs_ElementOrder order = ORDER_ANY) const throw(SALOME_Exception);
@@ -246,20 +262,25 @@ public:
   
   int NbHexas(SMDSAbs_ElementOrder order = ORDER_ANY) const throw(SALOME_Exception);
   
+  int NbTriQuadraticHexas() const throw(SALOME_Exception);
+  
   int NbPyramids(SMDSAbs_ElementOrder order = ORDER_ANY) const throw(SALOME_Exception);
 
   int NbPrisms(SMDSAbs_ElementOrder order = ORDER_ANY) const throw(SALOME_Exception);
   
+  int NbHexagonalPrisms() const throw(SALOME_Exception);
+  
   int NbPolyhedrons() const throw(SALOME_Exception);
   
   int NbSubMesh() const throw(SALOME_Exception);
   
   int NbGroup() const { return _mapGroup.size(); }
-  
+
   SMESH_Group* AddGroup (const SMDSAbs_ElementType theType,
                          const char*               theName,
                          int&                      theId,
-                         const TopoDS_Shape&       theShape=TopoDS_Shape());
+                         const TopoDS_Shape&       theShape=TopoDS_Shape(),
+                         const SMESH_PredicatePtr& thePredicate=SMESH_PredicatePtr());
   
   typedef boost::shared_ptr< SMDS_Iterator<SMESH_Group*> > GroupIteratorPtr;
   GroupIteratorPtr GetGroups() const;
@@ -279,6 +300,8 @@ public:
   };
   void SetRemoveGroupCallUp( TRmGroupCallUp * upCaller );
 
+  bool SynchronizeGroups();
+
 
   SMDSAbs_ElementType GetElementType( const int id, const bool iselem );