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 d29b1eea1650f1ad06320f806f1414388778aa8f..0d79c015d74c7a4ec1e912308811e81255ae393c 100644
(file)
--- a/
src/SMESH_I/SMESH_Mesh_i.hxx
+++ b/
src/SMESH_I/SMESH_Mesh_i.hxx
@@
-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);
@@
-460,7
+463,7
@@
public:
*
* Issue 0022501
*/
*
* 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
*
@@
-618,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
*/
@@
-765,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
);
};
};