From: LUCIE BERTHON <C41270@dsp0887684.atlas.edf.fr>
Date: Fri, 7 Sep 2018 08:48:49 +0000 (+0200)
Subject: Merge branch 'MapIdentification' of https://git.forge.pleiade.edf.fr/git/eficas into... 
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=89d565bde6b142a7fcdba42cf94af3d4a3e4ec58;p=tools%2Feficas.git

Merge branch 'MapIdentification' of https://git.forge.pleiade.edf.fr/git/eficas into MapIdentification
---

89d565bde6b142a7fcdba42cf94af3d4a3e4ec58
diff --cc MapIdentification/prefs_MapIdentification.py
index a0869136,4014ee8e..c2b6a3e5
--- a/MapIdentification/prefs_MapIdentification.py
+++ b/MapIdentification/prefs_MapIdentification.py
@@@ -37,17 -38,10 +38,10 @@@ utilParExtensions = { 'xml' : 'gedit' 
  #typeDeCata='XML'
  catalogues=(
     ('MapIdentification','MAP file',os.path.join(repIni,'cata_map_cl0d.py'),'MapIdentification','python'),
 -   ('MapIdentification','Experiences plan',os.path.join(repIni,'cata_map_cl0d_exp.py'),'python','python'),
 -   ('MapIdentification','Material parameters',os.path.join(repIni,'cata_map_cl0d_param.py'),'python','python'),
 +   ('MapIdentification','Experiences plan',os.path.join(repIni,'cata_map_cl0d_exp.py'),'MapIdentificationTMP','python'),
 +   ('MapIdentification','Material parameters',os.path.join(repIni,'cata_map_cl0d_param.py'),'MapIdentificationTMP','python'),
  
  )
- catalogues_exp=(
-    ('MapIdentification','Experiences plan',os.path.join(repIni,'cata_map_cl0d_exp.py'),'python','python'),
- )
- catalogues_param=(
-    ('MapIdentification','Material parameters',os.path.join(repIni,'cata_map_cl0d_param.py'),'python','python'),
- )
- #nombreDeBoutonParLigne=4
  simpleClic=True
  closeFrameRechercheCommande=True
  boutonDsMenuBar=False