From d124c5d354ca6980e3cf62b7a916f56bd46b3fd7 Mon Sep 17 00:00:00 2001 From: =?utf8?q?G=C3=A9rald=20NICOLAS?= Date: Wed, 7 Apr 2021 11:11:05 +0200 Subject: [PATCH] Publications --- src/Tools/blocFissure/gmu/insereFissureLongue.py | 1 - src/Tools/blocFissure/gmu/insereFissureLongue_a.py | 14 +++++++------- src/Tools/blocFissure/gmu/insereFissureLongue_b.py | 4 ++-- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/src/Tools/blocFissure/gmu/insereFissureLongue.py b/src/Tools/blocFissure/gmu/insereFissureLongue.py index 7f05e3238..de3d61066 100644 --- a/src/Tools/blocFissure/gmu/insereFissureLongue.py +++ b/src/Tools/blocFissure/gmu/insereFissureLongue.py @@ -156,7 +156,6 @@ def insereFissureLongue(geometriesSaines, \ zoneDefaut, zoneDefaut_skin, zoneDefaut_internalEdges, zoneDefaut_internalFaces, \ nro_cas) - if salome.sg.hasDesktop(): salome.sg.updateObjBrowser() diff --git a/src/Tools/blocFissure/gmu/insereFissureLongue_a.py b/src/Tools/blocFissure/gmu/insereFissureLongue_a.py index 2316ec41f..cd8b719ed 100644 --- a/src/Tools/blocFissure/gmu/insereFissureLongue_a.py +++ b/src/Tools/blocFissure/gmu/insereFissureLongue_a.py @@ -90,13 +90,13 @@ def insereFissureLongue_a(facePorteFissure, WirePorteFondFissure, \ # --- partition peau -face fissure - pipe fond de fissure prolongé partitionPeauFissByPipe = geompy.MakePartition([facesInside[0], facesOnside[0]], [pipefiss], list(), list(), geompy.ShapeType["FACE"], 0, list(), 0) - geomPublish(initLog.debug, partitionPeauFissByPipe, 'partitionPeauFissByPipe', nro_cas ) + geomPublish(initLog.always, partitionPeauFissByPipe, 'partitionPeauFissByPipe', nro_cas ) # --- identification face de peau [facesPeauFissInside, _, facesPeauFissOnside] = extractionOrientee(fillingFaceExterne, partitionPeauFissByPipe, centreFondFiss, "FACE", 0.1, "peauFiss_bord_") facesPeauSorted, _, _ = sortFaces(facesPeauFissOnside) # 4 demi disques, une grande face facePeau = facesPeauSorted[-1] # la plus grande face - geomPublishInFather(initLog.debug,partitionPeauFissByPipe, facePeau, "facePeau", nro_cas) + geomPublishInFather(initLog.always, partitionPeauFissByPipe, facePeau, "facePeau", nro_cas) # --- identification edges de bord face peau edgesFilling = geompy.ExtractShapes(fillingFaceExterne, geompy.ShapeType["EDGE"], False) @@ -106,7 +106,7 @@ def insereFissureLongue_a(facePorteFissure, WirePorteFondFissure, \ edgesBords.append(edgepeau) groupEdgesBordPeau = geompy.CreateGroup(facePeau, geompy.ShapeType["EDGE"]) geompy.UnionList(groupEdgesBordPeau, edgesBords) - geomPublishInFather(initLog.debug,facePeau, groupEdgesBordPeau , "EdgesBords", nro_cas) + geomPublishInFather(initLog.always, facePeau, groupEdgesBordPeau , "EdgesBords", nro_cas) # --- identification face fissure externe au pipe et edge commune peau fissure for face in facesPeauFissInside: @@ -115,9 +115,9 @@ def insereFissureLongue_a(facePorteFissure, WirePorteFondFissure, \ if sharedEdges is not None: faceFiss = face edgePeauFiss = sharedEdges[0] - geomPublishInFather(initLog.debug,partitionPeauFissByPipe, faceFiss, "faceFiss", nro_cas) - geomPublishInFather(initLog.debug,faceFiss, edgePeauFiss, "edgePeauFiss", nro_cas) - geomPublishInFather(initLog.debug,facePeau, edgePeauFiss, "edgePeauFiss", nro_cas) + geomPublishInFather(initLog.always, partitionPeauFissByPipe, faceFiss, "faceFiss", nro_cas) + geomPublishInFather(initLog.always, faceFiss, edgePeauFiss, "edgePeauFiss", nro_cas) + geomPublishInFather(initLog.always, facePeau, edgePeauFiss, "edgePeauFiss", nro_cas) break except: pass @@ -151,7 +151,7 @@ def insereFissureLongue_a(facePorteFissure, WirePorteFondFissure, \ group = geompy.CreateGroup(facePeau, geompy.ShapeType["EDGE"]) geompy.UnionList(group, demis) name = "Cercle{}".format(i_aux) - geomPublishInFather(initLog.debug,facePeau, group , name, nro_cas) + geomPublishInFather(initLog.always,facePeau, group , name, nro_cas) groupsDemiCerclesPeau.append(group) # --- identification edges commune pipe face fissure externe au pipe diff --git a/src/Tools/blocFissure/gmu/insereFissureLongue_b.py b/src/Tools/blocFissure/gmu/insereFissureLongue_b.py index ae04ce1a9..b868ef488 100644 --- a/src/Tools/blocFissure/gmu/insereFissureLongue_b.py +++ b/src/Tools/blocFissure/gmu/insereFissureLongue_b.py @@ -86,8 +86,8 @@ def insereFissureLongue_b (edgesInside, centreFondFiss, tangentFondFiss, \ #pipeFondFiss = geompy.MakePartition([pipeFondFiss], [planfiss, wireFondFiss, planBord1, planBord2], list(), list(), geompy.ShapeType["SOLID"], 0, list(), 0) geomPublish(initLog.debug, disque, 'disque') - geomPublish(initLog.debug, wireFondFiss, 'wireFondFiss') - geomPublish(initLog.debug, pipeFondFiss, 'pipeFondFiss') + geomPublish(initLog.always, wireFondFiss, 'wireFondFiss', nro_cas) + geomPublish(initLog.always, pipeFondFiss, 'pipeFondFiss', nro_cas) VerticesEndFondFiss, _ = findWireEndVertices(wireFondFiss) for i_aux, vertex in enumerate(VerticesEndFondFiss): -- 2.39.2