From: vsr <vsr@opencascade.com>
Date: Wed, 22 Aug 2012 05:45:47 +0000 (+0000)
Subject: 0021308: EDF 1923 SMESH: Remove hard-coded dependency of the external mesh plugins... 
X-Git-Tag: V6_6_0a1~198
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=a4ca8bc3bca9595ed93b9af55bcfaaf3a4281c2c;hp=7722c85978d5207d35d40b1da35e36f3a8d1a919;p=modules%2Fsmesh.git

0021308: EDF 1923 SMESH: Remove hard-coded dependency of the external mesh plugins from the SMESH module
* Improve documentation for meshing plug-ins (in particular, dynamically added methods)
---

diff --git a/src/SMESH_SWIG/smesh.py b/src/SMESH_SWIG/smesh.py
index c13a57e8e..64279aa68 100644
--- a/src/SMESH_SWIG/smesh.py
+++ b/src/SMESH_SWIG/smesh.py
@@ -36,34 +36,48 @@ import geompy
 import smeshDC
 from smeshDC import *
 
-# get instance of class smeshDC
-smesh = salome.lcc.FindOrLoadComponent("FactoryServer", "SMESH")
-smesh.init_smesh(salome.myStudy,geompy.geom)
+# retrieve SMESH engine in try/except block
+# to avoid problems in some cases, e.g. when generating documentation
+try:
+    # get instance of class smeshDC
+    smesh = salome.lcc.FindOrLoadComponent( "FactoryServer", "SMESH" )
+    smesh.init_smesh( salome.myStudy, geompy.geom )
+except:
+    smesh = None
+    pass
 
-# load plugins
+# load plugins and add dynamically generated methods to Mesh class,
+# the same for for global variables declared by plug-ins
 from smeshDC import Mesh, algoCreator
-for pluginName in os.environ["SMESH_MeshersList"].split(":"):
+for pluginName in os.environ[ "SMESH_MeshersList" ].split( ":" ):
+    #
+    pluginName += "DC"
+    try:
+        exec( "from %s import *" % pluginName )
+    except Exception, e:
+        print "Exception while loading %s: %s" % ( pluginName, e )
+        continue
+    exec( "import %s" % pluginName )
+    plugin = eval( pluginName )
 
-  pluginName += "DC"
-  try:
-    exec("from %s import *" % pluginName )
-  except Exception, e:
-    print "Exception while loading %s: %s" % ( pluginName, e )
-    continue
-  exec("import %s" % pluginName )
-  plugin = eval(pluginName)
+    # add methods creating algorithms to Mesh
+    for k in dir( plugin ):
+        if k[0] == '_': continue
+        algo = getattr( plugin, k )
+        if type( algo ).__name__ == 'classobj' and hasattr( algo, "meshMethod" ):
+            if not hasattr( Mesh, algo.meshMethod ):
+                setattr( Mesh, algo.meshMethod, algoCreator() )
+                pass
+            getattr( Mesh, algo.meshMethod ).add( algo )
+            pass
+        pass
+    pass
+del pluginName
 
-  # add methods creating algorithms to Mesh
-  for k in dir(plugin):
-    if k[0] == '_':continue
-    algo = getattr(plugin,k)
-    if type( algo ).__name__ == 'classobj' and hasattr( algo, "meshMethod"):
-      if not hasattr( Mesh, algo.meshMethod ):
-        setattr( Mesh, algo.meshMethod, algoCreator())
-      getattr( Mesh, algo.meshMethod ).add( algo )
-
-# Export the methods of smeshDC
-for k in dir(smesh):
-  if k[0] == '_':continue
-  globals()[k]=getattr(smesh,k)
-del k
+# export the methods of smeshDC
+if smesh:
+    for k in dir( smesh ):
+	if k[0] == '_': continue
+	globals()[k] = getattr( smesh, k )
+    del k
+    pass