Clés de repérage des données

diff --git a/src/Tools/blocFissure/AREextradosLauncher.py b/src/Tools/blocFissure/AREextradosLauncher.py
index 690af3caa5c26ac296700014972185bffd31b51f..ffe9de4a6d0d051f67ef59c3aafc0e5bf700a3fd 100644 (file)
--- 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 9ce8fc07abcd39881e4870d109f7a068346d72b2..24f861e829e4262503ff34a2fc530ea17e79fe63 100644 (file)
--- 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 688e351c4617332468e5153dd3669814152fca3c..5699196be396da15725a5259529e6fecc72424ef 100644 (file)
--- 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 06c6f395c0b309bd0daa736d1a2729fb50f241ae..b5485fe76235f8b4855dcdea0a846576d9004b49 100644 (file)
--- 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 2730591ddb843365b14ed2eb99e770c80010cfdd..570e7329486fe4f912006c9a69ba364cd55ea0a8 100644 (file)
--- 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 1c37491553fe2f6a1a036e4b5a10c181855db41a..ae4f14ff33a99d5f147c6eb7aea0f6d206dce51e 100644 (file)
--- 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 1cc04aa27ec2ceedb9fd17e6577c220ede44c0fe..de4944c2e0e65ca7298ec2ddd2893bac86aa65d6 100644 (file)
--- 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 b6d3886042c7029896c0ee1e0f427035aa6a416c..f464339a816c16b11875c28a1bcef0378ba38c7a 100644 (file)
--- 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 c9cb495c9694cb11afa50b6340ef0e4b85e7ace9..8e3863fa9c711a9160acc7f35e31276e867da339 100644 (file)
--- 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 2b9ef26e842598702c01cff2164889612222eaf7..52cd10547128ea7937779d44b8872d93dcf81c6f 100644 (file)
--- 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 2c5a9d4177e1b9e7d0ff7f2873f66758a88d99fc..45a58f568cdf169a1109e7aba73057c3be953bac 100644 (file)
--- 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 f871078c549c6d387d342fcbbc7ca8e0d0daa5a4..ebafd87e74ab91dac33bf608363fa37cb6a81db9 100644 (file)
--- 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 dc79c94d367382d803886ff05e1735c94c2cd2c4..7f6b5874c052cc49e3d976ab400636f58da2035c 100644 (file)
--- 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,