X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSALOMEDS%2FSALOMEDS_SComponent_i.cxx;h=7f21a0c1ab02355b5841f87e213aba96d9085c8c;hb=63414a08d9492c25c206579c1953ec6f390679fd;hp=53cfc55503879957f78cf02c81b6dc2a6baddbd8;hpb=bd0aa83cc3573de6b62b2a56e168dd372097bd45;p=modules%2Fyacs.git diff --git a/src/SALOMEDS/SALOMEDS_SComponent_i.cxx b/src/SALOMEDS/SALOMEDS_SComponent_i.cxx index 53cfc5550..7f21a0c1a 100644 --- a/src/SALOMEDS/SALOMEDS_SComponent_i.cxx +++ b/src/SALOMEDS/SALOMEDS_SComponent_i.cxx @@ -1,66 +1,49 @@ -// SALOME SALOMEDS : data structure of SALOME and sources of Salome data server +// Copyright (C) 2007-2014 CEA/DEN, EDF R&D, OPEN CASCADE // -// Copyright (C) 2003 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. -// -// 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.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// Copyright (C) 2003-2007 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, or (at your option) any later version. // +// 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_SComponent_i.cxx -// Author : Yves FRICAUD +// Author : Sergey RUIN // Module : SALOME -// $Header$ - +// #include "SALOMEDS_SComponent_i.hxx" -#include "SALOMEDS_Study_i.hxx" - +#include "SALOMEDS.hxx" #include "utilities.h" +#include -using namespace std; - -SALOMEDS_SComponent_i* SALOMEDS_SComponent_i::New(SALOMEDS_Study_i* theStudy, - const TDF_Label& theLabel) +SALOMEDS::SComponent_ptr SALOMEDS_SComponent_i::New(const SALOMEDSImpl_SComponent& theImpl, CORBA::ORB_ptr theORB) { - SALOMEDS_SComponent_i* aSComponent = NULL; - SALOMEDS_Study_i::TSObjectMap& anSObjectMap = theStudy->GetSObjectMap(); - SALOMEDS_Study_i::TSObjectMap::const_iterator anIter = anSObjectMap.find(theLabel); - //cout<<"SALOMEDS_SComponent_i::New - "<second; - aSComponent = dynamic_cast(aSObject); - } - if(aSComponent == NULL){ - aSComponent = new SALOMEDS_SComponent_i(theStudy,theLabel); - anSObjectMap[theLabel] = aSComponent; - } - return aSComponent; -} + SALOMEDS_SComponent_i* sco_servant = new SALOMEDS_SComponent_i(theImpl, theORB); + + return sco_servant->_this(); +} //============================================================================ /*! Function : constructor * Purpose : */ //============================================================================ -SALOMEDS_SComponent_i::SALOMEDS_SComponent_i(SALOMEDS_Study_i* theStudy, - const TDF_Label& theLabel): - SALOMEDS_SObject_i(theStudy,theLabel) -{ -} +SALOMEDS_SComponent_i::SALOMEDS_SComponent_i(const SALOMEDSImpl_SComponent& theImpl, CORBA::ORB_ptr orb) + :SALOMEDS_SObject_i(theImpl, orb) +{} //============================================================================ /*! Function : destructor @@ -68,10 +51,8 @@ SALOMEDS_SComponent_i::SALOMEDS_SComponent_i(SALOMEDS_Study_i* theStudy, */ //============================================================================ SALOMEDS_SComponent_i::~SALOMEDS_SComponent_i() -{ -} - - +{} + //============================================================================ /*! Function : ComponentDataType * Purpose : @@ -79,21 +60,9 @@ SALOMEDS_SComponent_i::~SALOMEDS_SComponent_i() //============================================================================ char* SALOMEDS_SComponent_i::ComponentDataType() { - //DEB - // MESSAGE("In SALOMEDS_SComponent_i::ComponentDataType"); - // TCollection_AsciiString anEntry; - // TDF_Tool::Entry (_lab,anEntry); - // MESSAGE("in SALOMEDS_SComponent_i, Entry :"<Get()); - res = ch.ToCString(); - } - - return CORBA::string_dup(res); + SALOMEDS::Locker lock; + std::string aType = dynamic_cast(_impl)->ComponentDataType(); + return CORBA::string_dup(aType.c_str()); } @@ -104,28 +73,12 @@ char* SALOMEDS_SComponent_i::ComponentDataType() //============================================================================ CORBA::Boolean SALOMEDS_SComponent_i::ComponentIOR(CORBA::String_out IOR) { - Handle(SALOMEDS_IORAttribute) ior; - if (!_lab.FindAttribute(SALOMEDS_IORAttribute::GetID(),ior) ) - return false; - TCollection_AsciiString ch(ior->Get()); - IOR = CORBA::string_dup(ch.ToCString()); - return true; -} - - -//============================================================================ -/*! Function : IsA - * Purpose : - */ -//============================================================================ -Standard_Boolean SALOMEDS_SComponent_i::IsA(const TDF_Label& Lab) -{ - Handle(TDF_Attribute) Att; - // scomponent must contain comment and belong to the 2th depth label - if ( Lab.FindAttribute(TDataStd_Comment::GetID(), Att) && Lab.Depth() == 2) { - return Standard_True; + SALOMEDS::Locker lock; + std::string ior; + if(!dynamic_cast(_impl)->ComponentIOR(ior)) { + IOR = CORBA::string_dup(""); + return false; } - return Standard_False; + IOR = CORBA::string_dup(ior.c_str()); + return true; } - -