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
#19926 [CEA 19782] renumbering meshes
[modules/smesh.git]
/
src
/
SMESH
/
SMESH_Mesh.hxx
diff --git
a/src/SMESH/SMESH_Mesh.hxx
b/src/SMESH/SMESH_Mesh.hxx
index 59ad490b1e0d7fee4a541bfa925ca38f0f48e9f5..18c11c894a6b61c1b43fade9ef5f96f87a3d620e 100644
(file)
--- a/
src/SMESH/SMESH_Mesh.hxx
+++ b/
src/SMESH/SMESH_Mesh.hxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-20
16
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-20
20
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
@@
-44,6
+44,7
@@
#include <map>
#include <list>
#include <vector>
#include <map>
#include <list>
#include <vector>
+#include <ostream>
#ifdef WIN32
#pragma warning(disable:4251) // Warning DLL Interface ...
#ifdef WIN32
#pragma warning(disable:4251) // Warning DLL Interface ...
@@
-86,6
+87,9
@@
class SMESH_EXPORT SMESH_Mesh
* \brief Return true if there is a geometry to be meshed, not PseudoShape()
*/
bool HasShapeToMesh() const { return _isShapeToMesh; }
* \brief Return true if there is a geometry to be meshed, not PseudoShape()
*/
bool HasShapeToMesh() const { return _isShapeToMesh; }
+
+ void UndefShapeToMesh() { _isShapeToMesh = false; }
+
/*!
* \brief Return diagonal size of bounding box of shape to mesh.
*/
/*!
* \brief Return diagonal size of bounding box of shape to mesh.
*/
@@
-210,6
+214,9
@@
class SMESH_EXPORT SMESH_Mesh
bool IsNotConformAllowed() const;
bool IsMainShape(const TopoDS_Shape& theShape) const;
bool IsNotConformAllowed() const;
bool IsMainShape(const TopoDS_Shape& theShape) const;
+
+ TopoDS_Shape GetShapeByEntry(const std::string& entry) const;
+
/*!
* \brief Return list of ancestors of theSubShape in the order
* that lower dimension shapes come first
/*!
* \brief Return list of ancestors of theSubShape in the order
* that lower dimension shapes come first
@@
-251,13
+258,14
@@
class SMESH_EXPORT SMESH_Mesh
*/
bool HasDuplicatedGroupNamesMED();
*/
bool HasDuplicatedGroupNamesMED();
- void ExportMED(const char * theFile,
- const char* theMeshName = NULL,
- bool theAutoGroups = true,
+ 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,
int theVersion = -1,
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);
@@
-314,9
+322,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);
@@
-325,7
+333,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);
@@
-333,9
+341,11
@@
class SMESH_EXPORT SMESH_Mesh
struct TCallUp // callback from SMESH to SMESH_I level
{
struct TCallUp // callback from SMESH to SMESH_I level
{
- virtual void RemoveGroup (const int theGroupID)=0;
- virtual void HypothesisModified (int theHypID)=0;
- virtual void Load ()=0;
+ virtual void RemoveGroup( const int theGroupID )=0;
+ virtual void HypothesisModified( int hypID, bool updateIcons )=0;
+ virtual void Load()=0;
+ virtual bool IsLoaded()=0;
+ virtual TopoDS_Shape GetShapeByEntry(const std::string& entry)=0;
virtual ~TCallUp() {}
};
void SetCallUp( TCallUp * upCaller );
virtual ~TCallUp() {}
};
void SetCallUp( TCallUp * upCaller );
@@
-356,7
+366,7
@@
class SMESH_EXPORT SMESH_Mesh
bool IsOrderOK( const SMESH_subMesh* smBefore,
const SMESH_subMesh* smAfter ) const;
bool IsOrderOK( const SMESH_subMesh* smBefore,
const SMESH_subMesh* smAfter ) const;
- std::ostream& Dump(ostream & save);
+ std::ostream& Dump(
std::
ostream & save);
private:
private: