-// Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2022 CEA/DEN, EDF R&D, OPEN CASCADE
//
// 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.
+// 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
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
-// SMESH SMESH : implementaion of SMESH idl descriptions
+// SMESH SMESH : implementation of SMESH idl descriptions
// File : StdMeshers_ObjRefUlils.hxx
// Created : Wed Oct 18 15:15:27 2006
// Author : Edward AGAPOV (eap)
#define StdMeshers_ObjRefUlils_HeaderFile
#include "SMESH_Gen_i.hxx"
+#include "SMESH_StdMeshers_I.hxx"
/*!
* \brief Class encapsulates methods
{
public:
/*!
- * \brief Return GEOM Object correspoding to TopoDS_Shape
+ * \brief Return GEOM Object corresponding to TopoDS_Shape
* \param theShape - input TopoDS_Shape
* \retval GEOM::GEOM_Object_ptr - result object
*/
}
/*!
- * \brief Return TopoDS_Shape correspoding to GEOM_Object
+ * \brief Return TopoDS_Shape corresponding to GEOM_Object
* \param theGeomObject - input object
* \retval TopoDS_Shape - result TopoDS_Shape
*/
return TopoDS_Shape();
}
+ /*!
+ * \brief Return TopoDS_Shape by a study entry
+ * \param theEntry - study entry
+ * \retval TopoDS_Shape - result TopoDS_Shape
+ */
+ STDMESHERS_I_EXPORT static TopoDS_Shape EntryToShape(const std::string theEntry);
+
/*!
* \brief Return study entry of GEOM Object
*/
- static std::string GeomObjectToEntry(GEOM::GEOM_Object_ptr& theGeomObject);
+ static std::string GeomObjectToEntry(GEOM::GEOM_Object_ptr theGeomObject);
/*!
* \brief Return GEOM Object by its study entry or TopoDS_Shape
* \param stream - the stream
* \retval TopoDS_Shape - resulting shape
*/
- static TopoDS_Shape LoadFromStream( std::istream & stream );
+ static TopoDS_Shape LoadFromStream( std::istream & stream, std::string* entry=NULL );
/*!
* \brief Store the CORBA object in the stream
if (SMESH_Gen_i* gen = SMESH_Gen_i::GetSMESHGen()) {
std::string str;
if (stream >> str) {
- if ( StudyContext* myStudyContext = gen->GetCurrentStudyContext() ) {
- string ior = myStudyContext->getIORbyOldId( atoi( str.c_str() ));
+ if ( StudyContext* myStudyContext = gen->GetStudyContext() ) {
+ std::string ior = myStudyContext->getIORbyOldId( atoi( str.c_str() ));
if ( !ior.empty() )
return TInterface::_narrow(gen->GetORB()->string_to_object( ior.c_str() ));
}