X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FSMESH_SWIG%2Fsmesh.py;h=92a88aaf3ac2364294328bb88c2ff852c24863de;hp=9fb73ab1168d82e16a2cda765c513c8f1f69b7d2;hb=c21442db90073d240f66d88902767e12b619247b;hpb=c965dca966db41d603435218bfb840c830679024 diff --git a/src/SMESH_SWIG/smesh.py b/src/SMESH_SWIG/smesh.py index 9fb73ab11..92a88aaf3 100644 --- a/src/SMESH_SWIG/smesh.py +++ b/src/SMESH_SWIG/smesh.py @@ -1,5 +1,5 @@ # -*- coding: iso-8859-1 -*- -# Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2016 CEA/DEN, EDF R&D, OPEN CASCADE # # Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, # CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS @@ -7,7 +7,7 @@ # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public # License as published by the Free Software Foundation; either -# version 2.1 of the License. +# version 2.1 of the License, or (at your option) any later version. # # This library is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -29,10 +29,12 @@ \brief Module smesh """ +import inspect import salome from salome import * import geompy + import SMESH, SALOMEDS from salome.smesh import smeshBuilder @@ -41,14 +43,14 @@ from salome.smesh import smeshBuilder try: # get instance of class smeshBuilder engineSmesh = salome.lcc.FindOrLoadComponent( "FactoryServer", "SMESH" ) - smesh = smeshBuilder.New(salome.myStudy, engineSmesh) + smesh = smeshBuilder.New(True,engineSmesh) except: - print "exception in smesh.py: instance creation failed" + print("exception in smesh.py: instance creation failed") smesh = None pass # load plugins and add dynamically generated methods to Mesh class, -# the same for for global variables declared by plug-ins +# the same for global variables declared by plug-ins from salome.smesh.smeshBuilder import * from salome.smesh.smeshBuilder import Mesh, algoCreator for pluginName in os.environ[ "SMESH_MeshersList" ].split( ":" ): @@ -57,8 +59,9 @@ for pluginName in os.environ[ "SMESH_MeshersList" ].split( ":" ): pluginBuilderName = pluginName + "Builder" try: exec( "from salome.%s.%s import *" % (pluginName, pluginBuilderName)) - except Exception, e: - print "Exception while loading %s: %s" % ( pluginBuilderName, e ) + except Exception as e: + from salome_utils import verbose + if verbose(): print("Exception while loading %s: %s" % ( pluginBuilderName, e )) continue exec( "from salome.%s import %s" % (pluginName, pluginBuilderName)) plugin = eval( pluginBuilderName ) @@ -67,7 +70,7 @@ for pluginName in os.environ[ "SMESH_MeshersList" ].split( ":" ): for k in dir( plugin ): if k[0] == '_': continue algo = getattr( plugin, k ) - if type( algo ).__name__ == 'classobj' and hasattr( algo, "meshMethod" ): + if inspect.isclass(algo) and hasattr(algo, "meshMethod"): if not hasattr( Mesh, algo.meshMethod ): setattr( Mesh, algo.meshMethod, algoCreator() ) pass @@ -80,12 +83,12 @@ del pluginName # export the methods of smeshBuilder if smesh: for k in dir( smesh ): - if k[0] == '_': continue - globals()[k] = getattr( smesh, k ) + if k[0] == '_': continue + globals()[k] = getattr( smesh, k ) del k pass -print """ +print(""" =============================================================================== WARNING: Usage of smesh.py is deprecated in SALOME V7.2! @@ -93,24 +96,27 @@ smesh.py will be removed in a future version! TODO: The following changes in your scripts are required to avoid this message: -replace +replace ------- import smesh, SMESH -smesh.SetCurrentStudy(theStudy) with ---- import SMESH from salome.smesh import smeshBuilder -smesh = smeshBuilder.New(salome.myStudy) +smesh = smeshBuilder.New() you also need to modify some lines where smeshBuilder is used instead of smesh -algo=smesh.xxxx ==> algo=smeshBuilder.xxxx +algo=smesh.xxxx ==> algo=smeshBuilder.xxxx See also SMESH User's Guide for more details +WARNING: +The smesh.py module works correctly only in the first created study. +It does not work in the second, third, etc studies! + =============================================================================== -""" +""")