X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FTools%2FblocFissure%2FmaterielCasTests%2Fdisque_perce.py;h=0bc931a2339228a44b8bf6520e584e5a3571b619;hb=cdd78104f527ec730f69a3b3c19e80b60e4b31ad;hp=72b925a307ad5d1071a514571749e4c697a898eb;hpb=deac0e50eb0cac03cef72883584e167fbe4f7d74;p=modules%2Fsmesh.git

diff --git a/src/Tools/blocFissure/materielCasTests/disque_perce.py b/src/Tools/blocFissure/materielCasTests/disque_perce.py
index 72b925a30..0bc931a23 100644
--- a/src/Tools/blocFissure/materielCasTests/disque_perce.py
+++ b/src/Tools/blocFissure/materielCasTests/disque_perce.py
@@ -1,5 +1,5 @@
 # -*- coding: iso-8859-1 -*-
-# Copyright (C) 2014-2020  EDF R&D
+# 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
@@ -17,68 +17,61 @@
 #
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
+"""Géométrie et maillage de base nécessaire au cas-test :
+. disque_perce
+"""
+
+import os
 
 import logging
 
-import sys
 import salome
+from salome.smesh import smeshBuilder
+from salome.StdMeshers import StdMeshersBuilder
+import GEOM
+import SMESH
+import SALOMEDS
 
-salome.salome_init()
-
-import salome_notebook
-notebook = salome_notebook.notebook
-
-import os
 from blocFissure import gmu
+from blocFissure.gmu.geomsmesh import geompy
+from blocFissure.gmu.geomsmesh import geomPublish
+from blocFissure.gmu.geomsmesh import geomPublishInFather
 
+from blocFissure.gmu.triedreBase import triedreBase
+from blocFissure.gmu.putName import putName
+from blocFissure.gmu import initLog
 
 ###
 ### GEOM component
 ###
 
-import GEOM
-from salome.geom import geomBuilder
-import math
-import SALOMEDS
-
-
-geompy = geomBuilder.New()
+O, OX, OY, OZ = triedreBase()
 
-O = geompy.MakeVertex(0, 0, 0)
-OX = geompy.MakeVectorDXDYDZ(1, 0, 0)
-OY = geompy.MakeVectorDXDYDZ(0, 1, 0)
-OZ = geompy.MakeVectorDXDYDZ(0, 0, 1)
 Cylinder_1 = geompy.MakeCylinderRH(100, 300)
 Cylinder_2 = geompy.MakeCylinderRH(600, 200)
 Cut_1 = geompy.MakeCut(Cylinder_2, Cylinder_1)
 Face_1 = geompy.MakeFaceHW(500, 1500, 3)
 Disque = geompy.MakePartition([Cut_1], [Face_1], [], [], geompy.ShapeType["SOLID"], 0, [], 0)
 [Compound_1, Compound_2, Compound_3, Compound_4] = geompy.Propagate(Disque)
-geompy.addToStudy( O, 'O' )
-geompy.addToStudy( OX, 'OX' )
-geompy.addToStudy( OY, 'OY' )
-geompy.addToStudy( OZ, 'OZ' )
-geompy.addToStudy( Cylinder_1, 'Cylinder_1' )
-geompy.addToStudy( Cylinder_2, 'Cylinder_2' )
-geompy.addToStudy( Cut_1, 'Cut_1' )
-geompy.addToStudy( Face_1, 'Face_1' )
 geompy.addToStudy( Disque, 'Disque' )
 geompy.addToStudyInFather( Disque, Compound_1, 'Compound_1' )
 geompy.addToStudyInFather( Disque, Compound_2, 'Compound_2' )
 geompy.addToStudyInFather( Disque, Compound_3, 'Compound_3' )
 geompy.addToStudyInFather( Disque, Compound_4, 'Compound_4' )
 
+geomPublish(initLog.debug, Cylinder_1, 'Cylinder_1' )
+geomPublish(initLog.debug, Cylinder_2, 'Cylinder_2' )
+geomPublish(initLog.debug, Cut_1, 'Cut_1' )
+geomPublish(initLog.debug, Face_1, 'Face_1' )
+
 ###
 ### SMESH component
 ###
 
-import  SMESH, SALOMEDS
-from salome.smesh import smeshBuilder
-
 smesh = smeshBuilder.New()
-from salome.StdMeshers import StdMeshersBuilder
 Disque_1 = smesh.Mesh(Disque)
-smesh.SetName(Disque_1, 'Disque')
+putName(Disque_1.GetMesh(), 'Disque')
+
 Regular_1D = Disque_1.Segment()
 Nb_Segments_1 = Regular_1D.NumberOfSegments(10)
 Nb_Segments_1.SetDistrType( 0 )
@@ -90,6 +83,13 @@ Regular_1D_2 = Disque_1.Segment(geom=Compound_4)
 status = Disque_1.AddHypothesis(Nb_Segments_2,Compound_4)
 Quadrangle_2D = Disque_1.Quadrangle(algo=smeshBuilder.QUADRANGLE)
 
+## set object names
+#smesh.SetName(Regular_1D.GetAlgorithm(), 'Regular_1D')
+#smesh.SetName(Quadrangle_2D.GetAlgorithm(), 'Quadrangle_2D')
+#smesh.SetName(Hexa_3D.GetAlgorithm(), 'Hexa_3D')
+putName(Nb_Segments_1, 'Nb. Segments_1', i_pref='Disque')
+putName(Nb_Segments_2, 'Nb. Segments_2', i_pref='Disque')
+
 is_done = Disque_1.Compute()
 text = "Disque_1.Compute"
 if is_done:
@@ -100,18 +100,6 @@ else:
   raise Exception(text)
 
 Disque_1.ExportMED(os.path.join(gmu.pathBloc, "materielCasTests", "disque.med"))
-SubMesh_1 = Regular_1D_1.GetSubMesh()
-SubMesh_2 = Regular_1D_2.GetSubMesh()
-
-## set object names
-smesh.SetName(Disque_1.GetMesh(), 'Disque')
-smesh.SetName(Regular_1D.GetAlgorithm(), 'Regular_1D')
-smesh.SetName(Nb_Segments_1, 'Nb. Segments_1')
-smesh.SetName(Hexa_3D.GetAlgorithm(), 'Hexa_3D')
-smesh.SetName(Nb_Segments_2, 'Nb. Segments_2')
-smesh.SetName(Quadrangle_2D.GetAlgorithm(), 'Quadrangle_2D')
-smesh.SetName(SubMesh_1, 'SubMesh_1')
-smesh.SetName(SubMesh_2, 'SubMesh_2')
 
 if salome.sg.hasDesktop():
   salome.sg.updateObjBrowser()