X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=InterfaceQT4%2Fcomposimp.py;h=6a357912ff463d67b33f865fcf09469f8b966c1f;hb=96176d0080e0d4efbd29d98c0df700a64a82acdc;hp=3f3e5a6e4e95ac176e089b458014438a5f87540c;hpb=d850460808b68f3e00e3555a66502236e5eb32e5;p=tools%2Feficas.git

diff --git a/InterfaceQT4/composimp.py b/InterfaceQT4/composimp.py
index 3f3e5a6e..6a357912 100644
--- a/InterfaceQT4/composimp.py
+++ b/InterfaceQT4/composimp.py
@@ -72,14 +72,6 @@ class Node(browser.JDCNode,typeNode.PopUpMenuNodeMinimal):
             if type(maDefinition.into) ==types.FunctionType : monInto=maDefinition.into() 
             else : monInto = maDefinition.into
 
-        # a faire ailleurs
-        #if maDefinition.intoExe != None :
-        #    print (self.item)
-        #    monInto = maDefinition.intoExe(self.item)
-        #    maDefinition.into = monInto
-        #    from Noyau.N_VALIDATOR import  IntoProtocol
-        #    monObjet.intoProto = IntoProtocol("into", into=maDefinition.into, val_min=maDefinition.val_min, val_max=maDefinition.val_max)
-
 
         if maDefinition.max == 1 :
 
@@ -136,7 +128,7 @@ class Node(browser.JDCNode,typeNode.PopUpMenuNodeMinimal):
             if len(self.item.get_sd_avant_du_bon_type()) == 0 :
                from .monWidgetVide import MonWidgetVide
                widget=MonWidgetVide(self,maDefinition,monNom,monObjet,parentQt,maCommande)
-            if len(self.item.get_sd_avant_du_bon_type()) < 4 :
+            elif len(self.item.get_sd_avant_du_bon_type()) < 4 :
               from .monWidgetRadioButton import MonWidgetRadioButtonSD
               widget=MonWidgetRadioButtonSD(self,maDefinition,monNom,monObjet,parentQt,maCommande)
             elif len(self.item.get_sd_avant_du_bon_type()) < 7 :
@@ -167,11 +159,21 @@ class Node(browser.JDCNode,typeNode.PopUpMenuNodeMinimal):
                 #widget=MonWidgetPlusieursTuple2(self,maDefinition,monNom,monObjet,parentQt,maCommande)
                 # pass
                #else :
-               from .monWidgetPlusieursInto import MonWidgetPlusieursInto
-               widget=MonWidgetPlusieursInto(self,maDefinition,monNom,monObjet,parentQt,maCommande)
+               listeAAfficher = self.item.get_sd_avant_du_bon_type()
+               if len(listeAAfficher) == 0:
+                 from .monWidgetVide import MonWidgetVide
+                 widget = MonWidgetVide(self,maDefinition,monNom,monObjet,parentQt,maCommande)
+               else :
+                 from .monWidgetPlusieursInto import MonWidgetPlusieursInto
+                 widget=MonWidgetPlusieursInto(self,maDefinition,monNom,monObjet,parentQt,maCommande)
           elif self.item.wait_assd() :
-               from .monWidgetPlusieursASSDIntoOrdonne import MonWidgetPlusieursASSDIntoOrdonne
-               widget=MonWidgetPlusieursASSDIntoOrdonne(self,maDefinition,monNom,monObjet,parentQt,maCommande)
+               listeAAfficher = self.item.get_sd_avant_du_bon_type()
+               if len(listeAAfficher) == 0:
+                 from .monWidgetVide import MonWidgetVide
+                 widget = MonWidgetVide(self,maDefinition,monNom,monObjet,parentQt,maCommande)
+               else :
+                 from .monWidgetPlusieursASSDIntoOrdonne import MonWidgetPlusieursASSDIntoOrdonne
+                 widget=MonWidgetPlusieursASSDIntoOrdonne(self,maDefinition,monNom,monObjet,parentQt,maCommande)
           elif self.item.wait_tuple() :
             if self.item.object.definition.type[0].ntuple == 2:
                from .monWidgetPlusieursTuple2 import MonWidgetPlusieursTuple2