X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FSMESH_I%2FSMESH_Mesh_i.hxx;h=cd9a7a9166388121dc1a630f64fef47988f8102e;hp=f83347539ae8dc3312913dadc38a4d6d1c52fe6b;hb=be0348c630bec8c50d15094deeec95f5cc2d7a8b;hpb=67dba15dfdd0b7f7a2671a70ad831a080a9c0487

diff --git a/src/SMESH_I/SMESH_Mesh_i.hxx b/src/SMESH_I/SMESH_Mesh_i.hxx
index f83347539..cd9a7a916 100644
--- a/src/SMESH_I/SMESH_Mesh_i.hxx
+++ b/src/SMESH_I/SMESH_Mesh_i.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2013  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2014  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
@@ -6,7 +6,7 @@
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
 // License as published by the Free Software Foundation; either
-// version 2.1 of the License.
+// version 2.1 of the License, or (at your option) any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -47,6 +47,8 @@ class SMESH_GroupBase_i;
 class SMESH_subMesh_i;
 class SMESH_PreMeshInfo;
 class SMESH_MeshEditor_i;
+class DriverMED_W_Field;
+class SMESHDS_Mesh;
 
 class SMESH_I_EXPORT SMESH_Mesh_i:
   public virtual POA_SMESH::SMESH_Mesh,
@@ -255,7 +257,9 @@ public:
                        CORBA::Boolean            auto_groups,
                        SMESH::MED_VERSION        version,
                        CORBA::Boolean            overwrite,
-                       CORBA::Boolean            autoDim=true) throw (SALOME::SALOME_Exception);
+                       CORBA::Boolean            autoDim,
+                       const GEOM::ListOfFields& fields,
+                       const char*               geomAssocFields) throw (SALOME::SALOME_Exception);
   void ExportPartToDAT(SMESH::SMESH_IDSource_ptr meshPart,
                        const char*               file) throw (SALOME::SALOME_Exception);
   void ExportPartToUNV(SMESH::SMESH_IDSource_ptr meshPart,
@@ -436,6 +440,12 @@ public:
 
   void checkMeshLoaded();
 
+  /*!
+   * \brief Update data if geometry changes
+   *
+   * Issue 0022501
+   */
+  void CheckGeomModif();
   /*!
    * \brief Update hypotheses assigned to geom groups if the latter change
    *
@@ -585,6 +595,10 @@ public:
    */
   SMESH::string_array* GetLastParameters();
 
+  /*!
+   * \brief Return \c true if a meshing order not yet set for a concurrent sub-mesh
+   */
+  CORBA::Boolean IsUnorderedSubMesh(CORBA::Long submeshID);
   /*!
    * \brief Return submesh objects list in meshing order
    */
@@ -646,6 +660,13 @@ private:
    */
   void checkGroupNames();
 
+  /*
+   * Write GEOM fields to MED file
+   */
+  void exportMEDFields( DriverMED_W_Field &       writer,
+                        SMESHDS_Mesh*             meshDS,
+                        const GEOM::ListOfFields& fields,
+                        const char*               geomAssocFields);
   /*!
    * Convert submesh ids into submesh interfaces
    */
@@ -653,6 +674,11 @@ private:
                         SMESH::submesh_array_array& theSubMeshOrder,
                         const bool                  theIsDump);
 
+  /*!
+   * \brief Finds concurrent sub-meshes
+   */
+  TListOfListOfInt findConcurrentSubMeshes();
+
 private:
 
   static int    _idGenerator;
@@ -682,6 +708,7 @@ private:
     CORBA::Object_var _smeshObject; // SMESH object depending on GEOM group
   };
   std::list<TGeomGroupData> _geomGroupData;
+  int                       _mainShapeTick; // to track modifications of the meshed shape
 
   /*!
    * Remember GEOM group data