Salome HOME
projects
/
modules
/
smesh.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote branch 'origin/master' into V9_3_BR
[modules/smesh.git]
/
src
/
SMESH
/
SMESH_Mesh.hxx
diff --git
a/src/SMESH/SMESH_Mesh.hxx
b/src/SMESH/SMESH_Mesh.hxx
index 054616c5e361ec3833fe375d482a1bb211f33142..e20d578ce387abd36805185c5945bfecf2f99594 100644
(file)
--- a/
src/SMESH/SMESH_Mesh.hxx
+++ b/
src/SMESH/SMESH_Mesh.hxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
6
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
9
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
@@
-68,7
+68,6
@@
class SMESH_EXPORT SMESH_Mesh
{
public:
SMESH_Mesh(int theLocalId,
{
public:
SMESH_Mesh(int theLocalId,
- int theStudyId,
SMESH_Gen* theGen,
bool theIsEmbeddedMode,
SMESHDS_Document* theDocument);
SMESH_Gen* theGen,
bool theIsEmbeddedMode,
SMESHDS_Document* theDocument);
@@
-236,6
+235,11
@@
class SMESH_EXPORT SMESH_Mesh
*/
bool HasModificationsToDiscard() const;
*/
bool HasModificationsToDiscard() const;
+ /*!
+ * \brief Return true if all sub-meshes are computed OK - to update an icon
+ */
+ bool IsComputedOK();
+
/*!
* \brief Return data map of descendant to ancestor shapes
*/
/*!
* \brief Return data map of descendant to ancestor shapes
*/
@@
-247,13
+251,14
@@
class SMESH_EXPORT SMESH_Mesh
*/
bool HasDuplicatedGroupNamesMED();
*/
bool HasDuplicatedGroupNamesMED();
- void ExportMED(const char * theFile,
- const char* theMeshName = NULL,
- bool theAutoGroups = true,
- int theVersion =
0
,
+ void ExportMED(const char * theFile,
+ const char* theMeshName = NULL,
+ bool theAutoGroups = true,
+ int theVersion =
-1
,
const SMESHDS_Mesh* theMeshPart = 0,
bool theAutoDimension = false,
bool theAddODOnVertices = false,
const SMESHDS_Mesh* theMeshPart = 0,
bool theAutoDimension = false,
bool theAddODOnVertices = false,
+ double theZTolerance = -1.,
bool theAllElemsToGroup = false)
throw(SALOME_Exception);
bool theAllElemsToGroup = false)
throw(SALOME_Exception);
@@
-310,9
+315,9
@@
class SMESH_EXPORT SMESH_Mesh
SMESH_Group* AddGroup (const SMDSAbs_ElementType theType,
const char* theName,
SMESH_Group* AddGroup (const SMDSAbs_ElementType theType,
const char* theName,
-
int& theId
,
- const TopoDS_Shape& theShape
=
TopoDS_Shape(),
- const SMESH_PredicatePtr& thePredicate
=
SMESH_PredicatePtr());
+
const int theId = -1
,
+ const TopoDS_Shape& theShape
=
TopoDS_Shape(),
+ const SMESH_PredicatePtr& thePredicate
=
SMESH_PredicatePtr());
SMESH_Group* AddGroup (SMESHDS_GroupBase* groupDS) throw(SALOME_Exception);
SMESH_Group* AddGroup (SMESHDS_GroupBase* groupDS) throw(SALOME_Exception);
@@
-321,7
+326,7
@@
class SMESH_EXPORT SMESH_Mesh
std::list<int> GetGroupIds() const;
std::list<int> GetGroupIds() const;
- SMESH_Group* GetGroup (const int theGroupID);
+ SMESH_Group* GetGroup (const int theGroupID)
const
;
bool RemoveGroup (const int theGroupID);
bool RemoveGroup (const int theGroupID);
@@
-330,7
+335,7
@@
class SMESH_EXPORT SMESH_Mesh
struct TCallUp // callback from SMESH to SMESH_I level
{
virtual void RemoveGroup (const int theGroupID)=0;
struct TCallUp // callback from SMESH to SMESH_I level
{
virtual void RemoveGroup (const int theGroupID)=0;
- virtual void HypothesisModified ()=0;
+ virtual void HypothesisModified (
int theHypID
)=0;
virtual void Load ()=0;
virtual ~TCallUp() {}
};
virtual void Load ()=0;
virtual ~TCallUp() {}
};
@@
-362,7
+367,6
@@
private:
protected:
int _id; // id given by creator (unique within the creator instance)
protected:
int _id; // id given by creator (unique within the creator instance)
- int _studyId;
int _groupId; // id generator for group objects
int _nbSubShapes; // initial nb of subshapes in the shape to mesh
bool _isShapeToMesh;// set to true when a shape is given (only once)
int _groupId; // id generator for group objects
int _nbSubShapes; // initial nb of subshapes in the shape to mesh
bool _isShapeToMesh;// set to true when a shape is given (only once)