modif du 1010

diff --git a/Ihm/I_ETAPE.py b/Ihm/I_ETAPE.py
index 196f58c56ae5c6e14bd247e6769beb3a555c1473..72a1205139210faf158817dde9771f6f633b3d39 100644 (file)
--- a/Ihm/I_ETAPE.py
+++ b/Ihm/I_ETAPE.py
@@ -362,6 +362,9 @@ class ETAPE(I_MCCOMPO.MCCOMPO):
       l_noms.sort()
       return l_noms
 
+   def get_genealogie_precise(self):
+      return [self.nom]
+
    def get_genealogie(self):
       """ 
           Retourne la liste des noms des ascendants de l'objet self

diff --git a/Ihm/I_JDC.py b/Ihm/I_JDC.py
index c2ee3459f62d511c1bffcb70e45c32e6f97bfdf2..7f2014f8a32eb3f0b4158128c28e6aa27d49d23b 100644 (file)
--- a/Ihm/I_JDC.py
+++ b/Ihm/I_JDC.py
@@ -52,6 +52,7 @@ class JDC(I_OBJECT.OBJECT):
       self._etape_context=None
       self.recorded_units={}
       self.old_recorded_units={}
+ 
 
    def get_index(self,objet):
       """
@@ -468,11 +469,11 @@ class JDC(I_OBJECT.OBJECT):
           Retourne 0 dans le cas contraire
       """
       #PN correction de bugs 
-      if etape not in self.etapes:
-         return 0
+      if etape not in self.etapes: return 0
 
       self.init_modif()
       index_etape=self.etapes.index(etape)
+
       self.etapes.remove(etape)
 
       if etape.niveau is not self:
@@ -641,6 +642,9 @@ class JDC(I_OBJECT.OBJECT):
                if l : l_mc.extend(l)
      return l_mc    
 
+   def get_genealogie_precise(self):
+      return []
+
    def get_genealogie(self):
       """
           Retourne la liste des noms des ascendants de l'objet self
@@ -829,7 +833,6 @@ class JDC(I_OBJECT.OBJECT):
 
 #ATTENTION SURCHARGE : cette methode doit etre gardee en synchronisation avec celle de Noyau
    def supprime(self):
-      #print "supprime",self
       Noyau.N_JDC.JDC.supprime(self)
       for etape in self.etapes:
          etape.supprime()

diff --git a/Ihm/I_JDC_CATA.py b/Ihm/I_JDC_CATA.py
index f20f8cca56a0f4dd1dddaabd8c39866523e9c348..9ffcce38f7c7aefac1ef0f17a8e078fa7dd57c88 100644 (file)
--- a/Ihm/I_JDC_CATA.py
+++ b/Ihm/I_JDC_CATA.py
@@ -30,6 +30,7 @@ class JDC_CATA:
   def get_docu(self):
     return
 
+
 #ATTENTION SURCHARGE: cette methode doit etre synchronisée avec celle du Noyau
   def enregistre(self,commande):
     """ 

diff --git a/Ihm/I_MCFACT.py b/Ihm/I_MCFACT.py
index afa55037e651edaa578caedd1cad1ad08a21db86..348341f1ef40892790a09eed73d5cb74b390a3d1 100644 (file)
--- a/Ihm/I_MCFACT.py
+++ b/Ihm/I_MCFACT.py
@@ -21,6 +21,7 @@ from Extensions.i18n import tr
 import CONNECTOR
 import I_MCCOMPO
 import Noyau
+import string
 
 class MCFACT(I_MCCOMPO.MCCOMPO):
   def isrepetable(self):
@@ -58,6 +59,17 @@ class MCFACT(I_MCCOMPO.MCCOMPO):
     except:
       return tr("Erreur - mot cle facteur de nom : %s", self.nom)
 
+  def get_genealogie_precise(self):
+    nom=self.getlabeltext() 
+    if nom[-1]==':' : nom=nom[0:-1]
+    if self.parent:
+       l=self.parent.get_genealogie_precise()
+       l.append(string.strip(nom))
+       return l
+    else:
+       return [string.strip(nom)]
+
+
   def init_modif(self):
     """
        Met l'état de l'objet à modified et propage au parent

diff --git a/Ihm/I_MCLIST.py b/Ihm/I_MCLIST.py
index 56f4ade116d8e161bd8edbd983183050f1303487..8dc1e87aa1a376bd8162ec0a46765b8411f346b7 100644 (file)
--- a/Ihm/I_MCLIST.py
+++ b/Ihm/I_MCLIST.py
@@ -219,6 +219,12 @@ class MCList:
     if self.parent:
       self.parent.fin_modif()
 
+  def get_genealogie_precise(self):
+     if self.parent: 
+        return self.parent.get_genealogie_precise()
+     else:
+        return []
+
   def get_genealogie(self):
      """
          Retourne la liste des noms des ascendants.

diff --git a/Ihm/I_MCSIMP.py b/Ihm/I_MCSIMP.py
index 71eca1b120c30253ead04249a5c082afa96d7810..c27058e8db80ff6afddaf66616ad1d250ca1fafa 100644 (file)
--- a/Ihm/I_MCSIMP.py
+++ b/Ihm/I_MCSIMP.py
@@ -156,6 +156,7 @@ class MCSIMP(I_OBJECT.OBJECT):
       except:
         return val
     else :
+      if val ==() or val == [] : return val
       s='( '
       for item in val :
         try :

diff --git a/Ihm/I_OBJECT.py b/Ihm/I_OBJECT.py
index 6dd26a6446d64fde80c757fbbcd8cce63f707606..3612981368823334dfc0c5581c0f62ea29e017a0 100644 (file)
--- a/Ihm/I_OBJECT.py
+++ b/Ihm/I_OBJECT.py
@@ -107,6 +107,14 @@ class OBJECT:
     """
     return [],[]
 
+  def get_genealogie_precise(self):
+    if self.parent:
+       l=self.parent.get_genealogie_precise()
+       l.append(string.strip(self.nom))
+       return l
+    else:
+       return [string.strip(self.nom)]
+
   def get_genealogie(self):
     """ 
         Retourne la liste des noms des ascendants (noms de MCSIMP,MCFACT,MCBLOC

diff --git a/InterfaceQT4/editor.py b/InterfaceQT4/editor.py
index 80f103507ae63d20ca3cc7b96ca8507953b3fbbd..d677ab76c673e6357a52b36f7acdf6d394e1381a 100755 (executable)
--- a/InterfaceQT4/editor.py
+++ b/InterfaceQT4/editor.py
@@ -126,6 +126,7 @@ class JDCEditor(Ui_baseWidget,QWidget):
         self.oldSizeWidgetOptionnel = 320
         self.liste_simp_reel=[]
         self.ihm="QT"
+        self.dicoNouveauxMC={}
 
         nameConf='configuration_'+self.code
         configuration=__import__(nameConf)
@@ -269,10 +270,11 @@ class JDCEditor(Ui_baseWidget,QWidget):
       
       path1 = os.path.abspath(os.path.join(os.path.abspath(__file__), '../','../','ProcessOutputs_Eficas','TreatOutputs'))
       sys.path.append(path1)
-      from Run import run 
-      res,txt_exception=run(dico)
-      if res : QMessageBox.information( self, tr("fin de script run"), txt_exception)
-      else  : QMessageBox.critical( self, tr("Erreur fatale script run"), txt_exception)
+      print 'in runPSEN_N1', dico
+      #from Run import run 
+      #res,txt_exception=run(dico)
+      #if res : QMessageBox.information( self, tr("fin de script run"), txt_exception)
+      #else  : QMessageBox.critical( self, tr("Erreur fatale script run"), txt_exception)
        
 
     #-------------------#  Pour execution avec output et error dans le bash
@@ -907,7 +909,7 @@ class JDCEditor(Ui_baseWidget,QWidget):
     def run(self):
     #------------#
       fonction="run"+self.code
-      print fonction
+      #print fonction
       if fonction in JDCEditor.__dict__.keys(): apply(JDCEditor.__dict__[fonction],(self,))
 
     #------------#
@@ -1129,7 +1131,7 @@ class JDCEditor(Ui_baseWidget,QWidget):
                                  )
            return
 
-        print generator.plugins.has_key(self.format)
+        #print generator.plugins.has_key(self.format)
         if generator.plugins.has_key(self.format):
              # Le generateur existe on l'utilise
              self.generator=generator.plugins[self.format]()
@@ -1147,7 +1149,7 @@ class JDCEditor(Ui_baseWidget,QWidget):
              self.affiche_infos(tr("Format %s non reconnu" , self.format),Qt.red)
              QMessageBox.critical( self, "Format  non reconnu" ,tr("EFICAS ne sait pas convertir le JDC selon le format "+ self.format))
              return ""
-        print "HELLO"
+        #print "HELLO"
         
 
 
@@ -1323,6 +1325,11 @@ class JDCEditor(Ui_baseWidget,QWidget):
         etape.build_includeInclude(texte)
         self.tree.racine.build_children()
 
+    #-------------------------------------#
+    def deleteEtape(self,etape):
+    #-------------------------------------#
+        self.jdc.suppentite(etape)
+
     #-------------------------------------#
     def deleteMC(self,etape,MCFils,listeAvant=()):
     #-------------------------------------#
@@ -1334,8 +1341,6 @@ class JDCEditor(Ui_baseWidget,QWidget):
         ouChercher.state='changed'
         ouChercher.isvalid()
 
-
-
     #-------------------------------------#
     def ajoutMC(self,etape,MCFils,valeurs,listeAvant=()):
     #-------------------------------------#
@@ -1386,13 +1391,13 @@ class JDCEditor(Ui_baseWidget,QWidget):
         MCADetruire=ouChercher.entites[nomDuMC]
         ouChercher.ordre_mc.remove(nomDuMC)
         del ouChercher.entites[nomDuMC]
+        del self.dicoNouveauxMC[nomDuMC]
 
 
     #-------------------------------------------------------------#
     def ajoutDefinitionMC(self,etape,listeAvant,nomDuMC,typ,**args):
     #-------------------------------------------------------------#
         definitionEtape=getattr(self.jdc.cata[0],etape)
-        print self.jdc
         ouChercher=definitionEtape
         for k in listeAvant : 
             ouChercher=ouChercher.entites[k]
@@ -1403,6 +1408,8 @@ class JDCEditor(Ui_baseWidget,QWidget):
         Nouveau.ordre_mc=[]
         ouChercher.entites[nomDuMC]=Nouveau
         ouChercher.ordre_mc.append(nomDuMC)
+        self.dicoNouveauxMC[nomDuMC]=('ajoutDefinitionMC',etape,listeAvant,nomDuMC,typ,args)
+        #print self.dicoNouveauxMC
 
     #----------------------------------------------------#
     def changeIntoMCandSet(self,etape,MCFils,into,valeurs):

diff --git a/InterfaceQT4/feuille.py b/InterfaceQT4/feuille.py
index ae30044f8b40b2cee22b1b22528a01f0f1730870..e096404b2453a3917af3cb31c122f47c39860840 100644 (file)
--- a/InterfaceQT4/feuille.py
+++ b/InterfaceQT4/feuille.py
@@ -127,7 +127,7 @@ class Feuille(QWidget,ContientIcones,SaisieValeur,FacultatifOuOptionnel):
                commentaire=tr("Entrez ")+str(mc.min)+tr(" valeurs ")+'\n'
            else :
                if mc.max != "**" :
-                  commentaire=tr("Entrez entre ")+str(mc.min)+tr(" et ")+str(mc.max)+tr(" valeurs ")+'\n'
+                  commentaire=tr("entre ")+str(mc.min)+tr(" et ")+str(mc.max)+tr(" valeurs ")+'\n'
                else :
                   commentaire=""
         else :

diff --git a/InterfaceQT4/monChoixCode.py b/InterfaceQT4/monChoixCode.py
index 74f2fb4d2c640050bad32c17c3a9060a2fa0a43b..e5313d622ef4d8d989404eca7f949a0d42fc3d3e 100644 (file)
--- a/InterfaceQT4/monChoixCode.py
+++ b/InterfaceQT4/monChoixCode.py
@@ -95,7 +95,7 @@ class MonChoixCode(Ui_ChoixCode,QDialog):
               self.groupCodes.addButton(bouton)
           except :
               pass
-      self.parentAppli.ListeCode=self.parentAppli.ListeCode+listeCodesIntegrateur
+      self.parentAppli.listeCode=self.parentAppli.listeCode+listeCodesIntegrateur
 
   def choisitCode(self):
       bouton=self.groupCodes.checkedButton()

diff --git a/InterfaceQT4/monChoixCommande.py b/InterfaceQT4/monChoixCommande.py
index cdef4528f196f6fcce778af3c2a3f7852fac18fa..43ff98ca2e015a7910b62eb9abd55a2da4f0e388 100644 (file)
--- a/InterfaceQT4/monChoixCommande.py
+++ b/InterfaceQT4/monChoixCommande.py
@@ -134,6 +134,7 @@ class MonChoixCommande(Ui_ChoixCommandes,QWidget):
       self.ajouteRadioButtons()
 
   def mouseDoubleClickEvent(self,event):
+      if self.editor.Classement_Commandes_Ds_Arbre!= None : self.chercheOu()
       nodeCourrant=self.node.tree.currentItem()
       if nodeCourrant==None: nodeCourrant=self.node.tree.racine
       if self.name != None :
@@ -157,6 +158,20 @@ class MonChoixCommande(Ui_ChoixCommandes,QWidget):
            self.node.tree.setCurrentItem(nouveau)
       event.accept()
       
+  def chercheOu(self):
+     if self.node.tree.racine.childrenComplete==[] : return None
+     listeNoeud=[]
+     for node in self.node.tree.racine.childrenComplete :
+         listeNoeud.append(node.item.object.nom)
+     indexAvant=-1
+     indexStop=self.editor.Classement_Commandes_Ds_Arbre.index(self.name)
+     for commande in self.editor.Classement_Commandes_Ds_Arbre[:indexStop]:
+         if commande in listeNoeud: indexAvant=indexAvant+1
+     if indexAvant==-1 : self.node.tree.setCurrentItem(None)
+     else :
+        nodeASelectionner=self.node.tree.racine.childrenComplete[indexAvant]
+        self.node.tree.setCurrentItem(nodeASelectionner)
+         
 
   def creeListeCommande(self,filtre):
       listeGroupes,dictGroupes=self.jdc.get_groups()

diff --git a/InterfaceQT4/monWidgetInfo.py b/InterfaceQT4/monWidgetInfo.py
index f359d298079c51dbed6067b270032dc227ba6be5..cda3ab760ea448586ea48cb864289899d2e5d198 100644 (file)
--- a/InterfaceQT4/monWidgetInfo.py
+++ b/InterfaceQT4/monWidgetInfo.py
@@ -42,3 +42,4 @@ class MonWidgetInfo (Ui_WidgetInformative,QWidget):
         self.lineEditVal.setText(str(valeur))
         parentQt.commandesLayout.insertWidget(-1,self)
 
+        commande.listeAffichageWidget.append(self.lineEditVal)

diff --git a/InterfaceQT4/monWidgetOptionnel.py b/InterfaceQT4/monWidgetOptionnel.py
index fe38895625e3bf4416ffb505f23d84c54b7620b9..69f8cf9554e536229aebea9919ed275425e880a5 100644 (file)
--- a/InterfaceQT4/monWidgetOptionnel.py
+++ b/InterfaceQT4/monWidgetOptionnel.py
@@ -58,9 +58,9 @@ class  MonWidgetOptionnel (QWidget,Ui_WidgetOptionnel):
      return groupe
 
   def vireLesAutres(self,MC):
-      print "je passe dans vireLesAutres"
+      #print "je passe dans vireLesAutres"
       genea =MC.obj.get_genealogie()
-      print genea
+      #print genea
       for k in self.dicoMCWidgetOptionnel.keys():
           if k not in genea :  
              self.dicoMCWidgetOptionnel[k].close()

diff --git a/InterfaceQT4/monWidgetPlusieursInto.py b/InterfaceQT4/monWidgetPlusieursInto.py
index 01df3ce0345b9e2b1972b58b1c0f4d3f32fb332c..1e9aec322bfd25fab9696f51259bf4b852cc2f6e 100644 (file)
--- a/InterfaceQT4/monWidgetPlusieursInto.py
+++ b/InterfaceQT4/monWidgetPlusieursInto.py
@@ -60,7 +60,7 @@ class MonWidgetPlusieursInto (Ui_WidgetPlusieursInto,Feuille,GerePlie,GereListe)
         self.gereIconePlier()
         self.editor.listeDesListesOuvertes.add(self.node.item)
         self.inhibe=False
-        self.finCommentaireListe()
+        #self.finCommentaireListe()
 
         if self.listeAAfficher== None or self.listeAAfficher==[] : 
             spacerItem = QSpacerItem(30, 20, QSizePolicy.Fixed, QSizePolicy.Minimum)
@@ -73,6 +73,8 @@ class MonWidgetPlusieursInto (Ui_WidgetPlusieursInto,Feuille,GerePlie,GereListe)
             spacerItem2 = QSpacerItem(40, 70, QSizePolicy.Fixed, QSizePolicy.Minimum)
             self.CBLayout.addItem(spacerItem2)
 
+        if len(self.listeAAfficher) < 8 :
+           self.frameRecherche.close()
         # try except si la liste des possibles est vide
         # prevoir qqchose
         try :
@@ -130,8 +132,8 @@ class MonWidgetPlusieursInto (Ui_WidgetPlusieursInto,Feuille,GerePlie,GereListe)
           self.listeAAfficher=self.node.item.get_sd_avant_du_bon_type()
        if self.listeAAfficher== None or self.listeAAfficher==[] : self.listeAAfficher=[]
 
-       if len(self.listeAAfficher)*20 > 400 : self.setMinimumHeight(400)
-       else : self.setMinimumHeight(len(self.listeAAfficher)*30)
+       #if len(self.listeAAfficher)*20 > 400 : self.setMinimumHeight(400)
+       #else : self.setMinimumHeight(len(self.listeAAfficher)*30)
 
        self.PourEtreCoche=[]
        if self.objSimp.wait_assd() : 
@@ -175,8 +177,6 @@ class MonWidgetPlusieursInto (Ui_WidgetPlusieursInto,Feuille,GerePlie,GereListe)
       setattr(self,nomCB,nouveauCB)
       
 
-  def finCommentaire(self):
-        return self.finCommentaireListe() 
 
   def ajout1Valeur(self,valeur=None):
         if valeur == None : return
@@ -223,7 +223,7 @@ class MonWidgetPlusieursInto (Ui_WidgetPlusieursInto,Feuille,GerePlie,GereListe)
       else : self.node.item.set_valeur(self.listeValeursCourantes)
 
       # Exception pour PSEN
-      if self.editor.code == 'PSEN_N1' and self.nom==('Onglets') and self.listeValeursCourantes== []: self.node.item.set_valeur([])
+      if min==0 and self.listeValeursCourantes== []: self.node.item.set_valeur([])
       self.setValide()
       self.reaffiche()
 

diff --git a/InterfaceQT4/monWidgetSimpSalome.py b/InterfaceQT4/monWidgetSimpSalome.py
index f5299f9a77ed0e28bee4dfa1294df8acc6606d39..0553e529d9c008002f6a5e1cdbb1ee55ad2348bd 100644 (file)
--- a/InterfaceQT4/monWidgetSimpSalome.py
+++ b/InterfaceQT4/monWidgetSimpSalome.py
@@ -59,3 +59,7 @@ class MonWidgetSimpSalome (Ui_WidgetSimpSalome,Feuille):
       self.setValeurs()
       self.reaffiche()
 
+
+  def setValeurs(self):
+      valeur=self.node.item.get_valeur()
+      if valeur != None : self.lineEditVal.setText(str(valeur))

diff --git a/InterfaceQT4/monWidgetSimpTuple.py b/InterfaceQT4/monWidgetSimpTuple.py
index 21212528400c48203035c296e5bc5b60852503ed..8c259af5ddd3036778ad1903d2b08b6650c63e26 100644 (file)
--- a/InterfaceQT4/monWidgetSimpTuple.py
+++ b/InterfaceQT4/monWidgetSimpTuple.py
@@ -64,11 +64,12 @@ class MonWidgetSimpTuple(Feuille):
              courant.setFocus(True)
              return 
           s=str(courant.text())
-          if self.objSimp.definition.validators.typeDesTuples[i] == "R" :
+          if hasattr(self.objSimp.definition.validators, 'typeDesTuples'):
+           if self.objSimp.definition.validators.typeDesTuples[i] == "R" :
              if (s.find('.')== -1 and s.find('e')== -1 and s.find('E')==-1) : 
                  s=s+'.0'
                  courant.setText(s)
-          if self.objSimp.definition.validators.typeDesTuples[i] == "TXM" :
+           if self.objSimp.definition.validators.typeDesTuples[i] == "TXM" :
              if s[0]!='"' and s[0] != "'": 
                 if s[-1]=="'": s="'"+s
                 else :         s='"'+s

diff --git a/InterfaceQT4/qtEficas.py b/InterfaceQT4/qtEficas.py
index 27eafbd1f8567bf92de2f67db1c899b842de5958..28778843ff4ffaec4b26454d48f5c11bc866dc94 100755 (executable)
--- a/InterfaceQT4/qtEficas.py
+++ b/InterfaceQT4/qtEficas.py
@@ -21,7 +21,7 @@
 import os, sys
 from  determine import monEnvQT5
 if monEnvQT5 :
-  from PyQt5.QtWidgets import QApplication, QMainWindow, QBoxLayout, QMenu, QAction
+  from PyQt5.QtWidgets import QApplication, QMainWindow, QBoxLayout, QMenu, QAction, QMessageBox
   from PyQt5.QtGui import QIcon
   from PyQt5.QtCore import Qt
 else:
@@ -37,6 +37,7 @@ from getVersion import getEficasVersion
 from Editeur import session
 
 
+
 class Appli(Ui_Eficas,QMainWindow):
     """
     Class implementing the main user interface.
@@ -65,16 +66,16 @@ class Appli(Ui_Eficas,QMainWindow):
         self.ficRecents={}
         self.mesScripts={}
         self.listeAEnlever=[]
-        self.ListeCode=['Aster','Carmel3D','Cuve2dg','Openturns_Study','Openturns_Wrapper','MAP','ZCracks', 'CarmelCND','MT','PSEN','PSEN_N1']
-        self.ListePathCode=['Aster','Carmel3D','CarmelCND','MT','PSEN_Eficas','PSEN_N1']
+        self.ListePathCode=['Adao','Carmel3D','Telemac','CF','MAP','ZCracks', 'SEP','SPECA','PSEN_Eficas','PSEN_N1']
+        self.listeCode=['Adao','Carmel3D','Telemac','CF','MAP','ZCracks', 'SEP','SPECA','PSEN_Eficas','PSEN_N1']
         self.repIcon=os.path.join( os.path.dirname(os.path.abspath(__file__)),'..','Editeur','icons')
 
+
         if self.salome:
           import Accas
           import eficasSalome
           Accas.SalomeEntry = eficasSalome.SalomeEntry
 
-        #self.salome=1
         self.multi=multi
         self.demande=multi # specifique PSEN
         if self.multi == False :
@@ -102,7 +103,7 @@ class Appli(Ui_Eficas,QMainWindow):
         self.blEntete.insertWidget(0,self.toolBar)
         self.blEntete.insertWidget(0,self.menubar)
 
-        if self.CONFIGURATION.closeEntete==True : self.closeEntete()
+        if hasattr (self, 'CONFIGURATION') and self.CONFIGURATION.closeEntete==True : self.closeEntete()
 
         eficas_root_dir = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 
@@ -121,7 +122,7 @@ class Appli(Ui_Eficas,QMainWindow):
         try :
           self.ouvreFichiers()
         except EficasException, exc:
-          exit()
+          if self.salome == 0 : exit()
 
 
     def closeEntete(self):
@@ -199,7 +200,7 @@ class Appli(Ui_Eficas,QMainWindow):
         ssCode=None
         code="PSEN_N1"
         self.cleanPath()
-        dirCode=os.path.abspath(os.path.join(os.path.abspath(__file__),'../..',code))
+        dirCode=os.path.abspath(os.path.join(os.path.abspath(__file__),'../..',"ProcessOutputs_Eficas"))
         sys.path.insert(0,dirCode)
         self.code=code
         self.definitCode(code,ssCode)
@@ -220,9 +221,9 @@ class Appli(Ui_Eficas,QMainWindow):
         self.fileNew()
 
     def ajoutN1(self):
-        self.menuN1 = self.menubar.addMenu(tr("Etude N-1"))
+        self.menuN1 = self.menubar.addMenu(tr("Process Output"))
         self.actionN1 = QAction(self)
-        self.actionN1.setText(tr("Etude N1"))
+        self.actionN1.setText(tr("Process Output"))
         self.menuN1.addAction(self.actionN1)
         if monEnvQT5 : self.actionN1.triggered.connect(self.newN1)
         else         : self.connect(self.actionN1,SIGNAL("triggered()"),self.newN1)
@@ -358,7 +359,12 @@ class Appli(Ui_Eficas,QMainWindow):
         self.ajoutIcones()
 
     def PSEN_N1(self):
+        self.enleverActionsStructures()
+        self.enleverParametres()
+        self.enleverRechercherDsCatalogue()
+        self.enleverNewInclude()
         self.ajoutExecution()
+        self.ajoutIcones()
 
     def TELEMAC(self):
         self.enleverActionsStructures()
@@ -777,8 +783,7 @@ class Appli(Ui_Eficas,QMainWindow):
             self.viewmanager.newEditor()
         except EficasException, exc:
             msg = unicode(exc)
-            if msg != "":
-                QMessageBox.warning(self, tr(u"Erreur"), msg)
+            if msg != "": QMessageBox.warning(self, tr(u"Erreur"), msg)
 
     def fileOpen(self):
         try:

diff --git a/InterfaceQT4/readercata.py b/InterfaceQT4/readercata.py
index 91f174dd9b29c47d6172b7a1cd087a9b2925e738..b6e9957d3163a0557dc88fef13a38ba56d93a529 100644 (file)
--- a/InterfaceQT4/readercata.py
+++ b/InterfaceQT4/readercata.py
@@ -65,7 +65,14 @@ class READERCATA:
       self.fic_cata=None
       self.OpenCata()
       self.cataitem=None
-      if self.code=="TELEMAC": self.cree_dico_inverse()
+      self.cree_dico_inverse()
+      if self.code=="TELEMAC": self.cree_dico_CasToCata()
+      #for k in self.dicoInverse.keys():
+      #   genea= self.dicoInverse[k]
+      #   for t in genea :
+      #       print t[0]
+      #   print "\n"
+
 
    def OpenCata(self):
       """ 
@@ -329,6 +336,9 @@ class READERCATA:
         #        self.dicoAnglaisFrancais[nom]=tr(nom)
         #    self.dicoInverseFrancais[tr(k)]=listefr
         #    #print tr(k),listefr
+
+   
+   def cree_dico_CasToCata(self):
         if self.appliEficas.langue=="ang" :
            from dicoCasEnToCata import DicoCasEnToCata as dicoCasToCata
         else :

diff --git a/UiQT4/desWidgetPlusieursInto.ui b/UiQT4/desWidgetPlusieursInto.ui
index 9d63c15b19beb6b032c095888308be72450950ca..4549c9667e2b072ee85f2b4d6afb716d19f32051 100644 (file)
--- a/UiQT4/desWidgetPlusieursInto.ui
+++ b/UiQT4/desWidgetPlusieursInto.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>938</width>
-    <height>200</height>
+    <width>1061</width>
+    <height>195</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -19,7 +19,7 @@
   <property name="minimumSize">
    <size>
     <width>0</width>
-    <height>200</height>
+    <height>0</height>
    </size>
   </property>
   <property name="windowTitle">
@@ -32,15 +32,9 @@
    <property name="leftMargin">
     <number>0</number>
    </property>
-   <property name="topMargin">
-    <number>2</number>
-   </property>
    <property name="rightMargin">
     <number>0</number>
    </property>
-   <property name="bottomMargin">
-    <number>5</number>
-   </property>
    <item>
     <layout class="QVBoxLayout" name="verticalLayout_2">
      <property name="spacing">
@@ -145,11 +139,11 @@
     </layout>
    </item>
    <item>
-    <layout class="QVBoxLayout" name="verticalLayout_3">
+    <layout class="QVBoxLayout" name="verticalLayout_4">
      <item>
       <widget class="MonLabelClic" name="label">
        <property name="sizePolicy">
-        <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
+        <sizepolicy hsizetype="Fixed" vsizetype="MinimumExpanding">
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
@@ -181,125 +175,195 @@
       </widget>
      </item>
      <item>
-      <spacer name="verticalSpacer_6">
+      <widget class="QFrame" name="frameRecherche">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="minimumSize">
+        <size>
+         <width>0</width>
+         <height>0</height>
+        </size>
+       </property>
+       <property name="maximumSize">
+        <size>
+         <width>16777215</width>
+         <height>111</height>
+        </size>
+       </property>
+       <property name="frameShape">
+        <enum>QFrame::NoFrame</enum>
+       </property>
+       <property name="frameShadow">
+        <enum>QFrame::Raised</enum>
+       </property>
+       <layout class="QVBoxLayout" name="verticalLayout_3">
+        <property name="spacing">
+         <number>2</number>
+        </property>
+        <property name="margin">
+         <number>0</number>
+        </property>
+        <item>
+         <layout class="QHBoxLayout" name="horizontalLayout_5">
+          <property name="spacing">
+           <number>0</number>
+          </property>
+          <item>
+           <layout class="QHBoxLayout" name="horizontalLayout_3"/>
+          </item>
+          <item>
+           <widget class="QLineEdit" name="LEFiltre">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+            <property name="minimumSize">
+             <size>
+              <width>250</width>
+              <height>0</height>
+             </size>
+            </property>
+            <property name="maximumSize">
+             <size>
+              <width>250</width>
+              <height>16777215</height>
+             </size>
+            </property>
+            <property name="styleSheet">
+             <string notr="true">background:rgb(255,255,255)
+
+</string>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <spacer name="horizontalSpacer_3">
+            <property name="orientation">
+             <enum>Qt::Horizontal</enum>
+            </property>
+            <property name="sizeType">
+             <enum>QSizePolicy::Fixed</enum>
+            </property>
+            <property name="sizeHint" stdset="0">
+             <size>
+              <width>5</width>
+              <height>20</height>
+             </size>
+            </property>
+           </spacer>
+          </item>
+          <item>
+           <widget class="QToolButton" name="PBFind">
+            <property name="minimumSize">
+             <size>
+              <width>21</width>
+              <height>31</height>
+             </size>
+            </property>
+            <property name="maximumSize">
+             <size>
+              <width>21</width>
+              <height>31</height>
+             </size>
+            </property>
+            <property name="toolTip">
+             <string>Cherche la valeur</string>
+            </property>
+            <property name="styleSheet">
+             <string notr="true">border : 0px</string>
+            </property>
+            <property name="text">
+             <string>...</string>
+            </property>
+            <property name="icon">
+             <iconset theme="find">
+              <normaloff/>
+             </iconset>
+            </property>
+            <property name="iconSize">
+             <size>
+              <width>32</width>
+              <height>32</height>
+             </size>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <spacer name="horizontalSpacer_2">
+            <property name="orientation">
+             <enum>Qt::Horizontal</enum>
+            </property>
+            <property name="sizeHint" stdset="0">
+             <size>
+              <width>40</width>
+              <height>20</height>
+             </size>
+            </property>
+           </spacer>
+          </item>
+         </layout>
+        </item>
+        <item>
+         <layout class="QHBoxLayout" name="horizontalLayout_6">
+          <item>
+           <widget class="QPushButton" name="PBCata">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+            <property name="text">
+             <string>Originel</string>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QPushButton" name="PBAlpha">
+            <property name="text">
+             <string>Alpha</string>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <spacer name="horizontalSpacer_7">
+            <property name="orientation">
+             <enum>Qt::Horizontal</enum>
+            </property>
+            <property name="sizeHint" stdset="0">
+             <size>
+              <width>40</width>
+              <height>20</height>
+             </size>
+            </property>
+           </spacer>
+          </item>
+         </layout>
+        </item>
+       </layout>
+      </widget>
+     </item>
+     <item>
+      <spacer name="verticalSpacer_3">
        <property name="orientation">
         <enum>Qt::Vertical</enum>
        </property>
-       <property name="sizeType">
-        <enum>QSizePolicy::Fixed</enum>
-       </property>
        <property name="sizeHint" stdset="0">
         <size>
          <width>20</width>
-         <height>20</height>
+         <height>40</height>
         </size>
        </property>
       </spacer>
      </item>
      <item>
-      <layout class="QHBoxLayout" name="horizontalLayout_5">
-       <property name="spacing">
-        <number>0</number>
-       </property>
-       <item>
-        <layout class="QHBoxLayout" name="horizontalLayout_3"/>
-       </item>
-       <item>
-        <widget class="QLineEdit" name="LEFiltre">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="minimumSize">
-          <size>
-           <width>250</width>
-           <height>0</height>
-          </size>
-         </property>
-         <property name="maximumSize">
-          <size>
-           <width>250</width>
-           <height>16777215</height>
-          </size>
-         </property>
-         <property name="styleSheet">
-          <string notr="true">background:rgb(255,255,255)
-
-</string>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <spacer name="horizontalSpacer_3">
-         <property name="orientation">
-          <enum>Qt::Horizontal</enum>
-         </property>
-         <property name="sizeType">
-          <enum>QSizePolicy::Fixed</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>5</width>
-           <height>20</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
-       <item>
-        <widget class="QToolButton" name="PBFind">
-         <property name="minimumSize">
-          <size>
-           <width>21</width>
-           <height>31</height>
-          </size>
-         </property>
-         <property name="maximumSize">
-          <size>
-           <width>21</width>
-           <height>31</height>
-          </size>
-         </property>
-         <property name="toolTip">
-          <string>Cherche la valeur</string>
-         </property>
-         <property name="styleSheet">
-          <string notr="true">border : 0px</string>
-         </property>
-         <property name="text">
-          <string>...</string>
-         </property>
-         <property name="icon">
-          <iconset theme="find">
-           <normaloff/>
-          </iconset>
-         </property>
-         <property name="iconSize">
-          <size>
-           <width>32</width>
-           <height>32</height>
-          </size>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <spacer name="horizontalSpacer_2">
-         <property name="orientation">
-          <enum>Qt::Horizontal</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>40</width>
-           <height>20</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
-      </layout>
-     </item>
-     <item>
-      <widget class="QScrollArea" name="scrollArea_2">
+      <widget class="QScrollArea" name="scrollAreaCommentaire">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Fixed" vsizetype="Expanding">
          <horstretch>0</horstretch>
@@ -333,7 +397,7 @@
           <x>0</x>
           <y>0</y>
           <width>300</width>
-          <height>92</height>
+          <height>66</height>
          </rect>
         </property>
         <layout class="QGridLayout" name="gridLayout_2">
@@ -343,49 +407,18 @@
          <property name="margin">
           <number>0</number>
          </property>
-         <item row="0" column="0">
-          <layout class="QHBoxLayout" name="horizontalLayout_6">
-           <item>
-            <widget class="QPushButton" name="PBCata">
-             <property name="text">
-              <string>Catalogue</string>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <widget class="QPushButton" name="PBAlpha">
-             <property name="text">
-              <string>Alpha</string>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <spacer name="horizontalSpacer_7">
-             <property name="orientation">
-              <enum>Qt::Horizontal</enum>
-             </property>
-             <property name="sizeHint" stdset="0">
-              <size>
-               <width>40</width>
-               <height>20</height>
-              </size>
-             </property>
-            </spacer>
-           </item>
-          </layout>
-         </item>
-         <item row="2" column="0">
+         <item row="1" column="0">
           <widget class="QLabel" name="monCommentaireLabel">
            <property name="sizePolicy">
-            <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
+            <sizepolicy hsizetype="Fixed" vsizetype="MinimumExpanding">
              <horstretch>0</horstretch>
              <verstretch>0</verstretch>
             </sizepolicy>
            </property>
            <property name="minimumSize">
             <size>
-             <width>78</width>
-             <height>25</height>
+             <width>0</width>
+             <height>0</height>
             </size>
            </property>
            <property name="maximumSize">
@@ -408,19 +441,6 @@
            </property>
           </widget>
          </item>
-         <item row="1" column="0">
-          <spacer name="verticalSpacer_3">
-           <property name="orientation">
-            <enum>Qt::Vertical</enum>
-           </property>
-           <property name="sizeHint" stdset="0">
-            <size>
-             <width>20</width>
-             <height>40</height>
-            </size>
-           </property>
-          </spacer>
-         </item>
         </layout>
        </widget>
       </widget>
@@ -458,8 +478,8 @@
        <rect>
         <x>0</x>
         <y>0</y>
-        <width>424</width>
-        <height>193</height>
+        <width>650</width>
+        <height>177</height>
        </rect>
       </property>
       <property name="sizePolicy">

diff --git a/UiQT4/desWidgetPlusieursIntoOrdonne.ui b/UiQT4/desWidgetPlusieursIntoOrdonne.ui
index 999b9620bffdc8f5f7e6b88b2cddcdbfe0b764ff..fbaa7a45ebbec4c02adb5ec3dc5ca45c45e612cb 100644 (file)
--- a/UiQT4/desWidgetPlusieursIntoOrdonne.ui
+++ b/UiQT4/desWidgetPlusieursIntoOrdonne.ui
@@ -173,7 +173,7 @@
         <enum>QFrame::NoFrame</enum>
        </property>
        <property name="text">
-        <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;aaa&lt;/p&gt;&lt;p&gt;dqsklmdqm&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+        <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
        </property>
        <property name="scaledContents">
         <bool>false</bool>
@@ -313,8 +313,8 @@
          <rect>
           <x>0</x>
           <y>0</y>
-          <width>296</width>
-          <height>188</height>
+          <width>18</width>
+          <height>196</height>
          </rect>
         </property>
         <property name="sizePolicy">
@@ -327,7 +327,7 @@
          <item>
           <widget class="QLabel" name="monCommentaireLabel">
            <property name="text">
-            <string>fqsdfqdfqfqsfqsfqfqsfqsfqsfqsfqsdfqsfqsfqsf</string>
+            <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
            </property>
           </widget>
          </item>
@@ -398,16 +398,7 @@
        <property name="spacing">
         <number>0</number>
        </property>
-       <property name="leftMargin">
-        <number>0</number>
-       </property>
-       <property name="topMargin">
-        <number>0</number>
-       </property>
-       <property name="rightMargin">
-        <number>0</number>
-       </property>
-       <property name="bottomMargin">
+       <property name="margin">
         <number>0</number>
        </property>
        <item>
@@ -495,16 +486,7 @@
            <property name="spacing">
             <number>0</number>
            </property>
-           <property name="leftMargin">
-            <number>0</number>
-           </property>
-           <property name="topMargin">
-            <number>0</number>
-           </property>
-           <property name="rightMargin">
-            <number>0</number>
-           </property>
-           <property name="bottomMargin">
+           <property name="margin">
             <number>0</number>
            </property>
            <item>
@@ -541,16 +523,7 @@
         <property name="spacing">
          <number>0</number>
         </property>
-        <property name="leftMargin">
-         <number>0</number>
-        </property>
-        <property name="topMargin">
-         <number>0</number>
-        </property>
-        <property name="rightMargin">
-         <number>0</number>
-        </property>
-        <property name="bottomMargin">
+        <property name="margin">
          <number>0</number>
         </property>
         <item>

diff --git a/UiQT4/desWidgetSimpBool.ui b/UiQT4/desWidgetSimpBool.ui
index 6a1577ae93e374d17fbdcaacb2c693fe5c449b6a..f9a78c7aabd647b8b8af6444af8df530c969fe50 100644 (file)
--- a/UiQT4/desWidgetSimpBool.ui
+++ b/UiQT4/desWidgetSimpBool.ui
@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>1065</width>
+    <width>572</width>
     <height>56</height>
    </rect>
   </property>

diff --git a/UiQT5/CMakeLists.txt b/UiQT5/CMakeLists.txt
index c2af2c8c55e6156e87c5a30bfe8c4cc864e18565..8a30e3f1a3f9804bc4c66e7a00b48c11df46e840 100644 (file)
--- a/UiQT5/CMakeLists.txt
+++ b/UiQT5/CMakeLists.txt
@@ -37,6 +37,7 @@ eficas_compile_ui ( desChoixCata.ui )
 eficas_compile_ui ( desChoixCode.ui )
 eficas_compile_ui ( desChoixCommandes.ui )
 eficas_compile_ui ( desRecherche.ui )
+eficas_compile_ui ( desRechercheCatalogue.ui )
 eficas_compile_ui ( desSelectVal.ui )
 eficas_compile_ui ( desViewTexte.ui )
 eficas_compile_ui ( desViewRegles.ui )

diff --git a/UiQT5/desRechercheCatalogue.ui b/UiQT5/desRechercheCatalogue.ui
index 2b67f65811988ca7023259afbdd46dbb938b0d93..ef529e25c252cb6f3458bacbaa42c346ff51a3c5 100644 (file)
--- a/UiQT5/desRechercheCatalogue.ui
+++ b/UiQT5/desRechercheCatalogue.ui
@@ -36,23 +36,7 @@
       </widget>
      </item>
      <item>
-      <widget class="QLineEdit" name="LERecherche">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Maximum" vsizetype="Expanding">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="minimumSize">
-        <size>
-         <width>411</width>
-         <height>41</height>
-        </size>
-       </property>
-       <property name="styleSheet">
-        <string notr="true">background:rgb(240,240,240)</string>
-       </property>
-      </widget>
+      <widget class="QComboBox" name="CBRecherche"/>
      </item>
     </layout>
    </item>
@@ -64,16 +48,13 @@
     </widget>
    </item>
    <item>
-    <widget class="QPlainTextEdit" name="teGenea">
+    <widget class="QTextEdit" name="teGenea">
      <property name="minimumSize">
       <size>
        <width>419</width>
        <height>91</height>
       </size>
      </property>
-     <property name="plainText">
-      <string/>
-     </property>
     </widget>
    </item>
    <item>
@@ -86,16 +67,13 @@
       </widget>
      </item>
      <item>
-      <widget class="QPlainTextEdit" name="teDoc">
+      <widget class="QTextEdit" name="teDoc">
        <property name="minimumSize">
         <size>
          <width>419</width>
          <height>101</height>
         </size>
        </property>
-       <property name="plainText">
-        <string/>
-       </property>
       </widget>
      </item>
     </layout>

diff --git a/UiQT5/desWidgetPlusieursInto.ui b/UiQT5/desWidgetPlusieursInto.ui
index 9d63c15b19beb6b032c095888308be72450950ca..45626a597732d492f06fa6a585e2b5a884f287ff 100644 (file)
--- a/UiQT5/desWidgetPlusieursInto.ui
+++ b/UiQT5/desWidgetPlusieursInto.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>938</width>
-    <height>200</height>
+    <width>1061</width>
+    <height>326</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -26,21 +26,6 @@
    <string>Form</string>
   </property>
   <layout class="QHBoxLayout" name="horizontalLayout_2">
-   <property name="spacing">
-    <number>0</number>
-   </property>
-   <property name="leftMargin">
-    <number>0</number>
-   </property>
-   <property name="topMargin">
-    <number>2</number>
-   </property>
-   <property name="rightMargin">
-    <number>0</number>
-   </property>
-   <property name="bottomMargin">
-    <number>5</number>
-   </property>
    <item>
     <layout class="QVBoxLayout" name="verticalLayout_2">
      <property name="spacing">
@@ -145,7 +130,7 @@
     </layout>
    </item>
    <item>
-    <layout class="QVBoxLayout" name="verticalLayout_3">
+    <layout class="QVBoxLayout" name="verticalLayout_4">
      <item>
       <widget class="MonLabelClic" name="label">
        <property name="sizePolicy">
@@ -181,125 +166,164 @@
       </widget>
      </item>
      <item>
-      <spacer name="verticalSpacer_6">
-       <property name="orientation">
-        <enum>Qt::Vertical</enum>
-       </property>
-       <property name="sizeType">
-        <enum>QSizePolicy::Fixed</enum>
+      <widget class="QFrame" name="frameRecherche">
+       <property name="minimumSize">
+        <size>
+         <width>0</width>
+         <height>111</height>
+        </size>
        </property>
-       <property name="sizeHint" stdset="0">
+       <property name="maximumSize">
         <size>
-         <width>20</width>
-         <height>20</height>
+         <width>16777215</width>
+         <height>111</height>
         </size>
        </property>
-      </spacer>
-     </item>
-     <item>
-      <layout class="QHBoxLayout" name="horizontalLayout_5">
-       <property name="spacing">
-        <number>0</number>
+       <property name="frameShape">
+        <enum>QFrame::NoFrame</enum>
        </property>
-       <item>
-        <layout class="QHBoxLayout" name="horizontalLayout_3"/>
-       </item>
-       <item>
-        <widget class="QLineEdit" name="LEFiltre">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="minimumSize">
-          <size>
-           <width>250</width>
-           <height>0</height>
-          </size>
-         </property>
-         <property name="maximumSize">
-          <size>
-           <width>250</width>
-           <height>16777215</height>
-          </size>
-         </property>
-         <property name="styleSheet">
-          <string notr="true">background:rgb(255,255,255)
+       <property name="frameShadow">
+        <enum>QFrame::Raised</enum>
+       </property>
+       <layout class="QVBoxLayout" name="verticalLayout_3">
+        <item>
+         <layout class="QHBoxLayout" name="horizontalLayout_5">
+          <property name="spacing">
+           <number>0</number>
+          </property>
+          <item>
+           <layout class="QHBoxLayout" name="horizontalLayout_3"/>
+          </item>
+          <item>
+           <widget class="QLineEdit" name="LEFiltre">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+            <property name="minimumSize">
+             <size>
+              <width>250</width>
+              <height>0</height>
+             </size>
+            </property>
+            <property name="maximumSize">
+             <size>
+              <width>250</width>
+              <height>16777215</height>
+             </size>
+            </property>
+            <property name="styleSheet">
+             <string notr="true">background:rgb(255,255,255)
 
 </string>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <spacer name="horizontalSpacer_3">
-         <property name="orientation">
-          <enum>Qt::Horizontal</enum>
-         </property>
-         <property name="sizeType">
-          <enum>QSizePolicy::Fixed</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>5</width>
-           <height>20</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
-       <item>
-        <widget class="QToolButton" name="PBFind">
-         <property name="minimumSize">
-          <size>
-           <width>21</width>
-           <height>31</height>
-          </size>
-         </property>
-         <property name="maximumSize">
-          <size>
-           <width>21</width>
-           <height>31</height>
-          </size>
-         </property>
-         <property name="toolTip">
-          <string>Cherche la valeur</string>
-         </property>
-         <property name="styleSheet">
-          <string notr="true">border : 0px</string>
-         </property>
-         <property name="text">
-          <string>...</string>
-         </property>
-         <property name="icon">
-          <iconset theme="find">
-           <normaloff/>
-          </iconset>
-         </property>
-         <property name="iconSize">
-          <size>
-           <width>32</width>
-           <height>32</height>
-          </size>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <spacer name="horizontalSpacer_2">
-         <property name="orientation">
-          <enum>Qt::Horizontal</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>40</width>
-           <height>20</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
-      </layout>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <spacer name="horizontalSpacer_3">
+            <property name="orientation">
+             <enum>Qt::Horizontal</enum>
+            </property>
+            <property name="sizeType">
+             <enum>QSizePolicy::Fixed</enum>
+            </property>
+            <property name="sizeHint" stdset="0">
+             <size>
+              <width>5</width>
+              <height>20</height>
+             </size>
+            </property>
+           </spacer>
+          </item>
+          <item>
+           <widget class="QToolButton" name="PBFind">
+            <property name="minimumSize">
+             <size>
+              <width>21</width>
+              <height>31</height>
+             </size>
+            </property>
+            <property name="maximumSize">
+             <size>
+              <width>21</width>
+              <height>31</height>
+             </size>
+            </property>
+            <property name="toolTip">
+             <string>Cherche la valeur</string>
+            </property>
+            <property name="styleSheet">
+             <string notr="true">border : 0px</string>
+            </property>
+            <property name="text">
+             <string>...</string>
+            </property>
+            <property name="icon">
+             <iconset theme="find">
+              <normaloff/>
+             </iconset>
+            </property>
+            <property name="iconSize">
+             <size>
+              <width>32</width>
+              <height>32</height>
+             </size>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <spacer name="horizontalSpacer_2">
+            <property name="orientation">
+             <enum>Qt::Horizontal</enum>
+            </property>
+            <property name="sizeHint" stdset="0">
+             <size>
+              <width>40</width>
+              <height>20</height>
+             </size>
+            </property>
+           </spacer>
+          </item>
+         </layout>
+        </item>
+        <item>
+         <layout class="QHBoxLayout" name="horizontalLayout_6">
+          <item>
+           <widget class="QPushButton" name="PBCata">
+            <property name="text">
+             <string>Originel</string>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QPushButton" name="PBAlpha">
+            <property name="text">
+             <string>Alpha</string>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <spacer name="horizontalSpacer_7">
+            <property name="orientation">
+             <enum>Qt::Horizontal</enum>
+            </property>
+            <property name="sizeHint" stdset="0">
+             <size>
+              <width>40</width>
+              <height>20</height>
+             </size>
+            </property>
+           </spacer>
+          </item>
+         </layout>
+        </item>
+       </layout>
+      </widget>
      </item>
      <item>
-      <widget class="QScrollArea" name="scrollArea_2">
+      <widget class="QScrollArea" name="scrollAreaCommentaire">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Fixed" vsizetype="Expanding">
          <horstretch>0</horstretch>
@@ -333,7 +357,7 @@
           <x>0</x>
           <y>0</y>
           <width>300</width>
-          <height>92</height>
+          <height>127</height>
          </rect>
         </property>
         <layout class="QGridLayout" name="gridLayout_2">
@@ -344,37 +368,6 @@
           <number>0</number>
          </property>
          <item row="0" column="0">
-          <layout class="QHBoxLayout" name="horizontalLayout_6">
-           <item>
-            <widget class="QPushButton" name="PBCata">
-             <property name="text">
-              <string>Catalogue</string>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <widget class="QPushButton" name="PBAlpha">
-             <property name="text">
-              <string>Alpha</string>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <spacer name="horizontalSpacer_7">
-             <property name="orientation">
-              <enum>Qt::Horizontal</enum>
-             </property>
-             <property name="sizeHint" stdset="0">
-              <size>
-               <width>40</width>
-               <height>20</height>
-              </size>
-             </property>
-            </spacer>
-           </item>
-          </layout>
-         </item>
-         <item row="2" column="0">
           <widget class="QLabel" name="monCommentaireLabel">
            <property name="sizePolicy">
             <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
@@ -408,19 +401,6 @@
            </property>
           </widget>
          </item>
-         <item row="1" column="0">
-          <spacer name="verticalSpacer_3">
-           <property name="orientation">
-            <enum>Qt::Vertical</enum>
-           </property>
-           <property name="sizeHint" stdset="0">
-            <size>
-             <width>20</width>
-             <height>40</height>
-            </size>
-           </property>
-          </spacer>
-         </item>
         </layout>
        </widget>
       </widget>
@@ -458,8 +438,8 @@
        <rect>
         <x>0</x>
         <y>0</y>
-        <width>424</width>
-        <height>193</height>
+        <width>465</width>
+        <height>308</height>
        </rect>
       </property>
       <property name="sizePolicy">

diff --git a/UiQT5/desWidgetPlusieursIntoOrdonne.ui b/UiQT5/desWidgetPlusieursIntoOrdonne.ui
index 999b9620bffdc8f5f7e6b88b2cddcdbfe0b764ff..fbaa7a45ebbec4c02adb5ec3dc5ca45c45e612cb 100644 (file)
--- a/UiQT5/desWidgetPlusieursIntoOrdonne.ui
+++ b/UiQT5/desWidgetPlusieursIntoOrdonne.ui
@@ -173,7 +173,7 @@
         <enum>QFrame::NoFrame</enum>
        </property>
        <property name="text">
-        <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;aaa&lt;/p&gt;&lt;p&gt;dqsklmdqm&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+        <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
        </property>
        <property name="scaledContents">
         <bool>false</bool>
@@ -313,8 +313,8 @@
          <rect>
           <x>0</x>
           <y>0</y>
-          <width>296</width>
-          <height>188</height>
+          <width>18</width>
+          <height>196</height>
          </rect>
         </property>
         <property name="sizePolicy">
@@ -327,7 +327,7 @@
          <item>
           <widget class="QLabel" name="monCommentaireLabel">
            <property name="text">
-            <string>fqsdfqdfqfqsfqsfqfqsfqsfqsfqsfqsdfqsfqsfqsf</string>
+            <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
            </property>
           </widget>
          </item>
@@ -398,16 +398,7 @@
        <property name="spacing">
         <number>0</number>
        </property>
-       <property name="leftMargin">
-        <number>0</number>
-       </property>
-       <property name="topMargin">
-        <number>0</number>
-       </property>
-       <property name="rightMargin">
-        <number>0</number>
-       </property>
-       <property name="bottomMargin">
+       <property name="margin">
         <number>0</number>
        </property>
        <item>
@@ -495,16 +486,7 @@
            <property name="spacing">
             <number>0</number>
            </property>
-           <property name="leftMargin">
-            <number>0</number>
-           </property>
-           <property name="topMargin">
-            <number>0</number>
-           </property>
-           <property name="rightMargin">
-            <number>0</number>
-           </property>
-           <property name="bottomMargin">
+           <property name="margin">
             <number>0</number>
            </property>
            <item>
@@ -541,16 +523,7 @@
         <property name="spacing">
          <number>0</number>
         </property>
-        <property name="leftMargin">
-         <number>0</number>
-        </property>
-        <property name="topMargin">
-         <number>0</number>
-        </property>
-        <property name="rightMargin">
-         <number>0</number>
-        </property>
-        <property name="bottomMargin">
+        <property name="margin">
          <number>0</number>
         </property>
         <item>