From 81eb14d32092a9cb23b23b2253de1dfb97103de2 Mon Sep 17 00:00:00 2001 From: Anthony Geay Date: Wed, 13 Jan 2021 10:48:39 +0100 Subject: [PATCH] 2 servant implementations of GEOM::GEOM_GEN. One with Study and ModuleCatalog retrived from NS (like the beginning), another one with Study and ModulCatalog embedded --- src/GEOM_I/CMakeLists.txt | 5 +++ src/GEOM_I/GEOM_Gen_No_Session_i.cc | 35 ++++++++++++++++ src/GEOM_I/GEOM_Gen_No_Session_i.hh | 34 +++++++++++++++ src/GEOM_I/GEOM_Gen_Session_i.cc | 64 +++++++++++++++++++++++++++++ src/GEOM_I/GEOM_Gen_Session_i.hh | 39 ++++++++++++++++++ src/GEOM_I/GEOM_Gen_i.cc | 55 ++----------------------- src/GEOM_I/GEOM_Gen_i.hh | 14 ++----- src/GEOM_I/GEOM_IOperations_i.cc | 4 +- src/GEOM_SWIG/CMakeLists.txt | 28 +++++++++++++ src/GEOM_SWIG/GeomHelper.cxx | 56 +++++++++++++++++++++++++ src/GEOM_SWIG/GeomHelper.h | 22 ++++++++++ src/GEOM_SWIG/GeomHelper.i | 27 ++++++++++++ src/GEOM_SWIG/geomBuilder.py | 2 +- 13 files changed, 321 insertions(+), 64 deletions(-) create mode 100644 src/GEOM_I/GEOM_Gen_No_Session_i.cc create mode 100644 src/GEOM_I/GEOM_Gen_No_Session_i.hh create mode 100644 src/GEOM_I/GEOM_Gen_Session_i.cc create mode 100644 src/GEOM_I/GEOM_Gen_Session_i.hh create mode 100644 src/GEOM_SWIG/GeomHelper.cxx create mode 100644 src/GEOM_SWIG/GeomHelper.h create mode 100644 src/GEOM_SWIG/GeomHelper.i diff --git a/src/GEOM_I/CMakeLists.txt b/src/GEOM_I/CMakeLists.txt index 577e57255..bc95fc6f2 100644 --- a/src/GEOM_I/CMakeLists.txt +++ b/src/GEOM_I/CMakeLists.txt @@ -52,6 +52,7 @@ SET(_link_LIBRARIES ${KERNEL_TOOLSDS} ${KERNEL_SalomeContainer} ${KERNEL_SalomeNS} + ${KERNEL_SalomeDS} ) # --- headers --- @@ -74,6 +75,8 @@ SET(GEOMEngine_HEADERS GEOM_IMeasureOperations_i.hh GEOM_IGroupOperations_i.hh GEOM_Gen_i.hh + GEOM_Gen_Session_i.hh + GEOM_Gen_No_Session_i.hh GEOM_GEOM_I.hxx GEOM_wrap.hxx ) @@ -98,6 +101,8 @@ SET(GEOMEngine_SOURCES GEOM_IGroupOperations_i.cc GEOM_IFieldOperations_i.cc GEOM_Gen_i.cc + GEOM_Gen_Session_i.cc + GEOM_Gen_No_Session_i.cc GEOM_DumpPython.cc ) diff --git a/src/GEOM_I/GEOM_Gen_No_Session_i.cc b/src/GEOM_I/GEOM_Gen_No_Session_i.cc new file mode 100644 index 000000000..98129ac4d --- /dev/null +++ b/src/GEOM_I/GEOM_Gen_No_Session_i.cc @@ -0,0 +1,35 @@ +// Copyright (C) 2021 CEA/DEN, EDF R&D +// +// 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 +// + +#include "GEOM_Gen_No_Session_i.hh" + +#include "SALOMEDS_Study_i.hxx" + +GEOM_Gen_No_Session_i::GEOM_Gen_No_Session_i(CORBA::ORB_ptr orb, + PortableServer::POA_ptr poa, + PortableServer::ObjectId *contId, + const char *instanceName, + const char *interfaceName):GEOM_Gen_i(orb,poa,contId,instanceName,interfaceName,false) +{ +} + +SALOMEDS::Study_var GEOM_Gen_No_Session_i::getStudyServant() +{ + return SALOMEDS::Study::_duplicate(KERNEL::getStudyServantSA()); +} diff --git a/src/GEOM_I/GEOM_Gen_No_Session_i.hh b/src/GEOM_I/GEOM_Gen_No_Session_i.hh new file mode 100644 index 000000000..552bdbf51 --- /dev/null +++ b/src/GEOM_I/GEOM_Gen_No_Session_i.hh @@ -0,0 +1,34 @@ +// Copyright (C) 2021 CEA/DEN, EDF R&D +// +// 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 +// + +#pragma once + +#include "GEOM_Gen_i.hh" + +class GEOM_I_EXPORT GEOM_Gen_No_Session_i : public GEOM_Gen_i +{ + public: + GEOM_Gen_No_Session_i(CORBA::ORB_ptr orb, + PortableServer::POA_ptr poa, + PortableServer::ObjectId * contId, + const char *instanceName, + const char *interfaceName); + + SALOMEDS::Study_var getStudyServant() override; +}; diff --git a/src/GEOM_I/GEOM_Gen_Session_i.cc b/src/GEOM_I/GEOM_Gen_Session_i.cc new file mode 100644 index 000000000..6c8528309 --- /dev/null +++ b/src/GEOM_I/GEOM_Gen_Session_i.cc @@ -0,0 +1,64 @@ +// Copyright (C) 2021 CEA/DEN, EDF R&D +// +// 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 +// + +#include "GEOM_Gen_Session_i.hh" + +GEOM_Gen_Session_i::GEOM_Gen_Session_i(CORBA::ORB_ptr orb, + PortableServer::POA_ptr poa, + PortableServer::ObjectId *contId, + const char *instanceName, + const char *interfaceName):GEOM_Gen_i(orb,poa,contId,instanceName,interfaceName,true) +{ + name_service = new SALOME_NamingService(_orb); +} + +GEOM_Gen_Session_i::~GEOM_Gen_Session_i() +{ + delete name_service; +} + +void GEOM_Gen_Session_i::register_name(char * name) +{ + GEOM::GEOM_Gen_var g = _this(); + name_service->Register(g, name); +} + +SALOMEDS::Study_var GEOM_Gen_Session_i::getStudyServant() +{ + static SALOMEDS::Study_var aStudy; + if(CORBA::is_nil(aStudy)) + { + CORBA::Object_ptr anObject = name_service->Resolve("/Study"); + aStudy = SALOMEDS::Study::_narrow(anObject); + } + return aStudy; +} + +extern "C" +{ + GEOM_I_EXPORT PortableServer::ObjectId* GEOMEngine_factory(CORBA::ORB_ptr orb, + PortableServer::POA_ptr poa, + PortableServer::ObjectId* contId, + const char* instanceName, + const char* interfaceName) + { + GEOM_Gen_Session_i* myGEOM_Gen_i = new GEOM_Gen_Session_i(orb, poa, contId, instanceName, interfaceName); + return myGEOM_Gen_i->getId(); + } +} diff --git a/src/GEOM_I/GEOM_Gen_Session_i.hh b/src/GEOM_I/GEOM_Gen_Session_i.hh new file mode 100644 index 000000000..5541d0150 --- /dev/null +++ b/src/GEOM_I/GEOM_Gen_Session_i.hh @@ -0,0 +1,39 @@ +// Copyright (C) 2021 CEA/DEN, EDF R&D +// +// 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 +// + +#pragma once + +#include "GEOM_Gen_i.hh" + +class GEOM_I_EXPORT GEOM_Gen_Session_i : public GEOM_Gen_i +{ +public: + GEOM_Gen_Session_i(CORBA::ORB_ptr orb, + PortableServer::POA_ptr poa, + PortableServer::ObjectId * contId, + const char *instanceName, + const char *interfaceName); + ~GEOM_Gen_Session_i(); + void register_name(char * name); + SALOMEDS::Study_var getStudyServant() override; + SALOME_NamingService *GetNS() { return name_service; } +private: + SALOME_NamingService *name_service = nullptr; +}; + diff --git a/src/GEOM_I/GEOM_Gen_i.cc b/src/GEOM_I/GEOM_Gen_i.cc index 2f8c4882d..4edd22303 100644 --- a/src/GEOM_I/GEOM_Gen_i.cc +++ b/src/GEOM_I/GEOM_Gen_i.cc @@ -98,13 +98,12 @@ GEOM_Gen_i::GEOM_Gen_i(CORBA::ORB_ptr orb, PortableServer::POA_ptr poa, PortableServer::ObjectId* contId, const char* instanceName, - const char* interfaceName) : - Engines_Component_i(orb, poa, contId, instanceName, interfaceName) + const char* interfaceName, + bool withRegistry) : + Engines_Component_i(orb, poa, contId, instanceName, interfaceName, false, withRegistry) { _thisObj = this; _id = _poa->activate_object(_thisObj); - name_service = new SALOME_NamingService(_orb); - _impl = new ::GEOMImpl_Gen; //PAL10867: disable signals catching with "noexcepthandler" option @@ -140,10 +139,8 @@ GEOM_Gen_i::GEOM_Gen_i(CORBA::ORB_ptr orb, // purpose : destructor //============================================================================ GEOM_Gen_i::~GEOM_Gen_i() { - delete name_service; delete _impl; - std::map::const_iterator it; - for ( it = myOpCreatorMap.begin(); it != myOpCreatorMap.end(); ++it) + for (auto it = myOpCreatorMap.cbegin(); it != myOpCreatorMap.cend(); ++it) delete (*it).second; } @@ -2155,30 +2152,6 @@ GEOM::ListOfGO* GEOM_Gen_i::RestoreGivenSubShapesOneLevel (SALOMEDS::SObject_ptr return aParts._retn(); } -//============================================================================ -// function : register() -// purpose : register 'name' in 'name_service' -//============================================================================ -void GEOM_Gen_i::register_name(char * name) -{ - GEOM::GEOM_Gen_var g = _this(); - name_service->Register(g, name); -} - -//============================================================================ -// function : getStudyServant() -// purpose : Get Study -//============================================================================ -SALOMEDS::Study_var GEOM_Gen_i::getStudyServant() -{ - static SALOMEDS::Study_var aStudy; - if(CORBA::is_nil(aStudy)){ - CORBA::Object_ptr anObject = name_service->Resolve("/Study"); - aStudy = SALOMEDS::Study::_narrow(anObject); - } - return aStudy; -} - //============================================================================ // function : findOrCreateComponent() // purpose : Find root study component; create if it does not exist @@ -3351,24 +3324,4 @@ void GEOM_Gen_i::includeSubObjects(const std::string& aSelectedEntry, includeSubObjects( aSubEntryStr, aSelected, aParents, aChildren, anOthers ); } } -//===================================================================================== -// EXPORTED METHODS -//===================================================================================== -extern "C" -{ - /* - GEOM_I_EXPORT - PortableServer::ObjectId* GEOMEngine_factory(CORBA::ORB*, PortableServer::POA*, PortableServer::ObjectId*, const char*, const char*); - */ - GEOM_I_EXPORT - PortableServer::ObjectId* GEOMEngine_factory(CORBA::ORB_ptr orb, - PortableServer::POA_ptr poa, - PortableServer::ObjectId* contId, - const char* instanceName, - const char* interfaceName) - { - GEOM_Gen_i* myGEOM_Gen_i = new GEOM_Gen_i(orb, poa, contId, instanceName, interfaceName); - return myGEOM_Gen_i->getId(); - } -} diff --git a/src/GEOM_I/GEOM_Gen_i.hh b/src/GEOM_I/GEOM_Gen_i.hh index ce3035be4..5f461a83f 100644 --- a/src/GEOM_I/GEOM_Gen_i.hh +++ b/src/GEOM_I/GEOM_Gen_i.hh @@ -81,7 +81,7 @@ class GEOM_I_EXPORT GEOM_GenericOperationsCreator //===================================================================== // GEOM_Gen_i : class definition //===================================================================== -class GEOM_I_EXPORT GEOM_Gen_i: virtual public POA_GEOM::GEOM_Gen, virtual public Engines_Component_i +class GEOM_I_EXPORT GEOM_Gen_i : public POA_GEOM::GEOM_Gen, public Engines_Component_i { public: @@ -95,22 +95,17 @@ class GEOM_I_EXPORT GEOM_Gen_i: virtual public POA_GEOM::GEOM_Gen, virtual publi PortableServer::POA_ptr poa, PortableServer::ObjectId * contId, const char *instanceName, - const char *interfaceName); + const char *interfaceName, + bool withRegistry = true); // destructor, doing nothing (for now) virtual ~GEOM_Gen_i(); - // generic method to be put in a super class - void register_name(char * name); - // Get ORB object CORBA::ORB_ptr GetORB() { return CORBA::ORB::_duplicate(_orb); } - // Get Naming Service object - SALOME_NamingService* GetNS() { return name_service; } - // Get Study - SALOMEDS::Study_var getStudyServant(); + virtual SALOMEDS::Study_var getStudyServant() = 0; //-----------------------------------------------------------------------// // Inherited methods from SALOMEDS::Driver // @@ -388,7 +383,6 @@ class GEOM_I_EXPORT GEOM_Gen_i: virtual public POA_GEOM::GEOM_Gen, virtual publi private: ::GEOMImpl_Gen* _impl; - SALOME_NamingService * name_service; char * _name; // plugin operations managing diff --git a/src/GEOM_I/GEOM_IOperations_i.cc b/src/GEOM_I/GEOM_IOperations_i.cc index e61cc8537..076de62f9 100644 --- a/src/GEOM_I/GEOM_IOperations_i.cc +++ b/src/GEOM_I/GEOM_IOperations_i.cc @@ -23,7 +23,7 @@ #include "GEOM_IOperations_i.hh" #include "GEOM_Engine.hxx" -#include "GEOM_Gen_i.hh" +#include "GEOM_Gen_Session_i.hh" #include #include "utilities.h" @@ -232,7 +232,7 @@ void GEOM_IOperations_i::UpdateGUIForObject(GEOM::GEOM_Object_ptr theObj) if (!CORBA::is_nil (theObj)) { // Cast _engine to GEOM_Gen_i type. PortableServer::Servant aServant = myPOA->reference_to_servant(_engine.in()); - GEOM_Gen_i *anEngine = dynamic_cast(aServant); + GEOM_Gen_Session_i *anEngine = dynamic_cast(aServant); if (anEngine) { SALOME_NamingService *aNameService = anEngine->GetNS(); diff --git a/src/GEOM_SWIG/CMakeLists.txt b/src/GEOM_SWIG/CMakeLists.txt index 4eaec4027..e506f9020 100644 --- a/src/GEOM_SWIG/CMakeLists.txt +++ b/src/GEOM_SWIG/CMakeLists.txt @@ -17,6 +17,17 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # +include(${SWIG_USE_FILE}) + +include_directories( + ${PROJECT_BINARY_DIR}/idl + ${PROJECT_SOURCE_DIR}/src/GEOMUtils + ${PROJECT_SOURCE_DIR}/src/GEOMAlgo + ${PROJECT_SOURCE_DIR}/src/GEOM + ${PROJECT_SOURCE_DIR}/src/GEOMImpl + ${PROJECT_SOURCE_DIR}/src/GEOM_I +) + # --- scripts --- # scripts / samples,data @@ -118,6 +129,23 @@ SET(_shared_SCRIPTS GEOM_shared_modules.py ) + +SET(GeomHelper_HEADERS GeomHelper.h GeomHelper.i) +SET(GeomHelper_SOURCES GeomHelper.cxx ${GeomHelper_HEADERS}) +SET_SOURCE_FILES_PROPERTIES(GeomHelper.i PROPERTIES CPLUSPLUS ON) +SET_SOURCE_FILES_PROPERTIES(GeomHelper.i PROPERTIES SWIG_FLAGS "-py3") +SET_SOURCE_FILES_PROPERTIES(GeomHelper_wrap.cpp PROPERTIES COMPILE_FLAGS "-DHAVE_CONFIG_H") +SET(_swig_SCRIPTS ${CMAKE_CURRENT_BINARY_DIR}/GeomHelper.py ) +IF(${CMAKE_VERSION} VERSION_LESS "3.8.0") + SWIG_ADD_MODULE(GeomHelper python ${GeomHelper_SOURCES}) +ELSE() + SWIG_ADD_LIBRARY(GeomHelper LANGUAGE python SOURCES ${GeomHelper_SOURCES}) +ENDIF() +SWIG_LINK_LIBRARIES(GeomHelper ${PYTHON_LIBRARIES} ${PLATFORM_LIBS} GEOMEngine ${KERNEL_SalomeKernelHelpers} ${KERNEL_SalomeDS} ) +install(TARGETS _GeomHelper DESTINATION ${SALOME_INSTALL_LIBS}) +install(FILES ${GeomHelper_HEADERS} DESTINATION ${SALOME_INSTALL_HEADERS}) +SALOME_INSTALL_SCRIPTS("${_swig_SCRIPTS}" ${SALOME_INSTALL_BINS} EXTRA_DPYS "${SWIG_MODULE_GeomHelper_REAL_NAME}") + # --- rules --- SALOME_INSTALL_SCRIPTS("${_other_SCRIPTS}" ${SALOME_INSTALL_SCRIPT_DATA} DEF_PERMS) diff --git a/src/GEOM_SWIG/GeomHelper.cxx b/src/GEOM_SWIG/GeomHelper.cxx new file mode 100644 index 000000000..f4121d9b9 --- /dev/null +++ b/src/GEOM_SWIG/GeomHelper.cxx @@ -0,0 +1,56 @@ +// Copyright (C) 2021 CEA/DEN, EDF R&D, OPEN CASCADE +// +// 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 +// + +#include "GeomHelper.h" + +#include "GEOM_Gen_No_Session_i.hh" +#include "SALOME_Container_i.hxx" +#include "SALOME_KernelServices.hxx" + +#include + +std::string BuildGEOMInstance() +{ + CORBA::ORB_var orb; + { int argc(0); orb = CORBA::ORB_init(argc,nullptr); } + CORBA::Object_var obj = orb->resolve_initial_references("RootPOA"); + PortableServer::POA_var poa = PortableServer::POA::_narrow(obj); + PortableServer::POAManager_var pman = poa->the_POAManager(); + CORBA::PolicyList policies; + policies.length(0); + PortableServer::ObjectId_var conId; + // + { + char *argv[4] = {"Container","FactoryServer","toto",nullptr}; + Engines_Container_i *cont = new Engines_Container_i(orb,poa,"FactoryServer",2,argv,false,false); + conId = poa->activate_object(cont); + } + // + pman->activate(); + // + GEOM_Gen_No_Session_i *servant = new GEOM_Gen_No_Session_i(orb,poa,const_cast(&conId.in()),"GEOM_inst_2","GEOM"); + PortableServer::ObjectId *zeId = servant->getId(); + CORBA::Object_var zeRef = poa->id_to_reference(*zeId); + char *interfaceName = servant->interfaceName(); + std::string interfaceNameCpp(interfaceName); + CORBA::string_free(interfaceName); + KERNEL::RegisterCompo(interfaceNameCpp,zeRef); + CORBA::String_var ior = orb->object_to_string(zeRef); + return std::string(ior.in()); +} diff --git a/src/GEOM_SWIG/GeomHelper.h b/src/GEOM_SWIG/GeomHelper.h new file mode 100644 index 000000000..92676977c --- /dev/null +++ b/src/GEOM_SWIG/GeomHelper.h @@ -0,0 +1,22 @@ +// Copyright (C) 2021 CEA/DEN, EDF R&D, OPEN CASCADE +// +// 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 +// + +#include + +std::string BuildGEOMInstance(); \ No newline at end of file diff --git a/src/GEOM_SWIG/GeomHelper.i b/src/GEOM_SWIG/GeomHelper.i new file mode 100644 index 000000000..64d70cad9 --- /dev/null +++ b/src/GEOM_SWIG/GeomHelper.i @@ -0,0 +1,27 @@ +// Copyright (C) 2021 CEA/DEN, EDF R&D, OPEN CASCADE +// +// 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 +// + +%module GeomHelper + +%include "std_string.i" + +%inline +{ + std::string BuildGEOMInstance(); +} diff --git a/src/GEOM_SWIG/geomBuilder.py b/src/GEOM_SWIG/geomBuilder.py index cef854f2a..a4c2d26fa 100644 --- a/src/GEOM_SWIG/geomBuilder.py +++ b/src/GEOM_SWIG/geomBuilder.py @@ -853,7 +853,7 @@ class geomBuilder(GEOM._objref_GEOM_Gen): self.GroupOp = self.GetIGroupOperations () self.FieldOp = self.GetIFieldOperations () - notebook.myStudy = salome.myStudy + notebook.myStudy = self.myStudy pass def GetPluginOperations(self, libraryName):