Merge from V5_1_main 14/05/2010

[modules/smesh.git] / src / SMESH / SMESH_Mesh.hxx

diff --git a/src/SMESH/SMESH_Mesh.hxx b/src/SMESH/SMESH_Mesh.hxx
index b93e8b5e732716959bdeceadb71633bcaf457672..ac504ced6405f0ef75833629368cb9a48b016531 100644 (file)
--- a/src/SMESH/SMESH_Mesh.hxx
+++ b/src/SMESH/SMESH_Mesh.hxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  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
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS


@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //

+

 //  SMESH SMESH : implementaion of SMESH idl descriptions
 //  File   : SMESH_Mesh.hxx
 //  Author : Paul RASCLE, EDF
 //  SMESH SMESH : implementaion of SMESH idl descriptions
 //  File   : SMESH_Mesh.hxx
 //  Author : Paul RASCLE, EDF


@@ -43,6 +44,11 @@
 #include <map>
 #include <list>
 
 #include <map>
 #include <list>
 

+#ifdef WNT
+#pragma warning(disable:4251) // Warning DLL Interface ...
+#pragma warning(disable:4290) // Warning Exception ...
+#endif
+

 class SMESH_Gen;
 class SMESHDS_Document;
 class SMESH_Group;
 class SMESH_Gen;
 class SMESHDS_Document;
 class SMESH_Group;


@@ -182,6 +188,21 @@ public:
 
   bool GetAutoColor() throw(SALOME_Exception);
 
 
   bool GetAutoColor() throw(SALOME_Exception);
 

+  /*!
+   * \brief Set the flag meaning that the mesh has been edited "manually".
+   * It is to set to false after Clear() and to set to true by MeshEditor
+   */
+  void SetIsModified(bool isModified);
+
+  bool GetIsModified() const { return _isModified; }
+
+  /*!
+   * \brief Return true if the mesh has been edited since a total re-compute
+   *        and those modifications may prevent successful partial re-compute.
+   *        As a side effect reset _isModified flag if mesh is empty
+   */
+  bool HasModificationsToDiscard() const;
+

   /*!
    * \brief Return data map of descendant to ancestor shapes
    */
   /*!
    * \brief Return data map of descendant to ancestor shapes
    */


@@ -287,6 +308,7 @@ protected:
   SMESH_Gen *                _gen;
   
   bool                       _isAutoColor;
   SMESH_Gen *                _gen;
   
   bool                       _isAutoColor;

+  bool                       _isModified; //!< modified since last total re-compute, issue 0020693

 
   double                     _shapeDiagonal; //!< diagonal size of bounding box of shape to mesh
   
 
   double                     _shapeDiagonal; //!< diagonal size of bounding box of shape to mesh