X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSMESH_SWIG%2FSMESH_BelongToGeom.py;h=04e6fc24488518be62f8af4c7ec549d93959e1b8;hb=f5882cb24088610fb4f7d1cbcd41cb19a71bed2c;hp=c87d78acf7cde0e9505842c77a4d1688e6f095e3;hpb=bd8f1aee7c78f7d2eb82bd4fec5e08c9e3d280ce;p=modules%2Fsmesh.git diff --git a/src/SMESH_SWIG/SMESH_BelongToGeom.py b/src/SMESH_SWIG/SMESH_BelongToGeom.py index c87d78acf..04e6fc244 100644 --- a/src/SMESH_SWIG/SMESH_BelongToGeom.py +++ b/src/SMESH_SWIG/SMESH_BelongToGeom.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 @@ -25,7 +25,6 @@ from SMESH_test1 import * ## Old style def CheckBelongToGeomFilterOld(theMeshGen, theMesh, theShape, theSubShape, theElemType): - import geompy if theShape != theSubShape: aName = str(theSubShape) geompy.addToStudyInFather(theShape,theSubShape,aName) @@ -45,25 +44,23 @@ def CheckBelongToGeomFilterOld(theMeshGen, theMesh, theShape, theSubShape, theEl ## Current style def CheckBelongToGeomFilter(theMesh, theShape, theSubShape, theElemType): - import geompy - import smesh if theShape != theSubShape: aName = str(theSubShape) geompy.addToStudyInFather(theShape,theSubShape,aName) theMesh.Compute() - aFilter = smesh.GetFilter(theElemType, smesh.FT_BelongToGeom, theSubShape) + aFilter = smesh.GetFilter(theElemType, SMESH.FT_BelongToGeom, theSubShape) return aFilter.GetElementsId(theMesh.GetMesh()) -anElemType = smesh.FACE; -print "anElemType =", anElemType +anElemType = SMESH.FACE; +print("anElemType =", anElemType) #anIds = CheckBelongToGeomFilter(mesh,box,subShapeList[1],anElemType) anIds = CheckBelongToGeomFilter(mesh,box,box,anElemType) -print "Number of ids = ", len(anIds) -print "anIds = ", anIds +print("Number of ids = ", len(anIds)) +print("anIds = ", anIds) ## Check old version -#anIds = CheckBelongToGeomFilterOld(smesh.smesh,mesh.GetMesh(),box,box,anElemType) +#anIds = CheckBelongToGeomFilterOld(smesh,mesh.GetMesh(),box,box,anElemType) #print "anIds = ", anIds -salome.sg.updateObjBrowser(1); +salome.sg.updateObjBrowser()