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 with version on tag OCC-V2_1_0d
[modules/smesh.git]
/
src
/
SMESH
/
SMESH_Group.hxx
diff --git
a/src/SMESH/SMESH_Group.hxx
b/src/SMESH/SMESH_Group.hxx
index 5147a44d79bb1fa32df646ab5dfe9bf648495b8a..26493e4e085296b3372c71cbdcc262bdaff916f9 100644
(file)
--- a/
src/SMESH/SMESH_Group.hxx
+++ b/
src/SMESH/SMESH_Group.hxx
@@
-30,25
+30,28
@@
#include <SMDSAbs_ElementType.hxx>
#include <string>
#include <SMDSAbs_ElementType.hxx>
#include <string>
-using namespace std;
+#include <TopoDS_Shape.hxx>
-class SMESHDS_Group;
+
+class SMESHDS_GroupBase;
class SMESH_Mesh;
class SMESH_Group
{
public:
class SMESH_Mesh;
class SMESH_Group
{
public:
- SMESH_Group (const SMESH_Mesh* theMesh,
+ SMESH_Group (int theID,
+ const SMESH_Mesh* theMesh,
const SMDSAbs_ElementType theType,
const SMDSAbs_ElementType theType,
- const char* theName);
+ const char* theName,
+ const TopoDS_Shape& theShape = TopoDS_Shape());
~SMESH_Group ();
void SetName (const char* theName) { myName = theName; }
const char* GetName () const { return myName.c_str(); }
~SMESH_Group ();
void SetName (const char* theName) { myName = theName; }
const char* GetName () const { return myName.c_str(); }
- SMESHDS_Group * GetGroupDS () { return myGroupDS; }
+ SMESHDS_Group
Base
* GetGroupDS () { return myGroupDS; }
private:
SMESH_Group (const SMESH_Group& theOther);
private:
SMESH_Group (const SMESH_Group& theOther);
@@
-56,8
+59,8
@@
class SMESH_Group
SMESH_Group& operator = (const SMESH_Group& theOther);
// prohibited assign operator
SMESH_Group& operator = (const SMESH_Group& theOther);
// prohibited assign operator
- SMESHDS_Group * myGroupDS;
- st
ring
myName;
+ SMESHDS_Group
Base
* myGroupDS;
+ st
d::string
myName;
};
};