From c90594b6581f77b2cdf558ea3ff17748b1bb4571 Mon Sep 17 00:00:00 2001 From: GERALD NICOLAS Date: Tue, 6 Apr 2021 16:36:28 +0200 Subject: [PATCH] Cas-tests tube et vis --- src/Tools/blocFissure/CasTests/tube.py | 6 ++++-- src/Tools/blocFissure/CasTests/vis_1.py | 11 +++++++---- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/src/Tools/blocFissure/CasTests/tube.py b/src/Tools/blocFissure/CasTests/tube.py index dd93f859d..81088ec54 100644 --- a/src/Tools/blocFissure/CasTests/tube.py +++ b/src/Tools/blocFissure/CasTests/tube.py @@ -25,6 +25,8 @@ import logging from blocFissure import gmu from blocFissure.gmu.geomsmesh import geompy, smesh +from blocFissure.gmu.geomsmesh import geomPublish +from blocFissure.gmu.geomsmesh import geomPublishInFather from blocFissure.gmu.fissureGenerique import fissureGenerique from blocFissure.gmu.genereMeshCalculZoneDefaut import genereMeshCalculZoneDefaut from blocFissure.gmu.creeZoneDefautDansObjetSain import creeZoneDefautDansObjetSain @@ -81,8 +83,8 @@ class tube(fissureGenerique): l_aux.append(group) fondFiss = geompy.CreateGroup(shellFiss, geompy.ShapeType["EDGE"]) geompy.UnionList(fondFiss, l_aux ) - geompy.addToStudy( shellFiss, 'shellFiss' ) - geompy.addToStudyInFather( shellFiss, fondFiss, 'fondFiss' ) + geomPublish(initLog.always, shellFiss, "shellFiss", self.numeroCas) + geomPublishInFather(initLog.always, shellFiss, fondFiss, "fondFiss", self.numeroCas) mailleur = self.mailleur2d3d() coordsNoeudsFissure = genereMeshCalculZoneDefaut(shellFiss, 0.025, 0.1, mailleur, self.numeroCas) diff --git a/src/Tools/blocFissure/CasTests/vis_1.py b/src/Tools/blocFissure/CasTests/vis_1.py index cefc1e3f4..3b5198787 100644 --- a/src/Tools/blocFissure/CasTests/vis_1.py +++ b/src/Tools/blocFissure/CasTests/vis_1.py @@ -19,18 +19,21 @@ # """problème de fissure non plane, débouchante non normale""" +import logging import os + from blocFissure import gmu +from blocFissure.gmu import initLog from blocFissure.gmu.geomsmesh import geompy, smesh +from blocFissure.gmu.geomsmesh import geomPublish +from blocFissure.gmu.geomsmesh import geomPublishInFather from blocFissure.gmu.putName import putName import GEOM import SALOMEDS import SMESH -import logging from blocFissure.gmu.fissureGenerique import fissureGenerique - from blocFissure.gmu.triedreBase import triedreBase from blocFissure.gmu.genereMeshCalculZoneDefaut import genereMeshCalculZoneDefaut from blocFissure.gmu.creeZoneDefautDansObjetSain import creeZoneDefautDansObjetSain @@ -82,8 +85,8 @@ class vis_1(fissureGenerique): shellFiss = geompy.ImportBREP(os.path.join(gmu.pathBloc, "materielCasTests", "visFiss.brep")) fondFiss = geompy.CreateGroup(shellFiss, geompy.ShapeType["EDGE"]) geompy.UnionIDs(fondFiss, [6, 8, 3]) - geompy.addToStudy( shellFiss, 'shellFiss' ) - geompy.addToStudyInFather( shellFiss, fondFiss, 'fondFiss' ) + geomPublish(initLog.always, shellFiss, "shellFiss", self.numeroCas) + geomPublishInFather(initLog.always, shellFiss, fondFiss, "fondFiss", self.numeroCas) mailleur = self.mailleur2d3d() coordsNoeudsFissure = genereMeshCalculZoneDefaut(shellFiss, 0.1 ,0.2, mailleur, self.numeroCas) -- 2.30.2