-// Copyright (C) 2005 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-// Lesser General Public License for more details.
+// Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE
//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
// File : SALOMEDS_SObject.hxx
// Author : Sergey RUIN
// Module : SALOME
-
-
-
+//
#include <string>
-#include <TCollection_AsciiString.hxx>
-#include <TColStd_HSequenceOfTransient.hxx>
#include "SALOMEDS_SObject.hxx"
#include "Utils_ORB_INIT.hxx"
#include "Utils_SINGLETON.hxx"
+#include "Basics_Utils.hxx"
+
+#include "utilities.h"
+
#ifdef WIN32
+#include <windows.h>
#include <process.h>
#else
#include <sys/types.h>
#include <unistd.h>
#endif
-#include "OpUtil.hxx"
-#include "utilities.h"
+
using namespace std;
long pid = (long)getpid();
#endif
- long addr = theSObject->GetLocalImpl(GetHostname().c_str(), pid, _isLocal);
+ CORBA::LongLong addr = // mpv: fix for IPAL13534: for 64-bit platforms use 8-bytes long for pointer storage
+ theSObject->GetLocalImpl(Kernel_Utils::GetHostname().c_str(), pid, _isLocal);
+
if(_isLocal) {
- _local_impl = ((SALOMEDSImpl_SObject*)(addr));
+ _local_impl = reinterpret_cast<SALOMEDSImpl_SObject*>(addr);
_corba_impl = SALOMEDS::SObject::_duplicate(theSObject);
}
else {
init_orb();
}
-SALOMEDS_SObject::SALOMEDS_SObject(const Handle(SALOMEDSImpl_SObject)& theSObject)
+SALOMEDS_SObject::SALOMEDS_SObject(const SALOMEDSImpl_SObject& theSObject)
:_isLocal(true)
{
_corba_impl = SALOMEDS::SObject::_nil();
- _local_impl = theSObject;
+
+ if(theSObject.IsComponent()) {
+ SALOMEDSImpl_SComponent sco = theSObject;
+ _local_impl = sco.GetPersistentCopy();
+ }
+ else {
+ _local_impl = theSObject.GetPersistentCopy();
+ }
init_orb();
}
if (!_isLocal) {
_corba_impl->Destroy();
}
+ else {
+ if(_local_impl) delete _local_impl;
+ }
}
std::string SALOMEDS_SObject::GetID()
std::string aValue;
if (_isLocal) {
SALOMEDS::Locker lock;
- aValue = _local_impl->GetID().ToCString();
+ aValue = _local_impl->GetID();
}
- else aValue = _corba_impl->GetID();
+ else aValue = (CORBA::String_var)_corba_impl->GetID();
return aValue;
}
{
if (_isLocal) {
SALOMEDS::Locker lock;
- Handle(SALOMEDSImpl_SComponent) aSCO =
- Handle(SALOMEDSImpl_SComponent)::DownCast(_local_impl->GetFatherComponent());
- return _PTR(SComponent)(new SALOMEDS_SComponent(aSCO));
+ return _PTR(SComponent)(new SALOMEDS_SComponent(_local_impl->GetFatherComponent()));
}
- return _PTR(SComponent)(new SALOMEDS_SComponent(_corba_impl->GetFatherComponent()));
+ return _PTR(SComponent)(new SALOMEDS_SComponent((SALOMEDS::SComponent_var)_corba_impl->GetFatherComponent()));
}
_PTR(SObject) SALOMEDS_SObject::GetFather()
SALOMEDS::Locker lock;
return _PTR(SObject)(new SALOMEDS_SObject(_local_impl->GetFather()));
}
- return _PTR(SObject)(new SALOMEDS_SObject(_corba_impl->GetFather()));
+ return _PTR(SObject)(new SALOMEDS_SObject((SALOMEDS::SObject_var)_corba_impl->GetFather()));
}
bool SALOMEDS_SObject::FindAttribute(_PTR(GenericAttribute)& anAttribute,
bool ret = false;
if (_isLocal) {
SALOMEDS::Locker lock;
- Handle(SALOMEDSImpl_GenericAttribute) anAttr;
- ret = _local_impl->FindAttribute(anAttr, (char*)aTypeOfAttribute.c_str());
- if(ret) anAttribute = _PTR(GenericAttribute)(SALOMEDS_GenericAttribute::CreateAttribute(anAttr));
+ DF_Attribute* anAttr = NULL;
+ ret = _local_impl->FindAttribute(anAttr, aTypeOfAttribute);
+ if(ret) {
+ SALOMEDSImpl_GenericAttribute* ga = dynamic_cast<SALOMEDSImpl_GenericAttribute*>(anAttr);
+ anAttribute = _PTR(GenericAttribute)(SALOMEDS_GenericAttribute::CreateAttribute(ga));
+ }
}
else {
SALOMEDS::GenericAttribute_var anAttr;
bool ret = false;
if (_isLocal) {
SALOMEDS::Locker lock;
- Handle(SALOMEDSImpl_SObject) aSO;
+ SALOMEDSImpl_SObject aSO;
ret = _local_impl->ReferencedObject(aSO);
if(ret) theObject = _PTR(SObject)(new SALOMEDS_SObject(aSO));
}
bool ret = false;
if (_isLocal) {
SALOMEDS::Locker lock;
- Handle(SALOMEDSImpl_SObject) aSO;
+ SALOMEDSImpl_SObject aSO;
ret = _local_impl->FindSubObject(theTag, aSO);
if(ret) theObject = _PTR(SObject)(new SALOMEDS_SObject(aSO));
}
SALOMEDS::Locker lock;
return _PTR(Study)(new SALOMEDS_Study(_local_impl->GetStudy()));
}
- return _PTR(Study)(new SALOMEDS_Study(_corba_impl->GetStudy()));
+ SALOMEDS::Study_var study=_corba_impl->GetStudy();
+ return _PTR(Study)(new SALOMEDS_Study(study));
}
std::string SALOMEDS_SObject::Name()
std::string aName;
if (_isLocal) {
SALOMEDS::Locker lock;
- aName = _local_impl->Name().ToCString();
+ aName = _local_impl->Name();
}
- else aName = _corba_impl->Name();
+ else aName = (CORBA::String_var)_corba_impl->Name();
return aName;
}
{
if (_isLocal) {
SALOMEDS::Locker lock;
- _local_impl->Name((char*)theName.c_str());
+ _local_impl->Name(theName);
}
else _corba_impl->Name(theName.c_str());
}
if (_isLocal) {
SALOMEDS::Locker lock;
- Handle(TColStd_HSequenceOfTransient) aSeq = _local_impl->GetAllAttributes();
- aLength = aSeq->Length();
- for (int i = 1; i <= aLength; i++) {
- anAttr = SALOMEDS_GenericAttribute::CreateAttribute
- (Handle(SALOMEDSImpl_GenericAttribute)::DownCast(aSeq->Value(i)));
+ vector<DF_Attribute*> aSeq = _local_impl->GetAllAttributes();
+ aLength = aSeq.size();
+ for (int i = 0; i < aLength; i++) {
+ anAttr = SALOMEDS_GenericAttribute::CreateAttribute(dynamic_cast<SALOMEDSImpl_GenericAttribute*>(aSeq[i]));
aVector.push_back(_PTR(GenericAttribute)(anAttr));
}
}
std::string aName;
if (_isLocal) {
SALOMEDS::Locker lock;
- aName = _local_impl->GetName().ToCString();
+ aName = _local_impl->GetName();
}
- else aName = _corba_impl->GetName();
+ else aName = (CORBA::String_var) _corba_impl->GetName();
return aName;
}
std::string aComment;
if (_isLocal) {
SALOMEDS::Locker lock;
- aComment = _local_impl->GetComment().ToCString();
+ aComment = _local_impl->GetComment();
}
- else aComment = _corba_impl->GetComment();
+ else aComment = (CORBA::String_var) _corba_impl->GetComment();
return aComment;
}
std::string anIOR;
if (_isLocal) {
SALOMEDS::Locker lock;
- anIOR = _local_impl->GetIOR().ToCString();
+ anIOR = _local_impl->GetIOR();
}
- else anIOR = _corba_impl->GetIOR();
+ else anIOR = (CORBA::String_var) _corba_impl->GetIOR();
return anIOR;
}
{
if(_isLocal) {
if(!CORBA::is_nil(_corba_impl)) return SALOMEDS::SObject::_duplicate(_corba_impl);
- SALOMEDS::SObject_var aSO = SALOMEDS_SObject_i::New(_local_impl, _orb);
+ SALOMEDS::SObject_var aSO = SALOMEDS_SObject_i::New(*_local_impl, _orb);
_corba_impl = SALOMEDS::SObject::_duplicate(aSO);
return aSO._retn();
}
