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 branch 'occ/shaper2smesh'
[modules/smesh.git]
/
src
/
SMESH_I
/
SMESH_Mesh_i.hxx
diff --git
a/src/SMESH_I/SMESH_Mesh_i.hxx
b/src/SMESH_I/SMESH_Mesh_i.hxx
index 2a6c368a0728a01f39251466680902e9faea74a5..0d79c015d74c7a4ec1e912308811e81255ae393c 100644
(file)
--- a/
src/SMESH_I/SMESH_Mesh_i.hxx
+++ b/
src/SMESH_I/SMESH_Mesh_i.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
@@
-74,6
+74,9
@@
public:
GEOM::GEOM_Object_ptr GetShapeToMesh()
throw (SALOME::SALOME_Exception);
GEOM::GEOM_Object_ptr GetShapeToMesh()
throw (SALOME::SALOME_Exception);
+ virtual void ReplaceShape(GEOM::GEOM_Object_ptr theNewGeom)
+ throw (SALOME::SALOME_Exception);
+
CORBA::Boolean IsLoaded()
throw (SALOME::SALOME_Exception);
CORBA::Boolean IsLoaded()
throw (SALOME::SALOME_Exception);
@@
-167,6
+170,10
@@
public:
CORBA::Boolean theUnderlyingOnly )
throw (SALOME::SALOME_Exception);
CORBA::Boolean theUnderlyingOnly )
throw (SALOME::SALOME_Exception);
+ SMESH::ListOfGroups* FaceGroupsSeparatedByEdges( CORBA::Double theSharpAngle,
+ CORBA::Boolean theCreateEdges,
+ CORBA::Boolean theUseExistingEdges )
+ throw (SALOME::SALOME_Exception);
SMESH::SMESH_Group_ptr ConvertToStandalone( SMESH::SMESH_GroupBase_ptr theGroupOn )
throw (SALOME::SALOME_Exception);
SMESH::SMESH_Group_ptr ConvertToStandalone( SMESH::SMESH_GroupBase_ptr theGroupOn )
throw (SALOME::SALOME_Exception);
@@
-436,6
+443,7
@@
public:
SMESH::SMESH_GroupBase_ptr createGroup(SMESH::ElementType theElemType,
const char* theName,
SMESH::SMESH_GroupBase_ptr createGroup(SMESH::ElementType theElemType,
const char* theName,
+ const int theID = -1,
const TopoDS_Shape& theShape = TopoDS_Shape(),
const SMESH_PredicatePtr& thePred = SMESH_PredicatePtr());
const TopoDS_Shape& theShape = TopoDS_Shape(),
const SMESH_PredicatePtr& thePred = SMESH_PredicatePtr());
@@
-447,17
+455,15
@@
public:
const std::map<int, SMESH::SMESH_GroupBase_ptr>& getGroups() { return _mapGroups; }
// return existing group objects
const std::map<int, SMESH::SMESH_GroupBase_ptr>& getGroups() { return _mapGroups; }
// return existing group objects
- void onHypothesisModified(int theHypID);
+ void onHypothesisModified(int theHypID
, bool updateIcons
);
// callback from _impl to forget not loaded mesh data (issue 0021208)
// callback from _impl to forget not loaded mesh data (issue 0021208)
- void checkMeshLoaded();
-
/*!
* \brief Update data if geometry changes
*
* Issue 0022501
*/
/*!
* \brief Update data if geometry changes
*
* Issue 0022501
*/
- void CheckGeomModif();
+ void CheckGeomModif(
bool isBreakLink = false
);
/*!
* \brief Update hypotheses assigned to geom groups if the latter change
*
/*!
* \brief Update hypotheses assigned to geom groups if the latter change
*
@@
-497,7
+503,8
@@
public:
* For given node returns list of IDs of inverse elements
* If there is not node for given ID - returns empty list
*/
* For given node returns list of IDs of inverse elements
* If there is not node for given ID - returns empty list
*/
- SMESH::long_array* GetNodeInverseElements(CORBA::Long id);
+ SMESH::long_array* GetNodeInverseElements(CORBA::Long id,
+ SMESH::ElementType elemType);
/*!
* \brief Return position of a node on shape
/*!
* \brief Return position of a node on shape
@@
-614,6
+621,12
@@
public:
std::string FileInfoToString();
void FileInfoFromString(const std::string& info);
std::string FileInfoToString();
void FileInfoFromString(const std::string& info);
+ /*!
+ * Persistence of geometry tick
+ */
+ int& MainShapeTick() { return _mainShapeTick; }
+
+
/*!
* Sets list of notebook variables used for Mesh operations separated by ":" symbol
*/
/*!
* Sets list of notebook variables used for Mesh operations separated by ":" symbol
*/
@@
-718,12
+731,13
@@
private:
*/
TListOfListOfInt findConcurrentSubMeshes();
*/
TListOfListOfInt findConcurrentSubMeshes();
-private:
+
private:
static int _idGenerator;
::SMESH_Mesh* _impl; // :: force no namespace here
SMESH_Gen_i* _gen_i;
int _id; // id given by creator (unique within the creator instance)
static int _idGenerator;
::SMESH_Mesh* _impl; // :: force no namespace here
SMESH_Gen_i* _gen_i;
int _id; // id given by creator (unique within the creator instance)
+ int _nbInvalidHypos;
std::map<int, SMESH::SMESH_subMesh_ptr> _mapSubMeshIor;
std::map<int, SMESH::SMESH_GroupBase_ptr> _mapGroups;
std::map<int, SMESH::SMESH_Hypothesis_ptr> _mapHypo;
std::map<int, SMESH::SMESH_subMesh_ptr> _mapSubMeshIor;
std::map<int, SMESH::SMESH_GroupBase_ptr> _mapGroups;
std::map<int, SMESH::SMESH_Hypothesis_ptr> _mapHypo;
@@
-760,7
+774,7
@@
private:
/*!
* Return new group contents if it has been changed and update group data
*/
/*!
* Return new group contents if it has been changed and update group data
*/
- TopoDS_Shape newGroupShape( TGeomGroupData & groupData);
+ TopoDS_Shape newGroupShape( TGeomGroupData & groupData
, int how
);
};
};