From: pascale.noyret <pascale.noyret@edf.fr>
Date: Fri, 27 Nov 2020 10:21:31 +0000 (+0100)
Subject: echange eric
X-Git-Tag: V210224_osthus~89^2
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=f571f14293f990ac91000ff4f3de323844b94e12;p=tools%2Feficas.git

echange eric
---

diff --git a/InterfaceQT4/composimp.py b/InterfaceQT4/composimp.py
index 29b718a9..0c18956d 100644
--- a/InterfaceQT4/composimp.py
+++ b/InterfaceQT4/composimp.py
@@ -36,6 +36,7 @@ from InterfaceQT4 import browser
 from Noyau.N_CR   import justifyText
 from Accas        import SalomeEntry
 from Accas        import UserASSD
+from Accas        import UserASSDMultiple
     
 class Node(browser.JDCNode,typeNode.PopUpMenuNodeMinimal):    
 
@@ -138,8 +139,8 @@ class Node(browser.JDCNode,typeNode.PopUpMenuNodeMinimal):
           elif self.item.waitAssd():
             
             # PN - pour ne pas appeller trop souvent self.item.getSdAvantDuBonType()
-            if not (self.item.waitUserAssdEnCreation()) : maListe=self.item.getSdAvantDuBonType()
-            if self.item.waitUserAssdEnCreation() : 
+            if not (self.item.waitUserAssdOrAssdMultipleEnCreation()) : maListe=self.item.getSdAvantDuBonType()
+            if self.item.waitUserAssdOrAssdMultipleEnCreation() : 
                from InterfaceQT4.monWidgetCreeUserAssd import MonWidgetCreeUserAssd
                widget=MonWidgetCreeUserAssd(self,maDefinition,monNom,monObjet,parentQt,maCommande)
             #elif len(self.item.getSdAvantDuBonType()) == 0 :
@@ -188,9 +189,9 @@ class Node(browser.JDCNode,typeNode.PopUpMenuNodeMinimal):
                else :
                  from InterfaceQT4.monWidgetPlusieursInto import MonWidgetPlusieursInto
                  widget=MonWidgetPlusieursInto(self,maDefinition,monNom,monObjet,parentQt,maCommande)
-          elif self.item.waitAssd()  and not self.item.waitUserAssdEnCreation() :
+          elif self.item.waitAssd()  and not self.item.waitUserAssdOrAssdMultipleEnCreation() :
                listeAAfficher = self.item.getSdAvantDuBonType()
-               #if not (self.item.waitUserAssdEnCreation()) : maListe=self.item.getSdAvantDuBonType()
+               # a changer selon UserASSD ou UserASSDMultiple
                mctype=maDefinition.type[0]
                enable_salome_selection = self.editor.salome and \
                       (('grma' in repr(mctype)) or ('grno' in repr(mctype)) or ('SalomeEntry' in repr(mctype)) or \
@@ -240,7 +241,7 @@ class Node(browser.JDCNode,typeNode.PopUpMenuNodeMinimal):
                   from InterfaceQT4.monWidgetPlusieursPlie import MonWidgetPlusieursPlie
                   widget=MonWidgetPlusieursPlie(self,maDefinition,monNom,monObjet,parentQt,maCommande)
           else :
-            if self.item.waitUserAssdEnCreation() : 
+            if self.item.waitUserAssdOrAssdMultipleEnCreation() : 
                from InterfaceQT4.monWidgetPlusieursCreeUserAssd import MonWidgetPlusieursCreeUserAssd
                widget=MonWidgetPlusieursCreeUserAssd(self,maDefinition,monNom,monObjet,parentQt,maCommande)
             elif self.item in self.editor.listeDesListesOuvertes or not(self.editor.afficheListesPliees)  : 
@@ -550,6 +551,7 @@ class SIMPTreeItem(Objecttreeitem.AtomicObjectTreeItem):
       Retourne la liste des noms des SD presentes avant l'etape qui contient
       le MCS pointe par self et du type requis par ce MCS
       """
+      # A changer pour tenir compte des UserASSDMultiple
       a=self.object.etape.parent.getSdAvantDuBonType(self.object.etape,self.object.definition.type)
       if self.waitUserAssd() : l=self.jdc.getSdCreeParObjet(self.object.definition.type)
       else :l=[]