La vis

diff --git a/src/Tools/blocFissure/materielCasTests/vis.py b/src/Tools/blocFissure/materielCasTests/vis.py
index 5c96a18d8d562bb1e065f53dd52636015b4efc5f..cd63959e47b848398b97ebf7cc61c2f4a4a1cf66 100644 (file)
--- a/src/Tools/blocFissure/materielCasTests/vis.py
+++ b/src/Tools/blocFissure/materielCasTests/vis.py
@@ -17,37 +17,37 @@
 #
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 #
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #

+"""Géométrie et maillage de base nécessaire au cas-test :
+. vis_1
+"""
+
+import os
+import math

 
 import logging
 
 
 import logging
 

-import sys

 import salome
 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 import gmu

+from blocFissure.gmu.geomsmesh import geompy
+from blocFissure.gmu.geomsmesh import geomPublish
+from blocFissure.gmu.geomsmesh import geomPublishInFather

 
 

-logging.info('start')
+from blocFissure.gmu.triedreBase import triedreBase
+from blocFissure.gmu.putName import putName
+from blocFissure.gmu import initLog

 
 ###
 ### GEOM component
 ###
 
 
 ###
 ### GEOM component
 ###
 

-import GEOM
-from salome.geom import geomBuilder
-import math
-import SALOMEDS
-
+O, OX, OY, OZ = triedreBase()

 
 

-geompy = geomBuilder.New()
-O = geompy.MakeVertex(0, 0, 0)
-OX = geompy.MakeVectorDXDYDZ(1, 0, 0)
-OY = geompy.MakeVectorDXDYDZ(0, 1, 0)
-OZ = geompy.MakeVectorDXDYDZ(0, 0, 1)

 geomObj_1 = geompy.MakeMarker(0, 0, 0, 1, 0, 0, 0, 1, 0)
 geomObj_2 = geompy.MakeMarker(0, 0, 0, 1, 0, 0, 0, 1, 0)
 sk = geompy.Sketcher2D()
 geomObj_1 = geompy.MakeMarker(0, 0, 0, 1, 0, 0, 0, 1, 0)
 geomObj_2 = geompy.MakeMarker(0, 0, 0, 1, 0, 0, 0, 1, 0)
 sk = geompy.Sketcher2D()


@@ -83,6 +83,31 @@ geompy.UnionIDs(appui, [39])
 p_imp = geompy.CreateGroup(coupe_vis, geompy.ShapeType["EDGE"])
 geompy.UnionIDs(p_imp, [11])
 
 p_imp = geompy.CreateGroup(coupe_vis, geompy.ShapeType["EDGE"])
 geompy.UnionIDs(p_imp, [11])
 

+geomPublish(initLog.debug, Sketch_1, 'Sketch_1' )
+geomPublish(initLog.debug, Face_1, 'Face_1' )
+geomPublish(initLog.debug, Vertex_1, 'Vertex_1' )
+geomPublish(initLog.debug, Vertex_2, 'Vertex_2' )
+geomPublish(initLog.debug, Vertex_3, 'Vertex_3' )
+geomPublishInFather(initLog.debug, Face_1, Face_1_vertex_17, 'Face_1:vertex_17' )
+geomPublish(initLog.debug, Line_1, 'Line_1' )
+geomPublishInFather(initLog.debug, Face_1, Face_1_vertex_9, 'Face_1:vertex_9' )
+geomPublish(initLog.debug, Line_2, 'Line_2' )
+geomPublishInFather(initLog.debug, Face_1, Face_1_vertex_19, 'Face_1:vertex_19' )
+geomPublishInFather(initLog.debug, Face_1, Face_1_vertex_7, 'Face_1:vertex_7' )
+geomPublish(initLog.debug, Line_3, 'Line_3' )
+geomPublish(initLog.debug, Line_4, 'Line_4' )
+
+geompy.addToStudy( coupe_vis, 'coupe_vis' )
+geompy.addToStudyInFather( coupe_vis, tige, 'tige' )
+geompy.addToStudyInFather( coupe_vis, section, 'section' )
+geompy.addToStudyInFather( coupe_vis, tige_haute, 'tige_haute' )
+geompy.addToStudyInFather( coupe_vis, rond, 'rond' )
+geompy.addToStudyInFather( coupe_vis, tete, 'tete' )
+geompy.addToStudyInFather( coupe_vis, section_tete, 'section_tete' )
+geompy.addToStudyInFather( coupe_vis, conge, 'conge' )
+geompy.addToStudyInFather( coupe_vis, appui, 'appui' )
+geompy.addToStudyInFather( coupe_vis, p_imp, 'p_imp' )
+

 Vertex_4 = geompy.MakeVertex(11.25, 98.75, 0)
 Vertex_5 = geompy.MakeVertexWithRef(Vertex_4, -0.5, 0.5, 0)
 Vertex_6 = geompy.MakeVertexWithRef(Vertex_4, -5, 5, 0)
 Vertex_4 = geompy.MakeVertex(11.25, 98.75, 0)
 Vertex_5 = geompy.MakeVertexWithRef(Vertex_4, -0.5, 0.5, 0)
 Vertex_6 = geompy.MakeVertexWithRef(Vertex_4, -5, 5, 0)


@@ -119,80 +144,54 @@ Revolution_2 = geompy.MakeRevolution2Ways(generatrice, OY, 65*math.pi/180.0)
 Fissure = geompy.MakeCommonList([Extrusion_1, Revolution_2], True)
 fondFiss = geompy.CreateGroup(Fissure, geompy.ShapeType["EDGE"])
 geompy.UnionIDs(fondFiss, [9, 7, 4])
 Fissure = geompy.MakeCommonList([Extrusion_1, Revolution_2], True)
 fondFiss = geompy.CreateGroup(Fissure, geompy.ShapeType["EDGE"])
 geompy.UnionIDs(fondFiss, [9, 7, 4])

-geompy.ExportBREP(Fissure, os.path.join(gmu.pathBloc, "materielCasTests", "visFiss.brep"))

 
 

-geompy.addToStudy( O, 'O' )
-geompy.addToStudy( OX, 'OX' )
-geompy.addToStudy( OY, 'OY' )
-geompy.addToStudy( OZ, 'OZ' )
-geompy.addToStudy( Sketch_1, 'Sketch_1' )
-geompy.addToStudy( Face_1, 'Face_1' )
-geompy.addToStudy( Vertex_1, 'Vertex_1' )
-geompy.addToStudy( Vertex_2, 'Vertex_2' )
-geompy.addToStudy( Vertex_3, 'Vertex_3' )
-geompy.addToStudyInFather( Face_1, Face_1_vertex_17, 'Face_1:vertex_17' )
-geompy.addToStudy( Line_1, 'Line_1' )
-geompy.addToStudyInFather( Face_1, Face_1_vertex_9, 'Face_1:vertex_9' )
-geompy.addToStudy( Line_2, 'Line_2' )
-geompy.addToStudyInFather( Face_1, Face_1_vertex_19, 'Face_1:vertex_19' )
-geompy.addToStudyInFather( Face_1, Face_1_vertex_7, 'Face_1:vertex_7' )
-geompy.addToStudy( Line_3, 'Line_3' )
-geompy.addToStudy( Line_4, 'Line_4' )
-geompy.addToStudy( coupe_vis, 'coupe_vis' )
-geompy.addToStudyInFather( coupe_vis, tige, 'tige' )
-geompy.addToStudyInFather( coupe_vis, section, 'section' )
-geompy.addToStudyInFather( coupe_vis, tige_haute, 'tige_haute' )
-geompy.addToStudyInFather( coupe_vis, rond, 'rond' )
-geompy.addToStudyInFather( coupe_vis, tete, 'tete' )
-geompy.addToStudyInFather( coupe_vis, section_tete, 'section_tete' )
-geompy.addToStudyInFather( coupe_vis, conge, 'conge' )
-geompy.addToStudyInFather( coupe_vis, appui, 'appui' )
-geompy.addToStudyInFather( coupe_vis, p_imp, 'p_imp' )
-
-geompy.addToStudy( Vertex_4, 'Vertex_4' )
-geompy.addToStudy( Vertex_6, 'Vertex_6' )
-geompy.addToStudy( Vertex_5, 'Vertex_5' )
-geompy.addToStudy( Line_5, 'Line_5' )
-geompy.addToStudy( Partition_1, 'Partition_1' )
-geompy.addToStudyInFather( Partition_1, Vertex_7, 'Vertex_7' )
-geompy.addToStudy( Vertex_8, 'Vertex_8' )
-geompy.addToStudy( generatrice, 'generatrice' )
-geompy.addToStudy( Revolution_1, 'Revolution_1' )
-geompy.addToStudy( Partition_2, 'Partition_2' )
-geompy.addToStudyInFather( Partition_2, Partition_2_vertex_11, 'Partition_2:vertex_11' )
-geompy.addToStudy( Plane_1, 'Plane_1' )
-geompy.addToStudy( Partition_3, 'Partition_3' )
-geompy.addToStudy( Vertex_9, 'Vertex_9' )
-geompy.addToStudy( Vertex_10, 'Vertex_10' )
-geompy.addToStudy( Vertex_11, 'Vertex_11' )
-geompy.addToStudy( Vertex_12, 'Vertex_12' )
-geompy.addToStudy( Vertex_13, 'Vertex_13' )
-geompy.addToStudy( Vertex_14, 'Vertex_14' )
-geompy.addToStudy( Vertex_15, 'Vertex_15' )
-geompy.addToStudy( Vertex_16, 'Vertex_16' )
-geompy.addToStudy( Arc_1, 'Arc_1' )
-geompy.addToStudy( Arc_2, 'Arc_2' )
-geompy.addToStudy( Line_6, 'Line_6' )
-geompy.addToStudy( Line_8, 'Line_8' )
-geompy.addToStudy( Wire_1, 'Wire_1' )
-geompy.addToStudy( Face_2, 'Face_2' )
-geompy.addToStudy( Extrusion_1, 'Extrusion_1' )
-geompy.addToStudy( Revolution_2, 'Revolution_2' )
-geompy.addToStudy( Fissure, 'Fissure' )
+geomPublish(initLog.debug, Vertex_4, 'Vertex_4' )
+geomPublish(initLog.debug, Vertex_6, 'Vertex_6' )
+geomPublish(initLog.debug, Vertex_5, 'Vertex_5' )
+geomPublish(initLog.debug, Line_5, 'Line_5' )
+geomPublish(initLog.debug, Partition_1, 'Partition_1' )
+geomPublishInFather(initLog.debug, Partition_1, Vertex_7, 'Vertex_7' )
+geomPublish(initLog.debug, Vertex_8, 'Vertex_8' )
+geomPublish(initLog.debug, generatrice, 'generatrice' )
+geomPublish(initLog.debug, Revolution_1, 'Revolution_1' )
+geomPublish(initLog.debug, Partition_2, 'Partition_2' )
+geomPublishInFather(initLog.debug, Partition_2, Partition_2_vertex_11, 'Partition_2:vertex_11' )
+geomPublish(initLog.debug, Plane_1, 'Plane_1' )
+geomPublish(initLog.debug, Partition_3, 'Partition_3' )
+geomPublish(initLog.debug, Vertex_9, 'Vertex_9' )
+geomPublish(initLog.debug, Vertex_10, 'Vertex_10' )
+geomPublish(initLog.debug, Vertex_11, 'Vertex_11' )
+geomPublish(initLog.debug, Vertex_12, 'Vertex_12' )
+geomPublish(initLog.debug, Vertex_13, 'Vertex_13' )
+geomPublish(initLog.debug, Vertex_14, 'Vertex_14' )
+geomPublish(initLog.debug, Vertex_15, 'Vertex_15' )
+geomPublish(initLog.debug, Vertex_16, 'Vertex_16' )
+geomPublish(initLog.debug, Arc_1, 'Arc_1' )
+geomPublish(initLog.debug, Arc_2, 'Arc_2' )
+geomPublish(initLog.debug, Line_6, 'Line_6' )
+geomPublish(initLog.debug, Line_8, 'Line_8' )
+geomPublish(initLog.debug, Wire_1, 'Wire_1' )
+geomPublish(initLog.debug, Face_2, 'Face_2' )
+geomPublish(initLog.debug, Extrusion_1, 'Extrusion_1' )
+geomPublish(initLog.debug, Revolution_2, 'Revolution_2' )
+geompy.addToStudy( Fissure, 'vis_Fissure' )

 geompy.addToStudyInFather( Fissure, fondFiss, 'fondFiss' )
 
 geompy.addToStudyInFather( Fissure, fondFiss, 'fondFiss' )
 

+ficcao = os.path.join(gmu.pathBloc, "materielCasTests", "visFiss.brep")
+text = ".. Exportation de la géométrie de la fissure dans le fichier '{}'".format(ficcao)
+logging.info(text)
+geompy.ExportBREP(Fissure, ficcao)
+

 ###
 ### SMESH component
 ###
 
 ###
 ### SMESH component
 ###
 

-logging.info("Maillage de {}".format(coupe_vis.GetName()))
-
-import  SMESH, SALOMEDS
-from salome.smesh import smeshBuilder
+logging.info("Maillage de %s", coupe_vis.GetName())

 
 smesh = smeshBuilder.New()
 
 smesh = smeshBuilder.New()

-

 coupe_vis_1 = smesh.Mesh(coupe_vis)
 coupe_vis_1 = smesh.Mesh(coupe_vis)

+putName(coupe_vis_1.GetMesh(), 'coupe_vis')
+

 Regular_1D = coupe_vis_1.Segment()
 Nb_Segments_1 = Regular_1D.NumberOfSegments(10)
 Quadrangle_2D = coupe_vis_1.Quadrangle(algo=smeshBuilder.QUADRANGLE)
 Regular_1D = coupe_vis_1.Segment()
 Nb_Segments_1 = Regular_1D.NumberOfSegments(10)
 Quadrangle_2D = coupe_vis_1.Quadrangle(algo=smeshBuilder.QUADRANGLE)


@@ -201,15 +200,22 @@ Nb_Segments_2 = Regular_1D_1.NumberOfSegments(30)
 Regular_1D_2 = coupe_vis_1.Segment(geom=section)
 Nb_Segments_3 = Regular_1D_2.NumberOfSegments(10,1,[ 7, 11, 16, 23 ])
 
 Regular_1D_2 = coupe_vis_1.Segment(geom=section)
 Nb_Segments_3 = Regular_1D_2.NumberOfSegments(10,1,[ 7, 11, 16, 23 ])
 

-tige_1 = coupe_vis_1.GroupOnGeom(tige,'tige',SMESH.EDGE)
-section_1 = coupe_vis_1.GroupOnGeom(section,'section',SMESH.EDGE)
-tige_haute_1 = coupe_vis_1.GroupOnGeom(tige_haute,'tige_haute',SMESH.EDGE)
-rond_1 = coupe_vis_1.GroupOnGeom(rond,'rond',SMESH.EDGE)
-tete_1 = coupe_vis_1.GroupOnGeom(tete,'tete',SMESH.EDGE)
-section_tete_1 = coupe_vis_1.GroupOnGeom(section_tete,'section_tete',SMESH.EDGE)
-conge_1 = coupe_vis_1.GroupOnGeom(conge,'conge',SMESH.EDGE)
-appui_1 = coupe_vis_1.GroupOnGeom(appui,'appui',SMESH.EDGE)
-p_imp_1 = coupe_vis_1.GroupOnGeom(p_imp,'p_imp',SMESH.EDGE)
+_ = coupe_vis_1.GroupOnGeom(tige,'tige',SMESH.EDGE)
+_ = coupe_vis_1.GroupOnGeom(section,'section',SMESH.EDGE)
+_ = coupe_vis_1.GroupOnGeom(tige_haute,'tige_haute',SMESH.EDGE)
+_ = coupe_vis_1.GroupOnGeom(rond,'rond',SMESH.EDGE)
+_ = coupe_vis_1.GroupOnGeom(tete,'tete',SMESH.EDGE)
+_ = coupe_vis_1.GroupOnGeom(section_tete,'section_tete',SMESH.EDGE)
+_ = coupe_vis_1.GroupOnGeom(conge,'conge',SMESH.EDGE)
+_ = coupe_vis_1.GroupOnGeom(appui,'appui',SMESH.EDGE)
+_ = coupe_vis_1.GroupOnGeom(p_imp,'p_imp',SMESH.EDGE)
+
+## set object names
+#smesh.SetName(Regular_1D.GetAlgorithm(), 'Regular_1D')
+#smesh.SetName(Quadrangle_2D.GetAlgorithm(), 'Quadrangle_2D')
+putName(Nb_Segments_1, 'Nb. Segments_1', i_pref='vis')
+putName(Nb_Segments_2, 'Nb. Segments_2', i_pref='vis')
+putName(Nb_Segments_3, 'Nb. Segments_3', i_pref='vis')

 
 is_done = coupe_vis_1.Compute()
 text = "coupe_vis_1.Compute"
 
 is_done = coupe_vis_1.Compute()
 text = "coupe_vis_1.Compute"


@@ -238,64 +244,16 @@ else:
   raise Exception(text)
 
 visHex80 = smesh.CopyMesh( coupe_vis_1, 'visHex80', 1, 0)
   raise Exception(text)
 
 visHex80 = smesh.CopyMesh( coupe_vis_1, 'visHex80', 1, 0)

+putName(visHex80.GetMesh(), 'visHex80')

 
 _ = visHex80.RotationSweepObjects( [ visHex80 ], [ visHex80 ], [ visHex80 ], SMESH.AxisStruct( 0, 0, 0, 0, 10, 0 ), 0.0785398, 40, 1e-05, 1 )
 
 
 _ = visHex80.RotationSweepObjects( [ visHex80 ], [ visHex80 ], [ visHex80 ], SMESH.AxisStruct( 0, 0, 0, 0, 10, 0 ), 0.0785398, 40, 1e-05, 1 )
 

-[ tige_2, section_2, tige_haute_2, rond_2, tete_2, section_tete_2, conge_2, appui_2, p_imp_2, \
-  tige_rotated, tige_top, section_rotated, section_top, tige_haute_rotated, tige_haute_top, \
-  rond_rotated, rond_top, tete_rotated, tete_top, section_tete_rotated, section_tete_top, \
-  conge_rotated, conge_top, appui_rotated, appui_top, p_imp_rotated, p_imp_top ] = visHex80.GetGroups()
-Sub_mesh_1 = Regular_1D_1.GetSubMesh()
-Sub_mesh_2 = Regular_1D_2.GetSubMesh()
-visHex80.ExportMED(os.path.join(gmu.pathBloc, "materielCasTests", "visSain.med"))
+ficmed = os.path.join(gmu.pathBloc, "materielCasTests","visSain.med")
+text = ".. Archivage du maillage dans le fichier '{}'".format(ficmed)
+logging.info(text)
+visHex80.ExportMED(ficmed)

 
 ## Set names of Mesh objects
 
 ## Set names of Mesh objects

-smesh.SetName(tige_2, 'tige')
-smesh.SetName(Regular_1D.GetAlgorithm(), 'Regular_1D')
-smesh.SetName(Quadrangle_2D.GetAlgorithm(), 'Quadrangle_2D')
-smesh.SetName(Nb_Segments_2, 'Nb. Segments_2')
-smesh.SetName(Nb_Segments_1, 'Nb. Segments_1')
-smesh.SetName(Nb_Segments_3, 'Nb. Segments_3')
-smesh.SetName(coupe_vis_1.GetMesh(), 'coupe_vis')
-smesh.SetName(visHex80.GetMesh(), 'visHex80')
-smesh.SetName(p_imp_top, 'p_imp_top')
-smesh.SetName(appui_top, 'appui_top')
-smesh.SetName(conge_top, 'conge_top')
-smesh.SetName(section_tete_top, 'section_tete_top')
-smesh.SetName(tete_top, 'tete_top')
-smesh.SetName(rond_top, 'rond_top')
-smesh.SetName(tige_haute_top, 'tige_haute_top')
-smesh.SetName(section_top, 'section_top')
-smesh.SetName(tige_top, 'tige_top')
-smesh.SetName(Sub_mesh_2, 'Sub-mesh_2')
-smesh.SetName(Sub_mesh_1, 'Sub-mesh_1')
-smesh.SetName(p_imp_1, 'p_imp')
-smesh.SetName(p_imp_rotated, 'p_imp_rotated')
-smesh.SetName(appui_1, 'appui')
-smesh.SetName(appui_rotated, 'appui_rotated')
-smesh.SetName(conge_rotated, 'conge_rotated')
-smesh.SetName(section_tete_rotated, 'section_tete_rotated')
-smesh.SetName(tete_rotated, 'tete_rotated')
-smesh.SetName(rond_rotated, 'rond_rotated')
-smesh.SetName(tige_haute_rotated, 'tige_haute_rotated')
-smesh.SetName(section_rotated, 'section_rotated')
-smesh.SetName(tige_1, 'tige')
-smesh.SetName(tige_rotated, 'tige_rotated')
-smesh.SetName(tige_haute_1, 'tige_haute')
-smesh.SetName(section_1, 'section')
-smesh.SetName(tete_1, 'tete')
-smesh.SetName(rond_1, 'rond')
-smesh.SetName(conge_1, 'conge')
-smesh.SetName(appui_2, 'appui')
-smesh.SetName(section_tete_1, 'section_tete')
-smesh.SetName(p_imp_2, 'p_imp')
-smesh.SetName(section_tete_2, 'section_tete')
-smesh.SetName(conge_2, 'conge')
-smesh.SetName(rond_2, 'rond')
-smesh.SetName(tete_2, 'tete')
-smesh.SetName(section_2, 'section')
-smesh.SetName(tige_haute_2, 'tige_haute')
-

 
 if salome.sg.hasDesktop():
   salome.sg.updateObjBrowser()
 
 if salome.sg.hasDesktop():
   salome.sg.updateObjBrowser()