From 0e945f05521728b022d21fd549d64091af5a1c5c Mon Sep 17 00:00:00 2001
From: salome <>
Date: Wed, 19 Jul 2006 09:49:50 +0000
Subject: [PATCH] =?utf8?q?ajout:=20-contr=C3=B4le=20saisie=20de=20l'utilis?=
 =?utf8?q?ateur=20pour=20GROUP=5FMA,=20GROUP=5FNO?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 doc/patchEficasV1_10.diff | 39 ++++++++++++++++++++++++++-------------
 1 file changed, 26 insertions(+), 13 deletions(-)

diff --git a/doc/patchEficasV1_10.diff b/doc/patchEficasV1_10.diff
index 01510fc8..03f721df 100644
--- a/doc/patchEficasV1_10.diff
+++ b/doc/patchEficasV1_10.diff
@@ -1,13 +1,26 @@
-diff -Naur EficasV1_10AsterSTA8.orig/Editeur/composimp.py EficasV1_10AsterSTA8/Editeur/composimp.py
---- EficasV1_10AsterSTA8.orig/Editeur/composimp.py	2006-06-20 16:41:50.000000000 +0200
-+++ EficasV1_10AsterSTA8/Editeur/composimp.py	2006-07-06 16:12:21.000000000 +0200
-@@ -123,7 +123,8 @@
-           self.clef_fonction="SALOME"
-           for i in range(0,len( genea )) :
-              self.clef_fonction=self.clef_fonction+"_"+ genea[i]
--             if genea[i] == "GROUP_NO" or genea[i] == "GROUP_MA":
-+#              if genea[i] == "GROUP_NO" or genea[i] == "GROUP_MA": 
-+             if "GROUP_NO" in genea[i] or "GROUP_MA" in genea[i]: #CS_AMA: généralisation à tous les mots clés en GROUP_NO* et GROUP_MA*
-                 self.select_noeud_maille=1
- 
-           recherche=panelsSalome.dict_classes_salome[self.panel]
+diff -Naur EficasV1_10AsterSTA8/Editeur/panelsSalome.py EficasV1_10AsterSTA8.orig/Editeur/panelsSalome.py
+--- EficasV1_10AsterSTA8/Editeur/panelsSalome.py	2006-07-18 17:44:45.000000000 +0200
++++ EficasV1_10AsterSTA8.orig/Editeur/panelsSalome.py	2006-06-20 16:41:50.000000000 +0200
+@@ -100,20 +100,12 @@
+       try: 
+         valeur,validite,commentaire=self.get_valeur()
+         #print 'add_valeur_plusieurs_base', name
+-        #print 'valeur = %s, validite = %s,commentaire = %s'%( valeur,validite,commentaire )
++        #print 'valeur = %s, validite = %s,commentaire = %s'%( valeur,validite,commentaire )            
+         if not valeur: # sélection dans salome        
+             #print 'CS_pbruno selection SALOME'
+             strSelection = ''
+             
+-            genea  = self.node.item.get_genealogie()            
+-            kwType = None
+-            for e in genea:
+-                if "GROUP_NO" in e:
+-                    kwType = "GROUP_NO"
+-                if "GROUP_MA" in e:
+-                    kwType = "GROUP_MA"            
+-                
+-            selection, msg = self.parent.appli.selectGroupFromSalome( kwType )
++            selection, msg = self.parent.appli.selectGroupFromSalome()
+             
+             #print 'CS_pbruno selection SALOME selection ->',selection
+             #print 'CS_pbruno selection SALOME msg ->',msg
-- 
2.39.2