From: Paul RASCLE Date: Thu, 7 Jan 2016 17:15:04 +0000 (+0100) Subject: merge master X-Git-Tag: V7_8_0a1~8 X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=commitdiff_plain;h=7a65c9fad427b1ccba6b9ccae612296e5092a324;hp=-c;ds=sidebyside merge master --- 7a65c9fad427b1ccba6b9ccae612296e5092a324 diff --combined src/Tools/blocFissure/CMakeLists.txt index 4dab87093,980d01d57..ccebbba99 --- a/src/Tools/blocFissure/CMakeLists.txt +++ b/src/Tools/blocFissure/CMakeLists.txt @@@ -1,4 -1,4 +1,4 @@@ - # Copyright (C) 2012-2014 EDF R&D + # Copyright (C) 2012-2015 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 @@@ -30,6 -30,7 +30,6 @@@ ENDIF(SALOME_BUILD_GUI # scripts / static SET(plugin_SCRIPTS __init__.py - casStandard.py exemple.py exemple2.py ) diff --combined src/Tools/blocFissure/CasTests/CMakeLists.txt index 0f6f09f98,e2808864d..a2d4b2a7f --- a/src/Tools/blocFissure/CasTests/CMakeLists.txt +++ b/src/Tools/blocFissure/CasTests/CMakeLists.txt @@@ -1,4 -1,4 +1,4 @@@ - # Copyright (C) 2012-2014 EDF R&D + # Copyright (C) 2012-2015 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 @@@ -24,9 -24,6 +24,9 @@@ SET(plugin_SCRIPT __init__.py cubeAngle2.py cubeAngle.py + cubeCoin.py + cubeMilieu.py + cubeTransverse.py cylindre_2.py cylindre.py disquePerce.py diff --combined src/Tools/blocFissure/gmu/CMakeLists.txt index d7d2d9e5c,0a301aec9..abe18806b --- a/src/Tools/blocFissure/gmu/CMakeLists.txt +++ b/src/Tools/blocFissure/gmu/CMakeLists.txt @@@ -1,4 -1,4 +1,4 @@@ - # Copyright (C) 2012-2014 EDF R&D + # Copyright (C) 2012-2015 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 @@@ -22,25 -22,15 +22,25 @@@ # scripts / static SET(plugin_SCRIPTS __init__.py + ajustePointsEdgePipeFissure.py blocDefaut.py + calculePointsAxiauxPipe.py + casStandard.py checkDecoupePartition.py commonSubShapes.py + compoundFromList.py + construitEdgesRadialesDebouchantes.py + construitFissureGenerale.py + construitMaillagePipe.py + construitPartitionsPeauFissure.py + creePointsPipePeau.py creeZoneDefautDansObjetSain.py creeZoneDefautFilling.py creeZoneDefautGeom.py creeZoneDefautMaillage.py distance2.py eliminateDoubles.py + elimineExtremitesPipe.py ellipsoideDefaut.py enleveDefaut.py extractionOrienteeMulti.py @@@ -53,32 -43,20 +53,32 @@@ findWireIntermediateVertices.py fissureCoude.py fissureGenerique.py + fusionMaillageAttributionDefaut.py genereElemsFissureElliptique.py genereMeshCalculZoneDefaut.py geomsmesh.py getCentreFondFiss.py getStatsMaillageFissure.py getSubshapeIds.py + identifieEdgesPeau.py + identifieElementsDebouchants.py + identifieElementsFissure.py + identifieElementsGeometriquesPeau.py + identifieFacesEdgesFissureExterne.py + identifieFacesPeau.py initEtude.py initLog.py insereFissureElliptique.py insereFissureGenerale.py insereFissureLongue.py + listOfExtraFunctions.py + mailleAretesEtJonction.py + mailleFacesFissure.py + mailleFacesPeau.py meshBlocPart.py orderEdgesFromWire.py partitionBlocDefaut.py + partitionneFissureParPipe.py partitionVolumeSain.py peauInterne.py produitMixte.py @@@ -87,11 -65,8 +87,11 @@@ prolongeWire.py propagateTore.py putName.py + quadranglesToShapeNoCorner.py quadranglesToShape.py + quadranglesToShapeWithCorner.py regroupeSainEtDefaut.py + restreintFaceFissure.py rotTrans.py shapesSurFissure.py shapeSurFissure.py @@@ -103,7 -78,6 +103,7 @@@ testgmu.py toreFissure.py triedreBase.py + trouveEdgesFissPeau.py whichSideMulti.py whichSide.py whichSideVertex.py diff --combined src/Tools/blocFissure/gmu/triedreBase.py index 068ca40b7,ffc3a1b32..8113cd077 --- a/src/Tools/blocFissure/gmu/triedreBase.py +++ b/src/Tools/blocFissure/gmu/triedreBase.py @@@ -2,9 -2,6 +2,9 @@@ import logging from geomsmesh import geompy +from geomsmesh import geomPublish +from geomsmesh import geomPublishInFather +import initLog # --- origine et vecteurs de base @@@ -26,10 -23,11 +26,11 @@@ def triedreBase() OX = geompy.MakeVectorDXDYDZ(1, 0, 0) OY = geompy.MakeVectorDXDYDZ(0, 1, 0) OZ = geompy.MakeVectorDXDYDZ(0, 0, 1) - + - geomPublish(initLog.debug, O, 'O' ) - geomPublish(initLog.debug, OX, 'OX' ) - geomPublish(initLog.debug, OY, 'OY' ) - geomPublish(initLog.debug, OZ, 'OZ' ) + if not geompy.myStudy.FindObjectByName( 'OX', geompy.ComponentDataType() ): - geompy.addToStudy( O, 'O' ) - geompy.addToStudy( OX, 'OX' ) - geompy.addToStudy( OY, 'OY' ) - geompy.addToStudy( OZ, 'OZ' ) ++ geomPublish(initLog.debug, O, 'O' ) ++ geomPublish(initLog.debug, OX, 'OX' ) ++ geomPublish(initLog.debug, OY, 'OY' ) ++ geomPublish(initLog.debug, OZ, 'OZ' ) return O, OX, OY, OZ diff --combined src/Tools/blocFissure/ihm/fissureCoude_plugin.py index 4e4453f25,3a25713d8..d6144f20a --- a/src/Tools/blocFissure/ihm/fissureCoude_plugin.py +++ b/src/Tools/blocFissure/ihm/fissureCoude_plugin.py @@@ -1,11 -1,11 +1,11 @@@ # -*- coding: utf-8 -*- - # Copyright (C) 2006-2013 EDF R&D + # Copyright (C) 2006-2015 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. +# version 2.1 of the License. # # This library is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --combined src/Tools/blocFissure/materielCasTests/CMakeLists.txt index 958211354,37cc0c166..af9a2996d --- a/src/Tools/blocFissure/materielCasTests/CMakeLists.txt +++ b/src/Tools/blocFissure/materielCasTests/CMakeLists.txt @@@ -1,4 -1,4 +1,4 @@@ - # Copyright (C) 2012-2014 EDF R&D + # Copyright (C) 2012-2015 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 @@@ -23,7 -23,6 +23,7 @@@ SET(plugin_SCRIPTS __init__.py cubeAngle.py + cubeFin.py decoupeCylindre.py disque_perce.py ellipse_disque.py