X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=InterfaceQT4%2Fcomposimp.py;h=173cc96e1b8cd2a1cbb30d4d3545d6fdc4c3a731;hb=80eb29926b88137b9f0f19175c0d0c52d7dcc206;hp=d0c1641de62a653bb72f6001f0c40bf43d342e1d;hpb=b6f3d448f830ec2f8623943bdae845f5c98358fa;p=tools%2Feficas.git diff --git a/InterfaceQT4/composimp.py b/InterfaceQT4/composimp.py index d0c1641d..173cc96e 100644 --- a/InterfaceQT4/composimp.py +++ b/InterfaceQT4/composimp.py @@ -1,4 +1,4 @@ -# -*- coding: utf-8 -*- +# -*- coding: iso-8859-1 -*- # Copyright (C) 2007-2013 EDF R&D # # This library is free software; you can redistribute it and/or @@ -142,6 +142,7 @@ class Node(browser.JDCNode,typeNode.PopUpMenuNodeMinimal): # Gestion d'une seule valeur (eventuellement un tuple ou un complexe) if maDefinition.max == 1 : + # A verifier if maDefinition.into != [] and maDefinition.into != None: if len(maDefinition.into) < 4 : from monWidgetRadioButton import MonWidgetRadioButton @@ -218,7 +219,22 @@ class Node(browser.JDCNode,typeNode.PopUpMenuNodeMinimal): # Gestion des listes else : - if maDefinition.into != [] and maDefinition.into != None: + #if maDefinition.into != [] and maDefinition.into != None: + # Attention pas fini --> on attend une liste de ASSD avec ordre + if self.item.wait_assd() and self.item.is_list_SansOrdreNiDoublon(): + from monWidgetPlusieursInto import MonWidgetPlusieursInto + widget=MonWidgetPlusieursInto(self,maDefinition,monNom,monObjet,parentQt,maCommande) + elif self.item.wait_tuple() : + if self.item.object.definition.type[0].ntuple == 2: + from monWidgetPlusieursTuple2 import MonWidgetPlusieursTuple2 + widget=MonWidgetPlusieursTuple2(self,maDefinition,monNom,monObjet,parentQt,maCommande) + elif self.item.object.definition.type[0].ntuple == 3 : + from monWidgetPlusieursTuple3 import MonWidgetPlusieursTuple3 + widget=MonWidgetPlusieursTuple3(self,maDefinition,monNom,monObjet,parentQt,maCommande) + else : + print "Pas de Tuple de longueur > 3" + print "Prevenir la maintenance " + elif self.item.has_into(): if self.item.is_list_SansOrdreNiDoublon(): from monWidgetPlusieursInto import MonWidgetPlusieursInto widget=MonWidgetPlusieursInto(self,maDefinition,monNom,monObjet,parentQt,maCommande)