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 'master' into pre/medCompatibility
[modules/smesh.git]
/
src
/
SMESH
/
SMESH_Mesh.hxx
diff --git
a/src/SMESH/SMESH_Mesh.hxx
b/src/SMESH/SMESH_Mesh.hxx
index 158788613f0b61d911b09f6d7e9bc57c7a69de10..59ad490b1e0d7fee4a541bfa925ca38f0f48e9f5 100644
(file)
--- a/
src/SMESH/SMESH_Mesh.hxx
+++ b/
src/SMESH/SMESH_Mesh.hxx
@@
-235,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
*/
@@
-249,7
+254,7
@@
class SMESH_EXPORT SMESH_Mesh
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 =
0
,
+ 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,
@@
-266,7
+271,8
@@
class SMESH_EXPORT SMESH_Mesh
const SMESHDS_Mesh* meshPart = 0) throw(SALOME_Exception);
void ExportCGNS(const char * file,
const SMESHDS_Mesh* mesh,
const SMESHDS_Mesh* meshPart = 0) throw(SALOME_Exception);
void ExportCGNS(const char * file,
const SMESHDS_Mesh* mesh,
- const char * meshName = 0);
+ const char * meshName = 0,
+ const bool groupElemsByType = false);
void ExportGMF(const char * file,
const SMESHDS_Mesh* mesh,
bool withRequiredGroups = true );
void ExportGMF(const char * file,
const SMESHDS_Mesh* mesh,
bool withRequiredGroups = true );
@@
-295,6
+301,8
@@
class SMESH_EXPORT SMESH_Mesh
int NbTriQuadraticHexas() const throw(SALOME_Exception);
int NbPyramids(SMDSAbs_ElementOrder order = ORDER_ANY) const throw(SALOME_Exception);
int NbPrisms(SMDSAbs_ElementOrder order = ORDER_ANY) const throw(SALOME_Exception);
int NbTriQuadraticHexas() const throw(SALOME_Exception);
int NbPyramids(SMDSAbs_ElementOrder order = ORDER_ANY) const throw(SALOME_Exception);
int NbPrisms(SMDSAbs_ElementOrder order = ORDER_ANY) const throw(SALOME_Exception);
+ int NbQuadPrisms() const throw(SALOME_Exception);
+ int NbBiQuadPrisms() const throw(SALOME_Exception);
int NbHexagonalPrisms() const throw(SALOME_Exception);
int NbPolyhedrons() const throw(SALOME_Exception);
int NbHexagonalPrisms() const throw(SALOME_Exception);
int NbPolyhedrons() const throw(SALOME_Exception);
@@
-326,7
+334,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() {}
};