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 tag 'V8_3_0a2' into ngr/python3_dev
[modules/smesh.git]
/
src
/
SMESH
/
SMESH_Mesh.hxx
diff --git
a/src/SMESH/SMESH_Mesh.hxx
b/src/SMESH/SMESH_Mesh.hxx
index da79ce1bfc378fa9ac53c3739e249844aa0ea682..a8ec5dfae4e0fdfc1762cd981c82ddcccc53dea1 100644
(file)
--- a/
src/SMESH/SMESH_Mesh.hxx
+++ b/
src/SMESH/SMESH_Mesh.hxx
@@
-43,7
+43,7
@@
#include <map>
#include <list>
#include <map>
#include <list>
-
+#include <vector>
#ifdef WIN32
#pragma warning(disable:4251) // Warning DLL Interface ...
#ifdef WIN32
#pragma warning(disable:4251) // Warning DLL Interface ...
@@
-121,7
+121,7
@@
class SMESH_EXPORT SMESH_Mesh
int MEDToMesh(const char* theFileName, const char* theMeshName);
int MEDToMesh(const char* theFileName, const char* theMeshName);
-
int
STLToMesh(const char* theFileName);
+
std::string
STLToMesh(const char* theFileName);
int CGNSToMesh(const char* theFileName, const int theMeshIndex, std::string& theMeshName);
int CGNSToMesh(const char* theFileName, const int theMeshIndex, std::string& theMeshName);
@@
-206,14
+206,14
@@
class SMESH_EXPORT SMESH_Mesh
bool IsUsedHypothesis(SMESHDS_Hypothesis * anHyp,
const SMESH_subMesh * aSubMesh);
/*!
bool IsUsedHypothesis(SMESHDS_Hypothesis * anHyp,
const SMESH_subMesh * aSubMesh);
/*!
- * \brief check if a hypothesis alowing notconform mesh is present
+ * \brief check if a hypothesis al
l
owing notconform mesh is present
*/
bool IsNotConformAllowed() const;
bool IsMainShape(const TopoDS_Shape& theShape) const;
/*!
* \brief Return list of ancestors of theSubShape in the order
*/
bool IsNotConformAllowed() const;
bool IsMainShape(const TopoDS_Shape& theShape) const;
/*!
* \brief Return list of ancestors of theSubShape in the order
- * that lower dimen
t
ion shapes come first
+ * that lower dimen
s
ion shapes come first
*/
const TopTools_ListOfShape& GetAncestors(const TopoDS_Shape& theSubShape) const;
*/
const TopTools_ListOfShape& GetAncestors(const TopoDS_Shape& theSubShape) const;
@@
-253,7
+253,8
@@
class SMESH_EXPORT SMESH_Mesh
int theVersion = 0,
const SMESHDS_Mesh* theMeshPart = 0,
bool theAutoDimension = false,
int theVersion = 0,
const SMESHDS_Mesh* theMeshPart = 0,
bool theAutoDimension = false,
- bool theAddODOnVertices = false)
+ bool theAddODOnVertices = false,
+ bool theAllElemsToGroup = false)
throw(SALOME_Exception);
void ExportDAT(const char * file,
throw(SALOME_Exception);
void ExportDAT(const char * file,
@@
-262,6
+263,7
@@
class SMESH_EXPORT SMESH_Mesh
const SMESHDS_Mesh* meshPart = 0) throw(SALOME_Exception);
void ExportSTL(const char * file,
const bool isascii,
const SMESHDS_Mesh* meshPart = 0) throw(SALOME_Exception);
void ExportSTL(const char * file,
const bool isascii,
+ const char * name = 0,
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,