X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FTools%2FblocFissure%2FmaterielCasTests%2Ftube.py;h=0fa59b616e6d0df8567f9cbe7ec68b1215cc000b;hb=069b583dab475d377bc34e336ca7e618b8ef279c;hp=3f6437aff04268aab0c691b60d95191bf077921d;hpb=d7ce9e283f7e6671e4b9d65f89b6320d6f57774b;p=modules%2Fsmesh.git

diff --git a/src/Tools/blocFissure/materielCasTests/tube.py b/src/Tools/blocFissure/materielCasTests/tube.py
index 3f6437aff..0fa59b616 100755
--- a/src/Tools/blocFissure/materielCasTests/tube.py
+++ b/src/Tools/blocFissure/materielCasTests/tube.py
@@ -17,21 +17,25 @@
 #
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
+"""Géométrie et maillage de base nécessaire au cas-test :
+. tube
+"""
 
-"""Cas-test de blocFissure sur un tube"""
-__revision__ = "V02.06"
+__revision__ = "V02.08"
 
-import logging
 import os
 
-from blocFissure import gmu
+import logging
 
 import salome
-from SketchAPI import *
 from salome.shaper import model
+from salome.smesh import smeshBuilder
+from SketchAPI import *
 import SHAPERSTUDY
 import SMESH
-from salome.smesh import smeshBuilder
+
+from blocFissure import gmu
+from blocFissure.gmu.putName import putName
 
 #=============== Options ====================
 # 1. NOM_OBJET = nom de l'objet
@@ -234,7 +238,7 @@ l_groups = l_aux[1:]
 
 smesh = smeshBuilder.New()
 Maillage_tube = smesh.Mesh(objet)
-smesh.SetName(Maillage_tube, NOM_OBJET)
+putName(Maillage_tube.GetMesh(), NOM_OBJET)
 
 for groupe in l_groups:
   groupe_nom = groupe.GetName()
@@ -260,6 +264,15 @@ Regular_1D_2 = Maillage_tube.Segment(geom=group_h)
 Number_of_Segments_2 = Regular_1D_2.NumberOfSegments(NB_S_H)
 Propagation_of_1D_Hyp_1 = Regular_1D_2.Propagation()
 
+## 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='tube')
+putName(Number_of_Segments_1, 'Number_of_Segments_1', i_pref='tube')
+putName(Number_of_Segments_2, 'Number_of_Segments_2', i_pref='tube')
+putName(Propagation_of_1D_Hyp, 'Propagation', i_pref='tube')
+
 is_done = Maillage_tube.Compute()
 text = "Maillage_tube.Compute"
 if is_done:
@@ -274,11 +287,5 @@ text = ".. Archivage du maillage dans le fichier '{}'".format(ficmed)
 logging.info(text)
 Maillage_tube.ExportMED(ficmed)
 
-## set object names
-smesh.SetName(Regular_1D.GetAlgorithm(), 'Regular_1D')
-smesh.SetName(Nb_Segments_1, 'Nb. Segments_1')
-smesh.SetName(Quadrangle_2D.GetAlgorithm(), 'Quadrangle_2D')
-smesh.SetName(Hexa_3D.GetAlgorithm(), 'Hexa_3D')
-
 if salome.sg.hasDesktop():
   salome.sg.updateObjBrowser()