Salome HOME
projects
/
modules
/
kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix on [Bug PAL7750] Regression of UNDO in GEOM
[modules/kernel.git]
/
src
/
SALOMEDS
/
SALOMEDS_SObject_i.hxx
diff --git
a/src/SALOMEDS/SALOMEDS_SObject_i.hxx
b/src/SALOMEDS/SALOMEDS_SObject_i.hxx
index 2f28e74c2c12131545b5654b1bee667902656686..a4c73ce43c8bffcf6bef0355079e5c7e01d1ace8 100644
(file)
--- a/
src/SALOMEDS/SALOMEDS_SObject_i.hxx
+++ b/
src/SALOMEDS/SALOMEDS_SObject_i.hxx
@@
-105,9
+105,12
@@
public:
FindOrCreateAttribute(const char* theTypeOfAttribute);
void RemoveAttribute(const char* theTypeOfAttribute);
FindOrCreateAttribute(const char* theTypeOfAttribute);
void RemoveAttribute(const char* theTypeOfAttribute);
+ void OnRemove();
SALOMEDS_Study_i* GetStudyServant(){ return _study;}
SALOMEDS_Study_i* GetStudyServant(){ return _study;}
+ TDF_Label GetLabel(){ return _lab;}
+
CORBA::ORB_var GetORB() const;
PortableServer::POA_var GetPOA() const;
CORBA::ORB_var GetORB() const;
PortableServer::POA_var GetPOA() const;
@@
-115,14
+118,19
@@
public:
protected:
friend class SALOMEDS_GenericAttribute_i;
protected:
friend class SALOMEDS_GenericAttribute_i;
- SALOMEDS_GenericAttribute_i*
+ typedef std::string TAttributeID;
+ typedef std::pair<SALOMEDS_GenericAttribute_i*,SALOMEDS::GenericAttribute_var> TAttrHolder;
+ typedef std::map<TAttributeID,TAttrHolder> TAttrMap;
+ TAttrMap myAttrMap;
+
+ TAttrHolder
_FindGenAttribute(const Handle(TDF_Attribute)& theAttr);
_FindGenAttribute(const Handle(TDF_Attribute)& theAttr);
- SALOMEDS_GenericAttribute_i*
+ TAttrHolder
_CreateGenAttribute(const Handle(TDF_Attribute)& theAttr,
const char* theTypeOfAttribute);
_CreateGenAttribute(const Handle(TDF_Attribute)& theAttr,
const char* theTypeOfAttribute);
- SALOMEDS_GenericAttribute_i*
+ TAttrHolder
_FindGenAttribute(const char* theTypeOfAttribute);
SALOMEDS::GenericAttribute_ptr
_FindGenAttribute(const char* theTypeOfAttribute);
SALOMEDS::GenericAttribute_ptr
@@
-135,11
+143,6
@@
protected:
std::string _name;
TDF_Label _lab;
std::string _name;
TDF_Label _lab;
- typedef std::string TAttributeID;
- typedef SALOMEDS_GenericAttribute_i* TAttrHolder;
- typedef std::map<TAttributeID,TAttrHolder> TAttrMap;
- TAttrMap myAttrMap;
-
SALOMEDS_SObject_i(SALOMEDS_Study_i* theStudy,
const TDF_Label& theLabel);
SALOMEDS_SObject_i(SALOMEDS_Study_i* theStudy,
const TDF_Label& theLabel);