0021308: EDF 1923 SMESH: Remove hard-coded dependency of the external mesh plugins...

* Improve documentation for meshing plug-ins (in particular, dynamically added methods)

diff --git a/src/GEOM_SWIG/geompy.py b/src/GEOM_SWIG/geompy.py
index 13df410632c98f07d198ffeff3cfc81531fd104a..f715dc8a469302d2c5fc85c894fbf202e7aa2c7b 100644 (file)
--- a/src/GEOM_SWIG/geompy.py
+++ b/src/GEOM_SWIG/geompy.py
@@ -31,13 +31,22 @@ import salome
 import geompyDC
 from salome import *
 
-geom = lcc.FindOrLoadComponent("FactoryServer", "GEOM")
-geom.init_geom(salome.myStudy)
-
-# Export the methods of geompyDC
-for k in dir(geom):
-  if k[0] == '_':continue
-  globals()[k]=getattr(geom,k)
-del k
-from geompyDC import ShapeType, GEOM, kind, info, PackData, ReadTexture, EnumToLong
+# retrieve GEOM engine in try/except block
+# to avoid problems in some cases, e.g. when generating documentation
+try:
+    # get GEOM engine
+    geom = lcc.FindOrLoadComponent( "FactoryServer", "GEOM" )
+    # initialize GEOM with current study
+    geom.init_geom( salome.myStudy )
 
+    # export the methods of geompyDC
+    for k in dir( geom ):
+       if k[0] == '_': continue
+       globals()[k] = getattr( geom, k )
+        pass
+    del k
+    from geompyDC import ShapeType, GEOM, kind, info, PackData, ReadTexture, EnumToLong
+    pass
+except:
+    geom = None
+    pass

diff --git a/src/GEOM_SWIG/geompyDC.py b/src/GEOM_SWIG/geompyDC.py
index b7e5a4a922ff572b1febece20d79fe9617182b3b..465f57eb6a0d7a84a533bad3e14f0d703f59ba94 100644 (file)
--- a/src/GEOM_SWIG/geompyDC.py
+++ b/src/GEOM_SWIG/geompyDC.py
@@ -73,9 +73,14 @@
 
 ## @}
 
-import salome
-salome.salome_init()
-from salome import *
+# initialize SALOME session in try/except block
+# to avoid problems in some cases, e.g. when generating documentation
+try:
+    import salome
+    salome.salome_init()
+    from salome import *
+except:
+    pass
 
 from salome_notebook import *