ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2025-03-25 22:37:55 +05:00
Code Issues Packages Projects Releases Wiki Activity

WIP

Browse Source
This commit is contained in:
Anthony Geay 2021-01-21 17:19:35 +01:00
parent 76da6e3859
commit 203cf427e4
6 changed files with 12 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/SMESH_I/CMakeLists.txt
View File

@ -90,6 +90,8 @@ SET(_link_LIBRARIES
# header files / no moc processing # header files / no moc processing
SET(SMESHEngine_HEADERS SET(SMESHEngine_HEADERS
SMESH_Gen_i.hxx SMESH_Gen_i.hxx
SMESH_Gen_No_Session_i.hxx
SMESH_Gen_Session_i.hxx
SMESH_Algo_i.hxx SMESH_Algo_i.hxx
SMESH_0D_Algo_i.hxx SMESH_0D_Algo_i.hxx
SMESH_1D_Algo_i.hxx SMESH_1D_Algo_i.hxx
@ -117,6 +119,8 @@ SET(SMESHEngine_HEADERS
SET(SMESHEngine_SOURCES SET(SMESHEngine_SOURCES
SMESH_Gen_i.cxx SMESH_Gen_i.cxx
SMESH_Gen_i_1.cxx SMESH_Gen_i_1.cxx
SMESH_Gen_No_Session_i.cxx
SMESH_Gen_Session_i.cxx
SMESH_PythonDump.cxx SMESH_PythonDump.cxx
SMESH_Mesh_i.cxx SMESH_Mesh_i.cxx
SMESH_subMesh_i.cxx SMESH_subMesh_i.cxx

23
src/SMESH_I/SMESH_Gen_i.cxx
View File

@ -6583,26 +6583,3 @@ std::vector<long> SMESH_Gen_i::_GetInside( SMESH::SMESH_IDSource_ptr meshPart,
} }
return res; return res;
} }
//=============================================================================
/*!
* SMESHEngine_factory
*
* C factory, accessible with dlsym, after dlopen
*/
//=============================================================================
extern "C"
{ SMESH_I_EXPORT
PortableServer::ObjectId* SMESHEngine_factory( CORBA::ORB_ptr orb,
PortableServer::POA_ptr poa,
PortableServer::ObjectId* contId,
const char* instanceName,
const char* interfaceName )
{
if(MYDEBUG) MESSAGE( "PortableServer::ObjectId* SMESHEngine_factory()" );
if(MYDEBUG) SCRUTE(interfaceName);
SMESH_Gen_i* aSMESHGen = new SMESH_Gen_i(orb, poa, contId, instanceName, interfaceName);
return aSMESHGen->getId() ;
}
}

4
src/SMESH_I/SMESH_Gen_i.hxx
View File

@ -93,9 +93,7 @@ private:
// =========================================================== // ===========================================================
// SMESH module's engine // SMESH module's engine
// ========================================================== // ==========================================================
class SMESH_I_EXPORT SMESH_Gen_i: class SMESH_I_EXPORT SMESH_Gen_i : public POA_SMESH::SMESH_Gen, public Engines_Component_i
public virtual POA_SMESH::SMESH_Gen,
public virtual Engines_Component_i
{ {
public: public:
// Get last created instance of the class // Get last created instance of the class

8
src/SMESH_SWIG/SMeshHelper.cxx
View File

@ -19,13 +19,13 @@
#include "SMeshHelper.h" #include "SMeshHelper.h"
#include "SMESH_Gen_i.hxx" #include "SMESH_Gen_No_Session_i.hxx"
#include "SALOME_Container_i.hxx" #include "SALOME_Container_i.hxx"
#include "SALOME_KernelServices.hxx" #include "SALOME_KernelServices.hxx"
#include <cstring> #include <cstring>
std::string BuildSMESHInstanceInternal(bool checkNS) std::string BuildSMESHInstanceInternal()
{ {
CORBA::ORB_var orb; CORBA::ORB_var orb;
{ int argc(0); orb = CORBA::ORB_init(argc,nullptr); } { int argc(0); orb = CORBA::ORB_init(argc,nullptr); }
@ -36,13 +36,13 @@ std::string BuildSMESHInstanceInternal(bool checkNS)
// //
{ {
char *argv[4] = {"Container","FactoryServer","toto",nullptr}; char *argv[4] = {"Container","FactoryServer","toto",nullptr};
Engines_Container_i *cont = new Engines_Container_i(orb,poa,"FactoryServer",2,argv,false,checkNS); Engines_Container_i *cont = new Engines_Container_i(orb,poa,"FactoryServer",2,argv,false,false);
conId = poa->activate_object(cont); conId = poa->activate_object(cont);
} }
// //
pman->activate(); pman->activate();
// //
SMESH_Gen_i *servant = new SMESH_Gen_i(orb,poa,const_cast<PortableServer::ObjectId*>(&conId.in()),"SMESH_inst_2","SMESH",checkNS); SMESH_Gen_No_Session_i *servant = new SMESH_Gen_No_Session_i(orb,poa,const_cast<PortableServer::ObjectId*>(&conId.in()),"SMESH_inst_2","SMESH");
PortableServer::ObjectId *zeId = servant->getId(); PortableServer::ObjectId *zeId = servant->getId();
CORBA::Object_var zeRef = poa->id_to_reference(*zeId); CORBA::Object_var zeRef = poa->id_to_reference(*zeId);
CORBA::String_var ior = orb->object_to_string(zeRef); CORBA::String_var ior = orb->object_to_string(zeRef);

2
src/SMESH_SWIG/SMeshHelper.h
View File

@ -21,4 +21,4 @@
#include <string> #include <string>
std::string BuildSMESHInstanceInternal(bool checkNS); std::string BuildSMESHInstanceInternal();

4
src/SMESH_SWIG/SMeshHelper.i
View File

@ -27,8 +27,8 @@
%inline %inline
{ {
std::string BuildSMESHInstance(bool checkNS) std::string BuildSMESHInstance()
{ {
return BuildSMESHInstanceInternal(checkNS); return BuildSMESHInstanceInternal();
} }
} }