X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSMESH_SWIG%2Fsmesh.py;h=0c62821bb6a901f4ffd235e5e387e1c82c975b44;hb=4e093d8c63f0480ccad6a252d92ecb80ca94ec51;hp=c13a57e8e4c414f784445f560a6898df85bbc23f;hpb=d4a710ce52f6e76786a7b3845e2f7975dc9a00b1;p=modules%2Fsmesh.git

diff --git a/src/SMESH_SWIG/smesh.py b/src/SMESH_SWIG/smesh.py
index c13a57e8e..0c62821bb 100644
--- a/src/SMESH_SWIG/smesh.py
+++ b/src/SMESH_SWIG/smesh.py
@@ -33,37 +33,81 @@ import salome
 from salome import *
 
 import geompy
-import smeshDC
-from smeshDC import *
+import SMESH, SALOMEDS
+from salome.smesh import smeshBuilder
+#from smeshBuilder 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 smeshBuilder
+    engineSmesh = salome.lcc.FindOrLoadComponent( "FactoryServer", "SMESH" )
+    smesh = smeshBuilder.New(salome.myStudy, engineSmesh)
+except:
+    smesh = None
+    pass
 
-# load plugins
-from smeshDC import Mesh, algoCreator
-for pluginName in os.environ["SMESH_MeshersList"].split(":"):
+# load plugins and add dynamically generated methods to Mesh class,
+# the same for for global variables declared by plug-ins
+from salome.smesh.smeshBuilder import Mesh, algoCreator
+for pluginName in os.environ[ "SMESH_MeshersList" ].split( ":" ):
+    #
+    #print "pluginName: ", pluginName
+    pluginBuilderName = pluginName + "Builder"
+    try:
+        exec( "from salome.%s.%s import *" % (pluginName, pluginBuilderName))
+    except Exception, e:
+        print "Exception while loading %s: %s" % ( pluginBuilderName, e )
+        continue
+    exec( "from salome.%s import %s" % (pluginName, pluginBuilderName))
+    plugin = eval( pluginBuilderName )
 
-  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 smeshBuilder
+if smesh:
+    for k in dir( smesh ):
+	if k[0] == '_': continue
+	globals()[k] = getattr( smesh, k )
+    del k
+    pass
 
-# Export the methods of smeshDC
-for k in dir(smesh):
-  if k[0] == '_':continue
-  globals()[k]=getattr(smesh,k)
-del k
+print """
+===============================================================================
+WARNING:                                                                      |
+Usage of smesh.py is deprecated in SALOME V7.2!                               |
+smesh.py will be removed in a future version!                                 |
+TODO:                                                                         |
+The following changes in your scripts are required to avoid this message:     |
+                                                                              |
+replace                                                                       |
+-------                                                                       |
+                                                                              |
+import smesh, SMESH, SALOMEDS                                                 |
+smesh.SetCurrentStudy(theStudy)                                               |
+                                                                              |
+with                                                                          |
+----                                                                          |
+                                                                              |
+import SMESH, SALOMEDS                                                        |
+from salome.smesh import smeshBuilder                                         |
+smesh = smeshBuilder.New(theStudy)                                            |
+                                                                              |
+you also need to modify some lines where smeshBuilder is used instead of smesh|
+                                                                              |
+algo=smesh.xxxx  ==> algo.smeshBuilder.xxxx                                   |
+                                                                              |
+===============================================================================
+"""