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

First SMESH/GEOM case OK without external Server connection

Browse Source
This commit is contained in:
Anthony Geay 2021-01-16 05:58:47 +01:00
parent 7911fd4a18
commit 498e1712b4
3 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/SMESH_I/CMakeLists.txt
View File

@ -71,6 +71,7 @@ SET(_link_LIBRARIES
${KERNEL_SALOMELocalTrace} ${KERNEL_SALOMELocalTrace}
${KERNEL_SalomeKernelHelpers} ${KERNEL_SalomeKernelHelpers}
${KERNEL_SalomeDS} ${KERNEL_SalomeDS}
${KERNEL_SalomeCatalog}
${OpenCASCADE_ApplicationFramework_LIBRARIES} ${OpenCASCADE_ApplicationFramework_LIBRARIES}
${OpenCASCADE_ModelingAlgorithms_LIBRARIES} ${OpenCASCADE_ModelingAlgorithms_LIBRARIES}
${GEOM_GEOMClient} ${GEOM_GEOMClient}

6
src/SMESH_I/SMESH_Gen_i_1.cxx
View File

@ -41,7 +41,8 @@
#include <SALOMEDS_wrap.hxx> #include <SALOMEDS_wrap.hxx>
#include <SALOMEDS_Attributes_wrap.hxx> #include <SALOMEDS_Attributes_wrap.hxx>
#include "SALOMEDS_Study_i.hxx" #include "SALOMEDS_Study_i.hxx"
#include <SALOME_KernelServices.hxx> #include "SALOME_KernelServices.hxx"
#include "SALOME_ModuleCatalog_impl.hxx"
#include <TCollection_AsciiString.hxx> #include <TCollection_AsciiString.hxx>
#include <TopoDS_Solid.hxx> #include <TopoDS_Solid.hxx>
@ -588,8 +589,7 @@ SALOMEDS::SComponent_ptr SMESH_Gen_i::PublishComponent()
// If component for this SMESH engine does not exist in the study, create it // If component for this SMESH engine does not exist in the study, create it
SALOME_ModuleCatalog::ModuleCatalog_var aCat = SALOME_ModuleCatalog::ModuleCatalog_var aCat = KERNEL::getModuleComponentServantSA();
SALOME_ModuleCatalog::ModuleCatalog::_narrow( GetNS()->Resolve("/Kernel/ModulCatalog") );
if ( CORBA::is_nil( aCat ) ) if ( CORBA::is_nil( aCat ) )
return father._retn(); return father._retn();

11
src/SMESH_SWIG/smeshBuilder.py
View File

@ -620,7 +620,9 @@ class smeshBuilder( SMESH._objref_SMESH_Gen, object ):
obj = obj.GetMesh() obj = obj.GetMesh()
elif isinstance( obj, Mesh_Algorithm ): elif isinstance( obj, Mesh_Algorithm ):
obj = obj.GetAlgorithm() obj = obj.GetAlgorithm()
ior = salome.orb.object_to_string(obj) import CORBA
orb=CORBA.ORB_init([''])
ior = orb.object_to_string(obj)
SMESH._objref_SMESH_Gen.SetName(self, ior, name) SMESH._objref_SMESH_Gen.SetName(self, ior, name)
def SetEmbeddedMode( self,theMode ): def SetEmbeddedMode( self,theMode ):
@ -1962,9 +1964,10 @@ class Mesh(metaclass = MeshMeta):
print(msg) print(msg)
print(allReasons) print(allReasons)
pass pass
if salome.sg.hasDesktop(): if salome.sg:
if not isinstance( refresh, list): # not a call from subMesh.Compute() if salome.sg.hasDesktop():
if refresh: salome.sg.updateObjBrowser() if not isinstance( refresh, list): # not a call from subMesh.Compute()
if refresh: salome.sg.updateObjBrowser()
return ok return ok