From 4e85b9376bcb05ac3eb4e5480d4745474b5432c4 Mon Sep 17 00:00:00 2001 From: GERALD NICOLAS Date: Thu, 28 Jan 2021 14:29:52 +0100 Subject: [PATCH] =?UTF-8?q?Cl=C3=A9s=20de=20rep=C3=A9rage=20des=20donn?= =?UTF-8?q?=C3=A9es?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Tools/blocFissure/AREextradosLauncher.py | 4 ++-- src/Tools/blocFissure/AREintradosLauncher.py | 4 ++-- src/Tools/blocFissure/CasTests/cubeCoin.py | 4 ++-- src/Tools/blocFissure/CasTests/cubeMilieu.py | 4 ++-- src/Tools/blocFissure/CasTests/cubeTransverse.py | 4 ++-- src/Tools/blocFissure/CasTests/disquePerce.py | 4 ++-- src/Tools/blocFissure/exemple.py | 4 ++-- src/Tools/blocFissure/exemple2.py | 4 ++-- src/Tools/blocFissure/fissureLauncher.py | 6 +++--- src/Tools/blocFissure/gmu/casStandard.py | 14 ++++++++++---- .../blocFissure/lanceurSoudureArrondieTest.py | 4 ++-- src/Tools/blocFissure/lanceurSoudureViveTest.py | 4 ++-- src/Tools/blocFissure/lanceurTestAubry.py | 4 ++-- 13 files changed, 35 insertions(+), 29 deletions(-) diff --git a/src/Tools/blocFissure/AREextradosLauncher.py b/src/Tools/blocFissure/AREextradosLauncher.py index 690af3caa..ffe9de4a6 100644 --- a/src/Tools/blocFissure/AREextradosLauncher.py +++ b/src/Tools/blocFissure/AREextradosLauncher.py @@ -38,8 +38,8 @@ crack = 'fissureExtrados.brep' dicoParams = dict(nomCas = 'fissTuyau', maillageSain = '/local00/home/I48174/Documents/soudure/essaiFissure/{0}'.format(mesh), - brepFaceFissure = '/local00/home/I48174/Documents/soudure/essaiFissure/{0}'.format(crack), - edgeFissIds = [4], + CAOFaceFissure = '/local00/home/I48174/Documents/soudure/essaiFissure/{0}'.format(crack), + edgeFiss = [4], lgInfluence = 12, meshBrep = (0.05, 2.0), rayonPipe = 1.0, diff --git a/src/Tools/blocFissure/AREintradosLauncher.py b/src/Tools/blocFissure/AREintradosLauncher.py index 9ce8fc07a..24f861e82 100644 --- a/src/Tools/blocFissure/AREintradosLauncher.py +++ b/src/Tools/blocFissure/AREintradosLauncher.py @@ -38,8 +38,8 @@ crack = 'fissureIntrados.brep' dicoParams = dict(nomCas = 'fissTuyau', maillageSain = '/local00/home/I48174/Documents/soudure/essaiFissure/{0}'.format(mesh), - brepFaceFissure = '/local00/home/I48174/Documents/soudure/essaiFissure/{0}'.format(crack), - edgeFissIds = [4], + CAOFaceFissure = '/local00/home/I48174/Documents/soudure/essaiFissure/{0}'.format(crack), + edgeFiss = [4], lgInfluence = 14, meshBrep = (0.05, 2.0), rayonPipe = 1.0, diff --git a/src/Tools/blocFissure/CasTests/cubeCoin.py b/src/Tools/blocFissure/CasTests/cubeCoin.py index 688e351c4..5699196be 100644 --- a/src/Tools/blocFissure/CasTests/cubeCoin.py +++ b/src/Tools/blocFissure/CasTests/cubeCoin.py @@ -25,8 +25,8 @@ from blocFissure import gmu dicoParams = dict(nomCas = "cubeCoin", maillageSain = os.path.join(gmu.pathBloc, "materielCasTests", "cubeFin.med"), - brepFaceFissure = os.path.join(gmu.pathBloc, "materielCasTests", "cubeFin_Coin.brep"), - edgeFissIds = [3], + CAOFaceFissure = os.path.join(gmu.pathBloc, "materielCasTests", "cubeFin_Coin.brep"), + edgeFiss = [3], lgInfluence = 50, meshBrep = (5,10), rayonPipe = 10, diff --git a/src/Tools/blocFissure/CasTests/cubeMilieu.py b/src/Tools/blocFissure/CasTests/cubeMilieu.py index 06c6f395c..b5485fe76 100644 --- a/src/Tools/blocFissure/CasTests/cubeMilieu.py +++ b/src/Tools/blocFissure/CasTests/cubeMilieu.py @@ -25,8 +25,8 @@ from blocFissure import gmu dicoParams = dict(nomCas = "cubeMilieu", maillageSain = os.path.join(gmu.pathBloc, "materielCasTests", "cubeFin.med"), - brepFaceFissure = os.path.join(gmu.pathBloc, "materielCasTests", "cubeFin_Milieu.brep"), - edgeFissIds = [3], + CAOFaceFissure = os.path.join(gmu.pathBloc, "materielCasTests", "cubeFin_Milieu.brep"), + edgeFiss = [3], lgInfluence = 50, meshBrep = (5,10), rayonPipe = 10, diff --git a/src/Tools/blocFissure/CasTests/cubeTransverse.py b/src/Tools/blocFissure/CasTests/cubeTransverse.py index 2730591dd..570e73294 100644 --- a/src/Tools/blocFissure/CasTests/cubeTransverse.py +++ b/src/Tools/blocFissure/CasTests/cubeTransverse.py @@ -25,8 +25,8 @@ from blocFissure import gmu dicoParams = dict(nomCas = "cubeTransverse", maillageSain = os.path.join(gmu.pathBloc, "materielCasTests", "cubeFin.med"), - brepFaceFissure = os.path.join(gmu.pathBloc, "materielCasTests", "cubeFin_Transverse.brep"), - edgeFissIds = [6], + CAOFaceFissure = os.path.join(gmu.pathBloc, "materielCasTests", "cubeFin_Transverse.brep"), + edgeFiss = [6], lgInfluence = 50, meshBrep = (5,10), rayonPipe = 10, diff --git a/src/Tools/blocFissure/CasTests/disquePerce.py b/src/Tools/blocFissure/CasTests/disquePerce.py index 1c3749155..ae4f14ff3 100644 --- a/src/Tools/blocFissure/CasTests/disquePerce.py +++ b/src/Tools/blocFissure/CasTests/disquePerce.py @@ -25,8 +25,8 @@ from blocFissure import gmu dicoParams = dict(nomCas = 'disque', maillageSain = os.path.join(gmu.pathBloc, "materielCasTests", "disque.med"), - brepFaceFissure = os.path.join(gmu.pathBloc, "materielCasTests", "ellipse_disque.brep"), - edgeFissIds = [3], + CAOFaceFissure = os.path.join(gmu.pathBloc, "materielCasTests", "ellipse_disque.brep"), + edgeFiss = [3], lgInfluence = 10, meshBrep = (0.5,2.5), rayonPipe = 1.0, diff --git a/src/Tools/blocFissure/exemple.py b/src/Tools/blocFissure/exemple.py index 1cc04aa27..de4944c2e 100644 --- a/src/Tools/blocFissure/exemple.py +++ b/src/Tools/blocFissure/exemple.py @@ -28,8 +28,8 @@ from blocFissure.gmu.casStandard import casStandard dicoParams = dict(nomCas = "angleCube", maillageSain = os.path.join(gmu.pathBloc, "materielCasTests", "CubeAngle.med"), - brepFaceFissure = os.path.join(gmu.pathBloc, "materielCasTests", "CubeAngleFiss.brep"), - edgeFissIds = [4], + CAOFaceFissure = os.path.join(gmu.pathBloc, "materielCasTests", "CubeAngleFiss.brep"), + edgeFiss = [4], lgInfluence = 20, meshBrep = (5,10), rayonPipe = 5, diff --git a/src/Tools/blocFissure/exemple2.py b/src/Tools/blocFissure/exemple2.py index b6d388604..f464339a8 100644 --- a/src/Tools/blocFissure/exemple2.py +++ b/src/Tools/blocFissure/exemple2.py @@ -93,8 +93,8 @@ from blocFissure.gmu.casStandard import casStandard dicoParams = dict(nomCas = 'angleCube2', maillageSain = 'boite.med', - brepFaceFissure = "disk.brep", - edgeFissIds = [4], + CAOFaceFissure = "disk.brep", + edgeFiss = [4], lgInfluence = 50, meshBrep = (5,10), rayonPipe = 15, diff --git a/src/Tools/blocFissure/fissureLauncher.py b/src/Tools/blocFissure/fissureLauncher.py index c9cb495c9..8e3863fa9 100644 --- a/src/Tools/blocFissure/fissureLauncher.py +++ b/src/Tools/blocFissure/fissureLauncher.py @@ -38,8 +38,8 @@ crack = 'fissureQuartEllipse.brep' dicoParams = dict(nomCas = 'fissTuyau', maillageSain = '/local00/home/I48174/Bureau/supportMaillage/{0}'.format(mesh), - brepFaceFissure = '/local00/home/I48174/Bureau/supportMaillage/{0}'.format(crack), - edgeFissIds = [9], + CAOFaceFissure = '/local00/home/I48174/Bureau/supportMaillage/{0}'.format(crack), + edgeFiss = [9], lgInfluence = 250, meshBrep = (10, 50), rayonPipe = 35, @@ -51,4 +51,4 @@ dicoParams = dict(nomCas = 'fissTuyau', execInstance = casStandard(dicoParams) if salome.sg.hasDesktop(): - salome.sg.updateObjBrowser() \ No newline at end of file + salome.sg.updateObjBrowser() diff --git a/src/Tools/blocFissure/gmu/casStandard.py b/src/Tools/blocFissure/gmu/casStandard.py index 2b9ef26e8..52cd10547 100644 --- a/src/Tools/blocFissure/gmu/casStandard.py +++ b/src/Tools/blocFissure/gmu/casStandard.py @@ -121,20 +121,26 @@ class casStandard(fissureGenerique): lgInfluence = shapeFissureParams['lgInfluence'] - cao_file = self.dicoParams['brepFaceFissure'] +# Contrôle de 'brepFaceFissure' pour les anciennes versions + if ( 'brepFaceFissure' in self.dicoParams ): + self.dicoParams['CAOFaceFissure'] = self.dicoParams['brepFaceFissure'] + cao_file = self.dicoParams['CAOFaceFissure'] suffix = os.path.basename(cao_file).split(".")[-1] if ( suffix.upper() == "BREP" ): shellFiss = geompy.ImportBREP(cao_file) elif ( suffix.upper() == "XAO" ): (_, shellFiss, _, l_groups, _) = geompy.ImportXAO(cao_file) fondFiss = geompy.CreateGroup(shellFiss, geompy.ShapeType["EDGE"]) - if isinstance(self.dicoParams['edgeFissIds'][0],int): - geompy.UnionIDs(fondFiss, self.dicoParams['edgeFissIds'] ) +# Contrôle de 'edgeFissIds' pour les anciennes versions + if ( 'edgeFissIds' in self.dicoParams ): + self.dicoParams['edgeFiss'] = self.dicoParams['edgeFissIds'] + if isinstance(self.dicoParams['edgeFiss'][0],int): + geompy.UnionIDs(fondFiss, self.dicoParams['edgeFiss'] ) else: l_groups = geompy.GetGroups(shellFiss) l_aux = list() for group in l_groups: - if ( group.GetName() in self.dicoParams['edgeFissIds'] ): + if ( group.GetName() in self.dicoParams['edgeFiss'] ): l_aux.append(group) geompy.UnionList(fondFiss, l_aux ) geomPublish(initLog.debug, shellFiss, 'shellFiss' ) diff --git a/src/Tools/blocFissure/lanceurSoudureArrondieTest.py b/src/Tools/blocFissure/lanceurSoudureArrondieTest.py index 2c5a9d417..45a58f568 100644 --- a/src/Tools/blocFissure/lanceurSoudureArrondieTest.py +++ b/src/Tools/blocFissure/lanceurSoudureArrondieTest.py @@ -34,8 +34,8 @@ crack = 'fissureSoudureTest.brep' dicoParams = dict(nomCas = 'casTestCoinTriple', maillageSain = '/local00/home/I48174/Documents/soudure/essaiFissure/{0}'.format(mesh), - brepFaceFissure = '/local00/home/I48174/Documents/soudure/essaiFissure/{0}'.format(crack), - edgeFissIds = [4], + CAOFaceFissure = '/local00/home/I48174/Documents/soudure/essaiFissure/{0}'.format(crack), + edgeFiss = [4], lgInfluence = 30, meshBrep = (5,10), rayonPipe = 5, diff --git a/src/Tools/blocFissure/lanceurSoudureViveTest.py b/src/Tools/blocFissure/lanceurSoudureViveTest.py index f871078c5..ebafd87e7 100644 --- a/src/Tools/blocFissure/lanceurSoudureViveTest.py +++ b/src/Tools/blocFissure/lanceurSoudureViveTest.py @@ -34,8 +34,8 @@ crack = 'fissureSoudureTest.brep' dicoParams = dict(nomCas = 'casTestCoinTriple', maillageSain = '/local00/home/I48174/Documents/soudure/essaiFissure/{0}'.format(mesh), - brepFaceFissure = '/local00/home/I48174/Documents/soudure/essaiFissure/{0}'.format(crack), - edgeFissIds = [4], + CAOFaceFissure = '/local00/home/I48174/Documents/soudure/essaiFissure/{0}'.format(crack), + edgeFiss = [4], lgInfluence = 30, meshBrep = (5,10), rayonPipe = 10, diff --git a/src/Tools/blocFissure/lanceurTestAubry.py b/src/Tools/blocFissure/lanceurTestAubry.py index dc79c94d3..7f6b5874c 100644 --- a/src/Tools/blocFissure/lanceurTestAubry.py +++ b/src/Tools/blocFissure/lanceurTestAubry.py @@ -34,8 +34,8 @@ crack = 'hue.brep' dicoParams = dict(nomCas = 'testAubry', maillageSain = '/local00/home/I48174/Bureau/{0}'.format(mesh), - brepFaceFissure = '/local00/home/I48174/Bureau/{0}'.format(crack), - edgeFissIds = [8], + CAOFaceFissure = '/local00/home/I48174/Bureau/{0}'.format(crack), + edgeFiss = [8], lgInfluence = 0.01, meshBrep = (0.0002,0.003), rayonPipe = 0.005,