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

Make the visualisation work with SSL gui mode

Browse Source
This commit is contained in:
Anthony Geay 2021-02-24 17:05:37 +01:00
parent 18d8f27e3e
commit a195a4eb8f
4 changed files with 30 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/SMESHClient/CMakeLists.txt
View File

@ -36,6 +36,7 @@ INCLUDE_DIRECTORIES(
${PROJECT_SOURCE_DIR}/src/SMESHDS ${PROJECT_SOURCE_DIR}/src/SMESHDS
${PROJECT_SOURCE_DIR}/src/SMESH ${PROJECT_SOURCE_DIR}/src/SMESH
${PROJECT_SOURCE_DIR}/src/SMESHUtils ${PROJECT_SOURCE_DIR}/src/SMESHUtils
${PROJECT_SOURCE_DIR}/src/SMESH_I
${PROJECT_BINARY_DIR}/idl ${PROJECT_BINARY_DIR}/idl
) )

36
src/SMESHClient/SMESH_Client.cxx
View File

@ -28,6 +28,7 @@
#include "SMESHDS_Mesh.hxx" #include "SMESHDS_Mesh.hxx"
#include "SMESHDS_Script.hxx" #include "SMESHDS_Script.hxx"
#include "SMESH_Mesh.hxx" #include "SMESH_Mesh.hxx"
#include "SMESH_Component_Generator.hxx"
#include "SALOME_NamingService.hxx" #include "SALOME_NamingService.hxx"
#include "SALOME_LifeCycleCORBA.hxx" #include "SALOME_LifeCycleCORBA.hxx"
@ -783,26 +784,35 @@ SMESH_Client::GetSMESHGen(CORBA::ORB_ptr theORB,
{ {
static SMESH::SMESH_Gen_var aMeshGen; static SMESH::SMESH_Gen_var aMeshGen;
if(CORBA::is_nil(aMeshGen.in())){ if(CORBA::is_nil(aMeshGen.in()))
{
Engines::EngineComponent_var isCompoInSSLMode = GetSMESHInstanceHasThis();
if( CORBA::is_nil(isCompoInSSLMode) )
{
#ifdef WIN32 #ifdef WIN32
long aClientPID = (long)_getpid(); long aClientPID = (long)_getpid();
#else #else
long aClientPID = (long)getpid(); long aClientPID = (long)getpid();
#endif #endif
SALOME_NamingService aNamingService(theORB); SALOME_NamingService aNamingService(theORB);
SALOME_LifeCycleCORBA aLifeCycleCORBA(&aNamingService); SALOME_LifeCycleCORBA aLifeCycleCORBA(&aNamingService);
Engines::EngineComponent_var aComponent = aLifeCycleCORBA.FindOrLoad_Component("FactoryServer","SMESH"); Engines::EngineComponent_var aComponent = aLifeCycleCORBA.FindOrLoad_Component("FactoryServer","SMESH");
aMeshGen = SMESH::SMESH_Gen::_narrow(aComponent); aMeshGen = SMESH::SMESH_Gen::_narrow(aComponent);
std::string aClientHostName = Kernel_Utils::GetHostname(); std::string aClientHostName = Kernel_Utils::GetHostname();
Engines::Container_var aServerContainer = aMeshGen->GetContainerRef(); Engines::Container_var aServerContainer = aMeshGen->GetContainerRef();
CORBA::String_var aServerHostName = aServerContainer->getHostName(); CORBA::String_var aServerHostName = aServerContainer->getHostName();
CORBA::Long aServerPID = aServerContainer->getPID(); CORBA::Long aServerPID = aServerContainer->getPID();
aMeshGen->SetEmbeddedMode((aClientPID == aServerPID) && (aClientHostName == aServerHostName.in())); aMeshGen->SetEmbeddedMode((aClientPID == aServerPID) && (aClientHostName == aServerHostName.in()));
}
else
{
aMeshGen = SMESH::SMESH_Gen::_narrow(isCompoInSSLMode);
}
} }
theIsEmbeddedMode = aMeshGen->IsEmbeddedMode(); theIsEmbeddedMode = aMeshGen->IsEmbeddedMode();
return aMeshGen; return aMeshGen;
} }

5
src/SMESH_I/SMESH_Component_Generator.cxx
View File

@ -53,3 +53,8 @@ Engines::EngineComponent_var RetrieveSMESHInstance()
} }
return _unique_compo; return _unique_compo;
} }
Engines::EngineComponent_var GetSMESHInstanceHasThis()
{
return _unique_compo;
}

1
src/SMESH_I/SMESH_Component_Generator.hxx
View File

@ -26,3 +26,4 @@
#include CORBA_SERVER_HEADER(SMESH_Gen) #include CORBA_SERVER_HEADER(SMESH_Gen)
SMESH_I_EXPORT Engines::EngineComponent_var RetrieveSMESHInstance(); SMESH_I_EXPORT Engines::EngineComponent_var RetrieveSMESHInstance();
SMESH_I_EXPORT Engines::EngineComponent_var GetSMESHInstanceHasThis();