Salome HOME
projects
/
modules
/
hexablock.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Undef max Visual Studio definition.
[modules/hexablock.git]
/
src
/
HEXABLOCK
/
HexGroup.hxx
diff --git
a/src/HEXABLOCK/HexGroup.hxx
b/src/HEXABLOCK/HexGroup.hxx
index e75315b6235bbf8b3585bf13adad1ef5c8d69a77..5f7b7566dd91399faaa2b6df5f041b39812d8299 100755
(executable)
--- a/
src/HEXABLOCK/HexGroup.hxx
+++ b/
src/HEXABLOCK/HexGroup.hxx
@@
-1,7
+1,7
@@
// Class : Implementation des groupes
// Class : Implementation des groupes
-// Copyright (C) 2009-201
2
CEA/DEN, EDF R&D
+// Copyright (C) 2009-201
3
CEA/DEN, EDF R&D
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
@@
-23,28
+23,27
@@
#ifndef __GROUP_H
#define __GROUP_H
#ifndef __GROUP_H
#define __GROUP_H
-#include "hexa_base.hxx"
+#include "Hex_defines.hxx"
+#include "HexEltBase.hxx"
BEGIN_NAMESPACE_HEXA
BEGIN_NAMESPACE_HEXA
-class
Group
+class
HEXABLOCKENGINE_EXPORT Group : public EltBase
{
public :
{
public :
- Group (cpchar nom, EnumGroup grp);
- ~Group () {}
-
- void setName (cpchar nom) { grp_name = nom ; }
- cpchar getName () { return grp_name.c_str () ; }
- char* getNextName (pchar buffer);
- EnumGroup getKind () { return grp_kind ; }
int addElement (EltBase* elt);
int addElement (EltBase* elt);
- int removeElement (EltBase* elt);
- int findElement (EltBase* elt);
- int removeElement (int nro);
- EltBase* getElement (int nro) { return grp_table [nro] ; }
int countElement () { return grp_table.size () ; }
int countElement () { return grp_table.size () ; }
+ EnumGroup getKind () { return grp_kind ; }
+ int removeElement (int nro);
void clearElement () { grp_table.clear () ; }
void clearElement () { grp_table.clear () ; }
+ int removeElement (EltBase* elt);
+ EltBase* getElement (int nro) { return grp_table [nro] ; }
+ Group (Document* dad, cpchar nom, EnumGroup grp);
+#ifndef SWIG
+public :
+ int findElement (EltBase* elt);
+ ~Group () {}
void saveXml (XmlWriter* xml);
EnumElt getTypeElt () { return grp_typelt ; }
void saveXml (XmlWriter* xml);
EnumElt getTypeElt () { return grp_typelt ; }
@@
-53,11
+52,10
@@
public :
private :
int grp_id;
private :
int grp_id;
- static int last_grp_id;
EnumGroup grp_kind;
EnumElt grp_typelt;
EnumGroup grp_kind;
EnumElt grp_typelt;
- std::string grp_name;
std::vector <EltBase*> grp_table;
std::vector <EltBase*> grp_table;
+#endif
};
END_NAMESPACE_HEXA
};
END_NAMESPACE_HEXA