From 1e48eab24572f65c21f1820fd58fc131f1cf618a Mon Sep 17 00:00:00 2001 From: vsr Date: Fri, 13 Apr 2018 16:39:36 +0300 Subject: [PATCH] Add missing methods to the client interface of SObject. --- src/SALOMEDS/SALOMEDS_SObject.cxx | 9 +++++++++ src/SALOMEDS/SALOMEDS_SObject.hxx | 3 ++- src/SALOMEDSClient/SALOMEDSClient_SObject.hxx | 18 ++++++++++-------- 3 files changed, 21 insertions(+), 9 deletions(-) diff --git a/src/SALOMEDS/SALOMEDS_SObject.cxx b/src/SALOMEDS/SALOMEDS_SObject.cxx index 2a6adb8c4..88aa17af3 100644 --- a/src/SALOMEDS/SALOMEDS_SObject.cxx +++ b/src/SALOMEDS/SALOMEDS_SObject.cxx @@ -299,6 +299,15 @@ int SALOMEDS_SObject::Tag() return _corba_impl->Tag(); } +int SALOMEDS_SObject::GetLastChildTag() +{ + if (_isLocal) { + SALOMEDS::Locker lock; + return _local_impl->GetLastChildTag(); + } + return _corba_impl->GetLastChildTag(); +} + int SALOMEDS_SObject::Depth() { if (_isLocal) { diff --git a/src/SALOMEDS/SALOMEDS_SObject.hxx b/src/SALOMEDS/SALOMEDS_SObject.hxx index 4635829ae..6b77e485c 100644 --- a/src/SALOMEDS/SALOMEDS_SObject.hxx +++ b/src/SALOMEDS/SALOMEDS_SObject.hxx @@ -67,8 +67,9 @@ public: virtual std::string GetName(); virtual std::string GetComment(); virtual std::string GetIOR(); - virtual void SetAttrString(const std::string& name, const std::string& value); + virtual void SetAttrString(const std::string& theName, const std::string& theValue); virtual int Tag(); + virtual int GetLastChildTag(); virtual int Depth(); CORBA::Object_ptr GetObject(); diff --git a/src/SALOMEDSClient/SALOMEDSClient_SObject.hxx b/src/SALOMEDSClient/SALOMEDSClient_SObject.hxx index 9aa5812b1..686f3ea5b 100644 --- a/src/SALOMEDSClient/SALOMEDSClient_SObject.hxx +++ b/src/SALOMEDSClient/SALOMEDSClient_SObject.hxx @@ -43,21 +43,23 @@ public: virtual ~SALOMEDSClient_SObject() {} virtual bool IsNull() const = 0; - virtual std::string GetID() = 0; + virtual std::string GetID() = 0; virtual _PTR(SComponent) GetFatherComponent() = 0; - virtual _PTR(SObject) GetFather() = 0; - virtual bool FindAttribute(_PTR(GenericAttribute)& anAttribute, const std::string& aTypeOfAttribute) = 0; - virtual bool ReferencedObject(_PTR(SObject)& theObject) = 0; - virtual bool FindSubObject(int theTag, _PTR(SObject)& theObject) = 0; + virtual _PTR(SObject) GetFather() = 0; + virtual bool FindAttribute(_PTR(GenericAttribute)& attribute, const std::string& type) = 0; + virtual bool ReferencedObject(_PTR(SObject)& object) = 0; + virtual bool FindSubObject(int tag, _PTR(SObject)& object) = 0; virtual _PTR(Study) GetStudy() = 0; virtual std::string Name() = 0; - virtual void Name(const std::string& theName) = 0; + virtual void Name(const std::string& name) = 0; virtual std::vector<_PTR(GenericAttribute)> GetAllAttributes() = 0; virtual std::string GetName() = 0; virtual std::string GetComment() = 0; virtual std::string GetIOR() = 0; - virtual int Tag() = 0; - virtual int Depth() = 0; + virtual void SetAttrString(const std::string& name, const std::string& value) = 0; + virtual int Tag() = 0; + virtual int GetLastChildTag() = 0; + virtual int Depth() = 0; }; #endif -- 2.39.2