merge master

diff --combined src/Tools/blocFissure/CMakeLists.txt
index 4dab87093ed4908144d0715f0cd0a8b0486fad28,980d01d57cb5291f8ce1378f5a308804648e1e49..ccebbba99e05b92e775a2cb6a516557336e9daf0
--- 1/src/Tools/blocFissure/CMakeLists.txt
--- 2/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 0f6f09f9853fad2f5379652ee69848c02d05fd07,e2808864d65c29692485d4fa2d3233f7b23f7d18..a2d4b2a7fb53e92c608b60eaa133e73383233a1b
--- 1/src/Tools/blocFissure/CasTests/CMakeLists.txt
--- 2/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 d7d2d9e5c508faa8307fc2398da51f660cf60bb1,0a301aec9d760e124419d1bdba425a066ea42b0d..abe18806b38d1dbc999c9942835bed8ef6d5ef67
--- 1/src/Tools/blocFissure/gmu/CMakeLists.txt
--- 2/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 068ca40b7a40b22aaf24adce51d8a769418ab55f,ffc3a1b329aa759d4e5062bb7a95cdee2424a4e2..8113cd077eecff59ca66b848cbc0149ccb48c1bf
--- 1/src/Tools/blocFissure/gmu/triedreBase.py
--- 2/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 4e4453f2553bbd004d4e1a2b7403d360f6ddaed8,3a25713d8ef41026cd45dac5e5b3d4c83041ae6e..d6144f20a8a1929dacbb2f5aeb01571c2a857dbf
--- 1/src/Tools/blocFissure/ihm/fissureCoude_plugin.py
--- 2/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 958211354af0da9e6ade7c3fc6c9c8bed254aff7,37cc0c1666009b5768c9dc83cbfe33dce2de1275..af9a2996db306b2d407f8208cd0c59f1076791a6
--- 1/src/Tools/blocFissure/materielCasTests/CMakeLists.txt
--- 2/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