X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FTools%2FblocFissure%2Fgmu%2FpartitionBlocDefaut.py;h=d38f8e55a829a6f9ef055474172099bb05907c66;hb=a274ade365bd0f0e19d56c577acc4a13aa1972a7;hp=4016c9a5bee28044b386f1522eb92d66203b3501;hpb=072a73120b6db7bba2389aa7ada0cde20e22ee57;p=modules%2Fsmesh.git diff --git a/src/Tools/blocFissure/gmu/partitionBlocDefaut.py b/src/Tools/blocFissure/gmu/partitionBlocDefaut.py index 4016c9a5b..d38f8e55a 100644 --- a/src/Tools/blocFissure/gmu/partitionBlocDefaut.py +++ b/src/Tools/blocFissure/gmu/partitionBlocDefaut.py @@ -1,7 +1,28 @@ # -*- coding: utf-8 -*- +# Copyright (C) 2014-2021 EDF R&D +# +# 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, 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 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# import logging -from geomsmesh import geompy +from .geomsmesh import geompy +from .geomsmesh import geomPublish +from .geomsmesh import geomPublishInFather +from . import initLog # ----------------------------------------------------------------------------- # --- partition du bloc defaut par generatrice, tore et plan fissure @@ -29,10 +50,10 @@ def partitionBlocDefaut(volDefaut, facesDefaut, gener, pipe, faceFissure = geompy.GetInPlaceByHistory(volDefautPart, facefis) #ellipsoidep =geompy.GetInPlaceByHistory(volDefautPart, ellipsoide) - geompy.addToStudy( volDefautPart, 'volDefautPart' ) - geompy.addToStudyInFather( volDefautPart, tore, 'tore' ) - geompy.addToStudyInFather( volDefautPart, faceFissure, 'FACE1' ) - #geompy.addToStudyInFather( volDefautPart, gencnt, 'generatrice' ) + geomPublish(initLog.debug, volDefautPart, 'volDefautPart' ) + geomPublishInFather(initLog.debug, volDefautPart, tore, 'tore' ) + geomPublishInFather(initLog.debug, volDefautPart, faceFissure, 'FACE1' ) + #geomPublishInFather(initLog.debug, volDefautPart, gencnt, 'generatrice' ) solids = geompy.ExtractShapes(blocp, geompy.ShapeType["SOLID"], True) vols = [] @@ -47,13 +68,13 @@ def partitionBlocDefaut(volDefaut, facesDefaut, gener, pipe, imaxvol = vols.index(maxvol) ellipsoidep = solids[imaxvol] - geompy.addToStudyInFather( volDefautPart, blocp, 'bloc' ) - geompy.addToStudyInFather( volDefautPart, ellipsoidep, 'ellipsoide' ) + geomPublishInFather(initLog.debug, volDefautPart, blocp, 'bloc' ) + geomPublishInFather(initLog.debug, volDefautPart, ellipsoidep, 'ellipsoide' ) sharedFaces = geompy.GetSharedShapesMulti([blocp, ellipsoidep], geompy.ShapeType["FACE"]) for i in range(len(sharedFaces)): name = "faceCommuneEllipsoideBloc_%d"%i - geompy.addToStudyInFather(blocp, sharedFaces[i], name) + geomPublishInFather(initLog.debug,blocp, sharedFaces[i], name) #sharedEdges = geompy.GetSharedShapesMulti([blocp, ellipsoidep], geompy.ShapeType["EDGE"]) allSharedEdges = geompy.GetSharedShapesMulti([blocp, ellipsoidep], geompy.ShapeType["EDGE"]) @@ -63,7 +84,7 @@ def partitionBlocDefaut(volDefaut, facesDefaut, gener, pipe, sharedEdges.append(allSharedEdges[i]) for i in range(len(sharedEdges)): name = "edgeCommuneEllipsoideBloc_%d"%i - geompy.addToStudyInFather(blocp, sharedEdges[i], name) + geomPublishInFather(initLog.debug,blocp, sharedEdges[i], name) facesExternes = [] facesExtBloc = [] @@ -75,14 +96,14 @@ def partitionBlocDefaut(volDefaut, facesDefaut, gener, pipe, faceExt = geompy.GetInPlace(ellipsoidep, faces[i]) if faceExt is not None: name = "faceExterne_e%d"%i - geompy.addToStudyInFather(ellipsoidep, faceExt, name) + geomPublishInFather(initLog.debug,ellipsoidep, faceExt, name) facesExternes.append(faceExt) facesExtElli.append(faceExt) faceExt = geompy.GetInPlace(blocp, faces[i]) if faceExt is not None: name = "faceExterne_b%d"%i - geompy.addToStudyInFather(blocp, faceExt, name) + geomPublishInFather(initLog.debug,blocp, faceExt, name) facesExternes.append(faceExt) facesExtBloc.append(faceExt) else: @@ -93,12 +114,12 @@ def partitionBlocDefaut(volDefaut, facesDefaut, gener, pipe, #extrusionFace = geompy.MakePrismVecH2Ways(faces[i], normal, 0.1) #extrusionFace = geompy.MakeScaleTransform(extrusionFace, vertex, 1.01) name = "extrusionFace_b%d"%i - geompy.addToStudyInFather(blocp, extrusionFace, name) + geomPublishInFather(initLog.debug,blocp, extrusionFace, name) #facesExt = geompy.GetShapesOnShape(extrusionFace, blocp, geompy.ShapeType["FACE"], GEOM.ST_ONIN) facesExt = geompy.GetShapesOnShape(extrusionFace, blocp, geompy.ShapeType["FACE"], GEOM.ST_ON) for j in range(len(facesExt)): name = "faceExterne_b%d_%d"%(i,j) - geompy.addToStudyInFather(blocp, facesExt[j], name) + geomPublishInFather(initLog.debug,blocp, facesExt[j], name) facesExternes.append(facesExt[j]) facesExtBloc.append(facesExt[j]) @@ -120,7 +141,7 @@ def partitionBlocDefaut(volDefaut, facesDefaut, gener, pipe, pass if len(allSharedEdges) > 0: name = "faceExterne_b%d_%d"%(i,j) - geompy.addToStudyInFather(blocp, facesBloc[i], name) + geomPublishInFather(initLog.debug,blocp, facesBloc[i], name) facesExternes.append(facesBloc[i]) facesExtBloc.append(facesBloc[i]) @@ -136,7 +157,7 @@ def partitionBlocDefaut(volDefaut, facesDefaut, gener, pipe, aretesInternes += shared for i in range(len(aretesInternes)): name = "aretesInternes_%d"%i - geompy.addToStudyInFather(blocp, aretesInternes[i], name) + geomPublishInFather(initLog.debug,blocp, aretesInternes[i], name) edgesBords = [] for faceExtB in facesExtBloc: @@ -150,7 +171,7 @@ def partitionBlocDefaut(volDefaut, facesDefaut, gener, pipe, if not isInterne: edgesBords.append(edges[i]) name = "edgeBord%d"%i - geompy.addToStudyInFather(blocp,edges[i] , name) + geomPublishInFather(initLog.debug,blocp,edges[i] , name) group = None if len(edgesBords) > 0: group = geompy.CreateGroup(blocp, geompy.ShapeType["EDGE"])