-// 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 <map>
-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 - "<<theLabel.Tag()<<" - "<<anSObjectMap.size()<<endl;
- if(anIter != anSObjectMap.end()){
- SALOMEDS_SObject_i* aSObject = anIter->second;
- aSComponent = dynamic_cast<SALOMEDS_SComponent_i*>(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
*/
//============================================================================
SALOMEDS_SComponent_i::~SALOMEDS_SComponent_i()
-{
-}
-
-
+{}
+
//============================================================================
/*! Function : ComponentDataType
* Purpose :
//============================================================================
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 :"<<anEntry);
- // END DEB
-
- Standard_CString res = "";
- Handle(TDataStd_Comment) type;
- if ( _lab.FindAttribute(TDataStd_Comment::GetID(),type) ) {
- TCollection_AsciiString ch(type->Get());
- res = ch.ToCString();
- }
-
- return CORBA::string_dup(res);
+ SALOMEDS::Locker lock;
+ std::string aType = dynamic_cast<SALOMEDSImpl_SComponent*>(_impl)->ComponentDataType();
+ return CORBA::string_dup(aType.c_str());
}
//============================================================================
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<SALOMEDSImpl_SComponent*>(_impl)->ComponentIOR(ior)) {
+ IOR = CORBA::string_dup("");
+ return false;
}
- return Standard_False;
+ IOR = CORBA::string_dup(ior.c_str());
+ return true;
}
-
-
