]> SALOME platform Git repositories - tools/eficas.git/commitdiff
Salome HOME
*** empty log message ***
authorPascale Noyret <pascale.noyret@edf.fr>
Fri, 19 Jun 2009 08:40:53 +0000 (08:40 +0000)
committerPascale Noyret <pascale.noyret@edf.fr>
Fri, 19 Jun 2009 08:40:53 +0000 (08:40 +0000)
176 files changed:
Aster/Cata/cataSTA8/cata.py
Aster/Cata/cataSTA9/SD/utilsd.py
Aster/Cata/cataSTA9/cata.py
Aster/configuration.py
Aster/editeur.ini
Aster/editeur_salome.ini
Aster/qtEficas_aster.py
Aster/sdist.py
Editeur/icons/About24.png [new file with mode: 0644]
Editeur/icons/Copy24.png [new file with mode: 0644]
Editeur/icons/Cut24.png [new file with mode: 0644]
Editeur/icons/Delete24.png [new file with mode: 0644]
Editeur/icons/Fermer24.png [new file with mode: 0644]
Editeur/icons/Help24.png [new file with mode: 0644]
Editeur/icons/New24.png [new file with mode: 0644]
Editeur/icons/Open24.png [new file with mode: 0644]
Editeur/icons/Paste24.png [new file with mode: 0644]
Editeur/icons/Save24.png [new file with mode: 0644]
Editeur/icons/Zoom24.png [new file with mode: 0644]
Editeur/icons/arrow_left.png [new file with mode: 0644]
Editeur/icons/arrow_right.png [new file with mode: 0644]
Editeur/icons/ast-green-ball.png [new file with mode: 0644]
Editeur/icons/ast-green-los.gif
Editeur/icons/ast-green-los.png [new file with mode: 0644]
Editeur/icons/ast-green-percent.png [new file with mode: 0644]
Editeur/icons/ast-green-square.gif
Editeur/icons/ast-green-square.png [new file with mode: 0644]
Editeur/icons/ast-green-text.png [new file with mode: 0644]
Editeur/icons/ast-red-ball.png [new file with mode: 0644]
Editeur/icons/ast-red-los.png [new file with mode: 0644]
Editeur/icons/ast-red-percent.png [new file with mode: 0644]
Editeur/icons/ast-red-square.png [new file with mode: 0644]
Editeur/icons/ast-red-text.png [new file with mode: 0644]
Editeur/icons/ast-white-percent.png [new file with mode: 0644]
Editeur/icons/ast-white-square.png [new file with mode: 0644]
Editeur/icons/ast-white-text.png [new file with mode: 0644]
Editeur/icons/ast-yel-ball.png [new file with mode: 0644]
Editeur/icons/ast-yel-los.png [new file with mode: 0644]
Editeur/icons/ast-yel-percent.png [new file with mode: 0644]
Editeur/icons/ast-yel-square.png [new file with mode: 0644]
Editeur/icons/ast-yellow-square.png [new file with mode: 0644]
Editeur/icons/ast-yellow-text.png [new file with mode: 0644]
Editeur/icons/minusnode.png [new file with mode: 0644]
Editeur/icons/plusnode.png [new file with mode: 0644]
Editeur/listePatrons.py
Homard/configuration.py [new file with mode: 0644]
Homard/prefs.py
Homard/qtEficas_homard.py [new file with mode: 0755]
Ihm/I_MACRO_ETAPE.py
Ihm/I_MCCOMPO.py
InterfaceQT/browser.py
InterfaceQT/editor.py
InterfaceQT/monRacinePanel.py
InterfaceQT/monUniqueBasePanel.py
InterfaceQT/qtCommun.py
InterfaceQT/qtEficas.py
InterfaceQT/readercata.py
InterfaceQT4/browser.py
InterfaceQT4/compobloc.py
InterfaceQT4/compofact.py
InterfaceQT4/compomacro.py
InterfaceQT4/compomclist.py
InterfaceQT4/componiveau.py
InterfaceQT4/compoparam.py
InterfaceQT4/composimp.py
InterfaceQT4/editor.py
InterfaceQT4/eficas_go.py
InterfaceQT4/monCommandePanel.py
InterfaceQT4/monCommentairePanel.py
InterfaceQT4/monFonctionPanel.py
InterfaceQT4/monFormulePanel.py
InterfaceQT4/monInactifPanel.py
InterfaceQT4/monIncludePanel.py
InterfaceQT4/monMCFactPanel.py
InterfaceQT4/monMCListAjoutPanel.py
InterfaceQT4/monMacroPanel.py
InterfaceQT4/monOptionsEditeur.py
InterfaceQT4/monParamPanel.py
InterfaceQT4/monPlusieursASSDPanel.py
InterfaceQT4/monPlusieursBasePanel.py
InterfaceQT4/monPlusieursIntoPanel.py
InterfaceQT4/monPoursuitePanel.py
InterfaceQT4/monRacinePanel.py
InterfaceQT4/monSelectVal.py
InterfaceQT4/monUniqueASSDPanel.py
InterfaceQT4/monUniqueBasePanel.py
InterfaceQT4/monUniqueCompPanel.py
InterfaceQT4/monUniqueIntoPanel.py
InterfaceQT4/monUniqueSDCOIntoPanel.py
InterfaceQT4/monUniqueSDCOPanel.py
InterfaceQT4/politiquesValidation.py
InterfaceQT4/qtCommun.py
InterfaceQT4/qtEficas.py
InterfaceQT4/qtSaisie.py
InterfaceQT4/readercata.py
InterfaceQT4/typeNode.py
InterfaceQT4/viewManager.py
InterfaceTK/appli.py
InterfaceTK/bureau.py
InterfaceTK/panels.py
InterfaceTK/styles.py
InterfaceTK/widgets.py
Minicode/cata_saturne.py
Minicode/configuration.py [new file with mode: 0644]
Minicode/eficas_mini.py
Minicode/prefs.py
Noyau/N_VALIDATOR.py
Openturns_Study/OpenTURNS_Cata_Study_V4.py [new file with mode: 0644]
Openturns_Study/catalogues_openturns.ini
Openturns_Study/prefs.py
Openturns_Study/qtEficas_openturns_study.py
Traducteur/dictErreurs.py
Traducteur/renamemocle.py
Traducteur/traduitV7V8.py
Traducteur/traduitV8V9.py
UiQT4/OptionsEditeur.py
UiQT4/OptionsEditeur.ui
UiQT4/OptionsPdf.py
UiQT4/aideQT.py
UiQT4/desChoixCata.py
UiQT4/desChoixCata.ui
UiQT4/desCommande.py
UiQT4/desCommande.ui
UiQT4/desCommentaire.py
UiQT4/desCommentaire.ui
UiQT4/desError.py
UiQT4/desFormule.py
UiQT4/desFormule.ui
UiQT4/desInactif.py
UiQT4/desInactif.ui
UiQT4/desInclude.py
UiQT4/desInclude.ui
UiQT4/desListeParam.py
UiQT4/desMCFact.py
UiQT4/desMCFact.ui
UiQT4/desMCListAjout.py
UiQT4/desMCListAjout.ui
UiQT4/desParam.py
UiQT4/desParam.ui
UiQT4/desPlusieursBase.py
UiQT4/desPlusieursBase.ui
UiQT4/desPlusieursInto.py
UiQT4/desPlusieursInto.ui
UiQT4/desPoursuite.py
UiQT4/desPoursuite.ui
UiQT4/desRacine.py
UiQT4/desRacine.ui
UiQT4/desSelectVal.py
UiQT4/desUniqueASSD.py
UiQT4/desUniqueASSD.ui
UiQT4/desUniqueBase.py
UiQT4/desUniqueBase.ui
UiQT4/desUniqueComp.py
UiQT4/desUniqueComp.ui
UiQT4/desUniqueInto.py
UiQT4/desUniqueInto.ui
UiQT4/desUniqueSDCO.py
UiQT4/desUniqueSDCO.ui
UiQT4/desUniqueSDCOInto.py
UiQT4/desUniqueSDCOInto.ui
UiQT4/desViewTexte.py
UiQT4/desVisu.py
UiQT4/myMain.py
UiQT4/myMain.ui
convert/convert_SEP.py [new file with mode: 0644]
convert/convert_cuve2dg.py [new file with mode: 0644]
convert/convert_openturns_study.py
convert/convert_openturns_wrapper.py
generator/Formatage.py
generator/OpenturnsSTD.py
generator/OpenturnsXML.py
generator/generator_SEP.py [new file with mode: 0644]
generator/generator_cuve2dg.py [new file with mode: 0644]
generator/generator_openturns_study.py
generator/generator_python.py
generator/tube.py [new file with mode: 0644]

index b3e12c0a06884bc2866fb13782198897e695d743..c313e98f9f07f4f35314bcb099a897d1586451b1 100755 (executable)
@@ -35,7 +35,11 @@ except:
   pass
 
 __version__="$Name:  $"
+<<<<<<< cata.py
+__Id__="$Id: cata.py,v 1.7 2009-06-19 08:36:49 pnoyret Exp $"
+=======
 __Id__="$Id: cata.py,v 1.5.4.4 2009-06-02 14:17:48 pnoyret Exp $"
+>>>>>>> 1.5.4.4
 
 EnumTypes = (ListType, TupleType)
 
index e76c04615ae7e6d36caef6ad6604861f561f39ac..7735bcd5a453d05e5ca21c783adaf52ab87ef665 100644 (file)
    Utilitaire sur le catalogue des structures de données.
 """
 
+<<<<<<< utilsd.py
+__revision__ = "$Id: utilsd.py,v 1.5 2009-06-19 08:36:49 pnoyret Exp $"
+=======
 __revision__ = "$Id: utilsd.py,v 1.3.4.3 2009-04-30 14:38:01 pnoyret Exp $"
+>>>>>>> 1.3.4.3
 
 import sys
 import os
index fb5f176ceababfedd4d20b4d57addd679a77045c..4fdc56a78219fdf2371a70619f4b7afe61902a46 100644 (file)
 from __future__ import division
 
 __version__ = "$Name:  $"
+<<<<<<< cata.py
+__Id__ = "$Id: cata.py,v 1.5 2009-06-19 08:36:49 pnoyret Exp $"
+=======
 __Id__ = "$Id: cata.py,v 1.3.4.5 2009-06-02 15:18:51 pnoyret Exp $"
+>>>>>>> 1.3.4.5
 
 import Accas
 from Accas import *
index d357d2323058e32ce63179c029ed49384aff103c..39390d3715fd411ca7c3622689ff35557a124024 100644 (file)
@@ -181,7 +181,7 @@ class CONFIGbase:
       items = self.l_param
       result = widgets.Formulaire(self.parent,
                                   obj_pere = self,
-                                  titre = "Saisie des données indispensables à la configuration d'EFICAS",
+                                  titre = "Saisie des donnees indispensables a la configuration d'EFICAS",
                                   texte = self.texte,
                                   items = items,
                                   mode='query')
@@ -240,7 +240,7 @@ class CONFIG(CONFIGbase):
       self.repIni = repIni
       self.rep_ini = repIni
       self.fic_ini = os.path.join(self.repIni,self.fichier)
-      self.titre = "Paramètres nécessaires à la configuration d'EFICAS"
+      self.titre = 'Parametres necessaires a la configuration d\'EFICAS'
       self.texte_ini = "Voici les paramètres que requiert Eficas"
       self.commande = self.creation_fichier_ini_si_possible
       self.labels={"savedir"       : "Répertoire initial pour Open/Save des fichiers",
@@ -318,7 +318,7 @@ class CONFIGStyle(CONFIGbase):
       self.repIni = repIni
       self.rep_ini = repIni
       self.fic_ini = os.path.join(self.repIni,self.fichier)
-      self.titre = "Paramètres d affichage"
+      self.titre = "Parametres d affichage"
       self.texte_ini = "Voici les paramètres configurables :  "
       self.commande = self.creation_fichier_ini_si_possible
       self.labels={"background":"couleur du fonds", 
@@ -328,14 +328,6 @@ class CONFIGStyle(CONFIGbase):
                    "standard_gras_souligne":"police utilisée pour le gras souligné",
                    "canvas_italique":"police italique",
                    "standard_gras":"gras",
-                   #"canvas":"police",
-                   #"canvas_gras":"police gras",
-                   #"canvas_gras_italique":"police gras italique",
-                   #"standard12":"police 12",
-                   #"standard12_gras":"police 12 gras",
-                   #"standard12_gras_italique":"police 12 gras italique",
-                   #"standardcourier10":"courrier "
-                   "statusfont":"police utilisée dans la status Bar",
                   }
       self.types ={"background":"mot", 
                    "foreground":"mot" ,
index 418bd663be15d529bf7202cb31177d574651557f..bc1df2869000a2a9732a1b7ef48883fbbea8557a 100644 (file)
@@ -27,7 +27,7 @@ rep_Pmw = os.path.join(prefs.REPINI,'../Pmw')
 
 # Accès à la documentation Aster
 path_doc              = os.path.join(rep_cata,'..','Doc')
-exec_acrobat    =       "acroread"
+exec_acrobat    =       "/usr/bin/xpdf"
 # Utilisateur/Développeur
 isdeveloppeur   =       "NON"
 path_cata_dev   =       "/tmp/cata"
@@ -38,11 +38,10 @@ initialdir=os.curdir
 
 # Choix des catalogues
 rep_mat_v88=os.path.join(rep_cata,'cataSTA8','materiau')
-rep_mat_v94=os.path.join(rep_cata,'cataSTA9','materiau')
+rep_mat_v95=os.path.join(rep_cata,'cataSTA9','materiau')
 
 catalogues = (
-              ('ASTER','v7.8',os.path.join(rep_cata,'cataSTA7'),'python'),
               ('ASTER','v8.8',os.path.join(rep_cata,'cataSTA8'),'python'),
-              ('ASTER','v9.4',os.path.join(rep_cata,'cataSTA9'),'python','defaut'),
+              ('ASTER','v9.5',os.path.join(rep_cata,'cataSTA9'),'python','defaut'),
              )
 
index 9805411b1368a0e42a6d0638a8b5728e1bcde539..bc1df2869000a2a9732a1b7ef48883fbbea8557a 100644 (file)
@@ -27,8 +27,7 @@ rep_Pmw = os.path.join(prefs.REPINI,'../Pmw')
 
 # Accès à la documentation Aster
 path_doc              = os.path.join(rep_cata,'..','Doc')
-#exec_acrobat    =       "acroread"
-exec_acrobat    =       "/local01/assire/v0.5/SALOME-MECA-2008.2/SALOME-MECA/prerequis/xpdf-3.02-linux/xpdf"
+exec_acrobat    =       "/usr/bin/xpdf"
 # Utilisateur/Développeur
 isdeveloppeur   =       "NON"
 path_cata_dev   =       "/tmp/cata"
@@ -38,12 +37,11 @@ rep_travail     =   "/tmp"
 initialdir=os.curdir
 
 # Choix des catalogues
-rep_mat_v85=os.path.join(rep_cata,'cataSTA8','materiau')
-rep_mat_v91=os.path.join(rep_cata,'cataSTA9','materiau')
+rep_mat_v88=os.path.join(rep_cata,'cataSTA8','materiau')
+rep_mat_v95=os.path.join(rep_cata,'cataSTA9','materiau')
 
 catalogues = (
-              ('ASTER','v7.8',os.path.join(rep_cata,'cataSTA7'),'python'),
-              ('ASTER','v8.7',os.path.join(rep_cata,'cataSTA8'),'python'),
-              ('ASTER','v9.3',os.path.join(rep_cata,'cataSTA9'),'python','defaut'),
+              ('ASTER','v8.8',os.path.join(rep_cata,'cataSTA8'),'python'),
+              ('ASTER','v9.5',os.path.join(rep_cata,'cataSTA9'),'python','defaut'),
              )
 
index e3736bd6abdf30eca6e08f7f9dae21fc35096298..cf2dbf0eeafbd76d81e900dee82dde8ebd16cae3 100755 (executable)
@@ -27,6 +27,7 @@
 
 # Modules Eficas
 import prefs
+#from InterfaceQT4 import eficas_go
 from InterfaceQT import eficas_go
 
 eficas_go.lance_eficas(code=prefs.code)
index ba37e082d46a157ac8a6b47c5174cb37f371cf59..04bd43474944987db0dadd7f57c55bbd4044c336 100644 (file)
@@ -66,8 +66,8 @@ def main():
    # copyfiles('Cata/Utilitai',os.path.join(path_distrib,'Aster','Cata','Utilitai'),['*.py'])
    # copyfiles('Cata/pre74',os.path.join(path_distrib,'Aster','Cata','pre74'),['*.py'])
 
-   copyfiles('Cata/cataSTA6',os.path.join(path_distrib,'Aster','Cata','cataSTA6'),['*.py'])
-   copyfiles('Cata/cataSTA6/Macro',os.path.join(path_distrib,'Aster','Cata','cataSTA6','Macro'),['*.py'])
+   #copyfiles('Cata/cataSTA6',os.path.join(path_distrib,'Aster','Cata','cataSTA6'),['*.py'])
+   #copyfiles('Cata/cataSTA6/Macro',os.path.join(path_distrib,'Aster','Cata','cataSTA6','Macro'),['*.py'])
 
    copyfiles('Cata/cataSTA7',os.path.join(path_distrib,'Aster','Cata','cataSTA7'),['*.py'])
    copyfiles('Cata/cataSTA7/Macro',os.path.join(path_distrib,'Aster','Cata','cataSTA7','Macro'),['*.py'])
@@ -83,7 +83,7 @@ def main():
    copyfiles('Cata/cataSTA9/materiau',os.path.join(path_distrib,'Aster','Cata','cataSTA9/materiau'),['README.py'])
    copyfiles('Cata/cataSTA9/SD',os.path.join(path_distrib,'Aster','Cata','cataSTA9/SD'),['*.py'])
 
-   copyfiles('Cata',os.path.join(path_distrib,'Aster','Cata'),['*c_clefs_docu'])
+   copyfiles('Cata',os.path.join(path_distrib,'Aster','Cata'),['*9c_clefs_docu'])
    copyfiles('../Aster/Cata',os.path.join(path_distrib,'Aster'),['aster.py',])
 
    #                           ______________________
diff --git a/Editeur/icons/About24.png b/Editeur/icons/About24.png
new file mode 100644 (file)
index 0000000..b96d072
Binary files /dev/null and b/Editeur/icons/About24.png differ
diff --git a/Editeur/icons/Copy24.png b/Editeur/icons/Copy24.png
new file mode 100644 (file)
index 0000000..45d3149
Binary files /dev/null and b/Editeur/icons/Copy24.png differ
diff --git a/Editeur/icons/Cut24.png b/Editeur/icons/Cut24.png
new file mode 100644 (file)
index 0000000..bf358b0
Binary files /dev/null and b/Editeur/icons/Cut24.png differ
diff --git a/Editeur/icons/Delete24.png b/Editeur/icons/Delete24.png
new file mode 100644 (file)
index 0000000..a8fc03a
Binary files /dev/null and b/Editeur/icons/Delete24.png differ
diff --git a/Editeur/icons/Fermer24.png b/Editeur/icons/Fermer24.png
new file mode 100644 (file)
index 0000000..1a50a00
Binary files /dev/null and b/Editeur/icons/Fermer24.png differ
diff --git a/Editeur/icons/Help24.png b/Editeur/icons/Help24.png
new file mode 100644 (file)
index 0000000..3c5921b
Binary files /dev/null and b/Editeur/icons/Help24.png differ
diff --git a/Editeur/icons/New24.png b/Editeur/icons/New24.png
new file mode 100644 (file)
index 0000000..96bc226
Binary files /dev/null and b/Editeur/icons/New24.png differ
diff --git a/Editeur/icons/Open24.png b/Editeur/icons/Open24.png
new file mode 100644 (file)
index 0000000..2693469
Binary files /dev/null and b/Editeur/icons/Open24.png differ
diff --git a/Editeur/icons/Paste24.png b/Editeur/icons/Paste24.png
new file mode 100644 (file)
index 0000000..6b1630b
Binary files /dev/null and b/Editeur/icons/Paste24.png differ
diff --git a/Editeur/icons/Save24.png b/Editeur/icons/Save24.png
new file mode 100644 (file)
index 0000000..8324c9f
Binary files /dev/null and b/Editeur/icons/Save24.png differ
diff --git a/Editeur/icons/Zoom24.png b/Editeur/icons/Zoom24.png
new file mode 100644 (file)
index 0000000..1cfb7af
Binary files /dev/null and b/Editeur/icons/Zoom24.png differ
diff --git a/Editeur/icons/arrow_left.png b/Editeur/icons/arrow_left.png
new file mode 100644 (file)
index 0000000..07cb0d3
Binary files /dev/null and b/Editeur/icons/arrow_left.png differ
diff --git a/Editeur/icons/arrow_right.png b/Editeur/icons/arrow_right.png
new file mode 100644 (file)
index 0000000..cdb4232
Binary files /dev/null and b/Editeur/icons/arrow_right.png differ
diff --git a/Editeur/icons/ast-green-ball.png b/Editeur/icons/ast-green-ball.png
new file mode 100644 (file)
index 0000000..6a887c9
Binary files /dev/null and b/Editeur/icons/ast-green-ball.png differ
index 0c9dbd020c77449eb2288a05326135e159cbf00f..44847265685a67735e84927fe539ee20526c0843 100755 (executable)
Binary files a/Editeur/icons/ast-green-los.gif and b/Editeur/icons/ast-green-los.gif differ
diff --git a/Editeur/icons/ast-green-los.png b/Editeur/icons/ast-green-los.png
new file mode 100644 (file)
index 0000000..10a27ee
Binary files /dev/null and b/Editeur/icons/ast-green-los.png differ
diff --git a/Editeur/icons/ast-green-percent.png b/Editeur/icons/ast-green-percent.png
new file mode 100644 (file)
index 0000000..5e5ddec
Binary files /dev/null and b/Editeur/icons/ast-green-percent.png differ
index 04ad5adc4adadb413cc45851249fe95640896478..22bbac0072afbb5a80a44d0f02933d083bb9843a 100755 (executable)
Binary files a/Editeur/icons/ast-green-square.gif and b/Editeur/icons/ast-green-square.gif differ
diff --git a/Editeur/icons/ast-green-square.png b/Editeur/icons/ast-green-square.png
new file mode 100644 (file)
index 0000000..540db29
Binary files /dev/null and b/Editeur/icons/ast-green-square.png differ
diff --git a/Editeur/icons/ast-green-text.png b/Editeur/icons/ast-green-text.png
new file mode 100644 (file)
index 0000000..3dc6f1d
Binary files /dev/null and b/Editeur/icons/ast-green-text.png differ
diff --git a/Editeur/icons/ast-red-ball.png b/Editeur/icons/ast-red-ball.png
new file mode 100644 (file)
index 0000000..9a2b3e2
Binary files /dev/null and b/Editeur/icons/ast-red-ball.png differ
diff --git a/Editeur/icons/ast-red-los.png b/Editeur/icons/ast-red-los.png
new file mode 100644 (file)
index 0000000..163b5c1
Binary files /dev/null and b/Editeur/icons/ast-red-los.png differ
diff --git a/Editeur/icons/ast-red-percent.png b/Editeur/icons/ast-red-percent.png
new file mode 100644 (file)
index 0000000..a5dec25
Binary files /dev/null and b/Editeur/icons/ast-red-percent.png differ
diff --git a/Editeur/icons/ast-red-square.png b/Editeur/icons/ast-red-square.png
new file mode 100644 (file)
index 0000000..501c7e9
Binary files /dev/null and b/Editeur/icons/ast-red-square.png differ
diff --git a/Editeur/icons/ast-red-text.png b/Editeur/icons/ast-red-text.png
new file mode 100644 (file)
index 0000000..32e1c92
Binary files /dev/null and b/Editeur/icons/ast-red-text.png differ
diff --git a/Editeur/icons/ast-white-percent.png b/Editeur/icons/ast-white-percent.png
new file mode 100644 (file)
index 0000000..255a409
Binary files /dev/null and b/Editeur/icons/ast-white-percent.png differ
diff --git a/Editeur/icons/ast-white-square.png b/Editeur/icons/ast-white-square.png
new file mode 100644 (file)
index 0000000..c117825
Binary files /dev/null and b/Editeur/icons/ast-white-square.png differ
diff --git a/Editeur/icons/ast-white-text.png b/Editeur/icons/ast-white-text.png
new file mode 100644 (file)
index 0000000..7f1040f
Binary files /dev/null and b/Editeur/icons/ast-white-text.png differ
diff --git a/Editeur/icons/ast-yel-ball.png b/Editeur/icons/ast-yel-ball.png
new file mode 100644 (file)
index 0000000..f64916d
Binary files /dev/null and b/Editeur/icons/ast-yel-ball.png differ
diff --git a/Editeur/icons/ast-yel-los.png b/Editeur/icons/ast-yel-los.png
new file mode 100644 (file)
index 0000000..363a02c
Binary files /dev/null and b/Editeur/icons/ast-yel-los.png differ
diff --git a/Editeur/icons/ast-yel-percent.png b/Editeur/icons/ast-yel-percent.png
new file mode 100644 (file)
index 0000000..8983af3
Binary files /dev/null and b/Editeur/icons/ast-yel-percent.png differ
diff --git a/Editeur/icons/ast-yel-square.png b/Editeur/icons/ast-yel-square.png
new file mode 100644 (file)
index 0000000..046d91d
Binary files /dev/null and b/Editeur/icons/ast-yel-square.png differ
diff --git a/Editeur/icons/ast-yellow-square.png b/Editeur/icons/ast-yellow-square.png
new file mode 100644 (file)
index 0000000..37d347b
Binary files /dev/null and b/Editeur/icons/ast-yellow-square.png differ
diff --git a/Editeur/icons/ast-yellow-text.png b/Editeur/icons/ast-yellow-text.png
new file mode 100644 (file)
index 0000000..ebe65ea
Binary files /dev/null and b/Editeur/icons/ast-yellow-text.png differ
diff --git a/Editeur/icons/minusnode.png b/Editeur/icons/minusnode.png
new file mode 100644 (file)
index 0000000..9c9ffce
Binary files /dev/null and b/Editeur/icons/minusnode.png differ
diff --git a/Editeur/icons/plusnode.png b/Editeur/icons/plusnode.png
new file mode 100644 (file)
index 0000000..57b164d
Binary files /dev/null and b/Editeur/icons/plusnode.png differ
index d6dbe89bedf81a02ee1fdf760eb6a30b0e77bbe1..19f81ef5dab846f045fe36c241e9c4c6a2e413cd 100644 (file)
@@ -3,7 +3,10 @@ import re
 
 sous_menus={"ASTER" : {0:{"3D":"3D.comm"},1:{"poutre":"pou.comm"},2:{"salome":"salome.comm"},3:{"divers":"comm"}},
            "OPENTURNS_STUDY" : {0:{"Anne":"Std.comm"}},
-            "OPENTURNS_WRAPPER" : {0:{"Anne":"wrapper_exemple.comm"}}
+            "OPENTURNS_WRAPPER" : {0:{"Anne":"wrapper_exemple.comm"}},
+           "HOMARD" : {},
+           "CUVE2DG" : {},
+            'SEP' : {}
            }
 
 class listePatrons :
diff --git a/Homard/configuration.py b/Homard/configuration.py
new file mode 100644 (file)
index 0000000..1f70895
--- /dev/null
@@ -0,0 +1,193 @@
+# -*- coding: utf-8 -*-
+#            CONFIGURATION MANAGEMENT OF EDF VERSION
+# ======================================================================
+# COPYRIGHT (C) 1991 - 2002  EDF R&D                  WWW.CODE-ASTER.ORG
+# THIS PROGRAM IS FREE SOFTWARE; YOU CAN REDISTRIBUTE IT AND/OR MODIFY
+# IT UNDER THE TERMS OF THE GNU GENERAL PUBLIC LICENSE AS PUBLISHED BY
+# THE FREE SOFTWARE FOUNDATION; EITHER VERSION 2 OF THE LICENSE, OR
+# (AT YOUR OPTION) ANY LATER VERSION.
+#
+# THIS PROGRAM IS DISTRIBUTED IN THE HOPE THAT IT WILL BE USEFUL, BUT
+# WITHOUT ANY WARRANTY; WITHOUT EVEN THE IMPLIED WARRANTY OF
+# MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. SEE THE GNU
+# GENERAL PUBLIC LICENSE FOR MORE DETAILS.
+#
+# YOU SHOULD HAVE RECEIVED A COPY OF THE GNU GENERAL PUBLIC LICENSE
+# ALONG WITH THIS PROGRAM; IF NOT, WRITE TO EDF R&D CODE_ASTER,
+#    1 AVENUE DU GENERAL DE GAULLE, 92141 CLAMART CEDEX, FRANCE.
+#
+#
+# ======================================================================
+"""
+    Ce module sert pour charger les paramètres de configuration d'EFICAS
+"""
+# Modules Python
+print "passage dans la surcharge de configuration pour Homard"
+import os, sys, string, types, re
+import traceback
+from PyQt4.QtGui  import *
+
+# Modules Eficas
+from Editeur import utils
+
+class CONFIG:
+
+  #-----------------------------------
+  def __init__(self,appli,repIni):
+  #-----------------------------------
+
+  # Classe de base permettant de lire, afficher
+  # et sauvegarder les fichiers utilisateurs 
+  # On a deux directories : la directory generale (Repertoire d instal + Nom du code
+  #                       Par exemple : ~/Install_Eficas/EficasV1_14/Homard
+  # et la directorie de l utilisateur 
+  #                      HOME/.Eficas_Homard
+  # Le fichier prefs.py va etre lu dans la directory generale puis surcharge eventuellement 
+  # par celui de l utilisateur
+  # le fichier de catalogue va etre lu dans la directory de l utilisateur s il exite
+  # dans le fichier general sinon
+      self.appli   = appli  
+      self.code    = appli.code
+      self.salome  = appli.salome
+      self.repIni = repIni
+      self.fic_prefs ="prefs.py"
+
+      if self.appli: 
+         self.parent=appli.top
+      else:         self.parent=None
+
+
+      self.labels=("rep_user","INSTALLDIR","path_doc","exec_acrobat","rep_cata","initialdir","savedir")
+
+      # Valeurs par defaut
+      self.rep_user     = os.path.join(os.environ['HOME'],'.Eficas_Homard')
+      self.initialdir   = self.rep_user
+      self.path_doc     = self.rep_user
+      self.savedir      = self.rep_user
+      self.exec_acrobat = self.rep_user
+      #Lecture des fichiers utilisateurs
+      self.lecture_fichier_ini_standard()
+      self.lecture_fichier_ini_utilisateur()
+      self.lecture_catalogues()
+      print self.initialdir
+
+  #--------------------------------------
+  def lecture_fichier_ini_standard(self):
+  #--------------------------------------
+  # Verifie l'existence du fichier "standard"
+  # appelle la lecture de ce fichier
+      self.fic_ini = os.path.join(self.repIni,self.fic_prefs)
+      if not os.path.isfile(self.fic_ini):
+          QMessageBox.critical( None, "Import du fichier de Configuration", 
+                               "Erreur à la lecture du fichier de configuration "+self.fic_ini+".py" )
+          sys.exit(0)
+      import prefs
+      for k in self.labels :
+         try :
+            valeur=getattr(prefs,k)
+            setattr(self,k,valeur)
+         except :
+            pass
+              
+
+  #--------------------------------------
+  def lecture_fichier_ini_utilisateur(self):
+  #--------------------------------------
+  # Surcharge les paramètres standards par les paramètres utilisateur s'ils existent
+      self.fic_ini_utilisateur = os.path.join(self.rep_user,self.fic_prefs)
+      #if not os.path.isfile(self.fic_ini_utilisateur+".py"):
+      if not os.path.isfile(self.fic_ini_utilisateur):
+        return
+      from utils import read_file
+      txt = utils.read_file(self.fic_ini_utilisateur)
+      from styles import style
+      d=locals()
+      try:
+         exec txt in d
+      except :
+         l=traceback.format_exception(sys.exc_info()[0],sys.exc_info()[1],sys.exc_info()[2])
+         QMessageBox.critical( None, "Import du fichier de Configuration", 
+                       "Erreur à la lecture du fichier de configuration " + self.fic_ini_utilisateur )
+         sys.exit(0)
+      for k in self.labels :
+         try :
+            setattr(self,k,d[k])
+         except :
+            pass
+
+
+
+  #--------------------------------------
+  def lecture_catalogues(self):
+  #--------------------------------------
+      rep_mat=" " # Compatbilite Aster
+      fic_cata  ="catalogues_homard.ini"
+      fic_ini = os.path.join(self.repIni,fic_cata)
+      fic_user= os.path.join(self.rep_user,fic_cata)
+      if  os.path.isfile(fic_user):
+          fichier = fic_user
+      else  :
+          fichier = fic_ini
+          if not os.path.isfile(fic_ini) :
+             QMessageBox.critical( None, "Erreur a l'import du fichier des Catalogues", 
+                       "Le fichier de configuration des catalogues "+fic_ini+" n a pas été trouvé" )
+             sys.exit(0)
+
+      from utils import read_file
+      txt = utils.read_file(fichier)
+      d=locals()
+      try:
+         exec txt in d
+         self.catalogues=d["catalogues"]
+      except :
+         l=traceback.format_exception(sys.exc_info()[0],sys.exc_info()[1],sys.exc_info()[2])
+         QMessageBox.critical( None, "Import du fichier de Configuration", 
+                       "Erreur à la lecture du fichier de configuration " + fichier )
+         sys.exit(0)
+
+
+
+  #--------------------------------------
+  def save_params(self):
+  #--------------------------------------
+  # sauvegarde
+  # les nouveaux paramètres dans le fichier de configuration utilisateur
+  #
+       print "a ecrire PNPNPN"
+#      l_param=('exec_acrobat', 'repIni','catalogues','rep_travail','rep_mat','path_doc')
+#      texte=""
+#      for clef in l_param :
+#          if hasattr(self,clef):
+#             valeur=getattr(self,clef)
+#             texte= texte + clef+"    = " + repr(valeur) +"\n"
+#
+#
+#      # recuperation des repertoires materiaux
+#      try :
+#          for item in self.catalogues :
+#              try :
+#                  (code,version,cata,format,defaut)=item
+#              except :
+#                  (code,version,cata,format)=item
+#              codeSansPoint=re.sub("\.","",version)
+#              chaine="rep_mat_"+codeSansPoint
+#              if hasattr(self,chaine):
+#                 valeur=getattr(self,chaine)
+#                 texte= texte + chaine+"      = '" + str(valeur) +"'\n"
+#      except :
+#             pass
+#
+#      f=open(self.fic_ini_utilisateur,'w+')
+#      f.write(texte) 
+#      f.close()
+#
+
+
+def make_config(appli,rep):
+    return CONFIG(appli,rep)
+
+def make_config_style(appli,rep):
+    return None
+
+
index 56bb96cd91d6e9c42af2b5e1ff44c30642bc81c1..f79fe6efb15cd5e8af3e678c74db9c13ee5cb7e1 100644 (file)
 #
 # ======================================================================
 
-import os
+import os, sys
+# Les variables pouvant positionnees sont :
+print "import des prefs de Homard"
 
-# REPINI sert à localiser le fichier editeur.ini
-# Obligatoire
+code = "Homard"
+
+# REPINI sert à localiser le fichier 
+# initialdir sert comme directory initial des QFileDialog
+# positionnee a repin au debut mise a jour dans configuration
 REPINI=os.path.dirname(os.path.abspath(__file__))
+initialdir=REPINI 
 
 # INSTALLDIR sert à localiser l'installation d'Eficas
-# Obligatoire
 INSTALLDIR=os.path.join(REPINI,'..')
+sys.path[:0]=[INSTALLDIR]
 
-# CODE_PATH sert à localiser Noyau et Validation éventuellement
-# non contenus dans la distribution EFICAS
-# Par défaut on utilise les modules de INSTALLDIR
-# Peut valoir None (defaut)
-CODE_PATH = None
-#CODE_PATH = os.path.join(REPINI,'../../Superv')
-
-# ICONDIR sert à localiser le répertoire contenant les icones
-# Par défaut on utilise le répertoire icons dans Editeur
-ICONDIR=os.path.join(INSTALLDIR,'Editeur','icons')
 
+# Codage des strings qui accepte les accents (en remplacement de 'ascii')
 # lang indique la langue utilisée pour les chaines d'aide : fr ou ang
 lang='fr'
-
-# Codage des strings qui accepte les accents (en remplacement de 'ascii')
 encoding='iso-8859-1'
 
-labels= ('Fichier','Edition','Jeu de commandes',
-#               'Catalogue','Browsers',
-                'Options',
-                'Aide',
-           )
-
-appli_composants=['readercata','bureau',
-#                  'browser',
-                   'options',
-           ]
+# Acces a la documentation
+rep_cata        = INSTALLDIR
+path_doc        = os.path.join(rep_cata,'Doc')
+exec_acrobat    = "/usr/bin/xpdf"
 
-menu_defs={ 'bureau': [
-              ('Fichier',[
-                           ('Nouveau','newJDC','<Control-n>'),
-                           ('Ouvrir','openJDC','<Control-o>'),
-                           ('Enregistrer','saveJDC','<Control-e>'),
-                           ('Enregistrer sous','saveasJDC','<Control-s>'),
-                           None,
-                           ('Fermer','closeJDC','<Control-f>'),
-                           ('Quitter','exitEFICAS','<Control-q>'),
-                         ]
-              ),
-              ('Edition',[
-                           ('Copier','copy','<Control-c>'),
-                           ('Couper','cut','<Control-x>'),
-                           ('Coller','paste','<Control-v>'),
-                         ]
-              ),
-              ('Jeu de commandes',[
-                                   ('Rapport de validation','visuCRJDC','<Control-r>'),
-                                   ('Fichier à plat','visu_a_plat','<Control-p>'),
-                                   ('Fichier format v6','visuJDC_py'),
-                                   ('Fichier source','visu_txt_brut_JDC','<Control-b>'),
-                                   ('Paramètres Eficas','affichage_fichier_ini'),
-                                   ('Mots-clés inconnus','mc_inconnus'),
-                                  ]
-              ),
-              ('Aide',[
-                        ('Aide EFICAS','aideEFICAS','<Control-a>'),
-                      ]
-              ),
-             ]
-           }
 
diff --git a/Homard/qtEficas_homard.py b/Homard/qtEficas_homard.py
new file mode 100755 (executable)
index 0000000..8ee037e
--- /dev/null
@@ -0,0 +1,33 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+#            CONFIGURATION MANAGEMENT OF EDF VERSION
+# ======================================================================
+# COPYRIGHT (C) 1991 - 2002  EDF R&D                  WWW.CODE-ASTER.ORG
+# THIS PROGRAM IS FREE SOFTWARE; YOU CAN REDISTRIBUTE IT AND/OR MODIFY
+# IT UNDER THE TERMS OF THE GNU GENERAL PUBLIC LICENSE AS PUBLISHED BY
+# THE FREE SOFTWARE FOUNDATION; EITHER VERSION 2 OF THE LICENSE, OR
+# (AT YOUR OPTION) ANY LATER VERSION.
+#
+# THIS PROGRAM IS DISTRIBUTED IN THE HOPE THAT IT WILL BE USEFUL, BUT
+# WITHOUT ANY WARRANTY; WITHOUT EVEN THE IMPLIED WARRANTY OF
+# MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. SEE THE GNU
+# GENERAL PUBLIC LICENSE FOR MORE DETAILS.
+#
+# YOU SHOULD HAVE RECEIVED A COPY OF THE GNU GENERAL PUBLIC LICENSE
+# ALONG WITH THIS PROGRAM; IF NOT, WRITE TO EDF R&D CODE_ASTER,
+#    1 AVENUE DU GENERAL DE GAULLE, 92141 CLAMART CEDEX, FRANCE.
+#
+#
+# ======================================================================
+
+"""
+   Ce module sert à lancer EFICAS configuré pour Homard
+"""
+# Modules Python
+
+# Modules Eficas
+import prefs
+prefs.code="HOMARD"
+from InterfaceQT4 import eficas_go
+
+eficas_go.lance_eficas(code=prefs.code)
index 5aab780a56cbf12a21d90d904109ed0d4a5d3f94..357fc5b783db4caf605f10980c99d792afe3fc83 100644 (file)
@@ -774,7 +774,7 @@ class MACRO_ETAPE(I_ETAPE.ETAPE):
           self.fichier_err="Le fichier INCLUDE n est pas defini"
            self.parent.record_unit(999,self)
            try :
-              MCFils=self.get_child('FICHIER')
+              MCFils=self.get_child('FileName')
               MCFils.set_valeur(None)
            except :
               pass
@@ -796,9 +796,9 @@ class MACRO_ETAPE(I_ETAPE.ETAPE):
              nom=maVariableListe[i].id_
              type=maVariableListe[i].type_
              if type :
-               ligneTexte=nom+"=VARI(type='IN',);\n"
+               ligneTexte="%s=DETERMINISTICVARIABLE(N='%s',T='in',R=%d);\n" % (nom, nom, i)
              else :
-              ligneTexte=nom+"=VARI(type='OUT',);\n"
+               ligneTexte="%s=DETERMINISTICVARIABLE(N='%s',T='out',R=%d);\n" % (nom, nom, i)
              self.fichier_text = self.fichier_text + ligneTexte
       except:
          self.make_incl2_except()
@@ -816,7 +816,7 @@ class MACRO_ETAPE(I_ETAPE.ETAPE):
          self.make_contexte_include(self.fichier_ini ,self.fichier_text)
          self.parent.record_unit(unite,self)
          try :
-            MCFils=self.get_child('FICHIER')
+            MCFils=self.get_child('FileName')
             MCFils.set_valeur(fichier)
          except :
             pass
@@ -838,7 +838,7 @@ class MACRO_ETAPE(I_ETAPE.ETAPE):
          self.fichier_err = string.join(l)
          self.contexte_fichier_init={}
          try :
-            MCFils=self.get_child('FICHIER')
+            MCFils=self.get_child('FileName')
             MCFils.set_valeur(None)
          except :
             pass
index 9d60d37a69d054e89da71c23dd7f61deb3cb7b4b..5ee3a1fdfb0cc2ebc0f364951d4d8f4038b1c924 100644 (file)
@@ -407,6 +407,10 @@ class MCCOMPO(I_OBJECT.OBJECT):
   def delete_mc_global(self):
      for motcle in self.mc_liste :
          motcle.delete_mc_global()
+     try :
+         motcle.update_mc_global()
+     except :
+       pass
 
   def init_modif_up(self):
     Validation.V_MCCOMPO.MCCOMPO.init_modif_up(self)
index 2b11541e5f8e83e652439709233dbc63bfdd37a5..3f8103ba2867d579e9a48369c1466b5a4eabb380 100644 (file)
@@ -22,7 +22,7 @@ class JDCTree( QListView ):
         self.addColumn(self.trUtf8('Commande'))
         self.addColumn(self.trUtf8('Concept/Valeur'))
                 
-        #self.setMinimumSize(QSize(400,500))
+        self.resize(QSize(400,500))
         self.connect(self,SIGNAL('contextMenuRequested(QListViewItem *, const QPoint &, int)'),
                      self.handleContextMenu)
 
index b2391368c5aaf2aa932e63f83354ac022a24217c..6346902abc2d0366d01aaaba6a29c3a9127731cd 100644 (file)
@@ -18,7 +18,7 @@ import readercata
 import prefs
 import qtCommun
 
-VERSION_EFICAS  = "EFICAS v1.15"
+VERSION_EFICAS  = "EFICAS v1.16"
 
 
 # -------------------------- #
@@ -137,6 +137,8 @@ class JDCEditor(QSplitter):
             self.connect(self.tree,SIGNAL('selectionChanged(QListViewItem *)'),self.updatePanel)
       
         sh = self.sizeHint()
+        if sh.width() < 300:
+            sh.setWidth(300)
         if sh.height() < 300:
             sh.setHeight(300)
         self.resize(sh)
@@ -658,10 +660,10 @@ class JDCEditor(QSplitter):
                 if QFileInfo(fn).exists():
                     abort = QMessageBox.warning(
                        self,
-                        self.trUtf8("Save File"),
-                        self.trUtf8("The file <b>%1</b> already exists.").arg(fn),
-                        self.trUtf8("&Overwrite"),
-                        self.trUtf8("&Abort") )
+                        self.trUtf8("Sauvegarde Fichier"),
+                        self.trUtf8("Le fichier <b>%1</b> existe deja.").arg(fn),
+                        self.trUtf8("&Remplacer"),
+                        self.trUtf8("&Abandonner") )
                     print abort
                     if abort:
                         return (0, None)
index 678fc089ce90d429d8b2355535b80a5f7da1b7eb..78f8e32a5565b82b107e7d4f29f489e32b0f2102 100644 (file)
@@ -41,6 +41,7 @@ class MonRacinePanel(DRac,QTPanelTBW2):
         QTPanel.__init__(self,node,parent)
         QTPanelTBW2.__init__(self,node,parent,racine=1)
         self.setMinimumSize(0,0)
+        self.LEFiltre.setFocus()
 
   def BSupPressed(self):
       QTPanel.BSupPressed(self)
index 435e559033a85c7d64ece2b3b0a66893640a09b9..75c9eb1ecbbb6ea3d3add7be9f088b1ffa00a32d 100644 (file)
@@ -65,10 +65,10 @@ class MonUniqueBasePanel(DUnBase,QTPanel,SaisieValeur):
         valeurTexte=self.politique.GetValeurTexte(valeur)
         if valeurTexte != None:
            try :
-               str=QString("").setNum(valeurTexte)
+               maString=QString("").setNum(valeurTexte)
            except :
-               str=QString(valeurTexte)
-           self.lineEditVal.setText(str)
+               maString=str(valeurTexte)
+           self.lineEditVal.setText(maString)
 
 
   def InitCommentaire(self):
index 99a9afca1ee3af86f57eaed2ee9cce61c5970abe..7e5b13e511fed3bfb062870d1550135e5ad9701b 100644 (file)
@@ -52,8 +52,8 @@ class QTPanel:
          QMessageBox.information( self.editor, "Documentation Vide", \
                                   "Aucune documentation Aster n'est associée à ce noeud")
          return
-      cle_doc = string.replace(cle_doc,'.','')
-      cle_doc = string.replace(cle_doc,'-','')
+      #cle_doc = string.replace(cle_doc,'.','')
+      #cle_doc = string.replace(cle_doc,'-','')
       commande = self.editor.appliEficas.CONFIGURATION.exec_acrobat
       try :
          f=open(commande,"rb")
@@ -61,7 +61,7 @@ class QTPanel:
          texte="impossible de trouver la commande  " + commande
          QMessageBox.information( self.editor, "Lecteur PDF", texte)
          return
-      nom_fichier = cle_doc+".pdf"
+      nom_fichier = cle_doc
       fichier = os.path.abspath(os.path.join(self.editor.CONFIGURATION.path_doc,
                                        nom_fichier))
       try :
@@ -173,9 +173,26 @@ class QTPanelTBW2(QTPanel):
         self.editor    = parent
         self.node      = node
         self.BuildLBNouvCommande()
-        if racine == 1 : self.AppelleBuildLBRegles()
+        self.LEFiltre.setFocus()
+        if racine == 1 : 
+           self.AppelleBuildLBRegles()
+        else :
+           self.connect(self.TWChoix, SIGNAL("currentChanged(QWidget *)"), self.handleCurrentChanged)
 
       
+  def handleCurrentChanged(self):
+        label=self.TWChoix.tabLabel(self.TWChoix.currentPage())
+        if label==QString("Nouvelle Commande"):
+           try :
+               self.LEFiltre.setFocus()
+           except :
+               pass
+        if label==QString("Nommer Concept"):
+           try :
+               self.LENomConcept.setFocus()
+           except :
+               pass
+
   def BuildLBNouvCommande(self):
         self.LBNouvCommande.clear()
         try :
@@ -260,6 +277,7 @@ class QTPanelTBW3(QTPanel):
         self.typeConcept.setText(type_sd)
         self.LENomConcept.setText("")
         self.LENomConcept.setText(nomConcept)
+        self.LENomConcept.setFocus()
         
 
 
@@ -317,11 +335,11 @@ class ViewText(QDialog):
         if not fn.isNull():                
            if QFileInfo(fn).exists():
               abort = QMessageBox.warning(self,
-                        self.trUtf8("Save File"),
-                        self.trUtf8("The file <b>%1</b> already exists.")
+                        self.trUtf8("Sauvegarde Fichier"),
+                        self.trUtf8("Le fichier <b>%1</b> existe.")
                             .arg(fn),
-                        self.trUtf8("&Overwrite"),
-                        self.trUtf8("&Abort"), None, 1)
+                        self.trUtf8("&Remplacer"),
+                        self.trUtf8("&Abandonner"), None, 1)
               if abort:
                  return
            fn = unicode(QDir.convertSeparators(fn))                
index df16582af833674544c8e91302d18b1ba166f406..cb670c6d1c2e1cb94fee4c0f2d5ed631d2e614cf 100644 (file)
@@ -130,7 +130,7 @@ class Appli(Eficas):
         titre = "version "
         monVisu=DVisu(parent=self.viewmanager,fl=Qt.WType_Dialog)
         monVisu.setCaption(titre)
-        monVisu.TB.setText("Eficas V1.15")
+        monVisu.TB.setText("Eficas V1.16")
         monVisu.adjustSize()
         monVisu.show()
 
index b6f4c53550c7ca909f81591d82b172bbd86ef8a9..ffeb8273eed3195637a104d974fe04f0c1915194 100644 (file)
@@ -42,7 +42,7 @@ from monChoixCata import MonChoixCata
 
 from qt import *
 
-version="15"
+version="16"
 
 class READERCATA:
 
index dc260e10a71c1d28b94a401ab25e9263313961a2..785633a0c6930d009f2255051bd9bdda731f7d8f 100644 (file)
@@ -22,6 +22,7 @@
 import string,re
 import types,sys,os
 import traceback
+import typeNode
 from PyQt4 import *
 from PyQt4.QtGui  import *
 from PyQt4.QtCore import *
@@ -29,9 +30,7 @@ from PyQt4.QtCore import *
 class JDCTree( QTreeWidget ):
     def __init__( self, jdc_item, QWParent):        
         QListView.__init__( self, QWParent )
-        print QWParent.__class__
         
-        print "je suis dans JDCTree et voilà ", jdc_item
         self.item          = jdc_item
         self.tree          = self        
         self.editor       = QWParent
@@ -42,8 +41,7 @@ class JDCTree( QTreeWidget ):
         mesLabels << self.trUtf8('Commande                   ') << self.trUtf8('Concept/Valeur           ')
         self.setHeaderLabels(mesLabels)
                 
-        self.setMinimumSize(QSize(600,500))
-        print self
+        self.setMinimumSize(QSize(600,505))
         self.setColumnWidth(0,300)
 
         self.connect(self, SIGNAL("itemClicked ( QTreeWidgetItem * ,int) "), self.handleOnItem)
@@ -101,7 +99,8 @@ class JDCNode(QTreeWidgetItem):
         mesColonnes <<  name << value
         QTreeWidgetItem.__init__(self,treeParent,mesColonnes)
 
-        monIcone = QIcon("/home/noyret/Install_Eficas/EficasV1/InterfaceQT4/icons/" +self.item.GetIconName() + ".gif")
+        RepIcon=QString(self.appliEficas.RepIcon)
+        monIcone = QIcon(RepIcon+"/" +self.item.GetIconName() + ".png")
         self.setIcon(0,monIcone)
         self.children = []
         self.build_children()
@@ -112,6 +111,7 @@ class JDCNode(QTreeWidgetItem):
         self.item.connect("supp" ,self.onAdd,())
         self.item.connect("add"  ,self.onSupp,())
 
+
     def build_children(self,posInsertion=10000):
         """ Construit la liste des enfants de self """
         """ Se charge de remettre les noeuds Expanded dans le meme etat """
@@ -134,6 +134,7 @@ class JDCNode(QTreeWidgetItem):
             ind=ind+1
 
     def affichePanneau(self) :
+        print self
         if self.item.isactif():
            panel=self.getPanel()
         else:
@@ -312,7 +313,8 @@ class JDCNode(QTreeWidgetItem):
            Elle appelle isvalid
         """
         #print 'NODE update_node_valid', self.item.GetLabelText()
-        monIcone = QIcon("/home/noyret/Install_Eficas/EficasV1/InterfaceQT4/icons/" +self.item.GetIconName() + ".gif")
+        RepIcon=QString(self.appliEficas.RepIcon)
+        monIcone = QIcon(RepIcon+"/" +self.item.GetIconName() + ".png")
         self.setIcon(0,monIcone)
 
     def update_node_label(self):
@@ -339,16 +341,6 @@ class JDCNode(QTreeWidgetItem):
             for child in self.children:
                 if child.isHidden() == false : child.update_texte()
         
-#    def update_valid(self) :
-#        """Cette methode a pour but de mettre a jour la validite du noeud
-#           et de propager la demande de mise a jour a son Parent
-#        """
-#        #print "NODE update_valid", self.item.GetLabelText()
-#        self.update_node_valid()
-#        try :
-#          self.treeParent.update_valid()            
-#        except:
-#          pass
  
     def doPasteCommande(self,objet_a_copier):
         """
index e236eef5c6a227764ed4ad77e9512a2d0c5df365..d80600636c4c1c609a3dbec0246cb70b4c1ce1fd 100644 (file)
@@ -6,15 +6,20 @@ from Editeur     import Objecttreeitem
 
 import compofact
 import browser
+import typeNode
 
 
-class Node(browser.JDCNode):
+class Node(browser.JDCNode,typeNode.PopUpMenuNodeMinimal):
     def getPanel(self):
         """        
         """    
         from monMCFactPanel import MonMCFactPanel
         return MonMCFactPanel(self,parent=self.editor)
 
+    def createPopUpMenu(self):
+        typeNode.PopUpMenuNodeMinimal.createPopUpMenu(self)
+
+
 
 class BLOCTreeItem(compofact.FACTTreeItem):
   itemNode=Node
index 76b81c63d5e0cc76229751c23322155c509b0a85..1551befe2c670e5fecf39246faa6edf272a14d84 100644 (file)
@@ -23,17 +23,22 @@ from PyQt4 import *
 from PyQt4.QtGui  import *
 from PyQt4.QtCore import *
 import browser
+import typeNode
+
 
 from Editeur import Objecttreeitem
 
 
-class Node(browser.JDCNode):
+class Node(browser.JDCNode,typeNode.PopUpMenuNodePartiel):
     def getPanel(self):
         """
         """
         from monMCFactPanel import MonMCFactPanel
         return MonMCFactPanel(self,parent=self.editor)
         
+    def createPopUpMenu(self):
+        typeNode.PopUpMenuNodeMinimal.createPopUpMenu(self)
+
     def doPaste(self,node_selected):
         objetACopier = self.item.get_copie_objet()
         child=node_selected.doPasteMCF(objetACopier)
index 1afafa5dceaf8c87c4608ae2e5cac2058f5f9f1a..c4e694cb4939281acd433ff6462fc9af0414fe06 100644 (file)
@@ -14,6 +14,7 @@ import typeNode
 
 class MACRONode(browser.JDCNode,typeNode.PopUpMenuNode):         
     def getPanel(self):
+      print "MACRONode MACRONode"
       from   monMacroPanel import MonMacroPanel
       return MonMacroPanel (self,parent=self.editor )
     
index 04a79132cb8354db4233c5dc804caa09b9e21007..b1104d4e673c761869d0a3c950918c5f60acd7c0 100644 (file)
@@ -5,12 +5,14 @@ import traceback
 
 import compofact
 import browser
+import typeNode
+
 from Editeur     import Objecttreeitem
 from Noyau.N_OBJECT import ErrorObj
 #import compoerror
 
 
-class Node(browser.JDCNode):
+class Node(browser.JDCNode,typeNode.PopUpMenuNodeMinimal):
     def getPanel(self):
         """        
         """    
@@ -26,6 +28,10 @@ class Node(browser.JDCNode):
         else :
            print "MCList"
 
+    def createPopUpMenu(self):
+        typeNode.PopUpMenuNodeMinimal.createPopUpMenu(self)
+
+
     def doPaste(self,node_selected):
         objet_a_copier = self.item.get_copie_objet()
         child=node_selected.doPasteMCF(objet_a_copier)
index 02743c711551e13b3064ee277066abeedac66855..3b9539b0b30568d99fa3fc4491061a5f90da3160 100644 (file)
@@ -5,7 +5,14 @@ from Extensions  import commentaire
 import browser
 
 class Node(browser.JDCNode):
-      pass
+
+    def getPanel(self):
+        from monRacinePanel import MonRacinePanel
+        return MonRacinePanel(self,parent=self.editor)
+
+
+    def createPopUpMenu(self):
+      typeNode.PopUpMenuNode.createPopUpMenu(self)
 
 class NIVEAUTreeItem(Objecttreeitem.ObjectTreeItem):
   itemNode=Node
@@ -22,11 +29,7 @@ class NIVEAUTreeItem(Objecttreeitem.ObjectTreeItem):
         - la fonte dans laquelle afficher ce texte
         - la couleur du texte
       """
-      if self.isactif():
-          fonte = Fonte_Niveau
-      else :
-          fonte = Fonte_Niveau_inactif
-      return self.labeltext,fonte,'#00008b'
+      return self.labeltext,None,None
     
   def GetIconName(self):
       if self.isactif():
index b21ae80345a23cd7b9b230b78ea69cdb45630f45..5c637496c84361fe7403013d74d7b9c3265cbb21 100644 (file)
@@ -23,6 +23,7 @@ class Node(browser.JDCNode,typeNode.PopUpMenuNodePartiel):
 
     def createPopUpMenu(self):
         typeNode.PopUpMenuNodePartiel.createPopUpMenu(self)
+        self.menu.removeAction(self.Documentation)
 
 
 
index d1422bf5af062de41d04db858dbb72f6355c2c55..fb0efe8bc7d6b902097fe5d1ab577e190569d7e6 100644 (file)
@@ -4,26 +4,20 @@ import string,types,os
 
 from copy import copy,deepcopy
 import traceback
+import typeNode
 
 # Modules Eficas
 from Editeur import Objecttreeitem
 import browser
 from Noyau.N_CR   import justify_text
     
-class Node(browser.JDCNode):    
+class Node(browser.JDCNode,typeNode.PopUpMenuNodeMinimal):    
     def getPanel(self):
         """        
         """
         klass = None 
         
         # Attention l ordre des if est important        
-        if self.item.wait_shell():
-            # l'objet attend un shell
-            # a priori jamais
-            print "Pb : Panneau Shell attendu"
-            print "Pb : Prevenir la maintenance"
-            klass = None #CS_pbruno todo
-            return None
 
         # l'objet prend sa (ses) valeur(s) dans un ensemble discret de valeurs
         if self.item.has_into():
@@ -39,7 +33,10 @@ class Node(browser.JDCNode):
             # on attend une liste de valeurs 
             if self.item.is_list() :
                 # on attend une liste de SD
-                if self.item.wait_assd():
+                if self.item.wait_tuple() :
+                    from monFonctionPanel import MonFonctionPanel
+                    klass = MonFonctionPanel
+                elif self.item.wait_assd():
                     from monPlusieursASSDPanel import MonPlusieursASSDPanel 
                     klass = MonPlusieursASSDPanel
                 else:
@@ -84,10 +81,14 @@ class Node(browser.JDCNode):
                 from monFonctionPanel import MonFonctionPanel
                 klass = MonFonctionPanel
 
+        print klass
         if not klass:
             return None
         return klass( self, self.editor )
         
+    def createPopUpMenu(self):
+        typeNode.PopUpMenuNodeMinimal.createPopUpMenu(self)
+
         
     
 class SIMPTreeItem(Objecttreeitem.AtomicObjectTreeItem):
@@ -389,7 +390,6 @@ class SIMPTreeItem(Objecttreeitem.AtomicObjectTreeItem):
   # wait_geom
   # wait_complex
   # wait_reel
-  # wait_shell
   # wait_assd
   # GetType
 
@@ -424,13 +424,13 @@ class SIMPTreeItem(Objecttreeitem.AtomicObjectTreeItem):
       else:
           return 0
         
-  def wait_shell(self):
+  def wait_tuple(self):
       """ Méthode booléenne qui retourne 1 si l'objet pointé par self
       attend un shell, 0 sinon """
-      if 'shell' in self.object.definition.type:
-          return 1
-      else:
-          return 0
+      for ss_type in self.object.definition.type:
+          if repr(ss_type).find('Tuple') != -1 :
+             return 1
+      return 0
 
   def wait_assd(self):
       """Méthode booléenne qui retourne 1 si l'objet pointé par self
index 7ab8dc62797164419a18aa4d11aa7f948a1af16e..0e885a6954544eaec69c82e2a7c37c6a0280784f 100644 (file)
@@ -36,7 +36,7 @@ import readercata
 import qtCommun
 
 
-VERSION_EFICAS  = "EFICAS v1.15"
+VERSION_EFICAS  = "EFICAS v1.16"
 
 
 class JDCEditor(QSplitter):
@@ -74,7 +74,9 @@ class JDCEditor(QSplitter):
         self.liste_simp_reel=[]        
         self.ihm="QT"
         
-        import configuration
+        import prefs
+        nameConf='configuration_'+prefs.code
+        configuration=__import__(nameConf)
         self.CONFIGURATION = self.appliEficas.CONFIGURATION
         self.CONFIGStyle =   self.appliEficas.CONFIGStyle
 
@@ -93,10 +95,12 @@ class JDCEditor(QSplitter):
         if not hasattr( readercata, 'reader' ) :
             readercata.reader = readercata.READERCATA( self, self.appliEficas )
         self.readercata = readercata.reader
+        self.Commandes_Ordre_Catalogue =self.readercata.Commandes_Ordre_Catalogue
         
         #------- construction du jdc --------------
 
         jdc_item = None
+        self.mode_nouv_commande=self.readercata.mode_nouv_commande
                         
         nouveau=0
         if self.fichier is not None:        #  fichier jdc fourni
@@ -299,16 +303,18 @@ class JDCEditor(QSplitter):
     #------------------------------#
     def affiche_infos(self,message):
     #------------------------------#
-        if self.salome :
-          if not hasattr(self.appliEficas,'MessageLabel') :
-              self.appliEficas.leLayout=QDockWindow(self.appliEficas)
-             self.appliEficas.MessageLabel = QLabel(self.appliEficas.leLayout,"MessageLabel")
-             self.appliEficas.MessageLabel.setAlignment(Qt.AlignBottom)
-              self.appliEficas.leLayout.setWidget(self.appliEficas.MessageLabel)
-              self.appliEficas.moveDockWindow(self.appliEficas.leLayout,Qt.DockBottom)
-          self.appliEficas.MessageLabel.setText(message)
-          self.appliEficas.MessageLabel.show()
-          self.appliEficas.leLayout.show()
+        #PN --> devenu inutile avec QT4
+        #if self.salome :
+       #   if not hasattr(self.appliEficas,'MessageLabel') :
+        #      self.appliEficas.leLayout=QDockWidget(self.appliEficas)
+       #      self.appliEficas.MessageLabel = QLabel("MessageLabel",self.appliEficas.leLayout)
+       #      self.appliEficas.MessageLabel.setAlignment(Qt.AlignBottom)
+        #      self.appliEficas.leLayout.setAllowedAreas(Qt.BottomDockWidgetArea)
+        #      self.appliEficas.leLayout.setWidget(self.appliEficas.MessageLabel)
+        #      #self.appliEficas.moveDockWindow(self.appliEficas.leLayout,Qt.DockBottom)
+       #   self.appliEficas.MessageLabel.setText(message)
+       #   self.appliEficas.MessageLabel.show()
+       #   self.appliEficas.leLayout.show()
         if self.sb:
             self.sb.showMessage(message)#,2000)
 
@@ -492,6 +498,12 @@ class JDCEditor(QSplitter):
          return ""
       
       
+    #-----------------------------------------#
+    def cherche_Groupes(self):
+        liste=self.get_text_JDC("GroupMA")
+        return liste
+    #-----------------------------------------#
+
     #-----------------------------------------#
     def saveFile(self, path = None, saveas= 0):
     #-----------------------------------------#
@@ -561,8 +573,28 @@ class JDCEditor(QSplitter):
             except :
                pass
 
-#            if self.salome : 
-#               self.QWParent.appli.addJdcInSalome( self.fichier)
+            try : 
+            #if 1 :
+               self.generator.writeCuve2DG()
+            #else :
+            except :
+               pass
+
+               
+            try : 
+            #if 1 :
+               self.tubePy=self.generator.getTubePy()
+               fileTube = '/tmp/tube.py'
+               if self.tubePy != '' :
+                  f=open(fileTube,'w')
+                  f.write(self.tubePy)
+                  f.close()
+            except :
+            #else :
+               pass
+
+            if self.salome : 
+               self.appliEficas.addJdcInSalome( self.fichier)
 #               if self.code == 'ASTER':
 #                  self.QWParent.appli.createOrUpdateMesh(self)
 #               #PN ; TODO
@@ -626,7 +658,10 @@ class JDCEditor(QSplitter):
         
 if __name__=='__main__':    
     import prefs # dans main
-    if hasattr(prefs,'encoding'):
+    name='prefs_'+prefs.code
+    prefsCode=__import__(name)
+
+    if hasattr(prefsCode,'encoding'):
        # Hack pour changer le codage par defaut des strings
        import sys
        reload(sys)
index e79bea8b0439c9ab756fe213a5b6b4d36aa51d46..1b2168c6d8c5e9a0883483b06f2405cf926e6c20 100644 (file)
@@ -42,7 +42,27 @@ def lance_eficas(code=None,fichier=None):
     Eficas=Appli(code=code)
     Eficas.show()
 
-
     res=app.exec_()
     sys.exit(res)
 
+
+def lance_eficas_ssIhm(code=None,fichier=None):
+    """
+        Lance l'appli EFICAS pour trouver les noms des groupes
+    """
+    # Analyse des arguments de la ligne de commande
+    options=session.parse(sys.argv)
+    code=options.code
+
+    app = QApplication(sys.argv)
+    Eficas=Appli(code=code)
+
+    from ssIhm  import QWParentSSIhm
+    parent=QWParentSSIhm(code,Eficas,'v9.4')
+
+    from readercata import READERCATA
+    readercata = READERCATA( parent, Eficas )
+   
+    from editor import JDCEditor
+    monEditeur=JDCEditor(Eficas,fichier)
+    print monEditeur.cherche_Groupes()
index 530142d53f33a57b300f29068095cc4a3167025a..210ffe594d1c5db5484a464b9c34bcca6401eae9 100644 (file)
@@ -69,29 +69,20 @@ class MonCommandePanel(DComm,QTPanelTBW1,QTPanelTBW2,QTPanelTBW3):
         self.connect(self.LBNouvCommande,SIGNAL("doubleClicked(QListBoxItem*)"),self.LBNouvCommandeClicked)
         self.connect(self.LEFiltre,SIGNAL("textChanged(const QString&)"),self.LEFiltreTextChanged)
         self.connect(self.LEFiltre,SIGNAL("returnPressed()"),self.LEfiltreReturnPressed)
-        self.connect(self.bSup,SIGNAL("pressed()"),self.BSupPressed)
         self.connect(self.bOk,SIGNAL("clicked()"),self.BOkPressed)
         self.connect(self.LENomConcept,SIGNAL("returnPressed()"),self.LENomConceptReturnPressed)
-        self.connect(self.RBGroupe,SIGNAL("clicked()"),self.BuildTabCommand)
-        self.connect(self.RBalpha,SIGNAL("clicked()"),self.BuildTabCommand)
-        self.connect(self.bHelp,SIGNAL("clicked()"),self.ViewDoc)
+        self.connect(self.RBGroupe,SIGNAL("clicked()"),self.BuildTabCommandChanged)
+        self.connect(self.RBalpha,SIGNAL("clicked()"),self.BuildTabCommandChanged)
         self.connect(self.BNext,SIGNAL("pressed()"),self.BNextPressed)
 
-
-  def ViewDoc(self):
-      QTPanel.ViewDoc(self)
-
-  def BSupPressed(self):
-      QTPanel.BSupPressed(self)
-
   def BOkPressed(self):
       QTPanel.BOkPressed(self)
 
   def BNextPressed(self):
       QTPanelTBW2.BNextPressed(self)
 
-  def BuildTabCommand(self):
-      QTPanelTBW2.BuildLBNouvCommande(self)
+  def BuildTabCommandChanged(self):
+      QTPanelTBW2.BuildLBNouvCommandChanged(self)
 
   def LEFiltreTextChanged(self):
       QTPanelTBW2.LEFiltreTextChanged(self)
index 2449ac3214b2aedb005a8afeb5662d763cb0be7f..4bb85c4e1d414aa73f800ded6e4e22ad4452379d 100644 (file)
@@ -48,6 +48,7 @@ class DComment(Ui_DComment,QDialog):
        self.setupUi(self)
 
 
+
 # Import des panels
 
 class MonCommentairePanel(DComment,QTPanelTBW2,QTPanel):
@@ -68,11 +69,9 @@ class MonCommentairePanel(DComment,QTPanelTBW2,QTPanel):
         self.connect(self.LBNouvCommande,SIGNAL("doubleClicked(QListBoxItem*)"),self.LBNouvCommandeClicked)
         self.connect(self.LEFiltre,SIGNAL("textChanged(const QString&)"),self.LEFiltreTextChanged)
         self.connect(self.LEFiltre,SIGNAL("returnPressed()"),self.LEfiltreReturnPressed)
-        self.connect(self.bSup,SIGNAL("pressed()"),self.BSupPressed)
         self.connect(self.bOk,SIGNAL("clicked()"),self.BOkPressed)
-        self.connect(self.RBGroupe,SIGNAL("clicked()"),self.BuildTabCommand)
-        self.connect(self.RBalpha,SIGNAL("clicked()"),self.BuildTabCommand)
-        self.connect(self.bHelp,SIGNAL("clicked()"),self.ViewDoc)
+        self.connect(self.RBGroupe,SIGNAL("clicked()"),self.BuildTabCommandChanged)
+        self.connect(self.RBalpha,SIGNAL("clicked()"),self.BuildTabCommandChanged)
         self.connect(self.BNext,SIGNAL("pressed()"),self.BNextPressed)
         self.connect(self.textCommentaire,SIGNAL("textChanged()"),self.TexteCommentaireEntre)
 
@@ -86,9 +85,6 @@ class MonCommentairePanel(DComment,QTPanelTBW2,QTPanel):
         self.node.item.set_valeur(texte)
         self.node.onValid()
 
-  def BuildTabCommand(self):
-      QTPanelTBW2.BuildLBNouvCommande(self)
-
   def LEFiltreTextChanged(self):
       QTPanelTBW2.LEFiltreTextChanged(self)
 
@@ -104,6 +100,6 @@ class MonCommentairePanel(DComment,QTPanelTBW2,QTPanel):
   def BOkPressed(self):
       QTPanel.BOkPressed(self)
 
-  def ViewDoc(self):
-      QTPanel.ViewDoc(self)
+  def BuildTabCommandChanged(self):
+      QTPanelTBW2.BuildLBNouvCommandChanged(self)
 
index 4dba067e9e7c9b27b18bbd7e859c67e80f108c04..0909093ff16900967784bc02df0385d97cbbe1aa 100644 (file)
@@ -43,6 +43,14 @@ class MonFonctionPanel(MonPlusieursBasePanel):
         MonPlusieursBasePanel.__init__(self,node,parent,name,fl)
 
   def SetNbValeurs(self):
+        self.nbValeurs = 1
+        if self.node.item.wait_tuple()== 1 :
+           for a in self.node.item.definition.type :
+               try :
+                   self.nbValeurs = a.ntuple
+                   break
+               except :
+                   pass
         genea=self.node.item.get_genealogie()
         if "VALE" in genea:
             self.nbValeurs=2
@@ -56,29 +64,34 @@ class MonFonctionPanel(MonPlusieursBasePanel):
         if (len(liste)% self.nbValeurs != 0):
             message="La cardinalité n'est pas correcte, la dernière valeur est ignorée"
             #self.Commentaire.setText(QString(commentaire)) 
-            self.editor.affiche_infos(commentaire)
-        for i in range(len(liste)/ self.nbValeurs) :
-            if (self.nbValeurs==2):
-              t=(liste[i*self.nbValeurs], liste[i*self.nbValeurs+1])
-            else:
-              t=(liste[i*self.nbValeurs], liste[i*self.nbValeurs+1], liste[i*self.nbValeurs+2])
+            self.editor.affiche_infos(message)
+        i=0
+        while ( i < (len(liste) - self.nbValeurs + 1)) :
+            t=tuple(liste[i:i+self.nbValeurs])
             l_valeurs.append(t)
+            i=i+self.nbValeurs
         return l_valeurs
 
   def BuildLBValeurs(self):
         self.LBValeurs.clear()
         listeValeurs=self.node.item.GetListeValeurs()
-        for valeur in self.DecoupeListeValeurs(listeValeurs):
-               if (self.nbValeurs==2):
-                    str_valeur=str(valeur[0])+","+str(valeur[1])
-               else:
-                    str_valeur=str(valeur[0])+","+str(valeur[1])+","+str(valeur[2])
-               self.LBValeurs.addItem(str_valeur)
+        if self.node.item.wait_tuple()== 1 :
+             listeATraiter=listeValeurs
+        else : 
+              listeATraiter=self.DecoupeListeValeurs(listeValeurs)
+        for valeur in listeATraiter:
+            str_valeur=str(valeur)
+            self.LBValeurs.addItem(str_valeur)
 
   def  Ajout1Valeur(self,liste=[]):
         # Pour être appele a partir du Panel Importer (donc plusieurs fois par AjouterNValeur)
         if liste == [] :
-           liste,validite=SaisieValeur.TraiteLEValeur(self)
+           if self.node.item.wait_tuple()== 1 :
+              liste=SaisieValeur.TraiteLEValeurTuple(self)
+              if liste == [''] : return
+              validite=1
+           else :
+              liste,validite=SaisieValeur.TraiteLEValeur(self)
         else :
            validite=1
         if validite == 0 : return
@@ -93,6 +106,9 @@ class MonFonctionPanel(MonPlusieursBasePanel):
             self.editor.affiche_infos(commentaire)
             return
 
+        if self.node.item.wait_tuple()== 1 :
+              liste2=tuple(liste)
+              liste=liste2
         index=self.LBValeurs.currentRow()
         if ((self.LBValeurs.isItemSelected(self.LBValeurs.item(index )) == 0) and (index > 0 )):
            index=0
@@ -104,7 +120,11 @@ class MonFonctionPanel(MonPlusieursBasePanel):
         listeVal=[]
         for valeur in self.listeValeursCourantes :
                 listeVal.append(valeur)
-        validite,comm,comm2,listeRetour=self.politique.AjoutValeurs(liste,index,listeVal)
+        if self.node.item.wait_tuple()== 1 :
+             indexListe = index
+             validite,comm,comm2,listeRetour=self.politique.AjoutTuple(liste,index,listeVal)
+        else :
+             validite,comm,comm2,listeRetour=self.politique.AjoutValeurs(liste,index,listeVal)
         self.Commentaire.setText(comm2)
         if not validite :
                 self.editor.affiche_infos(comm)
@@ -112,11 +132,12 @@ class MonFonctionPanel(MonPlusieursBasePanel):
            self.LEValeur.setText(QString(""))
            l1=self.listeValeursCourantes[:indexListe]
            l3=self.listeValeursCourantes[indexListe:]
-           for valeur in  self.DecoupeListeValeurs(listeRetour) :
-               if (self.nbValeurs==2):
-                    str_valeur=str(valeur[0])+","+str(valeur[1])
-               else:
-                    str_valeur=str(valeur[0])+","+str(valeur[1])+","+str(valeur[2])
+           if self.node.item.wait_tuple()== 1 :
+             listeATraiter=listeRetour
+           else : 
+              listeATraiter=self.DecoupeListeValeurs(listeRetour)
+           for valeur in  listeATraiter :
+               str_valeur=str(valeur)
                self.LBValeurs.insertItem(index,str_valeur)
                item=self.LBValeurs.item(index)
                item.setSelected(1)
@@ -135,21 +156,24 @@ class MonFonctionPanel(MonPlusieursBasePanel):
         for vals in listeDecoupee :
             self.Ajout1Valeur(vals)
            
-
   def Sup1Valeur(self):
         index=self.LBValeurs.currentRow()
         if index == None : return
         self.LBValeurs.takeItem(index)
         listeVal=[]
+        indexInterdit=[]
+        for i in range(self.nbValeurs):
+            indexAOter=index*self.nbValeurs + i
+            indexInterdit.append(indexAOter)
+        if self.node.item.wait_tuple()== 1 :
+           indexInterdit=[index]
+
         i=0
         for valeur in self.listeValeursCourantes :
-                if self.nbValeurs == 2 :
-                   if (i != index*2 and i != index*2+1 ) : listeVal.append(valeur)
-                elif self.nbValeurs == 3 :
-                   if (i != index*3 and i != index*3+1 and i != index*3 +2) : listeVal.append(valeur)
-                else :
-                   print "aiiiiiiiiiiiiiiiiiieeee"
-                i = i+1
+            if not (i in indexInterdit) : 
+                listeVal.append(valeur)
+            i = i+1
         self.listeValeursCourantes=listeVal
         listeValeurs=self.listeValeursCourantes
 
+      
index 570fc669582f2a45aadc7e3f7e062f9512b8875e..4a74051a43363ff4606ae3b40ae5742a00dd5bf7 100644 (file)
@@ -46,6 +46,7 @@ class DFormule(Ui_DFormule,QDialog):
        self.setupUi(self)
 
 
+
 # Import des panels
 
 class MonFormulePanel(DFormule,QTPanelTBW2):
@@ -76,30 +77,24 @@ class MonFormulePanel(DFormule,QTPanelTBW2):
         self.connect(self.LBNouvCommande,SIGNAL("doubleClicked(QListBoxItem*)"),self.LBNouvCommandeClicked)
         self.connect(self.LEFiltre,SIGNAL("textChanged(const QString&)"),self.LEFiltreTextChanged)
         self.connect(self.LEFiltre,SIGNAL("returnPressed()"),self.LEfiltreReturnPressed)
-        self.connect(self.bSup,SIGNAL("pressed()"),self.BSupPressed)
         self.connect(self.bOk,SIGNAL("clicked()"),self.BOkPressed)
-        self.connect(self.RBalpha,SIGNAL("clicked()"),self.BuildTabCommand)
-        self.connect(self.RBGroupe,SIGNAL("clicked()"),self.BuildTabCommand)
+        self.connect(self.RBalpha,SIGNAL("clicked()"),self.BuildTabCommandChanged)
+        self.connect(self.RBGroupe,SIGNAL("clicked()"),self.BuildTabCommandChanged)
         self.connect(self.BNext,SIGNAL("clicked()"),self.BNextPressed)
         self.connect(self.LENomFormule,SIGNAL("returnPressed()"),self.NomFormuleSaisi)
         self.connect(self.LENomsArgs,SIGNAL("returnPressed()"),self.argsSaisis)
         self.connect(self.LECorpsFormule,SIGNAL("returnPressed()"),self.FormuleSaisie)
-        self.connect(self.bHelp,SIGNAL("clicked()"),self.ViewDoc)
 
-  def BSupPressed(self):
-      QTPanel.BSupPressed(self)
 
   def BOkPressed(self):
       QTPanel.BOkPressed(self)
 
-  def ViewDoc(self):
-      QTPanel.ViewDoc(self)
-
   def BNextPressed(self):
       QTPanelTBW2.BNextPressed(self)
 
-  def BuildTabCommand(self):
-      QTPanelTBW2.BuildLBNouvCommande(self)
+  def BuildTabCommandChanged(self):
+      QTPanelTBW2.BuildLBNouvCommandChanged(self)
+
 
   def LEFiltreTextChanged(self):
       QTPanelTBW2.LEFiltreTextChanged(self)
index bf544724eac77df3608a4b5ee94cb3bab9329bd1..94cd999f6eaf67cb4a568d6719f2545e0f302fc7 100644 (file)
@@ -29,9 +29,9 @@ class PanelInactif( QTPanel, Ui_DInactif,QDialog ):
            parent.addWidget(parent.partieDroite)
            parent.leLayout.widgetActive=self
         self.setupUi(self)
-                
-        self.connect(self.bSup,SIGNAL("clicked()"),self.BSupPressed)
+        self.connect(self.bSup,SIGNAL("clicked()"),self.BSupPressed)              
 
     def BSupPressed(self):
-       QTPanel.BSupPressed(self)
+        self.editor.init_modif()
+        self.node.delete()
         
index 4d78b8d6f85735223473c0b2e307b82da4526a3c..79aa092d39ab09bd93d4b7ed046eb4e5ee585f75 100644 (file)
@@ -154,11 +154,9 @@ class MonIncludePanel(DInc,QTPanelTBW1,QTPanelTBW2,QTPanelTBW3):
         self.connect(self.LBNouvCommande,SIGNAL("doubleClicked(QListBoxItem*)"),self.LBNouvCommandeClicked)
         self.connect(self.LEFiltre,SIGNAL("textChanged(const QString&)"),self.LEFiltreTextChanged)
         self.connect(self.LEFiltre,SIGNAL("returnPressed()"),self.LEfiltreReturnPressed)
-        self.connect(self.bSup,SIGNAL("pressed()"),self.BSupPressed)
         self.connect(self.bOk,SIGNAL("clicked()"),self.BOkPressed)
-        self.connect(self.RBGroupe,SIGNAL("clicked()"),self.BuildTabCommand)
-        self.connect(self.RBalpha,SIGNAL("clicked()"),self.BuildTabCommand)
-        self.connect(self.bHelp,SIGNAL("clicked()"),self.ViewDoc)
+        self.connect(self.RBGroupe,SIGNAL("clicked()"),self.BuildTabCommandChanged)
+        self.connect(self.RBalpha,SIGNAL("clicked()"),self.BuildTabCommandChanged)
         self.connect(self.BNext,SIGNAL("pressed()"),self.BNextPressed)
         self.connect(self.BBrowse,SIGNAL("clicked()"),self.BBrowsePressed)
         try :
@@ -167,11 +165,6 @@ class MonIncludePanel(DInc,QTPanelTBW1,QTPanelTBW2,QTPanelTBW3):
         except :
            pass
 
-  def ViewDoc(self):
-      QTPanel.ViewDoc(self)
-
-  def BSupPressed(self):
-      QTPanel.BSupPressed(self)
 
   def BOkPressed(self):
       QTPanel.BOkPressed(self)
@@ -179,8 +172,8 @@ class MonIncludePanel(DInc,QTPanelTBW1,QTPanelTBW2,QTPanelTBW3):
   def BNextPressed(self):
       QTPanelTBW2.BNextPressed(self)
 
-  def BuildTabCommand(self):
-      QTPanelTBW2.BuildLBNouvCommande(self)
+  def BuildTabCommandChanged(self):
+      QTPanelTBW2.BuildLBNouvCommandChanged(self)
 
   def LEFiltreTextChanged(self):
       QTPanelTBW2.LEFiltreTextChanged(self)
index 7f775ff55901b909f0bc267be1efad33bf0f73df..c81d0b498038e2a7841c770fa21a60dc65d7e509 100644 (file)
@@ -60,16 +60,9 @@ class MonMCFactPanel(DMCFact,QTPanelTBW1):
         self.connecterSignaux()
 
   def connecterSignaux(self):
-        self.connect(self.bSup,SIGNAL("pressed()"),self.BSupPressed)
         self.connect(self.bOk,SIGNAL("clicked()"),self.BOkPressed)
-        self.connect(self.bHelp,SIGNAL("clicked()"),self.ViewDoc)
-
-  def BSupPressed(self):
-      QTPanel.BSupPressed(self)
 
   def BOkPressed(self):
       QTPanel.BOkPressed(self)
 
-  def ViewDoc(self):
-      QTPanel.ViewDoc(self)
 
index 5a80768073cdf4087fe43640678f50e660eb296a..8be5fd7cc96cb327e95f1cbda272cb9425af56cd 100644 (file)
@@ -27,6 +27,7 @@ from PyQt4.QtCore import *
 from qtCommun import QTPanel
 
 
+
 class DMCListAjout(Ui_DMCListAjout,QDialog):
    def __init__(self,parent ,modal ) :
        QDialog.__init__(self,parent)
@@ -61,17 +62,10 @@ class MonMCListAjoutPanel(DMCListAjout,QTPanel):
         self.connecterSignaux()
 
   def connecterSignaux(self):
-        self.connect(self.bOk,SIGNAL("clicked()"),self.BAjoutClicked)
         self.connect(self.bAjout,SIGNAL("clicked()"),self.BAjoutClicked)
-        self.connect(self.bSup,SIGNAL("clicked()"),self.BSupPressed)
-        self.connect(self.bHelp,SIGNAL("clicked()"),self.ViewDoc)
 
-  def BSupPressed(self):
-      QTPanel.BSupPressed(self)
 
   def BAjoutClicked(self):
         self.node.treeParent.append_child(self.node.item.get_nom())
 
-  def ViewDoc(self):
-      QTPanel.ViewDoc(self)
 
index 7e6d744a8d68d76a287906833d18d67854e72222..19f9f87195586aaeac7d4483d6b4545f7e36d36d 100644 (file)
@@ -32,6 +32,7 @@ from PyQt4.QtCore import *
 
 class DMacro(Ui_DComm,QDialog):
    def __init__(self,parent ,modal ) :
+       self.appliEficas=parent.appliEficas
        QDialog.__init__(self,parent)
        if hasattr(parent,"leLayout"):
           parent.leLayout.removeWidget(parent.leLayout.widgetActive)
@@ -70,19 +71,12 @@ class MonMacroPanel(DMacro,QTPanelTBW1,QTPanelTBW2,QTPanelTBW3):
         self.connect(self.LBNouvCommande,SIGNAL("doubleClicked(QListBoxItem*)"),self.LBNouvCommandeClicked)
         self.connect(self.LEFiltre,SIGNAL("textChanged(const QString&)"),self.LEFiltreTextChanged)
         self.connect(self.LEFiltre,SIGNAL("returnPressed()"),self.LEfiltreReturnPressed)
-        self.connect(self.bSup,SIGNAL("pressed()"),self.BSupPressed)
         self.connect(self.bOk,SIGNAL("clicked()"),self.BOkPressed)
         self.connect(self.LENomConcept,SIGNAL("returnPressed()"),self.LENomConceptReturnPressed)
-        self.connect(self.RBGroupe,SIGNAL("clicked()"),self.BuildTabCommand)
-        self.connect(self.RBalpha,SIGNAL("clicked()"),self.BuildTabCommand)
-        self.connect(self.bHelp,SIGNAL("clicked()"),self.ViewDoc)
+        self.connect(self.RBGroupe,SIGNAL("clicked()"),self.BuildTabCommandChanged)
+        self.connect(self.RBalpha,SIGNAL("clicked()"),self.BuildTabCommandChanged)
         self.connect(self.BNext,SIGNAL("pressed()"),self.BNextPressed)
 
-  def ViewDoc(self):
-      QTPanel.ViewDoc(self)
-
-  def BSupPressed(self):
-      QTPanel.BSupPressed(self)
 
   def BOkPressed(self):
       QTPanel.BOkPressed(self)
@@ -90,8 +84,8 @@ class MonMacroPanel(DMacro,QTPanelTBW1,QTPanelTBW2,QTPanelTBW3):
   def BNextPressed(self):
       QTPanelTBW2.BNextPressed(self)
 
-  def BuildTabCommand(self):
-      QTPanelTBW2.BuildLBNouvCommande(self)
+  def BuildTabCommandChanged(self):
+      QTPanelTBW2.BuildLBNouvCommandChanged(self)
 
   def LEFiltreTextChanged(self):
       QTPanelTBW2.LEFiltreTextChanged(self)
index d5542a1ac3c3a2a7ebc4bb1e65dc0af7491c5668..f1365093c18d51a24a5ed48bba9e124af9aeb7df 100644 (file)
@@ -34,7 +34,6 @@ class Options(desOptions):
        self.connect(self.Bok,SIGNAL("clicked()"),self.BokClicked)
        self.connect(self.LEVersionSup,SIGNAL("returnPressed()"),self.SupVersion)
        self.connect(self.PBajout,SIGNAL("clicked()"),self.AjoutVersion)
-       self.connect(self.PBSup,SIGNAL("clicked()"),self.SupVersion)
        self.connect(self.PBQuit,SIGNAL("clicked()"),self.close)
        self.connect(self.LERepDoc,SIGNAL("textChanged(const QString&)"),self.ChangePathDoc)
 
@@ -154,7 +153,10 @@ class Options(desOptions):
        old_fic_ini_util=fic_ini_util+"_old"
        commande="mv "+fic_ini_util+" "+old_fic_ini_util
        os.system(commande)
-       import configuration
+       import prefs
+       nameConf='configuration_'+prefs.code
+       configuration=__import__(nameConf)
+
        configNew=configuration.CONFIG(appli,repIni)
        self.configuration=configNew
        appli.CONFIGURATION=configNew
index ccc25e7a99af02cde82905812a46918940223b51..1a0437129a0f4d4286812a006a59cbc67da9f626 100644 (file)
@@ -64,11 +64,9 @@ class MonParamPanel(DParam,QTPanelTBW2,QTPanel):
         self.connect(self.LBNouvCommande,SIGNAL("doubleClicked(QListBoxItem*)"),self.LBNouvCommandeClicked)
         self.connect(self.LEFiltre,SIGNAL("textChanged(const QString&)"),self.LEFiltreTextChanged)
         self.connect(self.LEFiltre,SIGNAL("returnPressed()"),self.LEfiltreReturnPressed)
-        self.connect(self.bSup,SIGNAL("pressed()"),self.BSupPressed)
         self.connect(self.bOk,SIGNAL("clicked()"),self.BOkPressed)
-        self.connect(self.RBGroupe,SIGNAL("clicked()"),self.BuildTabCommand)
-        self.connect(self.RBalpha,SIGNAL("clicked()"),self.BuildTabCommand)
-        self.connect(self.bHelp,SIGNAL("clicked()"),self.ViewDoc)
+        self.connect(self.RBGroupe,SIGNAL("clicked()"),self.BuildTabCommandChanged)
+        self.connect(self.RBalpha,SIGNAL("clicked()"),self.BuildTabCommandChanged)
         self.connect(self.BNext,SIGNAL("pressed()"),self.BNextPressed)
         self.connect(self.lineEditVal,SIGNAL("returnPressed()"),self.BOkPressed)
 
@@ -96,12 +94,9 @@ class MonParamPanel(DParam,QTPanelTBW2,QTPanel):
         self.node.item.set_nom(nom)
         self.node.item.set_valeur(val)
         self.node.update_texte()
-        self.node.update_valid()
         self.editor.init_modif()
         self.InitLEs()
 
-  def BSupPressed(self):
-        QTPanel.BSupPressed(self)
 
   def LEValeurPressed(self):
         self.Commentaire.setText(QString(""))
@@ -144,8 +139,8 @@ class MonParamPanel(DParam,QTPanelTBW2,QTPanel):
            commentaire="Les noms de parametre doivent commencer par une lettre ou un souligne"
            return None,commentaire
 
-  def BuildTabCommand(self):
-      QTPanelTBW2.BuildLBNouvCommande(self)
+  def BuildTabCommandChanged(self):
+      QTPanelTBW2.BuildLBNouvCommandChanged(self)
 
   def LEFiltreTextChanged(self):
       QTPanelTBW2.LEFiltreTextChanged(self)
@@ -167,6 +162,3 @@ class MonParamPanel(DParam,QTPanelTBW2,QTPanel):
   def BOkPressed(self):
       QTPanel.BOkPressed(self)
 
-  def ViewDoc(self):
-      QTPanel.ViewDoc(self)
-
index 3af461a812c6ffe4dad0b4f7ed1caef8e0cc26a8..ce5888f70b722022b8b7d5b07ca887842ffea8b8 100644 (file)
@@ -76,8 +76,6 @@ class MonPlusieursASSDPanel(MonPlusieursIntoPanel):
        self.editor.affiche_infos("Valeur Acceptée")
        pass
 
-  def BSupPressed(self):
-        QTPanel.BSupPressed(self)
 
   def Sup1Valeur(self):
         indexCourant=self.LBValeurs.currentRow()
index 6dd3588a1c9fb02189c57a6586a2ba09e0375e45..da889f1aee0b2faa97404742de0589b4f5d2107b 100644 (file)
@@ -66,27 +66,21 @@ class MonPlusieursBasePanel(DPlusBase,QTPanel,SaisieValeur):
         self.connecterSignaux()
 
   def connecterSignaux(self) :
-        self.connect(self.bHelp,SIGNAL("clicked()"),self.ViewDoc)
         self.connect(self.bOk,SIGNAL("clicked()"),self.BOkPourListePressed)
-        self.connect(self.bSup,SIGNAL("clicked()"),self.BSupPressed)
         self.connect(self.bParam,SIGNAL("clicked()"),self.BParametresPressed)
         self.connect(self.bImport,SIGNAL("clicked()"),self.BImportPressed)
         self.connect(self.BAjout1Val,SIGNAL("clicked()"),self.Ajout1Valeur)
         self.connect(self.BSup1Val,SIGNAL("clicked()"),self.Sup1Valeur)
         self.connect(self.LEValeur,SIGNAL("returnPressed()"),self.LEValeurPressed)
         self.connect(self.BSalome,SIGNAL("clicked()"),self.BSalomePressed)
-        self.connect(self.BView2D,SIGNAL("clicked()"),self.BView2DPressed)
 
   def detruitBouton(self):
         mc = self.node.item.get_definition()
         type = mc.type[0]
-        print self.editor.salome
         if not(('grma' in repr(type)) or ('grno' in repr(type))) or not(self.editor.salome) :
            self.BSalome.close()
            self.BView2D.close()
 
-  def ViewDoc(self):
-        QTPanel.ViewDoc(self)
 
   def BuildLBValeurs(self):
        # redefinit en raison de l heritage par monFonctionPanel
@@ -95,13 +89,11 @@ class MonPlusieursBasePanel(DPlusBase,QTPanel,SaisieValeur):
   def BOkPourListePressed(self):
         self.editor.init_modif()
         if self.listeValeursCourantes == [] :
-           self.editor.affiche_infos("Pas de validation d un groupe vide")
+           self.editor.affiche_infos("Aucune Valeur")
            return
         self.node.item.set_valeur(self.listeValeursCourantes)
        self.editor.affiche_infos("Valeur Acceptée")
 
-  def BSupPressed(self):
-        QTPanel.BSupPressed(self)
 
   def BParametresPressed(self):
         QTPanel.BParametresPressed(self)
@@ -155,6 +147,11 @@ class MonPlusieursBasePanel(DPlusBase,QTPanel,SaisieValeur):
            self.listeValeursCourantes=l1+listeRetour+l3
           self.editor.affiche_infos("Valeurs Ajoutées")
 
+  def AjoutNValeur(self,liste) :
+      for val in liste :
+        print val
+       self.Ajout1Valeur(val)
+
   def BImportPressed(self):
         init=QString( self.editor.CONFIGURATION.savedir)
         fn = QFileDialog.getOpenFileName(self.node.appliEficas, 
index af2eaa455b9573560eade2ab895690cf952478e0..c5b53d191450b083c998a922531b02d6b9d92886 100644 (file)
@@ -66,9 +66,7 @@ class MonPlusieursIntoPanel(DPlusInto,QTPanel,SaisieValeur):
   def connecterSignaux(self) :
         self.connect(self.listBoxVal, SIGNAL("itemDoubleClicked(QListWidgetItem*)" ), self.Ajout1Valeur )
         self.connect(self.LBValeurs,SIGNAL("itemDoubleClicked(QListWidgetItem*)"),self.Sup1Valeur)
-        self.connect(self.bHelp,SIGNAL("clicked()"),self.ViewDoc)
         self.connect(self.bOk,SIGNAL("clicked()"),self.BOkPourListePressed)
-        self.connect(self.bSup,SIGNAL("clicked()"),self.BSupPressed)
         self.connect(self.BAjout1Val,SIGNAL("clicked()"),self.Ajout1Valeur)
         self.connect(self.BSup1Val,SIGNAL("clicked()"),self.Sup1Valeur)
 
@@ -80,11 +78,6 @@ class MonPlusieursIntoPanel(DPlusInto,QTPanel,SaisieValeur):
         self.node.item.set_valeur(self.listeValeursCourantes)
        self.editor.affiche_infos("Valeur Acceptée")
 
-  def BSupPressed(self):
-        QTPanel.BSupPressed(self)
-
-  def ViewDoc(self):
-      QTPanel.ViewDoc(self)
 
   def Sup1Valeur(self):
         indexCourant=self.LBValeurs.currentRow()
index 2143f273e1b3e653fa4f18654d1bfd9bc101e6c3..4623b46e7c7cf712c76d9ea16536f039cbcc2d1b 100644 (file)
@@ -25,6 +25,8 @@ import os,traceback,sys
 from PyQt4 import *
 from PyQt4.QtGui import *
 from PyQt4.QtCore import *
+import convert
+
 
 from monMacroPanel import MonMacroPanel
 
@@ -45,46 +47,106 @@ class MonPoursuitePanel(MonMacroPanel):
 
   def ajoutPageOk(self) :
         self.TabPage = QtGui.QWidget()
-        self.TabPage.setGeometry(QtCore.QRect(0,0,499,433))
         self.TabPage.setObjectName("TabPage")
-        self.gridLayout_2 = QtGui.QGridLayout(self.TabPage)
-        self.gridLayout_2.setObjectName("gridLayout_2")
         self.textLabel1_3 = QtGui.QLabel(self.TabPage)
+        self.textLabel1_3.setGeometry(QtCore.QRect(9, 9, 481, 19))
         self.textLabel1_3.setWordWrap(False)
         self.textLabel1_3.setObjectName("textLabel1_3")
-        self.gridLayout_2.addWidget(self.textLabel1_3,0,0,1,1)
         self.LENomFichier = QtGui.QLineEdit(self.TabPage)
-        self.LENomFichier.setMinimumSize(QtCore.QSize(470,40))
+        self.LENomFichier.setGeometry(QtCore.QRect(9, 33, 481, 40))
+        self.LENomFichier.setMinimumSize(QtCore.QSize(470, 40))
         self.LENomFichier.setObjectName("LENomFichier")
-        self.gridLayout_2.addWidget(self.LENomFichier,1,0,1,1)
-        spacerItem = QtGui.QSpacerItem(21,190,QtGui.QSizePolicy.Minimum,QtGui.QSizePolicy.Expanding)
-        self.gridLayout_2.addItem(spacerItem,2,0,1,1)
-        self.hboxlayout = QtGui.QHBoxLayout()
-        self.hboxlayout.setObjectName("hboxlayout")
-        spacerItem1 = QtGui.QSpacerItem(331,20,QtGui.QSizePolicy.Expanding,QtGui.QSizePolicy.Minimum)
-        self.hboxlayout.addItem(spacerItem1)
+        self.BFichier = QtGui.QPushButton(self.TabPage)
+        self.BFichier.setGeometry(QtCore.QRect(330, 170, 140, 50))
+        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.BFichier.sizePolicy().hasHeightForWidth())
+        self.BFichier.setSizePolicy(sizePolicy)
+        self.BFichier.setMinimumSize(QtCore.QSize(140, 50))
+        self.BFichier.setObjectName("BFichier")
         self.BBrowse = QtGui.QPushButton(self.TabPage)
-        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed,QtGui.QSizePolicy.Fixed)
+        self.BBrowse.setGeometry(QtCore.QRect(330, 110, 140, 50))
+        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.BBrowse.sizePolicy().hasHeightForWidth())
         self.BBrowse.setSizePolicy(sizePolicy)
-        self.BBrowse.setMinimumSize(QtCore.QSize(140,50))
+        self.BBrowse.setMinimumSize(QtCore.QSize(140, 50))
         self.BBrowse.setObjectName("BBrowse")
-        self.hboxlayout.addWidget(self.BBrowse)
-        self.gridLayout_2.addLayout(self.hboxlayout,3,0,1,1)
-        spacerItem2 = QtGui.QSpacerItem(21,87,QtGui.QSizePolicy.Minimum,QtGui.QSizePolicy.Expanding)
-        self.gridLayout_2.addItem(spacerItem2,4,0,1,1)
-        self.TWChoix.addTab(self.TabPage,"")
-        self.textLabel1_3.setText(QtGui.QApplication.translate("DPour", "<font size=\"+1\">La commande POURSUITE requiert un nom de Fichier :</font>", None, QtGui.QApplication.UnicodeUTF8))
+        self.TWChoix.addTab(self.TabPage, "")
+        self.gridlayout.addWidget(self.TWChoix, 0, 0, 1, 3)
+
+        self.BFichier.setText(QtGui.QApplication.translate("DPour", "Autre Fichier", None, QtGui.QApplication.UnicodeUTF8))
         self.BBrowse.setText(QtGui.QApplication.translate("DPour", "Edit", None, QtGui.QApplication.UnicodeUTF8))
         self.TWChoix.setTabText(self.TWChoix.indexOf(self.TabPage), QtGui.QApplication.translate("DPour", "Fichier Poursuite", None, QtGui.QApplication.UnicodeUTF8))
 
-        self.LENomFichier.setText(self.node.item.object.jdc_aux.nom)
+        if hasattr(self.node.item.object,"fichier_ini"):
+           self.LENomFichier.setText(self.node.item.object.fichier_ini)
+
         self.connect(self.BBrowse,SIGNAL("clicked()"),self.BBrowsePressed)
+        self.connect(self.BFichier,SIGNAL("clicked()"),self.BFichierPressed)
+        self.connect(self.LENomFichier,SIGNAL("returnPressed()"),self.LENomFichReturnPressed)
+
 
 
   def BBrowsePressed(self):
-      self.node.makeEdit()
+      if hasattr(self.node.item,'object'):
+         self.node.makeEdit()
+
+  def BFichierPressed(self):
+      fichier = QFileDialog.getOpenFileName(self.appliEficas,
+                        self.appliEficas.trUtf8('Ouvrir Fichier'),
+                        self.appliEficas.CONFIGURATION.savedir,
+                        self.appliEficas.trUtf8('JDC Files (*.comm);;''All Files (*)'))
+      if not(fichier.isNull()):
+        self.LENomFichier.setText(fichier)
+      self.LENomFichReturnPressed()
+
+  def LENomFichReturnPressed(self):
+        nomFichier=str(self.LENomFichier.text())
+        if not os.path.isfile(nomFichier) :
+           commentaire = "Fichier introuvable"
+           self.Commentaire.setText(QString(commentaire))
+           self.editor.affiche_infos(commentaire)
+           return
+
+        text=self.convert_file(nomFichier)
+
+        # Si probleme a la lecture-conversion on arrete le traitement
+        if not text:
+           return
+
+        try :
+           self.node.item.object.change_fichier_init(nomFichier,text)
+           commentaire = "Fichier modifie  : " + self.node.item.get_nom()
+           self.Commentaire.setText(QString(commentaire))
+        except: 
+           l=traceback.format_exception_only("Fichier invalide",sys.exc_info()[1])
+           QMessageBox.critical( self, "Erreur fatale au chargement du fichier Include", l[0])
+           commentaire = "Fichier invalide" 
+           self.Commentaire.setText(QString(commentaire))
+           self.editor.affiche_infos(commentaire)
+           return
+
 
+  def convert_file(self,file):
+       """
+         Methode pour convertir le fichier file dans le format courant
+       """
+       try :
+          format=self.editor.format_fichier
+       except :
+          format="python"
+       text=None
+       if convert.plugins.has_key(format):
+          # Le convertisseur existe on l'utilise
+          p=convert.plugins[format]()
+          p.readfile(file)
+          text=p.convert('execnoparseur')
+       else :
+            commentaire = "Impossible de lire le fichier : Format inconnu"
+            self.Commentaire.setText(QString(commentaire))
+            self.editor.affiche_infos(commentaire)
+       return text
 
index 2e542999d00efdf3ba246af4301f4896bd98a642..a614405ec79ce3b434fdd98c37d93870e002b00b 100644 (file)
@@ -46,6 +46,7 @@ class DRac(Ui_DRac,QWidget):
        self.setupUi(self)
 
 
+
 # Import des panels
 
 class MonRacinePanel(DRac,QTPanelTBW2):
@@ -66,27 +67,19 @@ class MonRacinePanel(DRac,QTPanelTBW2):
         self.connect(self.LBNouvCommande,SIGNAL("doubleClicked(QListBoxItem*)"),self.LBNouvCommandeClicked)
         self.connect(self.LEFiltre,SIGNAL("textChanged(const QString&)"),self.LEFiltreTextChanged)
         self.connect(self.LEFiltre,SIGNAL("returnPressed()"),self.LEfiltreReturnPressed)
-        self.connect(self.bSup,SIGNAL("pressed()"),self.BSupPressed)
         self.connect(self.bOk,SIGNAL("clicked()"),self.BOkPressed)
-        self.connect(self.RBalpha,SIGNAL("clicked()"),self.BuildTabCommand)
-        self.connect(self.RBGroupe,SIGNAL("clicked()"),self.BuildTabCommand)
+        self.connect(self.RBalpha,SIGNAL("clicked()"),self.BuildTabCommandChanged)
+        self.connect(self.RBGroupe,SIGNAL("clicked()"),self.BuildTabCommandChanged)
         self.connect(self.BNext,SIGNAL("clicked()"),self.BNextPressed)
-        self.connect(self.bHelp,SIGNAL("clicked()"),self.ViewDoc)
-
-  def BSupPressed(self):
-      QTPanel.BSupPressed(self)
 
   def BOkPressed(self):
       self.DefCmd()
 
-  def ViewDoc(self):
-      QTPanel.ViewDoc(self)
-
   def BNextPressed(self):
       QTPanelTBW2.BNextPressed(self)
 
-  def BuildTabCommand(self):
-      QTPanelTBW2.BuildLBNouvCommande(self)
+  def BuildTabCommandChanged(self):
+      QTPanelTBW2.BuildLBNouvCommandChanged(self)
 
   def LEFiltreTextChanged(self):
       QTPanelTBW2.LEFiltreTextChanged(self)
index 24e8839747a18a053ed23f4fd77bf44cc00de140..421682a3f6d32a62d0bcaa6cc292d7bfd6271b96 100644 (file)
@@ -56,6 +56,7 @@ class MonSelectVal(DSelVal):
         self.connect(self.BImportTout,SIGNAL("clicked()"),self.BImportToutPressed)
 
   def readVal(self):
+        if self.file == "" : return
         f = open(self.file, "rb")
         self.texte = f.read()
         f.close()
@@ -92,6 +93,7 @@ class MonSelectVal(DSelVal):
         liste1=self.textTraite.split(self.separateur)
         liste=[]
         for val in liste1 :
+          if val != '' and val != ' ' and val != self.separateur :
             val=str(val)
             try :
               val=eval(val,{})
index 474f62faddf3330ffd25a8250552b555495e568e..fae8cab924581ef1c8bbaf49c0e472c2f0627fae 100644 (file)
@@ -66,20 +66,13 @@ class MonUniqueASSDPanel(DUnASSD,QTPanel,SaisieValeur):
         self.connecterSignaux()
 
   def connecterSignaux(self) :
-        self.connect(self.bHelp,SIGNAL("clicked()"),self.ViewDoc)
         self.connect(self.listBoxASSD,SIGNAL("itemDoubleClicked(QListWidgetItem*)"),self.ClicASSD)
         self.connect(self.bOk,SIGNAL("clicked()"),self.BOkPressed)
-        self.connect(self.bSup,SIGNAL("clicked()"),self.BSupPressed)
 
 
   def BOkPressed(self):
         self.ClicASSD()
 
-  def BSupPressed(self):
-        QTPanel.BSupPressed(self)
-
-  def ViewDoc(self):
-      QTPanel.ViewDoc(self)
 
   def InitCommentaire(self): 
       mc = self.node.item.get_definition()
index b53c79cbbd77aea36beba4d9c1a1e76466be7339..b57e5141816ca1ef891a2daf5051358d8188b4eb 100644 (file)
@@ -33,6 +33,7 @@ from politiquesValidation import PolitiqueUnique
 class DUnBase(Ui_DUnBase,QDialog):
    def __init__(self,parent ,modal ) :
        QDialog.__init__(self,parent)
+       self.appliEficas=parent.appliEficas
        if hasattr(parent,"leLayout"):
           parent.leLayout.removeWidget(parent.leLayout.widgetActive)
           parent.leLayout.widgetActive.close()
@@ -66,19 +67,18 @@ class MonUniqueBasePanel(DUnBase,QTPanel,SaisieValeur):
         self.connecterSignaux()
 
   def connecterSignaux(self) :
-        self.connect(self.bHelp,SIGNAL("clicked()"),self.ViewDoc)
         self.connect(self.bOk,SIGNAL("clicked()"),self.BOk2Pressed)
-        self.connect(self.bSup,SIGNAL("clicked()"),self.BSupPressed)
         self.connect(self.lineEditVal,SIGNAL("returnPressed()"),self.LEValeurPressed)
         self.connect(self.bParametres,SIGNAL("pressed()"),self.BParametresPressed)
         self.connect(self.BSalome,SIGNAL("pressed()"),self.BSalomePressed)
         self.connect(self.BView2D,SIGNAL("clicked()"),self.BView2DPressed)
+        self.connect(self.BFichier,SIGNAL("clicked()"),self.BFichierPressed)
 
-  def ViewDoc(self):
-      QTPanel.ViewDoc(self)
 
   def detruitBouton(self):
         mc = self.node.item.get_definition()
+        if self.node.item.get_nom() != "FileName" :
+           self.BFichier.close()
         type = mc.type[0]
         #if not('grma' in repr(type)) or not(self.editor.salome) :
         if not(('grma' in repr(type)) or ('grno' in repr(type))) or not(self.editor.salome) :
@@ -112,16 +112,22 @@ class MonUniqueBasePanel(DUnBase,QTPanel,SaisieValeur):
 
   def BOk2Pressed(self):
         SaisieValeur.BOk2Pressed(self)
-        if self.node.item.parent.nom == "FICXML" : 
+        if self.node.item.parent.nom == "MODEL" : 
                self.node.item.parent.change_fichier="1"
                 self.node.item.parent.build_include(None,"")
 
-  def BSupPressed(self):
-        QTPanel.BSupPressed(self)
+  def BFichierPressed(self):
+      fichier = QFileDialog.getOpenFileName(self.appliEficas,
+                        self.appliEficas.trUtf8('Ouvrir Fichier'),
+                        self.appliEficas.CONFIGURATION.savedir,
+                        self.appliEficas.trUtf8('Wrapper Files (*.xml);;''All Files (*)'))
+      if not(fichier.isNull()):
+         self.lineEditVal.setText(fichier)
 
+         
   def LEValeurPressed(self):
         SaisieValeur.LEValeurPressed(self)
-        if self.node.item.parent.nom == "FICXML" : 
+        if self.node.item.parent.nom == "MODEL" : 
                self.node.item.parent.change_fichier="1"
                 self.node.item.parent.build_include(None,"")
 
index 22eb994f1728e41f12b4274f7173d3bd7903402c..481ba3da026534f200a009aee6402b5d4458dd16 100644 (file)
@@ -64,9 +64,7 @@ class MonUniqueCompPanel(DUnComp,QTPanel,PolitiqueUnique):
         self.connecterSignaux()
 
   def connecterSignaux(self):
-        self.connect(self.bHelp,SIGNAL("clicked()"),self.ViewDoc)
         self.connect(self.bOk,SIGNAL("clicked()"),self.BOkPressed)
-        self.connect(self.bSup,SIGNAL("clicked()"),self.BSupPressed)
         self.connect(self.LEImag,SIGNAL("returnPressed()"),self.LEImagRPressed)
         self.connect(self.LEReel,SIGNAL("returnPressed()"),self.LEReelRPressed)
         self.connect(self.LEcomp,SIGNAL("returnPressed()"),self.LEcompRPressed)
@@ -181,9 +179,3 @@ class MonUniqueCompPanel(DUnComp,QTPanel,PolitiqueUnique):
         self.Commentaire.setText(QString(commentaire))
 
 
-  def BSupPressed(self):
-        QTPanel.BSupPressed(self)
-
-  def ViewDoc(self):
-      QTPanel.ViewDoc(self)
-
index ab634816a3df003720a5aa42d6a4784410e30128..017ae9fe7db62c966f00fc72e1aabf6933be4c22 100644 (file)
@@ -63,9 +63,7 @@ class MonUniqueIntoPanel(DUnIn,QTPanel,SaisieValeur):
 
   def connecterSignaux(self) :
         self.connect(self.listBoxVal, SIGNAL("itemDoubleClicked(QListWidgetItem*)" ), self.ClicValeur )
-        self.connect(self.bHelp,SIGNAL("clicked()"),self.ViewDoc)
         self.connect(self.bOk,SIGNAL("clicked()"),self.BOkPressed)
-        self.connect(self.bSup,SIGNAL("clicked()"),self.BSupPressed)
 
   def ClicValeur(self):
         SaisieValeur.ClicValeur(self)
@@ -74,9 +72,3 @@ class MonUniqueIntoPanel(DUnIn,QTPanel,SaisieValeur):
   def BOkPressed(self):
         SaisieValeur.BOkPressed(self)
 
-  def BSupPressed(self):
-        QTPanel.BSupPressed(self)
-
-  def ViewDoc(self):
-      QTPanel.ViewDoc(self)
-
index 8c5e45dc2ee3763f0638abe6910ab42e43587451..8126f44211f1f71160258f6da6fa250b49b756e6 100644 (file)
@@ -88,10 +88,3 @@ class MonUniqueSDCOIntoPanel(DUnSDCOInto,QTPanel,SaisieSDCO):
 
   def BOkPressed(self):
         self.LESDCOReturnPressed()
-
-  def BSupPressed(self):
-        QTPanel.BSupPressed(self)
-
-  def ViewDoc(self):
-      QTPanel.ViewDoc(self)
-
index d00b6e04ddfe4ea9836faf60a5a293220c246786..ee545c6190eedaee098d3bbe1d271f3115ea1235 100644 (file)
@@ -63,18 +63,13 @@ class MonUniqueSDCOPanel(DUnSDCO,QTPanel,SaisieSDCO):
         self.connecterSignaux()
 
   def connecterSignaux(self) :
-        self.connect(self.bHelp,SIGNAL("clicked()"),self.ViewDoc)
         self.connect(self.bOk,SIGNAL("clicked()"),self.BOkPressed)
-        self.connect(self.bSup,SIGNAL("clicked()"),self.BSupPressed)
         self.connect(self.LESDCO,SIGNAL("returnPressed()"),self.LESDCOReturnPressed)
 
 
-
   def BOkPressed(self):
         SaisieSDCO.LESDCOReturnPressed(self)
 
-  def BSupPressed(self):
-        QTPanel.BSupPressed(self)
 
   def BOuiPressed(self):
         self.Commentaire.setText("Aucun Objet de ce type n'est defini")
@@ -87,6 +82,4 @@ class MonUniqueSDCOPanel(DUnSDCO,QTPanel,SaisieSDCO):
         """
         SaisieSDCO.LESDCOReturnPressed(self)
 
-  def ViewDoc(self):
-      QTPanel.ViewDoc(self)
 
index a976f9717be6a707f34d5723d8da1b989f225c05..062f9a870cce77db7a569f16586a714264561857 100644 (file)
@@ -120,8 +120,6 @@ class PolitiquePlusieurs:
          commentaire="Nouvelle valeur acceptée"
          commentaire2=""
          valide=1
-         if listevaleur==None: return
-         if listevaleur=="": return
          if not( type(listevaleur)  in (types.ListType,types.TupleType)) :
             listevaleur=tuple(listevaleur)
          for valeur in listevaleur :
@@ -158,3 +156,35 @@ class PolitiquePlusieurs:
              listeRetour.append(valeur)
 
          return valide,commentaire,commentaire2,listeRetour
+
+  def AjoutTuple(self,valeurTuple,index,listecourante):
+         listeRetour=[]
+         commentaire="Nouvelle valeur acceptée"
+         commentaire2=""
+         valide=1
+         if valeurTuple==None: return
+         if valeurTuple==['']: return
+         # On teste le type de la valeur
+         valide=self.node.item.valide_item(valeurTuple)
+         if not valide :
+            try :
+                valeur,valide=self.node.item.eval_valeur(valeurTuple)
+                valide = self.node.item.valide_item(valeur)
+            except :
+                pass
+         if not valide:
+            commentaire="Valeur "+str(valeurTuple)+ " incorrecte : ajout à la liste refusé"
+            commentaire2=self.node.item.info_erreur_item()
+            return valide,commentaire,commentaire2,listeRetour
+
+         # On valide la liste obtenue
+         encorevalide=self.node.item.valide_liste_partielle(valeurTuple,listecourante)
+         if not encorevalide :
+            commentaire2=self.node.item.info_erreur_liste()
+            # On traite le cas ou la liste n est pas valide pour un pb de cardinalite
+            min,max = self.node.item.GetMinMax()
+            if len(listecourante) + 1 >= max :
+               commentaire="La liste a déjà atteint le nombre maximum d'éléments,ajout refusé"
+               return valide,commentaire,commentaire2,listeRetour
+         listeRetour.append(valeurTuple)
+         return valide,commentaire,commentaire2,listeRetour
index ad7b6df291a3609034afcf3f1497b331a5d03f66..5e50d0e40778f1aed5d941866db6d7463a6e1db5 100644 (file)
@@ -43,44 +43,10 @@ class QTPanel:
         self.editor    = parent
         self.node      = node
         
-  def BSupPressed(self):
-        self.editor.init_modif()
-        self.node.delete()
-        
-  def ViewDoc(self) :
-      cle_doc = self.node.item.get_docu()
-      if cle_doc == None :
-         QMessageBox.information( self.editor, "Documentation Vide", \
-                                  "Aucune documentation Aster n'est associée à ce noeud")
-         return
-      cle_doc = string.replace(cle_doc,'.','')
-      cle_doc = string.replace(cle_doc,'-','')
-      commande = self.editor.appliEficas.CONFIGURATION.exec_acrobat
-      try :
-         f=open(commande,"rb")
-      except :
-         texte="impossible de trouver la commande  " + commande
-         QMessageBox.information( self.editor, "Lecteur PDF", texte)
-         return
-      nom_fichier = cle_doc+".pdf"
-      fichier = os.path.abspath(os.path.join(self.editor.CONFIGURATION.path_doc,
-                                       nom_fichier))
-      try :
-         f=open(fichier,"rb")
-      except :
-         texte="impossible d'ouvrir " + fichier
-         QMessageBox.information( self.editor, "Documentation Vide", texte)
-         return
-      if os.name == 'nt':
-          os.spawnv(os.P_NOWAIT,commande,(commande,fichier,))
-      elif os.name == 'posix':
-          script ="#!/usr/bin/sh \n%s %s&" %(commande,fichier)
-          pid = os.system(script)
-
   def BOkPressed(self):
         """ Impossible d utiliser les vrais labels avec designer ?? """
         label=self.TWChoix.tabText(self.TWChoix.currentIndex())
-        #print label
+        print label
         if label==QString("Nouvelle Commande"):
            self.DefCmd()
         if label==QString("Nommer Concept"):
@@ -171,18 +137,33 @@ class QTPanelTBW2(QTPanel):
         self.node      = node
         self.BuildLBNouvCommande()
         self.NbRecherches = 0
-        if racine == 1 : self.AppelleBuildLBRegles()
+        if racine == 1 :
+           self.AppelleBuildLBRegles()
+        else :
+           self.connect(self.TWChoix, SIGNAL("currentChanged(QWidget *)"), self.handleCurrentChanged)
+
+
+  def handleCurrentChanged(self):
+        try :
+           self.LEFiltre.setFocus()
+        except :
+           pass
 
       
   def BuildLBNouvCommande(self):
         self.LBNouvCommande.clear()
 
         jdc=self.node.item.object.get_jdc_root()
-        if self.RBalpha.isChecked():
+        if self.editor.mode_nouv_commande == "alpha":
+           self.RBalpha.setChecked(True)
+           self.RBGroupe.setChecked(False)
            listeCmd = jdc.get_liste_cmd()
            for aCmd in listeCmd:
               self.LBNouvCommande.addItem( aCmd )
-        else :
+        elif self.editor.mode_nouv_commande== "groupe" :
+           self.RBGroupe.setChecked(True)
+           self.RBalpha.setChecked(False)
+
            listeGroupes,dictGroupes=jdc.get_groups()
            for grp in listeGroupes:
               if grp == "CACHE":continue
@@ -193,12 +174,24 @@ class QTPanelTBW2(QTPanel):
               for aCmd in listeCmd:
                  self.LBNouvCommande.addItem( aCmd)
               self.LBNouvCommande.addItem( " " )
+        elif self.editor.mode_nouv_commande== "initial" :
+           listeCmd =  self.editor.Commandes_Ordre_Catalogue
+           listeCmd2=jdc.get_liste_cmd()
+           if len(listeCmd) != len(listeCmd2):
+               listeCmd        = listeCmd2
+           for aCmd in listeCmd:
+              self.LBNouvCommande.addItem( aCmd )
         #QObject.connect( self.LBNouvCommande, SIGNAL("itemClicked(QListWidgetItem*)"),self.DefCmd )
         QObject.connect( self.LBNouvCommande, SIGNAL("itemDoubleClicked(QListWidgetItem*)"),self.DefCmd )
 
+  def BuildLBNouvCommandChanged(self) :
+        if self.RBalpha.isChecked():
+           self.editor.mode_nouv_commande="alpha"
+        else :
+           self.editor.mode_nouv_commande="groupe"
+        self.BuildLBNouvCommande()
+
   def DefCmd(self):
-        if (self.editor.focusWidget())!=self.LBNouvCommande :
-            return 
         if self.LBNouvCommande.currentItem()== 0 : return
         if self.LBNouvCommande.currentItem()== None : return
         name=str(self.LBNouvCommande.currentItem().text())
@@ -283,7 +276,7 @@ class ViewText(Ui_dView,QDialog):
         self.parent=parent
         self.setupUi(self)
 
-        self.resize( QSize(600,507).expandedTo(self.minimumSizeHint()) )
+        self.resize( QSize(600,600).expandedTo(self.minimumSizeHint()) )
         self.connect( self.bclose,SIGNAL("clicked()"), self, SLOT("close()") )
         self.connect( self.bsave,SIGNAL("clicked()"), self.saveFile )
         
index 54921093cc1261e2608a467f276d39f97b9fc1fc..5d27974e7ae0577dbe99cb72689c769f26007a19 100644 (file)
@@ -10,8 +10,6 @@ from viewManager import MyTabview
 
 from Editeur import session
 
-dirCode={"ASTER":"Aster","OPENTURNS_WRAPPER":"Openturns_Wrapper"}
-
 
 class Appli(Ui_Eficas,QMainWindow):    
     """
@@ -26,20 +24,30 @@ class Appli(Ui_Eficas,QMainWindow):
         self.salome=salome
         self.format_fichier="python"   #par defaut
        self.top = self #(pour CONFIGURATION)
+        self.QWParent=None #(Pour lancement sans IHM)
 
         import prefs
-        self.REPINI=prefs.REPINI
-        import configuration
-        self.CONFIGURATION = configuration.make_config(self,prefs.REPINI)
-        self.CONFIGStyle = configuration.make_config_style(self,prefs.REPINI)
-        if hasattr(prefs,'encoding'):
+        if salome :
+           import sys
+        prefs.code=code
+        name='prefs_'+prefs.code
+        prefsCode=__import__(name)
+        nameConf='configuration_'+prefs.code
+        configuration=__import__(nameConf)
+
+        self.REPINI=prefsCode.REPINI
+        self.RepIcon=prefsCode.INSTALLDIR+"/Editeur/icons"
+        self.CONFIGURATION = configuration.make_config(self,prefsCode.REPINI)
+        self.CONFIGStyle = configuration.make_config_style(self,prefsCode.REPINI)
+        if hasattr(prefsCode,'encoding'):
            import sys
            reload(sys)
-           sys.setdefaultencoding(prefs.encoding)
+           sys.setdefaultencoding(prefsCode.encoding)
 
         QMainWindow.__init__(self)
         Ui_Eficas.__init__(self)
         self.setupUi(self)
+        self.ajoutIcones()
         self.viewmanager = MyTabview(self) 
         self.recentMenu=self.menuFichier.addMenu(self.trUtf8('&Recents'))
         self.connecterSignaux() 
@@ -63,6 +71,21 @@ class Appli(Ui_Eficas,QMainWindow):
         self.MenuBar.removeItem(6)
         self.MenuBar.removeItem(7)
 
+    def ajoutIcones(self) :
+        # Pour pallier les soucis de repertoire d icone
+        icon = QIcon(self.RepIcon+"/New24.png")
+        self.action_Nouveau.setIcon(icon)
+        icon1 = QIcon(self.RepIcon+"/Open24.png")
+        self.action_Ouvrir.setIcon(icon1)
+        icon2 = QIcon(self.RepIcon+"/Save24.png")
+        self.actionEnregistrer.setIcon(icon2)
+        icon3 = QIcon(self.RepIcon+"/Cut24.png")
+        self.actionCouper.setIcon(icon3)
+        icon4 = QIcon(self.RepIcon+"/Copy24.png")
+        self.actionCopier.setIcon(icon4)
+        icon5 = QIcon(self.RepIcon+"/Paste24.png")
+        self.actionColler.setIcon(icon5)
+
 
     def connecterSignaux(self) :
         self.connect(self.recentMenu,SIGNAL('aboutToShow()'),self.handleShowRecentMenu)
@@ -292,12 +315,12 @@ if __name__=='__main__':
 
     # Modules Eficas
     sys.path.append(INSTALLDIR+"/Aster")
-    from Aster import prefs
-    if hasattr(prefs,'encoding'):
+    from Aster import prefsCode
+    if hasattr(prefsCode,'encoding'):
        # Hack pour changer le codage par defaut des strings
        import sys
        reload(sys)
-       sys.setdefaultencoding(prefs.encoding)
+       sys.setdefaultencoding(prefsCode.encoding)
        del sys.setdefaultencoding
        # Fin hack
 
index c0fd8a43694696918f85a5c24929fc471c705db7..be089958ae4db09c730202941cb72d3aa3f0888e 100644 (file)
@@ -109,6 +109,18 @@ class SaisieValeur:
             self.editor.affiche_infos(commentaire)
 
 
+  def TraiteLEValeurTuple(self) :
+        listeValeurs=[]
+        valeurBrute=str(self.LEValeur.text())
+        listeValeursSplit=valeurBrute.split(',')
+        for val in listeValeursSplit :
+            try :
+               valeur=eval(val,{})        
+            except :
+               valeur=val
+            listeValeurs.append(valeur)
+        return listeValeurs
+
   def TraiteLEValeur(self,valeurTraitee=None) :
         # lit la chaine entree dans le line edit
         # et la tranforme en chaine de valeurs
index 8a2f645ca2bed6dd89fe1285f8b036dfb6647c57..7c11bbfefc1ef8849ab6ddb1d06b2118210f72ad 100644 (file)
@@ -35,6 +35,7 @@ from Noyau.N_CR import CR
 from Editeur.utils  import init_rep_cata_dev
 
 import analyse_catalogue
+import analyse_catalogue_initial
 import autre_analyse_cata
 import uiinfo
 from monChoixCata import MonChoixCata
@@ -43,7 +44,7 @@ from PyQt4 import *
 from PyQt4.QtGui import *
 from PyQt4.QtCore import *
 
-VERSION_EFICAS="Eficas V1.15"
+VERSION_EFICAS="Eficas V1.16"
 
 class READERCATA:
 
@@ -52,6 +53,10 @@ class READERCATA:
       self.appliEficas=self.QWParent.appliEficas
       self.code=self.QWParent.code
       self.appliEficas.format_fichier='python'
+      if hasattr(self.appliEficas,'mode_nouv_commande'):
+        self.mode_nouv_commande=self.appliEficas.mode_nouv_commande
+      else :
+         self.mode_nouv_commande='alpha'
       self.version_code=self.QWParent.version_code
       self.version_cata=None
       self.fic_cata=None
@@ -63,7 +68,6 @@ class READERCATA:
           Ouvre le catalogue standard du code courant, cad le catalogue présent
           dans le répertoire Cata 
       """
-      message1 = "Compilation des fichiers Eficas \n\n Veuillez patienter ..."
 
       liste_cata_possibles=[]
       for catalogue in self.appliEficas.CONFIGURATION.catalogues:
@@ -92,7 +96,7 @@ class READERCATA:
           lab+=QString(" avec le catalogue ")
           lab+=self.version_code
           try :
-          # souci pour les includes
+          # souci pour les includes et sans Ihm
               self.appliEficas.setWindowTitle(lab)
           except :
               pass
@@ -125,6 +129,10 @@ class READERCATA:
       # remplacé par Retrouve_Ordre_Cata_Standard_autre qui utilise une numerotation
       # des mots clés a la création
       self.Retrouve_Ordre_Cata_Standard_autre()
+      if self.mode_nouv_commande== "initial" :
+         self.Retrouve_Ordre_Cata_Standard()
+      else:
+         self.Commandes_Ordre_Catalogue=[]
 
       #
       # analyse des données liées a  l'IHM : UIinfo
@@ -183,52 +191,11 @@ class READERCATA:
    def Retrouve_Ordre_Cata_Standard(self):
       """ 
           Retrouve l'ordre des mots-clés dans le catalogue, cad :
-           - si ce dernier a été modifié, relance l'analyse du catalogue pour déterminer
-               l'ordre des mots-clés dans le catalogue
-           - s'il n'a pas été modifié, relie le fichier pickle 
+          Attention s appuie sur les commentaires
       """
-      time1 = os.path.getmtime(self.fic_cata)
-      try :
-          time2 = os.path.getmtime(self.fic_cata_p)
-      except:
-          time2 = 0
-      if time2 > time1 :
-          # l'objet catalogue n'a pas été modifié depuis le dernier "pickle"
-          self.Get_Ordre_Cata()
-      else :
-          # le catalogue a été modifié depuis le dernier "pickle" :
-          # il faut retrouver l'ordre du catalogue et refaire pickle
-          self.Get_Ordre_Cata(mode='cata')
-      self.appliEficas.affiche_infos("Catalogue standard chargé")
-
-
-   def Get_Ordre_Cata(self,mode='pickle'):
-      """ 
-          Retrouve l'ordre du catalogue :
-            - mode='pickle ': tente de relire le fichier pickle et sinon lance l'analyse du catalogue
-            - mode='cata'   : force l'analyse du catalogue directement sans relire le pickle
-      """
-      if mode == 'pickle' :
-          try:
-              f = open(self.fic_cata_p)
-              u = cPickle.Unpickler(f)
-              self.cata_ordonne_dico = u.load()
-              f.close()
-          except :
-              # on peut ne pas arriver a  relire le fichier pickle s'il a été altéré
-              # ou (le plus probable) s'il a été créé sous un autre OS
-              self.Get_Ordre_Cata(mode='cata')
-      elif mode == 'cata':
-          cata_ordonne = analyse_catalogue.analyse_catalogue(self,self.fic_cata)
-          self.cata_ordonne_cr = cata_ordonne.cr
-          self.cata_ordonne_dico = cata_ordonne.entites
-          f = open(self.fic_cata_p,'w+')
-          p = cPickle.Pickler(f)
-          p.dump(self.cata_ordonne_dico)
-          f.close()
-      else :
-          raise Exception("Appel a  un mode inconnu de Get_Ordre_Cata : %s" % mode)
-          return
+      nom_cata = os.path.splitext(os.path.basename(self.fic_cata))[0]
+      rep_cata = os.path.dirname(self.fic_cata)
+      self.Commandes_Ordre_Catalogue = analyse_catalogue_initial.analyse_catalogue(self.fic_cata)
 
    def ask_choix_catalogue(self):
       """
@@ -246,8 +213,7 @@ class READERCATA:
       liste_choix = self.dico_catalogues.keys()
       liste_choix.sort()
 
-      lab=QString("Eficas V1.") 
-      lab+=QString(version) 
+      lab=QString(VERSION_EFICAS)
       lab+=QString(" pour ")
       lab+=QString(self.code) 
       lab+=QString(" avec le catalogue ")
@@ -262,8 +228,7 @@ class READERCATA:
       widgetChoix=MonChoixCata(liste_choix,self, self.appliEficas, "", True )
       ret=widgetChoix.exec_()
       
-      lab=QString("Eficas V1.") 
-      lab+=QString(version) 
+      lab=QString(VERSION_EFICAS)
       lab+=QString(" pour ")
       lab+=QString(self.code) 
       lab+=QString(" avec le catalogue ")
@@ -279,46 +244,6 @@ class READERCATA:
           sys.exit(0)
 
 
-   def compile_cata(self,cata,catac):
-      """ 
-           Teste si le catalogue a bien besoin d'etre recompilé et si oui, le compile et
-           affiche un message dans le splash . Retourne 1 si la compilation s'est bien déroulée,
-           0 sinon.
-      """
-      time1 = os.path.getmtime(cata)
-      try:
-          time2 = os.path.getmtime(catac)
-      except:
-          time2 = 0
-      if time1 > time2:
-          try:
-              # le catalogue doit etre recompilé avant d'etre importé
-              if self.QWParent.test == 0 :
-                 splash._splash.configure(text="Compilation du catalogue\nCela peut prendre plusieurs secondes ...")
-              py_compile.compile(cata)
-          except:
-              return 0
-      return 1
-
-
-
-   def visuCRCATA(self):
-      """
-      Méthode permettant l'affichage du rapport de validation
-      """
-      cr = CR( debut = "Début rapport de validation du catalogue",
-               fin = "Fin rapport de validation du catalogue")
-      titre="rapport de validation du catalogue"
-      if hasattr(self,'cata_ordonne_cr') :
-          cr.add(self.cata_ordonne_cr)
-      if hasattr(self,'cata_dev_ordonne_cr') :
-          cr.add(self.cata_dev_ordonne_cr)
-      for cata in self.cata:
-          if hasattr(cata,'JdC'):
-              cr.add(cata.JdC.report())
-      texte_cr = str(cr)
-      self.visu_texte_cr = Fenetre(self.appliEficas,titre=titre,texte=texte_cr)
-
 
    def traite_clefs_documentaires(self):
       try:
index f3e84ec18414fbaddfed9c74f83296e11a8f31cd..a8443feb29e9fea27afd1b5bdf913d17a4899f65 100644 (file)
@@ -4,21 +4,11 @@ from PyQt4.QtGui import *
 from PyQt4.QtCore import *
 
 #---------------------------#
-class PopUpMenuNodePartiel :
+class PopUpMenuNodeMinimal :
 #---------------------------#
     def createPopUpMenu(self):
         self.createActions()
-
         self.menu = QMenu(self.tree)
-        #ss-menu Comment:
-        self.commentMenu=self.menu.addMenu('Commentaire')
-        self.commentMenu.addAction(self.CommApres)
-        self.commentMenu.addAction(self.CommAvant)
-        #ss-menu Parameters:
-        self.paramMenu =self.menu.addMenu('Parametre') 
-        self.paramMenu.addAction(self.ParamApres)
-        self.paramMenu.addAction(self.ParamAvant)
-
         #items du menu
         self.menu.addAction(self.Supprime)
     
@@ -40,11 +30,46 @@ class PopUpMenuNodePartiel :
         self.Supprime = QAction('Supprimer',self.tree)
         self.tree.connect(self.Supprime,SIGNAL("activated()"),self.supprimeNoeud)
         self.Supprime.setStatusTip("supprime le mot clef ")
+        self.Documentation = QAction('Documentation',self.tree)
+        self.tree.connect(self.Documentation,SIGNAL("activated()"),self.viewDoc)
+        self.Documentation.setStatusTip("documentation sur la commande ")
 
     def supprimeNoeud(self):
         item= self.tree.currentItem()
         item.delete()
 
+    def viewDoc(self):
+        self.node=self.tree.currentItem()
+        cle_doc = self.node.item.get_docu()
+        if cle_doc == None :
+            QMessageBox.information( self.editor, "Documentation Vide", \
+                                    "Aucune documentation Aster n'est associée à ce noeud")
+        return
+        #cle_doc = string.replace(cle_doc,'.','')
+        #cle_doc = string.replace(cle_doc,'-','')
+        #print dir(self)
+        commande = self.editor.appliEficas.CONFIGURATION.exec_acrobat
+        try :
+            f=open(commande,"rb")
+        except :
+             texte="impossible de trouver la commande  " + commande
+             QMessageBox.information( self.editor, "Lecteur PDF", texte)
+             return
+        nom_fichier = cle_doc+".pdf"
+        fichier = os.path.abspath(os.path.join(self.editor.CONFIGURATION.path_doc,
+                                       nom_fichier))
+        try :
+           f=open(fichier,"rb")
+        except :
+           texte="impossible d'ouvrir " + fichier
+           QMessageBox.information( self.editor, "Documentation Vide", texte)
+           return
+        if os.name == 'nt':
+           os.spawnv(os.P_NOWAIT,commande,(commande,fichier,))
+        elif os.name == 'posix':
+            script ="#!/usr/bin/sh \n%s %s&" %(commande,fichier)
+            pid = os.system(script)
+
     def addParametersApres(self):
         item= self.tree.currentItem()
         item.addParameters(True)
@@ -61,6 +86,22 @@ class PopUpMenuNodePartiel :
         item= self.tree.currentItem()
         item.addComment(False)
 
+#--------------------------------------------#
+class PopUpMenuNodePartiel (PopUpMenuNodeMinimal):
+#---------------------------------------------#
+    def createPopUpMenu(self):
+        PopUpMenuNodeMinimal.createPopUpMenu(self)
+        #ss-menu Comment:
+        self.commentMenu=self.menu.addMenu('Commentaire')
+        self.commentMenu.addAction(self.CommApres)
+        self.commentMenu.addAction(self.CommAvant)
+        #ss-menu Parameters:
+        self.paramMenu =self.menu.addMenu('Parametre') 
+        self.paramMenu.addAction(self.ParamApres)
+        self.paramMenu.addAction(self.ParamAvant)
+        self.menu.addAction(self.Documentation)
+
+
 #-----------------------------------------#
 class PopUpMenuNode(PopUpMenuNodePartiel) :
 #-----------------------------------------#
index 12a9f825f1d77d3079025bc396d42c24f2106b3c..67e4c75e48e582c905db7e993797bfea4d64a8e2 100644 (file)
@@ -73,32 +73,32 @@ class MyTabview:
 
    def handleCloseAll(self):
        self.appliEficas.sauveRecents()
-       print "passage dans CloseAll"
+       #print "passage dans CloseAll"
        print "self.dict_editors", self.dict_editors
        while len(self.dict_editors) > 0 :
              self.myQtab.setCurrentIndex(0)
              self.handleClose(0)
         
    def handleEditCopy(self):
-       print "passage dans handleEditCopy"
+       #print "passage dans handleEditCopy"
        index=self.myQtab.currentIndex()
        editor=self.dict_editors[index]
        editor.handleEditCopy()
 
    def handleEditCut(self):
-       print "passage dans handleEditCut"
+       #print "passage dans handleEditCut"
        index=self.myQtab.currentIndex()
        editor=self.dict_editors[index]
        editor.handleEditCut()
 
    def handleEditPaste(self):
-       print "passage dans handleEditPaste"
+       #print "passage dans handleEditPaste"
        index=self.myQtab.currentIndex()
        editor=self.dict_editors[index]
        editor.handleEditPaste()
 
    def newEditor(self,include=0):
-       print "passage dans newEditor"
+       #print "passage dans newEditor"
        maPage=self.getEditor()
 
    def newIncludeEditor(self):
index f08b160d8fa2ddaab47b3c9c4bc7a1f5ef52c398..668f00483e006f1473bc0f02fb85a0e041f0d20e 100644 (file)
@@ -55,7 +55,7 @@ import listePatronsTK
 REPTK=os.path.dirname(os.path.abspath(__file__))
 sys.path[:0]=[REPTK]
 
-VERSION="EFICAS v1.15"
+VERSION="EFICAS v1.16"
 
 class APPLI: 
   def __init__ (self,master,code=prefs.code,fichier=None,test=0,ihm="TK",salome=0) :
index 59b0ab86fe2df7f475163d0a0a6c38478058738b..2c2d6680727364d17e1f65fc78bd5deacf2b43a1 100644 (file)
@@ -461,6 +461,7 @@ class BUREAU:
          jdc_formate=g.gener(self.JDC,format='beautifie')
          if format == 'homard':
             self.jdc_homard=g.get_homard()
+            #print "hhhhhhhh"
         elif format == 'openturns' :
            self.jdc_openturn_xml=g.getOpenturnsXML()
            self.jdc_openturn_std=g.getOpenturnsSTD()
@@ -664,11 +665,11 @@ class BUREAU:
       try:
           cle_doc = self.JDCDisplay_courant.node_selected.item.get_docu()
           if cle_doc == None : return
-          cle_doc = string.replace(cle_doc,'.','')
-          cle_doc = string.replace(cle_doc,'-','')
           commande = self.appli.CONFIGURATION.exec_acrobat
-          nom_fichier = cle_doc+".pdf"
-          fichier = os.path.abspath(os.path.join(self.appli.CONFIGURATION.path_doc,nom_fichier))
+          fichier = os.path.abspath(os.path.join(self.appli.CONFIGURATION.path_doc,cle_doc))
+          if os.path.isfile(fichier) == 0:
+              showerror("Pas de Documentation", "Eficas ne trouve pas de fichier documentation associe a cette commande")
+              return
           if os.name == 'nt':
               os.spawnv(os.P_NOWAIT,commande,(commande,fichier,))
           elif os.name == 'posix':
@@ -794,14 +795,17 @@ class BUREAU:
       if (FichieraTraduire == "" or FichieraTraduire == () ) : return
       i=FichieraTraduire.rfind(".")
       Feuille=FichieraTraduire[0:i]
-      FichierTraduit=Feuille+"v8.comm"
       log=self.savedir+"/convert.log"
-      os.system("rm -rf "+log)
-      os.system("rm -rf "+FichierTraduit)
       Pmw.showbusycursor()
+      FichierTraduit=""
+      os.system("rm -rf "+log)
       if version == 7 :
+         FichierTraduit=Feuille+"v8.comm"
+         os.system("rm -rf "+FichierTraduit)
          traduitV7V8.traduc(FichieraTraduire,FichierTraduit,log)
       else :
+         FichierTraduit=Feuille+"v9.comm"
+         os.system("rm -rf "+FichierTraduit)
          traduitV8V9.traduc(FichieraTraduire,FichierTraduit,log)
       Pmw.hidebusycursor()
       Entete="Fichier Traduit : "+FichierTraduit +"\n\n"
@@ -816,7 +820,7 @@ class BUREAU:
           commande="diff "+FichieraTraduire+" "+FichierTraduit+" >/dev/null"
           try :
             if os.system(commande) == 0 :
-               texte_cr = texte_cr + "Pas de difference entre le fichier V7 et le fichier traduit"
+               texte_cr = texte_cr + "Pas de difference entre le fichier initial et le fichier traduit"
           except :
                pass
 
index b84a5697a98b9b8ee5577b4da66010f31ed692ae..d1f724913e0ba4f337cea5d0a4a986a77c751d5f 100644 (file)
@@ -26,7 +26,7 @@ import time
 import traceback
 
 import widgets
-from widgets import ListeChoix
+from widgets import ListeChoix, showerror
 from widgets import ListeChoixParGroupes
 import prefs
 import options
@@ -184,12 +184,15 @@ class Panel(Frame) :
         - indication du chemin d'accès aux fichiers pdf à revoir : trop statique"""
       cle_doc = self.node.item.get_docu()
       if cle_doc == None : return
-      cle_doc = string.replace(cle_doc,'.','')
-      cle_doc = string.replace(cle_doc,'-','')
+      #cle_doc = string.replace(cle_doc,'.','')
+      #cle_doc = string.replace(cle_doc,'-','')
       commande = self.parent.appli.CONFIGURATION.exec_acrobat
-      nom_fichier = cle_doc+".pdf"
+      nom_fichier = cle_doc
       fichier = os.path.abspath(os.path.join(self.parent.appli.CONFIGURATION.path_doc,
                                        nom_fichier))
+      if os.path.isfile(fichier) == 0:
+           showerror("Pas de Documentation", "Eficas ne trouve pas de fichier documentation associe a cette commande")
+           return
       if os.name == 'nt':
           os.spawnv(os.P_NOWAIT,commande,(commande,fichier,))
       elif os.name == 'posix':
index 2d5fc4a2fd06b1566a61a046abd1ad923e87d299..8febcbb947f1fb561c0005ff3477270ad6ab0d78 100644 (file)
@@ -8,7 +8,7 @@ inistylefile=os.path.join(prefs.REPINI,"style.py")
 if os.path.isfile(inistylefile):
    execfile(inistylefile)
 
-userstylefile=os.path.expanduser("~/Eficas_install/style.py")
+userstylefile=os.path.expanduser("~/.Eficas_install/style.py")
 if os.path.isfile(userstylefile):
    execfile(userstylefile)
 
index e978db2a67c92d8e8d20bdaba09440afa18d9e9e..13a6f92ed695487c96616269df0cf31f037b3d72 100644 (file)
@@ -33,7 +33,7 @@ from tkFileDialog import *
 from tkMessageBox import showinfo,askyesno,showerror,askretrycancel
 
 import fontes
-import prefs
+
 from Editeur.utils import save_in_file
 from centerwindow import centerwindow
 
@@ -707,7 +707,6 @@ class Formulaire:
             self.resultat = apply(self.command[1],(),{})
             self.fenetre.destroy()
         else :
-            print "Nom de bouton inconnu"
             self.quit()
 
     def fini(self):
index afddca075b695235176ada28edeff2790e2a2620..0bd093ab8e3b4591530d09503fa818c5365ea2a1 100755 (executable)
@@ -3,6 +3,7 @@
 
 import Accas
 from Accas import *
+import types
 
 #CONTEXT.debug=1
 
@@ -1753,3 +1754,38 @@ RETOUR=PROC(nom="RETOUR",op= -2,docu="U4.13.02-e",
             fr="Retour au fichier de commandes appelant",
 ) ;
 
+class LongStr:
+  def __init__(self,min,max):
+    self.min=min
+    self.max=max
+  def __convert__(self,valeur):
+    if type(valeur) == types.StringType:
+      if self.min <= len(valeur) <= self.max:
+        return valeur
+    return None
+  def info(self):
+    return "Chaine de longueur comprise entre %s et %s" % (self.min,self.max)
+  __repr__=info
+  __str__=info
+
+class Tuple:
+  def __init__(self,ntuple):
+    self.ntuple=ntuple
+
+  def __convert__(self,valeur):
+    if type(valeur) == types.StringType:
+      return None
+    if len(valeur) != self.ntuple:
+      return None
+    return valeur
+
+  def info(self):
+    return "Tuple de %s elements" % self.ntuple
+  __repr__=info
+  __str__=info
+
+CCAR=PROC(nom="CCAR",op=15,MCS=SIMP(typ=Tuple(3),statut='o',min=1,max=5),
+                     MCS1=SIMP(typ=(Tuple(2),LongStr(3,8)),statut='o',min=3,max=8),
+                     MCS2=SIMP(typ=Tuple(2),statut='o',min=3,max=8),
+                     MCS3=SIMP(typ='R',statut='o',min=3,max=8),
+         )
diff --git a/Minicode/configuration.py b/Minicode/configuration.py
new file mode 100644 (file)
index 0000000..c885f3e
--- /dev/null
@@ -0,0 +1,366 @@
+# -*- coding: utf-8 -*-
+#            CONFIGURATION MANAGEMENT OF EDF VERSION
+# ======================================================================
+# COPYRIGHT (C) 1991 - 2002  EDF R&D                  WWW.CODE-ASTER.ORG
+# THIS PROGRAM IS FREE SOFTWARE; YOU CAN REDISTRIBUTE IT AND/OR MODIFY
+# IT UNDER THE TERMS OF THE GNU GENERAL PUBLIC LICENSE AS PUBLISHED BY
+# THE FREE SOFTWARE FOUNDATION; EITHER VERSION 2 OF THE LICENSE, OR
+# (AT YOUR OPTION) ANY LATER VERSION.
+#
+# THIS PROGRAM IS DISTRIBUTED IN THE HOPE THAT IT WILL BE USEFUL, BUT
+# WITHOUT ANY WARRANTY; WITHOUT EVEN THE IMPLIED WARRANTY OF
+# MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. SEE THE GNU
+# GENERAL PUBLIC LICENSE FOR MORE DETAILS.
+#
+# YOU SHOULD HAVE RECEIVED A COPY OF THE GNU GENERAL PUBLIC LICENSE
+# ALONG WITH THIS PROGRAM; IF NOT, WRITE TO EDF R&D CODE_ASTER,
+#    1 AVENUE DU GENERAL DE GAULLE, 92141 CLAMART CEDEX, FRANCE.
+#
+#
+# ======================================================================
+"""
+    Ce module sert pour charger les paramètres de configuration d'EFICAS
+"""
+# Modules Python
+import os, sys, string, types, re
+import traceback
+
+# Modules Eficas
+from Editeur import utils
+
+class CONFIGbase:
+
+  #-----------------------------------
+  def __init__(self,appli):
+  #-----------------------------------
+
+  # Classe de base permettant de lire, afficher
+  # et sauvegarder les fichiers utilisateurs editeur.ini
+  # et style.py
+  # Classe Mere de : class CONFIG(CONFIGbase)
+  #                  class CONFIGStyle(CONFIGbase):
+      self.appli = appli  
+      self.salome = appli.salome
+      self.dRepMat={}
+      if self.appli:
+         self.parent=appli.top
+      else:
+         self.parent=None
+      self.rep_user = utils.get_rep_user()
+      self.lecture_fichier_ini_standard()
+      self.lecture_catalogues_standard()
+      self.lecture_fichier_ini_utilisateur()
+      self.init_liste_param()
+
+  #--------------------------------------
+  def lecture_fichier_ini_standard(self):
+  #--------------------------------------
+  # Verifie l'existence du fichier "standard"
+  # appelle la lecture de ce fichier
+      if not os.path.isfile(self.fic_ini):
+          if self.appli.ihm=="TK" :
+              from widgets import showerror
+              showerror("Erreur","Pas de fichier de configuration" + self.fic_ini+"\n")
+          print "Erreur à la lecture du fichier de configuration : %s" % self.fic_ini
+          sys.exit(0)
+      self.lecture_fichier(self.fic_ini)
+
+  #-----------------------------
+  def lecture_fichier(self,fic):
+  #------------------------------
+  # lit les paramètres du fichier eficas.ini ou style.py
+  # les transforme en attribut de l 'objet  
+  # utilisation du dictionnaire local pour récuperer style
+      txt = utils.read_file(fic)
+      from styles import style
+      d=locals()
+      try:
+         exec txt in d
+      except:
+         l=traceback.format_exception(sys.exc_info()[0],sys.exc_info()[1],sys.exc_info()[2])
+         if self.appli.ihm=="TK" :
+              from widgets import showerror
+              showerror("Erreur","Une erreur s'est produite lors de la lecture du fichier : " + fic + "\n")
+         print "Erreur à la lecture du fichier de configuration : %s" % fic
+         sys.exit()
+
+      for k in d.keys() :
+          if  k in self.labels.keys()  :
+             setattr(self,k,d[k])
+    # Glut horrible pour les repertoires materiau...
+          elif k[0:9]=="rep_mat_v" :
+             setattr(self,k,d[k])
+      
+      for k in d['style'].__dict__.keys() :
+          setattr(self,k,d['style'].__dict__[k])
+
+      if hasattr(self,"catalogues") :
+         for ligne in self.catalogues :
+            version=ligne[1]
+            codeSansPoint=re.sub("\.","",version)
+            chaine="rep_mat_"+codeSansPoint
+            if hasattr(self,chaine):
+               rep_mat=getattr(self,chaine)
+               self.dRepMat[version]=str(rep_mat)
+
+
+  #--------------------------------------
+  def lecture_fichier_ini_utilisateur(self):
+  #--------------------------------------
+  # Surcharge les paramètres standards par les paramètres utilisateur s'ils existent
+      self.fic_ini_utilisateur = os.path.join(self.rep_user,self.fichier)
+      if not os.path.isfile(self.fic_ini_utilisateur):
+          return
+      self.lecture_fichier(self.fic_ini_utilisateur)
+
+  #--------------------------------------
+  def lecture_catalogues_standard(self):
+  #--------------------------------------
+      # repertoires Materiau
+      if hasattr(self,"catalogues") :
+         for ligne in self.catalogues :
+            version=ligne[1]
+            cata=ligne[2]
+            self.dRepMat[version]=os.path.join(cata,'materiau')
+
+  #--------------------------------------
+  def affichage_fichier_ini(self):
+  #--------------------------------------
+      """
+      Affichage des valeurs des paramètres relus par Eficas
+      """
+      import widgets
+      result = widgets.Formulaire(self.parent,
+                                  obj_pere = self,
+                                  titre = self.titre,
+                                  texte = self.texte_ini,
+                                  items = self.l_param,
+                                  mode='display',
+                                  commande=('Modifier',self.commande))
+      if result.resultat :
+          #print 'on sauvegarde les nouveaux paramètres :',result.resultat
+          self.save_param_ini(result.resultat)
+
+  #--------------------------------------
+  def save_param_ini(self,dico):
+  #--------------------------------------
+  # sauvegarde
+  # les nouveaux paramètres dans le fichier de configuration utilisateur
+  #
+      f=open(self.fic_ini_utilisateur,'w+')
+      for k,v in dico.items():
+         if self.types[k] in ('mot2','mot3','mot4'): 
+            v1=v[1:-1]
+            val=v1.split(",")
+            p = "(" 
+            listeval=""
+            for valeur in val:
+              listeval = listeval+ p + str(valeur) 
+              p=" , "
+            listeval = listeval + ")"
+            f.write(str(self.pref)+str(k) + '=' + str(listeval) + '\n') 
+         elif k == 'catalogues' :
+            f.write(k + '\t=\t' + str(v) + '\n')
+         else:
+            f.write(str(self.pref)+str(k) + '\t=\t"' + str(v) + '"\n')
+      f.close()
+      self.lecture_fichier_ini_utilisateur()
+
+  #-------------------------------------------
+  def creation_fichier_ini_si_possible(self):
+  #-------------------------------------------
+      return self.creation_fichier_ini(mode='ignorer_annuler')
+
+  #--------------------------------------------------------
+  def creation_fichier_ini(self,mode='considerer_annuler'):
+  #---------------------------------------------------------
+  # Récupération des valeurs des paramétres requis pour la création du fichier
+  # eficas.ini
+  #
+      import widgets
+      items = self.l_param
+      result = widgets.Formulaire(self.parent,
+                                  obj_pere = self,
+                                  titre = "Saisie des données indispensables à la configuration d'EFICAS",
+                                  texte = self.texte,
+                                  items = items,
+                                  mode='query')
+      if not result.resultat :
+          if mode == 'considerer_annuler':
+             test=0
+             if self.appli.ihm=="TK" :
+                from widgets import showerror,askretrycancel
+                test = askretrycancel("Erreur","Données incorrectes !")
+             if not test:
+                 # XXX On sort d'EFICAS, je suppose
+                 self.appli.exitEFICAS()
+             else:
+                 self.creation_fichier_ini()
+          else:
+              return None
+      else :
+          self.save_param_ini(result.resultat)
+          return result.resultat
+
+  #--------------------------
+  def init_liste_param (self):
+  #--------------------------
+  # construit self.l_param 
+  # a partir de self.labels et des attributs 
+  # de l objet (mis a jour lors de la lecture du fichier)
+  # l_param est une liste de tuples où chaque tuple est de la forme :
+  #           (label,nature,nom_var,defaut)
+
+      self.l_param=[]
+      for k in self.labels.keys()  :
+          if hasattr(self,k) :
+             if k in self.YesNo.keys():
+                self.l_param.append((self.labels[k],self.types[k],k,self.__dict__[k],
+                                     self.YesNo[k][0],self.YesNo[k][1]))
+             else :
+                self.l_param.append((self.labels[k],self.types[k],k,self.__dict__[k]))
+      self.l_param = tuple(self.l_param)
+
+
+class CONFIG(CONFIGbase):
+  def __init__(self,appli,rep_ini):
+
+      self.dFichierEditeur={"MINICODE"                    : "editeur.ini", }
+      self.texte = "EFICAS a besoin de certains renseignements pour se configurer\n"+\
+              "Veuillez remplir TOUS les champs ci-dessous et appuyer sur 'Valider'\n"+\
+              "Si vous annulez, EFICAS ne se lancera pas !!"
+
+      self.salome=appli.salome
+      self.code=appli.code
+      clef=self.code
+      if self.salome != 0 :
+         clef = clef + "_SALOME"
+      self.fichier=self.dFichierEditeur[clef]
+      self.rep_ini = rep_ini
+      self.fic_ini = os.path.join(self.rep_ini,self.fichier)
+      self.titre = "Paramètres nécessaires à la configuration d'EFICAS"
+      self.texte_ini = "Voici les paramètres que requiert Eficas"
+      self.commande = self.creation_fichier_ini_si_possible
+      self.labels={"savedir"       : "Répertoire initial pour Open/Save des fichiers",
+                   "rep_travail"   : "Répertoire de travail",
+                   "rep_mat"       : "Répertoire materiaux",
+                   "path_doc"      : "Chemin d'accès à la doc Aster",
+                   "exec_acrobat"  : "Ligne de commande Acrobat Reader",
+                   "catalogues"    : "Versions du code ",
+                   "isdeveloppeur" : "Niveau de message ",
+                   "path_cata_dev" : "Chemin d'accès aux catalogues développeurs"}
+
+                   
+      self.types ={"savedir":"rep", "rep_travail":"rep","rep_mat":"rep",
+                   "path_doc": "rep","exec_acrobat":"file","exec_acrobat":"file",
+                   "catalogues" :"cata","isdeveloppeur":"YesNo","path_cata_dev":"rep",
+                  "DTDDirectory":"rep"}
+
+      self.YesNo={}
+      self.YesNo['isdeveloppeur']=('Deboggage','Utilisation')
+
+      # Valeurs par defaut
+      self.rep_user = utils.get_rep_user()
+      self.initialdir=self.rep_user
+      self.savedir = self.initialdir
+      self.rep_travail=os.path.join(self.rep_user,'uaster','tmp_eficas')
+      self.rep_mat=""
+      self.path_doc=self.rep_user
+      self.exec_acrobat=self.rep_user
+      self.catalogues= os.path.join(self.rep_ini,'..','Cata/cata.py')
+      self.isdeveloppeur='NON'
+      self.path_cata_dev=os.path.join(self.rep_user,'cata')
+      CONFIGbase.__init__ (self,appli)
+      self.pref=""
+
+  #--------------------------------------
+  def save_params(self):
+  #--------------------------------------
+  # sauvegarde
+  # les nouveaux paramètres dans le fichier de configuration utilisateur
+  #
+      l_param=('exec_acrobat', 'rep_ini','catalogues','rep_travail','rep_mat','path_doc','savedir')
+      texte=""
+      for clef in l_param :
+          if hasattr(self,clef):
+             valeur=getattr(self,clef)
+             texte= texte + clef+"     = " + repr(valeur) +"\n"
+
+
+      # recuperation des repertoires materiaux
+      try :
+          for item in self.catalogues :
+              try :
+                  (code,version,cata,format,defaut)=item
+              except :
+                  (code,version,cata,format)=item
+              codeSansPoint=re.sub("\.","",version)
+              chaine="rep_mat_"+codeSansPoint
+              if hasattr(self,chaine):
+                 valeur=getattr(self,chaine)
+                 texte= texte + chaine+"       = '" + str(valeur) +"'\n"
+      except :
+             pass
+
+      f=open(self.fic_ini_utilisateur,'w+')
+      f.write(texte) 
+      f.close()
+
+
+class CONFIGStyle(CONFIGbase):
+  def __init__(self,appli,rep_ini):
+      self.salome=appli.salome
+      self.texte = "Pour prendre en compte les modifications \n"+\
+                   "     RELANCER EFICAS"
+      self.fichier="style.py"
+      self.rep_ini = rep_ini
+      self.fic_ini = os.path.join(self.rep_ini,self.fichier)
+      self.titre = "Paramètres d affichage"
+      self.texte_ini = "Voici les paramètres configurables :  "
+      self.commande = self.creation_fichier_ini_si_possible
+      self.labels={"background":"couleur du fonds", 
+                   "foreground":"couleur de la police standard" ,
+                   "standard":" police et taille standard",
+                   "standard_italique":"police utilisée pour l'arbre ",
+                   "standard_gras_souligne":"police utilisée pour le gras souligné",
+                   "canvas_italique":"police italique",
+                   "standard_gras":"gras",
+                   #"canvas":"police",
+                   #"canvas_gras":"police gras",
+                   #"canvas_gras_italique":"police gras italique",
+                   #"standard12":"police 12",
+                   #"standard12_gras":"police 12 gras",
+                   #"standard12_gras_italique":"police 12 gras italique",
+                   #"standardcourier10":"courrier "
+                   "statusfont":"police utilisée dans la status Bar",
+                  }
+      self.types ={"background":"mot", 
+                   "foreground":"mot" ,
+                   "standard":"mot2",
+                   "standard_italique":"mot3",
+                   "standard_gras":"mot3",
+                   "standard_gras_souligne":"mot4",
+                   "canvas":"mot2",
+                   "canvas_italique":"mot3",
+                   "canvas_gras":"mot3",
+                   "canvas_gras_italique":"mot4",
+                   "standard12":"mot2",
+                   "standard12_gras":"mot3",
+                   "standard12_gras_italique":"mot4",
+                   "statusfont":"mot2",
+                   "standardcourier10":"mot2"}
+      self.YesNo={}
+      self.l_param=[]
+      CONFIGbase.__init__ (self,appli)
+      self.pref="style."
+
+  def affichage_style_ini(self):
+      self.affichage_fichier_ini()
+
+def make_config(appli,rep):
+    return CONFIG(appli,rep)
+
+def make_config_style(appli,rep):
+    return CONFIGStyle(appli,rep)
+
+
index 41789389be0cca748ae56bb1bda9a7f5e0b384a9..aa40ebe11a1856a12d9f18d8b997434aa5c8d76b 100755 (executable)
@@ -4,30 +4,16 @@
     Ce module sert à lancer EFICAS configuré pour Code_Mini
 """
 # Modules Python
-import sys,os
 
 # Modules Eficas
 import prefs
-sys.path[:0]=[prefs.INSTALLDIR]
-
-args=sys.argv[1:]
-for a in args:
-   if a == "-display":
-      os.environ['DISPLAY']=args[args.index("-display")+1]
-
-import Misc.Trace
-import Editeur
-from Editeur import eficas_go
+#import Misc.Trace
+from InterfaceTK import eficas_go
 
 def main():
    #Misc.Trace.begin_trace()
-   if len(sys.argv) > 1 :
-       # on veut ouvrir un fichier directement au lancement d'Eficas
-       eficas_go.lance_eficas(code='MINICODE',fichier = sys.argv[1])
-   else:
-       # on veut ouvrir Eficas 'vide'
-       eficas_go.lance_eficas(code='MINICODE')
-   Misc.Trace.end_trace()
+   eficas_go.lance_eficas(code=prefs.code)
+   #Misc.Trace.end_trace()
 
 def hidez():
    from Misc import Cyclops
index 3d28234a1efea46a49340dc96ed8cf1ffc5da039..7349c667def53186fd291038cfc384c98e075ac7 100644 (file)
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-import os
+import os,sys
 
 # REPINI sert à localiser le fichier editeur.ini
 # Obligatoire
@@ -9,9 +9,6 @@ REPINI=os.path.dirname(os.path.abspath(__file__))
 # Obligatoire
 INSTALLDIR=os.path.join(REPINI,'..')
 
-# la variable code donne le nom du code a selectionner
-code="MINICODE"
-
 # CODE_PATH sert à localiser Noyau et Validation éventuellement
 # non contenus dans la distribution EFICAS
 # Par défaut on utilise les modules de INSTALLDIR
@@ -20,11 +17,17 @@ CODE_PATH = None
 #CODE_PATH = os.path.join(REPINI,'../../Superv')
 #CODE_PATH = "/home01/chris/projet_Eficas/Devel/SUPER6_3/Aster6_3/bibpyt"
 
-# ICONDIR sert à localiser le répertoire contenant les icones
-# Par défaut on utilise le répertoire icons dans Editeur
-ICONDIR=os.path.join(INSTALLDIR,'Editeur','icons')
+# la variable code donne le nom du code a selectionner
+code="MINICODE"
 
 # lang indique la langue utilisée pour les chaines d'aide : fr ou ang
 lang='fr'
 
+# Codage des strings qui accepte les accents (en remplacement de 'ascii')
+encoding='iso-8859-1'
+
+sys.path[:0]=[INSTALLDIR]
 
+# ICONDIR sert à localiser le répertoire contenant les icones
+# Par défaut on utilise le répertoire icons dans Editeur
+ICONDIR=os.path.join(INSTALLDIR,'Editeur','icons')
index 61a79a4ce4d679491a1d88898cda6123a3273147..21fa1f26744035957105650083321082449c61f9 100644 (file)
@@ -1213,3 +1213,59 @@ class InstanceVal(ListVal):
           if not isinstance(valeur,self.aClass): return 0
           return 1
 
+class VerifTypeTuple(Valid,ListVal) :
+      def __init__(self,typeDesTuples):
+          self.typeDesTuples=typeDesTuples
+          Valid.__init__(self)
+          self.cata_info=""
+
+      def info(self):
+          return ": verifie les types dans un tuple"
+
+      def info_erreur_liste(self):
+          return "Les types entres  ne sont pas permis"
+
+      def default(self,valeur):
+          #if valeur in self.liste : raise ValError("%s est un doublon" % valeur)
+          return valeur
+
+      def is_list(self) :
+          return 1
+
+      def convert_item(self,valeur):
+          if len(valeur) != len(self.typeDesTuples):
+             raise ValError("%s devrait etre de type  %s " %(valeur,self.typeDesTuples))
+          for i in range(len(valeur)) :
+              ok=self.verifType(valeur[i],self.typeDesTuples[i])
+              if ok!=1 : 
+                 raise ValError("%s devrait etre de type  %s " %(valeur,self.typeDesTuples))
+          return valeur
+
+      def verif_item(self,valeur):
+          try :
+               if len(valeur) != len(self.typeDesTuples): return 0
+                for i in range(len(valeur)) :
+                    ok=self.verifType(valeur[i],self.typeDesTuples[i])
+                    if ok!=1 : return 0
+          except :
+                return 0
+          return 1
+
+      def verifType(self,valeur,type_permis):
+          if type_permis == 'R':
+             if type(valeur) in (types.IntType,types.FloatType,types.LongType):return 1
+          elif type_permis == 'I':
+             if type(valeur) in (types.IntType,types.LongType):return 1
+          elif type_permis == 'C':
+             if self.is_complexe(valeur):return 1
+          elif type_permis == 'TXM':
+             if type(valeur)==types.StringType:return 1
+          return 0
+
+      def verif(self,valeur):
+          if type(valeur) in (types.ListType,types.TupleType):
+             liste=list(valeur)
+             for val in liste:
+                if self.verif_item(val)!=1 : return 0
+             return 1
+
diff --git a/Openturns_Study/OpenTURNS_Cata_Study_V4.py b/Openturns_Study/OpenTURNS_Cata_Study_V4.py
new file mode 100644 (file)
index 0000000..05fdd22
--- /dev/null
@@ -0,0 +1,1630 @@
+# -*- coding: utf-8 -*-
+
+# --------------------------------------------------
+# debut entete
+# --------------------------------------------------
+
+# Les commentaires du style # Ordre Catalogue MOTCLEF sont utilises pour
+# retrouver l ordre du catalogue
+
+
+#from Accas import ASSD, JDC_CATA, AU_MOINS_UN, PROC, SIMP, FACT, OPER, MACRO, BLOC, A_VALIDATOR
+from Accas import *
+
+class loi      ( ASSD ) : pass
+class variable ( ASSD ) : pass
+
+import types
+class Tuple:
+  def __init__(self,ntuple):
+    self.ntuple=ntuple
+
+  def __convert__(self,valeur):
+    if type(valeur) == types.StringType:
+      return None
+    if len(valeur) != self.ntuple:
+      return None
+    return valeur
+
+  def info(self):
+    return "Tuple de %s elements" % self.ntuple
+
+  __repr__=info
+  __str__=info
+
+
+#CONTEXT.debug = 1
+JdC = JDC_CATA ( code = 'OPENTURNS_STUDY',
+                 execmodul = None,
+                 regles = ( AU_MOINS_UN ( 'CRITERIA' ), AU_MOINS_UN ( 'MODEL' ), 
+                           A_CLASSER(('LOG','DETERMINISTICVARIABLE'),'VARIABLE'),)
+                 ) # Fin JDC_CATA
+
+# --------------------------------------------------
+# fin entete
+# --------------------------------------------------
+
+LOG = PROC ( nom = "LOG",
+             op = None,
+             docu = "",
+               
+  DebugMessages = SIMP ( statut = "o",
+                 typ = "TXM",
+                 into = ( 'yes', 'no' ),
+                 defaut = 'no',
+                 fr = "Affichage du niveau de debug de la bibliotheque Open TURNS",
+                 ang = "Open TURNS library debug level print",
+                 ),
+               
+  WrapperMessages = SIMP ( statut = "o",
+                 typ = "TXM",
+                 into = ( 'yes', 'no' ),
+                 defaut = 'no',
+                 fr = "Affichage du niveau de wrapper de la bibliotheque Open TURNS",
+                 ang = "Open TURNS library debug level print",
+                 ),
+               
+  UserMessages = SIMP ( statut = "o",
+                 typ = "TXM",
+                 into = ( 'yes', 'no' ),
+                 defaut = 'no',
+                 fr = "Affichage du niveau de user de la bibliotheque Open TURNS",
+                 ang = "Open TURNS library user level print",
+                 ),
+               
+  InfoMessages = SIMP ( statut = "o",
+                 typ = "TXM",
+                 into = ( 'yes', 'no' ),
+                 defaut = 'yes',
+                 fr = "Affichage du niveau de info de la bibliotheque Open TURNS",
+                 ang = "Open TURNS library info level print",
+                 ),
+               
+  WarningMessages = SIMP ( statut = "o",
+                 typ = "TXM",
+                 into = ( 'yes', 'no' ),
+                 defaut = 'yes',
+                 fr = "Affichage du niveau de warning de la bibliotheque Open TURNS",
+                 ang = "Open TURNS library warning level print",
+                 ),
+               
+  ErrorMessages = SIMP ( statut = "o",
+                 typ = "TXM",
+                 into = ( 'yes', 'no' ),
+                 defaut = 'yes',
+                 fr = "Affichage du niveau de error de la bibliotheque Open TURNS",
+                 ang = "Open TURNS library error level print",
+                 ),
+               
+) # Fin PROC LOG
+# Ordre Catalogue LOG
+
+
+
+
+#================================
+# 0. Definition du modele physique
+#================================
+
+
+DETERMINISTICVARIABLE = OPER ( nom = "DETERMINISTICVARIABLE",
+            sd_prod = variable,
+            op = None,
+            fr = "Variable deterministe",
+            ang = "Deterministic variable",
+            
+  N = SIMP ( statut = 'o',
+             typ = "TXM",
+             fr = "Nom",
+             ang = "Name",
+             ),
+            
+  T = SIMP ( statut = 'o',
+             defaut = "in",
+             into = ( "in" , "out", ),
+             typ = "TXM",
+             fr = "Type",
+             ang = "Type",
+             ),
+            
+  R = SIMP ( statut = 'o',
+             defaut = 0,
+             typ = "I",
+             fr = "Rang",
+             ang = "Rank",
+             ),
+            
+) # Fin OPER DETERMINISTICVARIABLE
+# Ordre Catalogue DETERMINISTICVARIABLE
+
+
+import opsOT
+MODEL = MACRO ( nom = "MODEL",
+                op = None,
+                UIinfo = { "groupes" : ( "Gestion du travail", ) },
+                fr = "Chargement du wrapper du modele physique",
+                ang = "Physical model wrapper load",
+                sd_prod = opsOT.INCLUDE,
+                op_init = opsOT.INCLUDE_context,
+                fichier_ini = 1,
+               
+  FileName = SIMP ( statut = "o",
+                    typ = "TXM",
+                    fr = "Nom du modele physique",
+                    ang = "Physical model identifier",
+                    ),
+               
+) # Fin PROC MODEL
+# Ordre Catalogue MODEL
+
+
+
+
+VARIABLE = PROC ( nom = "VARIABLE",
+                  op = None,
+                  docu = "",
+                  fr = "Variable probabiliste",
+                  ang = "Probabilistic variable",
+
+  ModelVariable = SIMP ( statut = "o",
+                         typ = ( variable, ),
+                         ),
+
+  Distribution = SIMP ( statut = "o",
+                        typ = ( loi, ),
+                        ),
+                  
+) # Fin PROC VARIABLE
+# Ordre Catalogue VARIABLE
+
+
+
+
+#================================
+# 1. Definition des LOIS
+#================================
+
+# Nota : les variables de type OPER doivent etre en majuscules !
+# Nota : les variables de type OPER doivent etre de premier niveau (pas imbriquees dans un autre type)
+DISTRIBUTION = OPER ( nom = "DISTRIBUTION",
+                      sd_prod = loi,
+                      op = 68,
+                      fr = "Definitions des lois marginales utilisees par les variables d'entree", 
+                      
+                      
+#====
+# Type de distribution
+#====
+
+  Kind = SIMP ( statut = "o", typ = "TXM",
+                into = ( "Beta",
+                         "Exponential",
+                         "Gamma",
+                         "Geometric",
+                         "Gumbel",
+                         "Histogram",
+                         "Logistic",
+                         "LogNormal",
+                         "MultiNomial",
+                         "Normal",
+                         "TruncatedNormal",
+                         "Poisson",
+                         "Student",
+                         "Triangular",
+                         "Uniform",
+                         #"UserDefined",
+                         "Weibull",
+                         ),
+                fr = "Choix du type de la loi marginale",
+                ang = "1D marginal distribution",
+                ),
+
+#====
+# Definition des parametres selon le type de la loi
+#====
+
+  BETA = BLOC ( condition = " Kind in ( 'Beta', ) ",
+
+                  Settings = SIMP ( statut = "o",
+                                       typ = "TXM",
+                                       max = 1,
+                                       into = ( "RT", "MuSigma" ),
+                                       defaut = "RT",
+                                       fr = "Parametrage de la loi beta",
+                                       ang = "Beta distribution parameter set",
+                                       ),
+
+                  RT_Parameters = BLOC ( condition = " Settings in ( 'RT', ) ",
+
+                                      R = SIMP ( statut = "o",
+                                                 typ = "R",
+                                                 max = 1,
+                                                 val_min = 0.,
+                                                 fr = "Parametre R de la loi",
+                                                 ang = "R parameter",
+                                                 ),
+
+                                      # T > R
+                                      T = SIMP ( statut = "o",
+                                                 typ = "R",
+                                                 max = 1,
+                                                 val_min = 0.,
+                                                 fr = "Parametre T de la loi | T > R",
+                                                 ang = "T parameter | T > R",
+                                                 ),
+
+                                      ), # Fin BLOC RT_Parameters
+
+
+                  MuSigma_Parameters = BLOC ( condition = " Settings in ( 'MuSigma', ) ",
+
+                                      Mu = SIMP ( statut = "o",
+                                                  typ = "R",
+                                                  max = 1,
+                                                  fr = "Parametre Mu de la loi",
+                                                  ang = "Mu parameter",
+                                                  ),
+
+                                      Sigma = SIMP ( statut = "o",
+                                                     typ = "R",
+                                                     max = 1,
+                                                     val_min = 0.,
+                                                     fr = "Parametre Sigma de la loi | Sigma > 0",
+                                                     ang = "Sigma parameter | Sigma > 0",
+                                                     ),
+
+                                      ), # Fin BLOC MuSigma_Parameters
+
+
+                  A = SIMP ( statut = "o",
+                             typ = "R",
+                             max = 1,
+                             fr = "Parametre A de la loi",
+                             ang = "A parameter",
+                             ),
+
+                  # B > A
+                  B = SIMP ( statut = "o",
+                             typ = "R",
+                             max = 1,
+                             fr = "Parametre B de la loi | B > A",
+                             ang = "B parameter | B > A",
+                             ),
+
+  ), # Fin BLOC BETA
+
+
+
+  EXPONENTIAL = BLOC ( condition = " Kind in ( 'Exponential', ) ",
+
+                         Lambda = SIMP ( statut = "o",
+                                         typ = "R",
+                                         max = 1,
+                                         val_min = 0.,
+                                         fr = "Parametre Lambda | Lambda > 0",
+                                         ang = "Lambda parameter | Lambda > 0",
+                                         ),
+
+                         Gamma = SIMP ( statut = "o",
+                                        typ = "R",
+                                        max = 1,
+                                        fr = "Parametre Gamma",
+                                        ang = "Gamma parameter",
+                                        ),
+
+  ), # Fin BLOC EXPONENTIAL
+
+
+
+  GAMMA = BLOC ( condition = " Kind in ( 'Gamma', ) ",
+
+                   Settings = SIMP ( statut = "o",
+                                        typ = "TXM",
+                                        max = 1,
+                                        into = ( "KLambda", "MuSigma" ),
+                                        defaut = "KLambda",
+                                        fr = "Parametrage de la loi gamma",
+                                        ang = "Gamma distribution parameter set",
+                                        ),
+
+                   KLambda_Parameters = BLOC ( condition = " Settings in ( 'KLambda', ) ",
+
+                                       K = SIMP ( statut = "o",
+                                                  typ = "R",
+                                                  max = 1,
+                                                  val_min = 0.,
+                                                  fr = "Parametre K de la loi | K > 0",
+                                                  ang = "K parameter | K > 0",
+                                                  ),
+
+                                       Lambda = SIMP ( statut = "o",
+                                                       typ = "R",
+                                                       max = 1,
+                                                       val_min = 0.,
+                                                       fr = "Parametre Lambda de la loi | Lambda > 0",
+                                                       ang = "Lambda parameter | Lambda > 0",
+                                                       ),
+
+                                       ), # Fin BLOC KLambda_Parameters
+
+
+                   MuSigma_Parameters = BLOC ( condition = " Settings in ( 'MuSigma', ) ",
+
+                                       Mu = SIMP ( statut = "o",
+                                                   typ = "R",
+                                                   max = 1,
+                                                   defaut = 0.0,
+                                                   fr = "Parametre Mu de la loi",
+                                                   ang = "Mu parameter",
+                                                   ),
+
+                                       Sigma = SIMP ( statut = "o",
+                                                      typ = "R",
+                                                      max = 1,
+                                                      defaut = 1.0,
+                                                      val_min = 0.,
+                                                      fr = "Parametre Sigma de la loi | Sigma > 0",
+                                                      ang = "Sigma parameter | Sigma > 0",
+                                                      ),
+
+                                       ), # Fin BLOC MuSigma_Parameters
+
+                   Gamma = SIMP ( statut = "o",
+                                  typ = "R",
+                                  max = 1,
+                                  fr = "Parametre Gamma",
+                                  ang = "Gamma parameter",
+                                  ),
+
+
+  ), # Fin BLOC GAMMA
+
+
+
+  GEOMETRIC = BLOC ( condition = " Kind in ( 'Geometric', ) ",
+
+                       P = SIMP ( statut = "o",
+                                  typ = "R",
+                                  max = 1,
+                                  val_min = 0.,
+                                  val_max = 1.,
+                                  fr = "Parametre P | 0 < P < 1",
+                                  ang = "P parameter | 0 < P < 1",
+                                  ),
+
+  ), # Fin BLOC GEOMETRIC
+
+
+
+  GUMBEL = BLOC ( condition = " Kind in ( 'Gumbel', ) ",
+
+                    Settings = SIMP ( statut = "o",
+                                         typ = "TXM",
+                                         max = 1,
+                                         into = ( "AlphaBeta", "MuSigma" ),
+                                         defaut = "AlphaBeta",
+                                         fr = "Parametrage de la loi gumbel",
+                                         ang = "Gumbel distribution parameter set",
+                                         ),
+
+                    AlphaBeta_Parameters = BLOC ( condition = " Settings in ( 'AlphaBeta', ) ",
+
+                                        Alpha = SIMP ( statut = "o",
+                                                       typ = "R",
+                                                       max = 1,
+                                                       val_min = 0.,
+                                                       fr = "Parametre Alpha de la loi | Alpha > 0",
+                                                       ang = "Alpha parameter | Alpha > 0",
+                                                       ),
+
+                                        Beta = SIMP ( statut = "o",
+                                                      typ = "R",
+                                                      max = 1,
+                                                      fr = "Parametre Beta de la loi",
+                                                      ang = "Beta parameter",
+                                                      ),
+
+                                        ), # Fin BLOC AlphaBeta_Parameters
+
+
+                    MuSigma_Parameters = BLOC ( condition = " Settings in ( 'MuSigma', ) ",
+
+                                        Mu = SIMP ( statut = "o",
+                                                    typ = "R",
+                                                    max = 1,
+                                                    fr = "Parametre Mu de la loi",
+                                                    ang = "Mu parameter",
+                                                    ),
+
+                                        Sigma = SIMP ( statut = "o",
+                                                       typ = "R",
+                                                       max = 1,
+                                                       val_min = 0.,
+                                                       fr = "Parametre Sigma de la loi | Sigma > 0",
+                                                       ang = "Sigma parameter | Sigma > 0",
+                                                       ),
+
+                                        ), # Fin BLOC MuSigma_Parameters
+
+  ), # Fin BLOC GUMBEL
+
+
+
+  HISTOGRAM = BLOC ( condition = " Kind in ( 'Histogram', ) ",
+
+                       First = SIMP ( statut = "o",
+                                    typ = "R",
+                                    max = 1,
+                                    fr = "Premier point de la distribution",
+                                    ang = "First point",
+                                    ),
+
+                       # Il faut definir une collection de couples ( x,p ) 
+                       Values = SIMP ( statut = 'o',
+                                       typ = Tuple(2),
+                                       max = '**',
+                                       fr = "Liste de couples (point,probabilite)",
+                                       ang = "(point,probabiblity) couple list",
+                                       validators=VerifTypeTuple(('R','R')),
+                                       ),
+
+  ), # Fin BLOC HISTOGRAM
+
+
+
+  LOGNORMAL = BLOC ( condition = " Kind in ( 'LogNormal', ) ",
+
+                     Settings = SIMP ( statut = "o",
+                                       typ = "TXM",
+                                       max = 1,
+                                       into = ( "MuSigmaLog", "MuSigma", "MuSigmaOverMu" ),
+                                       defaut = "MuSigmaLog",
+                                       fr = "Parametrage de la loi lognormale",
+                                       ang = "Lognormal distribution parameter set",
+                                       ),
+
+                     MuSigma_Parameters = BLOC ( condition = " Settings in ( 'MuSigma', ) ",
+
+                                                 Mu = SIMP ( statut = "o",
+                                                             typ = "R",
+                                                             max = 1,
+                                                             fr = "Parametre Mu de la loi | Mu > Gamma",
+                                                             ang = "Mu parameter | Mu > Gamma",
+                                                             ),
+
+                                                 Sigma = SIMP ( statut = "o",
+                                                                typ = "R",
+                                                                max = 1,
+                                                                val_min = 0.,
+                                                                fr = "Parametre Sigma de la loi | Sigma > 0",
+                                                                ang = "Sigma parameter | Sigma > 0",
+                                                                ),
+
+                                                 ), # Fin BLOC MuSigma_Parameters
+
+                     MuSigmaOverMu_Parameters = BLOC ( condition = " Settings in ( 'MuSigmaOverMu', ) ",
+
+                                                 Mu = SIMP ( statut = "o",
+                                                             typ = "R",
+                                                             max = 1,
+                                                             fr = "Parametre Mu de la loi | Mu > Gamma",
+                                                             ang = "Mu parameter | Mu > Gamma",
+                                                             ),
+
+                                                 SigmaOverMu = SIMP ( statut = "o",
+                                                                typ = "R",
+                                                                max = 1,
+                                                                val_min = 0.,
+                                                                fr = "Parametre SigmaOverMu de la loi | SigmaOverMu > 0",
+                                                                ang = "SigmaOverMu parameter | SigmaOverMu > 0",
+                                                                ),
+
+                                                 ), # Fin BLOC MuSigmaOverMu_Parameters
+
+                     MuSigmaLog_Parameters = BLOC ( condition = " Settings in ( 'MuSigmaLog', ) ",
+
+                                                    MuLog = SIMP ( statut = "o",
+                                                                   typ = "R",
+                                                                   max = 1,
+                                                                   fr = "Parametre Mu log de la loi",
+                                                                   ang = "Mu log parameter",
+                                                                   ),
+
+                                                    SigmaLog = SIMP ( statut = "o",
+                                                                      typ = "R",
+                                                                      max = 1,
+                                                                      val_min = 0.,
+                                                                      fr = "Parametre Sigma log de la loi | SigmaLog > 0",
+                                                                      ang = "Sigma log parameter | SigmaLog > 0",
+                                                                      ),
+                                            
+                                                    ), # Fin BLOC MuSigmaLog_Parameters
+
+                     Gamma = SIMP ( statut = "o",
+                                    typ = "R",
+                                    max = 1,
+                                    fr = "Parametre Gamma",
+                                    ang = "Gamma parameter",
+                                    ),
+
+   ), # Fin BLOC LOGNORMAL
+
+
+
+   LOGISTIC = BLOC ( condition = " Kind in ( 'Logistic', ) ",
+
+                       Alpha = SIMP ( statut = "o",
+                                      typ = "R",
+                                      max = 1,
+                                      fr = "Parametre Alpha de la loi",
+                                      ang = "Alpha parameter",
+                                      ),
+
+                       Beta = SIMP ( statut = "o",
+                                     typ = "R",
+                                     max = 1,
+                                     val_min = 0.,
+                                     fr = "Parametre Beta de la loi | Beta > = 0",
+                                     ang = "Beta parameter | Beta > = 0",
+                                     ),
+
+   ), # Fin BLOC LOGISTIC
+
+
+
+   MULTINOMIAL = BLOC ( condition = " Kind in ( 'MultiNomial', ) ",
+                         
+                         N = SIMP ( statut = "o",
+                                    typ = "I",
+                                    max = 1,
+                                    fr = "Dimension de la loi",
+                                    ang = "Distribution dimension",
+                                    ),
+
+                         # Il faut un vecteur P de taille N
+                         Mu = SIMP ( statut = 'o',
+                                     typ = 'R',
+                                     max = '**',
+                                     ),
+
+   ), # Fin BLOC MULTINOMIAL
+
+
+
+   NORMAL = BLOC ( condition = " Kind in ( 'Normal', ) ",
+
+                    Mu = SIMP ( statut = "o",
+                                typ = "R",
+                                max = 1,
+                                fr = "Parametre Mu de la loi",
+                                ang = "Mu parameter",
+                                ),
+
+                   Sigma = SIMP ( statut = "o",
+                                  typ = "R",
+                                  max = 1,
+                                  val_min = 0.,
+                                  fr = "Parametre Sigma de la loi | Sigma > 0",
+                                  ang = "Sigma parameter | Sigma > 0",
+                                  ),
+
+   ), # Fin BLOC NORMAL
+
+
+
+   POISSON = BLOC ( condition = " Kind in ( 'Poisson', ) ",
+
+                     Lambda = SIMP ( statut = "o",
+                                     typ = "R",
+                                     max = 1,
+                                     val_min = 0.,
+                                     fr = "Parametre Lambda de la loi | Lambda > 0",
+                                     ang = "Lambda parameter | Lambda > 0",
+                                     ),
+
+   ), # Fin BLOC POISSON
+
+
+
+   STUDENT = BLOC ( condition = " Kind in ( 'Student', ) ",
+
+                     Mu = SIMP ( statut = "o",
+                                 typ = "R",
+                                 max = 1,
+                                 fr = "Parametre Mu de la loi",
+                                 ang = "Mu parameter",
+                                 ),
+
+                     Nu = SIMP ( statut = "o",
+                                 typ = "R",
+                                 max = 1,
+                                 val_min = 2.,
+                                 fr = "Parametre Nu de la loi | V > = 2",
+                                 ang = "Nu parameter | V > = 2",
+                                 ),
+
+   ), # Fin BLOC STUDENT
+
+
+
+   TRIANGULAR = BLOC ( condition = " Kind in ( 'Triangular', ) ",
+
+                         A = SIMP ( statut = "o",
+                                    typ = "R",
+                                    max = 1,
+                                    fr = "Borne inferieure de la loi | A < = M < = B",
+                                    ang = "Lower bound | A < = M < = B",
+                                    ),
+
+                         M = SIMP ( statut = "o",
+                                    typ = "R",
+                                    max = 1,
+                                    fr = "Mode de la loi | A < = M < = B",
+                                    ang = "Mode | A < = M < = B",
+                                    ),
+
+                         B = SIMP ( statut = "o",
+                                    typ = "R",
+                                    max = 1,
+                                    fr = "Borne superieure de la loi | A < = M < = B",
+                                    ang = "Upper bound | A < = M < = B",
+                                    ),
+
+   ), # Fin BLOC TRIANGULAR
+
+
+
+   TRUNCATEDNORMAL = BLOC ( condition = " Kind in ( 'TruncatedNormal', ) ",
+
+                             MuN = SIMP ( statut = "o",
+                                          typ = "R",
+                                          max = 1,
+                                          fr = "Parametre Mu de la loi",
+                                          ang = "Mu parameter",
+                                          ),
+
+                             SigmaN = SIMP ( statut = "o",
+                                             typ = "R",
+                                             max = 1,
+                                             val_min = 0.,
+                                             fr = "Parametre SigmaN de la loi | SigmaN > 0",
+                                             ang = "SigmaN parameter | SigmaN> 0",
+                                             ),
+
+                             A = SIMP ( statut = "o",
+                                        typ = "R",
+                                        max = 1,
+                                        fr = "Borne inferieure de la loi | A < = B",
+                                        ang = "Lower bound | A < = B",
+                                        ),
+
+                             B = SIMP ( statut = "o",
+                                        typ = "R",
+                                        max = 1,
+                                        fr = "Borne superieure de la loi | A < = B",
+                                        ang = "Upper bound | A < = B",
+                                        ),
+
+   ), # Fin BLOC TRUNCATEDNORMAL
+
+
+
+   UNIFORM = BLOC ( condition = " Kind in ( 'Uniform', ) ",
+
+                     A = SIMP ( statut = "o",
+                                typ = "R",
+                                max = 1,
+                                fr = "Borne inferieure de la loi | A < = B",
+                                ang = "Lower bound | A < = B",
+                                ),
+
+                     B = SIMP ( statut = "o",
+                                typ = "R",
+                                max = 1,
+                                fr = "Borne superieure de la loi | A < = B",
+                                ang = "Upper bound | A < = B",
+                                ),
+
+   ), # Fin BLOC UNIFORM
+
+
+
+   USERDEFINED = BLOC ( condition = " Kind in ( 'UserDefined', ) ",
+
+                           # Il faut definir une collection de couples ( x,p ) 
+                         Values = SIMP ( statut = 'o',
+                                         typ = 'R',
+                                         max = '**',
+                                         ),
+
+   ), # Fin BLOC USERDEFINED
+
+
+
+   WEIBULL = BLOC ( condition = " Kind in ( 'Weibull', ) ",
+
+                     Settings = SIMP ( statut = "o",
+                                          typ = "TXM",
+                                          max = 1,
+                                          into = ( "AlphaBeta", "MuSigma" ),
+                                          defaut = "AlphaBeta",
+                                          fr = "Parametrage de la loi weibull",
+                                          ang = "Weibull distribution parameter set",
+                                          ),
+
+                     AlphaBeta_Parameters = BLOC ( condition = " Settings in ( 'AlphaBeta', ) ",
+
+                                         Alpha = SIMP ( statut = "o",
+                                                        typ = "R",
+                                                        max = 1,
+                                                        val_min = 0.,
+                                                        fr = "Parametre Alpha de la loi | Alpha > 0",
+                                                        ang = "Alpha parameter | Alpha > 0",
+                                                        ),
+
+                                         Beta = SIMP ( statut = "o",
+                                                       typ = "R",
+                                                       max = 1,
+                                                       val_min = 0.,
+                                                       fr = "Parametre Beta de la loi | Beta > 0",
+                                                       ang = "Beta parameter | Beta > 0",
+                                                       ),
+
+                                         ), # Fin BLOC AlphaBeta_Parameters
+
+
+                     MuSigma_Parameters = BLOC ( condition = " Settings in ( 'MuSigma', ) ",
+
+                                         Mu = SIMP ( statut = "o",
+                                                     typ = "R",
+                                                     max = 1,
+                                                     fr = "Parametre Mu de la loi",
+                                                     ang = "Mu parameter",
+                                                     ),
+
+                                         Sigma = SIMP ( statut = "o",
+                                                        typ = "R",
+                                                        max = 1,
+                                                        val_min = 0.,
+                                                        fr = "Parametre Sigma de la loi | Sigma > 0",
+                                                        ang = "Sigma parameter | Sigma > 0",
+                                                        ),
+
+                                         ), # Fin BLOC MuSigma_Parameters
+
+                     Gamma = SIMP ( statut = "o",
+                                    typ = "R",
+                                    max = 1,
+                                    fr = "Parametre Gamma",
+                                    ang = "Gamma parameter",
+                                    ),
+
+    ), # Fin BLOC WEIBULL
+
+) # Fin OPER DISTRIBUTION
+# Ordre Catalogue DISTRIBUTION
+
+
+
+
+
+
+
+#================================
+# 3. Definition de l'etude
+#================================
+
+# Nota : les variables de type PROC doivent etre en majuscules !
+CRITERIA = PROC ( nom = "CRITERIA",
+                  op = None,
+                  docu = "",
+                  fr = "Mise en donnee pour le fichier de configuration de OPENTURNS.",
+                  ang = "Writes the configuration file for OPENTURNS.",
+
+
+
+  Type = SIMP ( statut = "o",
+                typ = "TXM",
+                into = ( "Min/Max", "Central Uncertainty", "Threshold Exceedence" ),
+                fr = "Type d'Analyse",
+                ang = "Analysis",
+                ),
+
+
+
+
+
+
+
+  MinMax = BLOC ( condition = " Type in ( 'Min/Max', ) ",
+
+                  Method = SIMP ( statut = "o",
+                                  typ = "TXM",
+                                  into = ( "Experiment Plane", "Random Sampling" ),
+                                  fr = "Methode",
+                                  ang = "Method",
+                                  ),
+                  # UC 3.1.1
+                  ExperimentPlaneSettings = BLOC ( condition = " Method in ( 'Experiment Plane', ) ",
+
+                          ExperimentPlane = SIMP ( statut = "o",
+                                                   typ = "TXM",
+                                                   into = ( "Axial", "Factorial", "Composite", ),
+                                                   fr = "Methode",
+                                                   ang = "Method",
+                                                   ),
+
+                          Levels = SIMP ( statut = "o",
+                                          typ = "R",
+                                          val_min = 0.0,
+                                          max = '**',    
+                                          fr = "Nombre de niveaux dans chaque direction",
+                                          ang = "Levels in each direction",
+                                          ),
+
+                          # Scaled Vector
+                          UnitsPerDimension = SIMP ( statut = "o",
+                                          typ = "R",
+                                          max = '**',    
+                                          fr = "Unite par dimension (autant que de variables declarees)",
+                                          ang = "Units per dimension (as much as declared variables)",
+                                          ),
+
+                          # Translation Vector
+                          Center = SIMP ( statut = "o",
+                                          typ = "R",
+                                          max = '**',    
+                                          fr = "Unite par dimension",
+                                          ang = "Units per dimension",
+                                          ),
+
+                    ), # Fin BLOC ExperimentPlaneSettings
+
+
+
+                  RandomSamplingSettings = BLOC ( condition = " Method in ( 'Random Sampling', ) ",
+
+                          PointsNumber = SIMP ( statut = "o",
+                                                typ = "I",
+                                                val_min = 1,
+                                                fr = "Nombre de points",
+                                                ang = "Points number",
+                                                ),
+
+                    ), # Fin BLOC RandomSamplingSettings
+
+                  Result = SIMP (  statut = "o",
+                                   typ = "TXM",
+                                   into = ( "Min/Max", ),
+                                   defaut = "Min/Max",
+                                   fr = "Le minimum et le maximum",
+                                   ang = "The min and max values",
+                                   ),
+
+
+  ), # Fin BLOC MinMax
+
+
+
+
+  CentralUncertainty = BLOC ( condition = " Type in ( 'Central Uncertainty', ) ",
+
+                  Method = SIMP ( statut = "o",
+                                  typ = "TXM",
+                                  into = ( "Taylor Variance Decomposition", "Random Sampling" ),
+                                  fr = "Methode",
+                                  ang = "Method",
+                                  ),
+                              
+                  # UC 3.2.
+                  TaylorVarianceDecompositionSettings = BLOC ( condition = " Method in ( 'Taylor Variance Decomposition', ) ",
+
+                      Result = FACT ( statut = "o",
+                                      min = 1,
+                                      max = "**",
+
+                              MeanFirstOrder = SIMP ( statut = "o",
+                                                typ = 'TXM',
+                                                into = ( 'yes', 'no' ),
+                                                defaut = 'yes',
+                                                max = 1,
+                                                fr = "Moyenne au premier ordre",
+                                                ang = "MeanFirstOrder",
+                                                ),
+
+                              StandardDeviationFirstOrder = SIMP ( statut = "o",
+                                                                   typ = 'TXM',
+                                                                   into = ( 'yes', 'no' ),
+                                                                   defaut = 'yes',
+                                                                   max = 1,
+                                                                   fr = "Ecart-type au premier ordre",
+                                                                   ang = "StandardDeviationFirstOrder",
+                                                                   ),
+
+                              MeanSecondOrder = SIMP ( statut = "o",
+                                                       typ = 'TXM',
+                                                       into = ( 'yes', 'no' ),
+                                                       defaut = 'yes',
+                                                       max = 1,
+                                                       fr = "Moyenne au second ordre",
+                                                       ang = "MeanSecondOrder",
+                                                       ),
+
+                              ImportanceFactor = SIMP ( statut = "o",
+                                                        typ = 'TXM',
+                                                        into = ( 'yes', 'no' ),
+                                                        defaut = 'no',
+                                                        max = 1,
+                                                        fr = "Facteur d'importance pour variable de sortie scalaire",
+                                                        ang = "ImportanceFactor",
+                                                        ),
+
+                             ImportanceFactorSettings = BLOC ( condition = " ImportanceFactor in ( 'yes', ) ",
+
+                                    NumericalResults  = SIMP ( statut = "o",
+                                                               typ = 'TXM',
+                                                               into = ( 'yes', 'no' ),
+                                                               defaut = 'yes',
+                                                               max = 1,
+                                                               fr = "Resultats numeriques",
+                                                               ang = "NumericalResults",
+                                                               ),
+
+                                     GraphicalResults  = SIMP ( statut = "o",
+                                                                typ = 'TXM',
+                                                                into = ( 'yes', 'no' ),
+                                                                defaut = 'no',
+                                                                max = 1,
+                                                                fr = "Resultats graphiques",
+                                                                ang = "GraphicalResults",
+                                                                ),
+
+                            ), # Fin BLOC ImportanceFactorSettings
+
+                      ), # Fin FACT Result
+                                                               
+                  ), # Fin BLOC TaylorVarianceDecompositionSettings
+
+
+
+                  RandomSamplingSettings = BLOC ( condition = " Method in ( 'Random Sampling', ) ",
+
+                          PointsNumber = SIMP ( statut = "o",
+                                                typ = "I",
+                                                val_min = 1,
+                                                fr = "Nombre de points",
+                                                ang = "Points number",
+                                                ),
+
+                       Result = FACT ( statut = "o",
+                                      min = 1,
+                                      max = "**",
+
+                              EmpiricalMean = SIMP ( statut = "o",
+                                                     typ = 'TXM',
+                                                     into = ( 'yes', 'no' ),
+                                                     defaut = 'yes',
+                                                     max = 1,
+                                                     fr = "Moyenne empirique",
+                                                     ang = "Empirical mean",
+                                                     ),
+
+                              EmpiricalStandardDeviation = SIMP ( statut = "o",
+                                                                  typ = 'TXM',
+                                                                  into = ( 'yes', 'no' ),
+                                                                  defaut = 'yes',
+                                                                  max = 1,
+                                                                  fr = "Ecart-type empirique",
+                                                                  ang = "Empirical standard deviation",
+                                                                  ),
+
+                              EmpiricalQuantile = SIMP ( statut = "o",
+                                                         typ = 'TXM',
+                                                         into = ( 'yes', 'no' ),
+                                                         defaut = 'yes',
+                                                         max = 1,
+                                                         fr = "Quantile empirique",
+                                                         ang = "Empirical quantile",
+                                                         ),
+
+                              EmpiricalQuantileSettings = BLOC ( condition = " EmpiricalQuantile in ( 'yes', ) ",
+
+                                  EmpiricalQuantile_Order = SIMP ( statut = "o",
+                                                                   typ = 'R',
+                                                                   defaut = 0.95,
+                                                                   max = 1,
+                                                                   val_min = 0.0,
+                                                                   val_max = 1.0,
+                                                                   fr = "Ordre du quantile empirique",
+                                                                   ang = "Empirical quantile order",
+                                                                   ),
+
+                              ), # Fin BLOC EmpiricalQuantileSettings
+
+                              AnalysedCorrelations = SIMP ( statut = "o",
+                                                            typ = 'TXM',
+                                                            into = ( 'yes', 'no' ),
+                                                            defaut = 'no',
+                                                            max = 1,
+                                                            fr = "Correlations analysees",
+                                                            ang = "Analysed correlations",
+                                                            ),
+
+                              KernelSmoothing = SIMP ( statut = "o",
+                                                       typ = 'TXM',
+                                                       into = ( 'yes', 'no' ),
+                                                       defaut = 'no',
+                                                       max = 1,
+                                                       fr = "Kernel smoothing de l'echantillon",
+                                                       ang = "Kernel smoothing of the sample",
+                                                       ),
+
+                      ), # Fin FACT Result
+                                                               
+                  ), # Fin BLOC RandomSamplingSettings
+
+  ), # Fin BLOC CentralUncertainty
+
+
+
+
+  ThresholdExceedence = BLOC ( condition = " Type in ( 'Threshold Exceedence', ) ",
+
+         Event =  FACT ( statut = "o",
+                         min = 1,
+                         max = 1,
+
+                         Threshold = SIMP ( statut = "o",
+                                            typ = "R",
+                                            max = 1,
+                                            fr = "Le seuil de defaillance",
+                                            ang = "Failure threshold",
+                                            ),
+
+                         ComparisonOperator = SIMP ( statut = "o",
+                                                     typ = "TXM",
+                                                     max = 1,
+                                                     into = ( "Less", "LessOrEqual", "Equal", "GreaterOrEqual", "Greater" ),
+                                                     fr = "Que faut-il ne pas depasser : un maximum ou un minimum",
+                                                     ang = "What is the failure threshold : maximum or minimum",
+                                                     ),
+         ), # Fin FACT Event
+                         
+
+         Method = SIMP ( statut = "o",
+                         typ = "TXM",
+                         into = ( "Simulation", "Analytical" ),
+                         fr = "Methode",
+                         ang = "Method",
+                         ),
+
+         SimulationSettings = BLOC ( condition = " Method in ( 'Simulation', ) ",
+
+               Algorithm = SIMP ( statut = "o",
+                                  typ = "TXM",
+                                  into = ( "MonteCarlo", "LHS", "ImportanceSampling" ),
+                                  fr = "Algorithme de simulation",
+                                  ang = "Simulation algorithm",
+                                  ),
+
+                                 
+               RandomGenerator = FACT ( statut = "o",
+                                        min = 1,
+                                        max = 1,
+
+                           SeedToBeSet = SIMP ( statut = "o",
+                                                typ = 'TXM',
+                                                into = ( 'yes', 'no' ),
+                                                defaut = 'no',
+                                                max = 1,
+                                                fr = "La racine du generateur aleatoire doit-elle etre positionnee ?",
+                                                ang = "Does the random generator seed need to be set ?",
+                                                ),
+
+                           SeedSettings = BLOC ( condition = " SeedToBeSet in ( 'yes', ) ",
+
+                                                 RandomGeneratorSeed = SIMP ( statut = "o",
+                                                                              typ = "I",
+                                                                              max = 1,
+                                                                              fr = "Racine du generateur aleatoire",
+                                                                              ang = "Random generator seed",
+                                                                              ),
+
+                                               ), # Fin BLOC SeedSettings
+
+               ), # Fin FACT RandomGenerator
+
+
+               BlockSize = SIMP ( statut = "f",
+                                  typ = "I",
+                                  max = 1,
+                                  val_min = 1,
+                                  defaut = 1,
+                                  fr = "Nombre de calculs realises en bloc",
+                                  ang = "Number of computations as a block",
+                                  ),
+
+               MaximumOuterSampling = SIMP ( statut = "o",
+                                             typ = "I",
+                                             max = 1,
+                                             val_min = 1,
+                                             fr = "Maximum d'iterations externes",
+                                             ang = "Maximum outer Sampling value",
+                                             ),
+
+               MaximumCoefficientOfVariation = SIMP ( statut = "f",
+                                                      typ = "R",
+                                                      max = 1,
+                                                      defaut = 0.1,
+                                                      val_min = 0.0,
+                                                      fr = " maximum ...",
+                                                      ang = "Absolute maximum ...."
+                                                      ),
+
+               ImportanceSamplingSettings = BLOC ( condition = " Algorithm in ( 'ImportanceSampling', ) ",
+
+                            MeanVector = SIMP ( statut = "o",
+                                                typ = "R",
+                                                max = "**",
+                                                fr = "Moyenne",
+                                                ang = "Mean vector",
+                                                ),
+
+                            Correlation = SIMP ( statut = "o",
+                                                 typ = 'TXM',
+                                                 into = ( 'Independent', 'Linear' ),
+                                                 defaut = 'Linear',
+                                                 max = 1,
+                                                 fr = "Le type de correlation entre les variables",
+                                                 ang = "Correlation between variables",
+                                                 ),
+
+               ), # Fin BLOC ImportanceSamplingSettings
+
+               Result = FACT ( statut = "o",
+                                      min = 1,
+                                      max = "**",
+
+                    Probability = SIMP ( statut = "o",
+                                         typ = 'TXM',
+                                         into = ( 'yes', ),
+                                         defaut = 'yes',
+                                         max = 1,
+                                         fr = "Probabiblite",
+                                         ang = "Probability",
+                                         ),
+
+                    StandardDeviation = SIMP ( statut = "o",
+                                         typ = 'TXM',
+                                         into = ( 'yes', ),
+                                         defaut = 'yes',
+                                         max = 1,
+                                         fr = "Ecart type",
+                                         ang = "Standard deviation",
+                                         ),
+
+                    ConfidenceInterval = SIMP ( statut = "o",
+                                                typ = 'TXM',
+                                                into = ( 'yes', 'no' ),
+                                                defaut = 'yes',
+                                                max = 1,
+                                                fr = "Ecart-type empirique",
+                                                ang = "Empirical standard deviation",
+                                                ),
+
+                    ConfidenceIntervalSettings = BLOC ( condition = " ConfidenceInterval in ( 'yes', ) ",
+
+                          Level = SIMP ( statut = "o",
+                                         typ = 'R',
+                                         defaut = 0.9,
+                                         max = 1,
+                                         val_min = 0.0,
+                                         val_max = 1.0,
+                                         fr = "Niveau de confiance",
+                                         ang = "Confidence level",
+                                         ),
+                                                     
+                    ), # Fin BLOC ConfidenceIntervalSettings
+                               
+                    VariationCoefficient = SIMP ( statut = "o",
+                                                  typ = 'TXM',
+                                                  into = ( 'yes', 'no' ),
+                                                  defaut = 'yes',
+                                                  max = 1,
+                                                  fr = "Coefficient de variation",
+                                                  ang = "VariationCoefficient",
+                                                  ),
+
+                    IterationNumber = SIMP ( statut = "o",
+                                             typ = 'TXM',
+                                             into = ( 'yes', 'no' ),
+                                             defaut = 'yes',
+                                             max = 1,
+                                             fr = "Nombre d'iterations",
+                                             ang = "Iteration number",
+                                             ),
+
+                    ConvergenceGraph = SIMP ( statut = "o",
+                                             typ = 'TXM',
+                                             into = ( 'yes', 'no' ),
+                                             defaut = 'yes',
+                                             max = 1,
+                                             fr = "Graphe de convergence",
+                                             ang = "Convergence graph",
+                                             ),
+
+               ), # Fin FACT Result
+                                                               
+
+
+         ), # Fin BLOC SimulationSettings
+
+
+                               
+         AnalyticalSettings = BLOC ( condition = " Method in ( 'Analytical', ) ",
+
+                Approximation = SIMP ( statut = "o",
+                                       typ = "TXM",
+                                       defaut = "FirstOrder",
+                                       into = ( "FirstOrder", "SecondOrder" ),
+                                       max = 1,
+                                       fr = "Approximation",
+                                       ang = "Approximation",
+                                       ),
+
+                OptimizationAlgorithm = SIMP ( statut = "o",
+                                               typ = "TXM",
+                                               defaut = "Cobyla",
+                                               into = ( "Cobyla", "AbdoRackwitz" ),
+                                               max = 1,
+                                               fr = "Methode d'optimisation",
+                                               ang = "Optimisation method",
+                                               ),
+
+                                     
+                PhysicalStartingPoint = SIMP ( statut = "f",
+                                               typ = "R",
+                                               max = "**",
+                                               fr = "Point de demarrage de l'algorithme iteratif",
+                                               ang = "Initial point for iterative process",
+                                               ),
+
+                MaximumIterationsNumber = SIMP ( statut = "f",
+                                                 typ = "I",
+                                                 max = 1,
+                                                 val_min = 1,
+                                                 fr = "Nombre maximum d iterations",
+                                                 ang = "Maximum number of iterations",
+                                                 ),
+
+                                     
+                MaximumAbsoluteError = SIMP ( statut = "f",
+                                              typ = "R",
+                                              max = 1,
+                                              defaut = 1E-4,
+                                              val_min = 0.0,
+                                              fr = "Distance maximum absolue entre 2 iterations successifs",
+                                              ang = "Absolute maximum distance between 2 successive iterates",
+                                              ),
+
+                MaximumRelativeError = SIMP ( statut = "f",
+                                               typ = "R",
+                                               max = 1,
+                                               defaut = 1E-4,
+                                               val_min = 0.0,
+                                               fr = "Distance maximum relative entre 2 iterations successives",
+                                               ang = "Relative maximum distance between 2 successive iterates",
+                                               ),
+                                     
+                MaximumConstraintError = SIMP ( statut = "f",
+                                                typ = "R",
+                                                max = 1,
+                                                defaut = 1E-4,
+                                                val_min = 0.0,
+                                                fr = "Valeur maximum absolue de la fonction moins la valeur du niveau",
+                                                ang = "Maximum absolute value of the constraint function minus the level value",
+                                                ),
+
+                ImportanceSampling = SIMP ( statut = "o",
+                                            typ = 'TXM',
+                                            into = ( 'yes', 'no' ),
+                                            defaut = 'no',
+                                            max = 1,
+                                            fr = "Tirage d'importance au point de conception",
+                                            ang = "Importance sampling at design point",
+                                            ),
+
+                FirstOrder = BLOC ( condition = " Approximation in ( 'FirstOrder', ) ",
+
+                    Probability = SIMP ( statut = "o",
+                                         typ = 'TXM',
+                                         into = ( 'yes', ),
+                                         defaut = 'yes',
+                                         max = 1,
+                                         fr = "Probabiblite",
+                                         ang = "Probability",
+                                         ),
+
+                    DesignPoint = SIMP ( statut = "o",
+                                         typ = 'TXM',
+                                         into = ( 'yes', 'no' ),
+                                         defaut = 'yes',
+                                         max = 1,
+                                         fr = "Point de conception",
+                                         ang = "Design point",
+                                         ),
+
+                    HasoferReliabilityIndex = SIMP ( statut = "o",
+                                                 typ = 'TXM',
+                                                 into = ( 'yes', 'no' ),
+                                                 defaut = 'yes',
+                                                 max = 1,
+                                                 fr = "Indice de fiabilite",
+                                                 ang = "Reliability index",
+                                                 ),
+
+                    ImportanceFactor = SIMP ( statut = "o",
+                                              typ = 'TXM',
+                                              into = ( 'yes', 'no' ),
+                                              defaut = 'no',
+                                              max = 1,
+                                              fr = "Facteur d'importance pour variable de sortie scalaire",
+                                              ang = "ImportanceFactor",
+                                              ),
+
+                    ImportanceFactorSettings = BLOC ( condition = " ImportanceFactor in ( 'yes', ) ",
+
+                            ImportanceFactorNumericalResults  = SIMP ( statut = "o",
+                                                       typ = 'TXM',
+                                                       into = ( 'yes', 'no' ),
+                                                       defaut = 'yes',
+                                                       max = 1,
+                                                       fr = "Resultats numeriques",
+                                                       ang = "NumericalResults",
+                                                       ),
+
+                             ImportanceFactorGraphicalResults  = SIMP ( statut = "o",
+                                                        typ = 'TXM',
+                                                        into = ( 'yes', 'no' ),
+                                                        defaut = 'no',
+                                                        max = 1,
+                                                        fr = "Resultats graphiques",
+                                                        ang = "GraphicalResults",
+                                                        ),
+
+                    ), # Fin BLOC ImportanceFactorSettings
+
+
+                    SensitivityAnalysis = SIMP ( statut = "o",
+                                                 typ = 'TXM',
+                                                 into = ( 'yes', 'no' ),
+                                                 defaut = 'no',
+                                                 max = 1,
+                                                 fr = "Analyse de sensibilite",
+                                                 ang = "Sensitivity analysis",
+                                                 ),
+
+                    SensitivityAnalysisSettings = BLOC ( condition = " SensitivityAnalysis in ( 'yes', ) ",
+
+                            FORMEventProbabilitySensitivity = SIMP ( statut = "o",
+                                                             typ = 'TXM',
+                                                             into = ( 'yes', 'no' ),
+                                                             defaut = 'no',
+                                                             max = 1,
+                                                             fr = "Indice de fiabilite de Hasofer",
+                                                             ang = "Hasofer reliability index",
+                                                             ),
+        
+                            FORMEventProbabilitySensitivitySettings = BLOC ( condition = " FORMEventProbabilitySensitivity in ( 'yes', ) ",
+        
+                                    FORMEventProbabilitySensitivityNumericalResults  = SIMP ( statut = "o",
+                                                               typ = 'TXM',
+                                                               into = ( 'yes', 'no' ),
+                                                               defaut = 'yes',
+                                                               max = 1,
+                                                               fr = "Resultats numeriques",
+                                                               ang = "NumericalResults",
+                                                               ),
+        
+                                     FORMEventProbabilitySensitivityGraphicalResults  = SIMP ( statut = "o",
+                                                                typ = 'TXM',
+                                                                into = ( 'yes', 'no' ),
+                                                                defaut = 'no',
+                                                                max = 1,
+                                                                fr = "Resultats graphiques",
+                                                                ang = "GraphicalResults",
+                                                                ),
+
+                            ), # Fin BLOC FORMEventProbabilitySensitivitySettings
+                                                         
+                            HasoferReliabilityIndexSensitivity = SIMP ( statut = "o",
+                                                             typ = 'TXM',
+                                                             into = ( 'yes', 'no' ),
+                                                             defaut = 'no',
+                                                             max = 1,
+                                                             fr = "Indice de fiabilite de Hasofer",
+                                                             ang = "Hasofer reliability index",
+                                                             ),
+        
+                            HasoferReliabilityIndexSensitivitySettings = BLOC ( condition = " HasoferReliabilityIndexSensitivity in ( 'yes', ) ",
+        
+                                    HasoferReliabilityIndexSensitivityNumericalResults  = SIMP ( statut = "o",
+                                                               typ = 'TXM',
+                                                               into = ( 'yes', 'no' ),
+                                                               defaut = 'yes',
+                                                               max = 1,
+                                                               fr = "Resultats numeriques",
+                                                               ang = "NumericalResults",
+                                                               ),
+        
+                                     HasoferReliabilityIndexSensitivityGraphicalResults  = SIMP ( statut = "o",
+                                                                typ = 'TXM',
+                                                                into = ( 'yes', 'no' ),
+                                                                defaut = 'no',
+                                                                max = 1,
+                                                                fr = "Resultats graphiques",
+                                                                ang = "GraphicalResults",
+                                                                ),
+
+                            ), # Fin BLOC HasoferReliabilityIndexSettings
+                                                         
+                    ), # Fin BLOC SensitivityAnalysisSettings
+
+                    FunctionCallsNumber = SIMP ( statut = "o",
+                                                 typ = 'TXM',
+                                                 into = ( 'yes', 'no' ),
+                                                 defaut = 'no',
+                                                 max = 1,
+                                                 fr = "Nombre d'appels a la fonction",
+                                                 ang = "Function calls number",
+                                                 ),
+
+
+                ), # Fin BLOC FirstOrder
+
+
+                SecondOrder = BLOC ( condition = " Approximation in ( 'SecondOrder', ) ",
+
+
+                    TvedtApproximation = SIMP ( statut = "o",
+                                                typ = 'TXM',
+                                                into = ( 'yes', 'no' ),
+                                                defaut = 'no',
+                                                max = 1,
+                                                fr = "Approximation de Tvedt",
+                                                ang = "Tvedt approximation",
+                                                ),
+
+                    HohenBichlerApproximation = SIMP ( statut = "o",
+                                                       typ = 'TXM',
+                                                       into = ( 'yes', 'no' ),
+                                                       defaut = 'no',
+                                                       max = 1,
+                                                       fr = "Approximation de HohenBichler",
+                                                       ang = "HohenBichler approximation",
+                                                       ),
+
+                    BreitungApproximation = SIMP ( statut = "o",
+                                                   typ = 'TXM',
+                                                   into = ( 'yes', 'no' ),
+                                                   defaut = 'no',
+                                                   max = 1,
+                                                   fr = "Approximation de Breitung",
+                                                   ang = "Breitung approximation",
+                                                   ),
+
+                    DesignPoint = SIMP ( statut = "o",
+                                         typ = 'TXM',
+                                         into = ( 'yes', 'no' ),
+                                         defaut = 'yes',
+                                         max = 1,
+                                         fr = "Point de conception",
+                                         ang = "Design point",
+                                         ),
+
+                    ImportanceFactor = SIMP ( statut = "o",
+                                              typ = 'TXM',
+                                              into = ( 'yes', 'no' ),
+                                              defaut = 'no',
+                                              max = 1,
+                                              fr = "Facteur d'importance pour variable de sortie scalaire",
+                                              ang = "ImportanceFactor",
+                                              ),
+
+                    ImportanceFactorSettings = BLOC ( condition = " ImportanceFactor in ( 'yes', ) ",
+
+                            ImportanceFactorNumericalResults  = SIMP ( statut = "o",
+                                                       typ = 'TXM',
+                                                       into = ( 'yes', 'no' ),
+                                                       defaut = 'yes',
+                                                       max = 1,
+                                                       fr = "Resultats numeriques",
+                                                       ang = "NumericalResults",
+                                                       ),
+
+                             ImportanceFactorGraphicalResults  = SIMP ( statut = "o",
+                                                        typ = 'TXM',
+                                                        into = ( 'yes', 'no' ),
+                                                        defaut = 'no',
+                                                        max = 1,
+                                                        fr = "Resultats graphiques",
+                                                        ang = "GraphicalResults",
+                                                        ),
+
+                    ), # Fin BLOC ImportanceFactorSettings
+
+                    SensitivityAnalysis = SIMP ( statut = "o",
+                                                 typ = 'TXM',
+                                                 into = ( 'yes', 'no' ),
+                                                 defaut = 'no',
+                                                 max = 1,
+                                                 fr = "Analyse de sensibilite",
+                                                 ang = "Sensitivity analysis",
+                                                 ),
+
+                    SensitivityAnalysisSettings = BLOC ( condition = " SensitivityAnalysis in ( 'yes', ) ",
+
+                            HasoferReliabilityIndexSensitivity = SIMP ( statut = "o",
+                                                             typ = 'TXM',
+                                                             into = ( 'yes', 'no' ),
+                                                             defaut = 'no',
+                                                             max = 1,
+                                                             fr = "Indice de fiabilite de Hasofer",
+                                                             ang = "Hasofer reliability index",
+                                                             ),
+        
+                            HasoferReliabilityIndexSensitivitySettings = BLOC ( condition = " HasoferReliabilityIndexSensitivity in ( 'yes', ) ",
+        
+                                    HasoferReliabilityIndexSensitivityNumericalResults  = SIMP ( statut = "o",
+                                                               typ = 'TXM',
+                                                               into = ( 'yes', 'no' ),
+                                                               defaut = 'yes',
+                                                               max = 1,
+                                                               fr = "Resultats numeriques",
+                                                               ang = "NumericalResults",
+                                                               ),
+        
+                                     HasoferReliabilityIndexSensitivityGraphicalResults  = SIMP ( statut = "o",
+                                                                typ = 'TXM',
+                                                                into = ( 'yes', 'no' ),
+                                                                defaut = 'no',
+                                                                max = 1,
+                                                                fr = "Resultats graphiques",
+                                                                ang = "GraphicalResults",
+                                                                ),
+
+                            ), # Fin BLOC HasoferReliabilityIndexSettings
+                                                         
+                    ), # Fin BLOC SensitivityAnalysisSettings
+
+                    FunctionCallsNumber = SIMP ( statut = "o",
+                                                 typ = 'TXM',
+                                                 into = ( 'yes', 'no' ),
+                                                 defaut = 'no',
+                                                 max = 1,
+                                                 fr = "Nombre d'appels a la fonction",
+                                                 ang = "Function calls number",
+                                                 ),
+
+
+                ), # Fin BLOC SecondOrder
+
+
+                                     
+        ), # Fin BLOC AnalyticalSettings
+
+
+                               
+  ), # Fin BLOC ThresholdExceedence
+
+
+
+) # Fin PROC CRITERIA
+# Ordre Catalogue CRITERIA
+
+
+
+
+
+
+
index 7cd5b3c1cbda250aaabd23e15ef7dfa4b8b11080..7592ca46775cdd9064dc4df48a16647a76d397d1 100644 (file)
@@ -6,7 +6,8 @@ rep_cata=os.getcwd()
 catalogues = (
 # (code,version,catalogue,formatIn,formatOut)
   #('OPENTURNS_WRAPPER','V1',os.path.join(rep_cata,'OpenTURNS_Cata_Wrapper_V1.py'),'openturns_wrapper','wrapper'),
-  ('OPENTURNS_STUDY','V3',os.path.join(rep_cata,'OpenTURNS_Cata_Study_V3.py'),'openturns_study','wrapper'),
+  ('OPENTURNS_STUDY','V4',os.path.join(rep_cata,'OpenTURNS_Cata_Study_V4.py'),'openturns_study','wrapper'),
+  #('OPENTURNS_STUDY','V4',os.path.join(rep_cata,'OpenTURNS_Cata_Study_VPN.py'),'openturns_study','wrapper'),
   #('OPENTURNS','Wrapper',os.path.join(rep_cata,'OpenTURNS_Cata_Wrapper_V1.py'),'openturns'),
 )
 
index 5fff47f63a11f9d13490002383f3ac45355d7e78..84f4d9a30dd748bd01800054786693da8534a948 100644 (file)
@@ -1,54 +1 @@
-# -*- coding: utf-8 -*-
-#            CONFIGURATION MANAGEMENT OF EDF VERSION
-# ======================================================================
-# COPYRIGHT (C) 1991 - 2002  EDF R&D                  WWW.CODE-ASTER.ORG
-# THIS PROGRAM IS FREE SOFTWARE; YOU CAN REDISTRIBUTE IT AND/OR MODIFY
-# IT UNDER THE TERMS OF THE GNU GENERAL PUBLIC LICENSE AS PUBLISHED BY
-# THE FREE SOFTWARE FOUNDATION; EITHER VERSION 2 OF THE LICENSE, OR
-# (AT YOUR OPTION) ANY LATER VERSION.
-#
-# THIS PROGRAM IS DISTRIBUTED IN THE HOPE THAT IT WILL BE USEFUL, BUT
-# WITHOUT ANY WARRANTY; WITHOUT EVEN THE IMPLIED WARRANTY OF
-# MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. SEE THE GNU
-# GENERAL PUBLIC LICENSE FOR MORE DETAILS.
-#
-# YOU SHOULD HAVE RECEIVED A COPY OF THE GNU GENERAL PUBLIC LICENSE
-# ALONG WITH THIS PROGRAM; IF NOT, WRITE TO EDF R&D CODE_ASTER,
-#    1 AVENUE DU GENERAL DE GAULLE, 92141 CLAMART CEDEX, FRANCE.
-#
-#
-# ======================================================================
-
-import os, sys
-# Les variables pouvant positionnees sont :
-# "CODE_PATH_SURCHARGE","DTDDirectory","rep_user","INSTALLDIR","path_doc","exec_acrobat","rep_cata"
-print "import des prefs de OPENTURNS_STUDY"
-
-code = "OPENTURNS_STUDY"
-
-# REPINI sert à localiser le fichier 
-# initialdir sert comme directory initial des QFileDialog
-# positionnee a repin au debut mise a jour dans configuration
-REPINI=os.path.dirname(os.path.abspath(__file__))
-initialdir=REPINI 
-
-# INSTALLDIR sert à localiser l'installation d'Eficas
-INSTALLDIR=os.path.join(REPINI,'..')
-
-
-# Codage des strings qui accepte les accents (en remplacement de 'ascii')
-# lang indique la langue utilisée pour les chaines d'aide : fr ou ang
-lang='fr'
-encoding='iso-8859-1'
-
-# Acces a la documentation
-rep_cata        = INSTALLDIR
-path_doc        = os.path.join(rep_cata,'Doc')
-exec_acrobat    = "/usr/bin/xpdf"
-
-# Repertoire initial
-DTDDirectory="/local00/home/dutka/OpenTURNS/dutka/devel/build/install/share/openturns/wrappers/"
-
-# Choix des catalogues
-sys.path[:0]=[INSTALLDIR]
-
+code='OPENTURNS_STUDY'
index 76e0ad8acfa19e0320c20a349fa27339d0537694..5c8654929dcb3fd906646a3c39deb0ac25a0757d 100755 (executable)
@@ -27,7 +27,9 @@
 
 # Modules Eficas
 import prefs
-prefs.code="OPENTURNS_STUDY"
-from InterfaceQT4 import eficas_go
+name='prefs_'+prefs.code
+__import__(name)
 
+import sys
+from InterfaceQT4 import eficas_go
 eficas_go.lance_eficas(code=prefs.code)
index a66aa137b8e6c16a29bfa138c23b065389552a51..85d9fe6669b67dda3c542d2dc38eea12dc91b78c 100644 (file)
@@ -5,83 +5,9 @@ import sets
 
 jdcSet=sets.Set()
 
-dict_erreurs={
-#STA8.4
-              "DIST_LIGN_3D": "la commande DIST_LIGN_3D a ete supprimee",
-              "DEFI_THER_JOULE": "la commande DIST_LIGN_3D a ete supprimee",
-              "DIST_LIGN_3D": "la commande DIST_LIGN_3D a ete supprimee",
-              "AFFE_MODELE_AFFE": "Les modelisations APPUI_REP, ASSE_GRIL et 3D_JOINT_CT ont ete supprimees",
-              "AFFE_CHAR_MECA_CONTACT_FROTTEMENT": "Suppression d un mot clef FROTTEMENT",
-              "AFFE_CHAR_MECA_SECH_CALCULEE": "le sechage est maintenant une variable de commande",
-              "AFFE_CHAR_MECA_HYDR_CALCULEE": "l'hydratation est maintenant une variable de commande",
-              "AFFE_CHAR_MECA_EPSA_CALCULEE":"EPSA est maintenant une variable de commande",
-              "AFFE_CHAR_MECA_PRESSION_CALCULEE":"PRESSION_CALCULEE est remplace par EVOL_CHAR",
-              "MACR_LIGN_COUPE" : "MACR_LIGN_COUPE demande un traitement manuel",
-              "POST_RCCM" : "POST_RCCM demande un traitement manuel",
-              "DEFI_MATERIAU_CHABOCHE" : "remplacer la valeur CINx_CHAB",
-              "DEFI_MATERIAU_POLY_CFC" : "le materiau POLY_CFC est remplace par le comportement POLYCRISTAL",
-              "DEFI_MATERIAU_ECOU_PLAS1" : "le materiau ECOU_PLAS1 est supprime",
-              "DEFI_MATERIAU_COMP_THM_ELAS_THM" : "le materiau ELAS_THM a ete supprime",
-              "DEFI_MATERIAU_COMP_THM_SURF_ETAT_SATU" : "le materiau SURF_ETAT_SATU a ete supprime",
-              "DEFI_MATERIAU_COMP_THM_SURF_ETAT_NSAT" : "le materiau SURF_ETAT_NSAT a ete supprime",
-              "DEFI_MATERIAU_COMP_THM_CAM_CLAY_THM" : "le materiau CAM_CLAY_THM a ete supprime",
-              "DEFI_MATERIAU_COMP_THM_LIQU_SATU_GAT" : "le materiau LIQU_SATU_GAT a ete supprime",
-              "DEFI_MATERIAU_COMP_THM_LIQU_NSAT_GAT" : "le materiau LIQU_NSAT_GAT a ete supprime",
-              "DEFI_MATERIAU_GLRC" : "le materiau GLRC a ete remplace par GLRC_DAMAGE",
-              "DEFI_MATERIAU_GLRC_FO" : "le materiau GLRC_FO a ete remplace par GLRC_DAMAGE",
-              "DEFI_MATERIAU_OHNO" : "le materiau OHNO a ete remplace par TAHERI",
-              "DEFI_MATERIAU_OHNO_FO" : "le materiau OHNO a ete remplace par TAHERI",
-              "CALC_CHAM_ELEM":"reecrire la partie SOUR_ELGA_ELEC",
-              "CALC_G_THETA_T_OPTION_VALEUR":"verifier la valeur d OPTION",
-              "CALC_G_THETA_T_OPTION_DEFAUT":"verifier la valeur d OPTION donnee a la place du defaut",
-              "CALC_G_MODELE":"Mot Clef MODELE supprimé sous CALC_G",
-              "CALC_G_DEPL":"Mot Clef DEPL supprimé sous CALC_G",
-              "CALC_G_CHAM_MATER":"Mot Clef CHAM_MATER supprimé sous CALC_G",
-              "CALC_G_CARA_ELEM":"Mot Clef CARA_ELEM supprimé sous CALC_G",
-              "CALC_G_RESULTAT=XXX,":"Mot Clef RESULTAT à completer sous CALC_G",
-              "AFFE_MODELE_AFFE_MODELISATION_VALEUR":"verifier la valeur de MODELISATION",
-              "STAT_NON_LINE_COMP_INCR_RELATION_VALEUR":"verifier la valeur de RELATION",
-              "STAT_NON_LINE_COMP_INCR_RELATION_KIT_VALEUR":"verifier la valeur de RELATION_KIT",
-              "STAT_NON_LINE_VARI_COMM":"suppression des variables de commande",
-              "STAT_NON_LINE_INCREMENT_SUBD_PAS":"Si SUBD_PAS=1 il n'y a pas subdivision : le mot est clef est ote du STAT_NON_LINE",
-              "DYNA_NON_LINE_COMP_INCR_RELATION_VALEUR":"verifier la valeur de RELATION",
-              "DYNA_NON_LINE_COMP_INCR_RELATION_KIT_VALEUR":"verifier la valeur de RELATION_KIT",
-              "DYNA_NON_LINE_VARI_COMM":"suppression des variables de commande",
-              "DYNA_NON_LINE_INCREMENT_SUBD_PAS":"Si SUBD_PAS=1 il n'y a pas subdivision : le mot est clef est ote du DYNA_NON_LINE",
-              "CALC_PRECONT_SUBD_PAS":"Si SUBD_PAS=1 il n'y a pas subdivision : le mot est clef est ote du CALC_PRECONT",
-              "TEST_RESU_UNITE":"suppression du mot clef UNITE dans TEST_RESU",
-              "POST_SIMPLIFIE":"commande POST_SIMPLIFIE supprimee",
-              "POST_DYNA_ALEA_GAUSS":"la methode GAUSS a ete supprimee de POST_DYNA_ALEA",
-              "POST_DYNA_ALEA_VANMARCKE":"la methode VANMARCKE a ete supprimee de POST_DYNA_ALEA",
-              "POST_DYNA_ALEA_DEPASSEMENT":"la methode DEPASSEMENT a ete supprimee de POST_DYNA_ALEA",
-              "POST_DYNA_ALEA_RAYLEIGH":"la methode RAYLEIGH a ete supprimee de POST_DYNA_ALEA",
-              "DYNA_TRAN_MODAL_EXCIT_NUME_MODE":"le numero du mode utilise pour EXCIT DYNA_TRAN_MODAL est le numero d'ORDRE",
-              "DEFI_INTERF_DYNA_INTERFACE_DDL_ACTIF":"DDL_ACTIF supprime de DEFI_INTERF_DYNA; utiliser MASQUE",
-              "DEFI_TEXTURE":"le materiau POLY_CFC est remplace par le comportement POLYCRISTAL",
-              "CREA_RESU_NOM_CHAM_VALEUR":"HYDR_ELGA est remplace par HYDR_ELNO_ELGA et HYDR_NOEU_ELGA",
-              "COMB_CHAM_NO":"COMB_CHAM_NO est remplace par CREA_CHAMP",
-              "COMB_CHAM_ELEM":"COMB_CHAM_ELEM est remplace par CREA_CHAMP",
-              "IMPR_OAR":"IMPR_OAR demande un traitement manuel",
-              "IMPR_FICO_HOMARD":"IMPR_FICO_HOMARD a ete integre dans MACR_ADPA_MAIL",
-# STA9.2
-              "POST_RCCM_SITUATION_NUME_PASSAGE":"Utilisation de NUME_PASSAGE pour le type TUYAUTERIE impossible en 9.2. On ne traite pour le moment que les chemins de passage simples.",
-              "POST_RCCM_SITUATION_NB_CYCL_SEISME":"POST_RCCM : maintenant les SITUATIONS sismiques ont leur propre mot clef facteur SEISME, attention, traduction incomplete",
-              "DEFI_MATERIAU_BAZANT_FD" : "le materiau BAZANT_FD a ete supprime",
-              "DEFI_MATERIAU_APPUI_ELAS" : "le materiau APPUI_ELAS a ete supprime",
-              "DEFI_MATERIAU_PORO_JOINT" : "le materiau PORO_JOINT a ete supprime",
-              "DEFI_MATERIAU_ZIRC_CYRA2" : "le materiau ZIRC_CYRA2 a ete supprime",
-              "DEFI_MATERIAU_ZIRC_EPRI" : "le materiau ZIRC_EPRI a ete supprime",
-              "IMPR_MATRICE_MATR_ELEM_FORMAT=RESULTAT" : "IMPR_MATRICE au format RESULTAT a ete supprime",
-              "IMPR_MATRICE_MATR_ASSE_FORMAT=RESULTAT" : "IMPR_MATRICE au format RESULTAT a ete supprime",
-              "CALC_G_OPTION=G_LAGR" : "l'OPTION G_LAGR de CALC_G a ete supprimee",
-              "CALC_G_OPTION=G_LAGR_GLOB" : "l'OPTION G_LAGR_GLOB de CALC_G a ete supprimee",
-              "CALC_MATR_ELEM_THETA" : "l'OPTION RIGI_MECA_LAGR de CALC_MATR_ELEM a ete supprimee",
-              "TEST_FICHIER_NB_CHIFFRE" : "le fonctionnement de TEST_FICHIER a change entre la V8 et la V9, consultez la doc, en particulier pour entrer la bonne valeur de NB_VALE",
-              "DYNA_NON_LINE_PILOTAGE" : "le PILOTAGE n'est pas actif dans DYNA_NON_LINE ",
-              "DYNA_NON_LINE_RECH_LINEAIRE" : "la RECH_LINEAIRE n'est pas active dans DYNA_NON_LINE ",
-             }
 
 def EcritErreur(listeGena,ligne=None) :
+    from sys import dict_erreurs
     maCle=""
     for Mot in listeGena :
         maCle=maCle+"_"+Mot
@@ -90,7 +16,7 @@ def EcritErreur(listeGena,ligne=None) :
        maClef=maCle[1:]
         if maClef in dict_erreurs.keys() :
            if ligne != None :
-             logging.warning("ligne %d : %s ligne ",ligne,dict_erreurs[maClef])
+             logging.warning("ligne %d : %s ",ligne,dict_erreurs[maClef])
            else :
              logging.warning("%s",dict_erreurs[maClef])
         else :
@@ -101,7 +27,7 @@ def EcritErreur(listeGena,ligne=None) :
           maClef=maCle+"_"+"VALEUR"
            if maClef in dict_erreurs.keys() :
               if ligne != None :
-                 logging.warning("ligne %d : %s ligne ",ligne,dict_erreurs[maClef])
+                 logging.warning("ligne %d : %s ",ligne,dict_erreurs[maClef])
               else :
                  logging.warning("%s",dict_erreurs[maClef])
     #except :
@@ -116,3 +42,16 @@ def GenereErreurPourCommande(jdc,listeCommande) :
            if c.name != Mot :continue
            EcritErreur((Mot,),c.lineno)
 
+def GenereErreurMotCleInFact(jdc,command,fact,mocle):
+    for c in jdc.root.childNodes:
+        if c.name != command:continue
+        for mc in c.childNodes:
+            if mc.name != fact:continue
+            l=mc.childNodes[:]
+            for ll in l:
+                for n in ll.childNodes:
+                    if n.name != mocle:
+                       continue
+                   else :
+                       EcritErreur((command,fact,mocle,),c.lineno)
+
index e4f8448d096bb913ee5da11330424df4ef04cd8e..90c0aa35e2f4533a7f5a00b99b2a75ca8a8b0930 100644 (file)
@@ -100,7 +100,7 @@ def renameMotCleInFact(jdc,command,fact,mocle,new_name, ensemble=regles.SansRegl
                     if erreur :
                        EcritErreur((command,fact,mocle),c.lineno)
                     else :
-                       logging.info("Renommage de: %s, %s, %s, en %s",n.name,n.lineno,n.colno,new_name)
+                       logging.info("Renommage de: %s, ligne %s, en %s",n.name,n.lineno,new_name)
 
     if boolChange : jdc.reset(jdc.getSource())
 
@@ -128,7 +128,7 @@ def renameCommande(jdc,command,new_name,ensemble=regles.SansRegle):
         if ensemble.verif(c) == 0 : continue
         boolChange=1
         if debug:print "Renommage de:",c.name,new_name ,c.lineno,c.colno
-        logging.info("Renommage de: %s en ligne %d en %s",c.name,c.lineno,new_name)
+        logging.info("Renommage de: %s ligne %d en %s",c.name,c.lineno,new_name)
         s=jdc.getLines()[c.lineno-1]
         jdc.getLines()[c.lineno-1]=s[:c.colno]+new_name+s[c.colno+len(command):]
 
index 1b53c44e20f327ac737d0a78c0457dfd3cfd063e..2b591a49f14e1dc7ceb033eb5286f6ab5e0f56af 100644 (file)
@@ -7,6 +7,7 @@ Typical use is:
   python traduitV7V8.py --infile=xxxx --outfile=yyyy
 """
 
+import sys
 import log
 import optparse
 
@@ -18,7 +19,7 @@ from renamemocle  import *
 from inseremocle  import *
 from changeValeur import *
 from movemocle    import *
-from dictErreurs  import GenereErreurPourCommande
+from dictErreurs  import GenereErreurPourCommande,GenereErreurMotCleInFact
 
 import calcG
 
@@ -35,9 +36,71 @@ atraiter=( "IMPR_GENE","CALC_FONCTION", "DEFI_MATERIAU","STAT_NON_LINE",
           "CALC_PRECONT","DEFI_TEXTURE","TEST_RESU","COMB_CHAM_NO","COMB_CHAM_ELEM",
           "CALC_FATIGUE","IMPR_OAR", "AFFE_CHAR_MECA_F",
            "MACR_ASCOUF_CALC","MACR_ASPIC_CALC","MACR_CABRI_CALC",
-           "MACR_ADAP_MAIL","IMPR_FICO_HOMARD","DEFI_PART_FETI",
+           "MACR_ADAP_MAIL","IMPR_FICO_HOMARD","DEFI_PART_FETI"
         )
 
+dict_erreurs={
+#STA8
+              "DIST_LIGN_3D": "la commande DIST_LIGN_3D a ete supprimee",
+              "DEFI_THER_JOULE": "la commande DIST_LIGN_3D a ete supprimee",
+              "DIST_LIGN_3D": "la commande DIST_LIGN_3D a ete supprimee",
+              "AFFE_MODELE_AFFE": "Les modelisations APPUI_REP, ASSE_GRIL et 3D_JOINT_CT ont ete supprimees",
+              "AFFE_CHAR_MECA_CONTACT_FROTTEMENT": "Suppression d un mot clef FROTTEMENT",
+              "AFFE_CHAR_MECA_SECH_CALCULEE": "le sechage est maintenant une variable de commande",
+              "AFFE_CHAR_MECA_HYDR_CALCULEE": "l'hydratation est maintenant une variable de commande",
+              "AFFE_CHAR_MECA_EPSA_CALCULEE":"EPSA est maintenant une variable de commande",
+              "AFFE_CHAR_MECA_PRESSION_CALCULEE":"PRESSION_CALCULEE est remplace par EVOL_CHAR",
+              "MACR_LIGN_COUPE" : "MACR_LIGN_COUPE demande un traitement manuel",
+              "POST_RCCM" : "POST_RCCM demande un traitement manuel",
+              "DEFI_MATERIAU_CHABOCHE" : "remplacer la valeur CINx_CHAB",
+              "DEFI_MATERIAU_POLY_CFC" : "le materiau POLY_CFC est remplace par le comportement POLYCRISTAL",
+              "DEFI_MATERIAU_ECOU_PLAS1" : "le materiau ECOU_PLAS1 est supprime",
+              "DEFI_MATERIAU_COMP_THM_ELAS_THM" : "le materiau ELAS_THM a ete supprime",
+              "DEFI_MATERIAU_COMP_THM_SURF_ETAT_SATU" : "le materiau SURF_ETAT_SATU a ete supprime",
+              "DEFI_MATERIAU_COMP_THM_SURF_ETAT_NSAT" : "le materiau SURF_ETAT_NSAT a ete supprime",
+              "DEFI_MATERIAU_COMP_THM_CAM_CLAY_THM" : "le materiau CAM_CLAY_THM a ete supprime",
+              "DEFI_MATERIAU_COMP_THM_LIQU_SATU_GAT" : "le materiau LIQU_SATU_GAT a ete supprime",
+              "DEFI_MATERIAU_COMP_THM_LIQU_NSAT_GAT" : "le materiau LIQU_NSAT_GAT a ete supprime",
+              "DEFI_MATERIAU_GLRC" : "le materiau GLRC a ete remplace par GLRC_DAMAGE",
+              "DEFI_MATERIAU_GLRC_FO" : "le materiau GLRC_FO a ete remplace par GLRC_DAMAGE",
+              "DEFI_MATERIAU_OHNO" : "le materiau OHNO a ete remplace par TAHERI",
+              "DEFI_MATERIAU_OHNO_FO" : "le materiau OHNO a ete remplace par TAHERI",
+              "CALC_CHAM_ELEM":"reecrire la partie SOUR_ELGA_ELEC",
+              "CALC_G_THETA_T_OPTION_VALEUR":"verifier la valeur d OPTION",
+              "CALC_G_THETA_T_OPTION_DEFAUT":"verifier la valeur d OPTION donnee a la place du defaut",
+              "CALC_G_MODELE":"Mot Clef MODELE supprimé sous CALC_G",
+              "CALC_G_DEPL":"Mot Clef DEPL supprimé sous CALC_G",
+              "CALC_G_CHAM_MATER":"Mot Clef CHAM_MATER supprimé sous CALC_G",
+              "CALC_G_CARA_ELEM":"Mot Clef CARA_ELEM supprimé sous CALC_G",
+              "CALC_G_RESULTAT=XXX,":"Mot Clef RESULTAT à completer sous CALC_G",
+              "AFFE_MODELE_AFFE_MODELISATION_VALEUR":"verifier la valeur de MODELISATION",
+              "STAT_NON_LINE_COMP_INCR_RELATION_VALEUR":"verifier la valeur de RELATION",
+              "STAT_NON_LINE_COMP_INCR_RELATION_KIT_VALEUR":"verifier la valeur de RELATION_KIT",
+              "STAT_NON_LINE_VARI_COMM":"suppression des variables de commande",
+              "STAT_NON_LINE_INCREMENT_SUBD_PAS":"Si SUBD_PAS=1 il n'y a pas subdivision : le mot est clef est ote du STAT_NON_LINE",
+              "DYNA_NON_LINE_COMP_INCR_RELATION_VALEUR":"verifier la valeur de RELATION",
+              "DYNA_NON_LINE_COMP_INCR_RELATION_KIT_VALEUR":"verifier la valeur de RELATION_KIT",
+              "DYNA_NON_LINE_VARI_COMM":"suppression des variables de commande",
+              "DYNA_NON_LINE_INCREMENT_SUBD_PAS":"Si SUBD_PAS=1 il n'y a pas subdivision : le mot est clef est ote du DYNA_NON_LINE",
+              "CALC_PRECONT_SUBD_PAS":"Si SUBD_PAS=1 il n'y a pas subdivision : le mot est clef est ote du CALC_PRECONT",
+              "TEST_RESU_UNITE":"suppression du mot clef UNITE dans TEST_RESU",
+              "POST_SIMPLIFIE":"commande POST_SIMPLIFIE supprimee",
+              "POST_DYNA_ALEA_GAUSS":"la methode GAUSS a ete supprimee de POST_DYNA_ALEA",
+              "POST_DYNA_ALEA_VANMARCKE":"la methode VANMARCKE a ete supprimee de POST_DYNA_ALEA",
+              "POST_DYNA_ALEA_DEPASSEMENT":"la methode DEPASSEMENT a ete supprimee de POST_DYNA_ALEA",
+              "POST_DYNA_ALEA_RAYLEIGH":"la methode RAYLEIGH a ete supprimee de POST_DYNA_ALEA",
+              "DYNA_TRAN_MODAL_EXCIT_NUME_MODE":"le numero du mode utilise pour EXCIT DYNA_TRAN_MODAL est le numero d'ORDRE",
+              "DEFI_INTERF_DYNA_INTERFACE_DDL_ACTIF":"DDL_ACTIF supprime de DEFI_INTERF_DYNA; utiliser MASQUE",
+              "DEFI_TEXTURE":"le materiau POLY_CFC est remplace par le comportement POLYCRISTAL",
+              "CREA_RESU_NOM_CHAM_VALEUR":"HYDR_ELGA est remplace par HYDR_ELNO_ELGA et HYDR_NOEU_ELGA",
+              "COMB_CHAM_NO":"COMB_CHAM_NO est remplace par CREA_CHAMP",
+              "COMB_CHAM_ELEM":"COMB_CHAM_ELEM est remplace par CREA_CHAMP",
+              "IMPR_OAR":"IMPR_OAR demande un traitement manuel",
+              "IMPR_FICO_HOMARD":"IMPR_FICO_HOMARD a ete integre dans MACR_ADPA_MAIL",
+             }
+
+sys.dict_erreurs=dict_erreurs
+
 #atraiter=( "MACR_ADAP_MAIL",)
 
 def traduc(infile,outfile,flog=None):
@@ -50,7 +113,7 @@ def traduc(infile,outfile,flog=None):
     parseKeywords(root)
     
     ####################### traitement erreurs ########################
-    GenereErreurPourCommande(jdc,("POST_RCCM","DIST_LIGN_3D","IMPR_OAR","COMB_CHAM_NO","COMB_CHAM_ELEM"))
+    GenereErreurPourCommande(jdc,("DEBUT","POST_RCCM","DIST_LIGN_3D","IMPR_OAR","COMB_CHAM_NO","COMB_CHAM_ELEM"))
 
     ####################### traitement CALC_META     #######################
     renameMotCleInFact(jdc,"CALC_META","ETAT_INIT","META_INIT","META_INIT_ELNO")
index 13647f1e0aeeb3cc9aa514596f581ae1691b17ee..a17422e03cf5a3376d4f131e1627a3ce009755b6 100644 (file)
@@ -9,6 +9,7 @@ Typical use is:
 
 import log
 import optparse
+import sys
 
 from load   import getJDC
 from mocles import parseKeywords
@@ -18,12 +19,45 @@ from renamemocle  import *
 from inseremocle  import *
 from changeValeur import *
 from movemocle    import *
-from dictErreurs  import GenereErreurPourCommande
+from dictErreurs  import GenereErreurPourCommande,GenereErreurMotCleInFact
 
 import calcG
 
 
-atraiter=( "DEFI_MAILLAGE","CALC_VECT_ELEM","DYNA_TRAN_EXPLI","DYNA_NON_LINE","STAT_NON_LINE","FACT_LDLT","FACT_GRAD","RESO_LDLT","RESO_GRAD","DYNA_TRAN_MODAL","NORM_MODE","MACRO_MODE_MECA","POST_RCCM","THER_NON_LINE","THER_LINEAIRE","THER_NON_LINE_MO","DEFI_CABLE_BP","GENE_VARI_ALEA","DEFI_MATERIAU","IMPR_MATRICE","CALC_G","CALC_MATR_ELEM","MACR_ADAP_MAIL","MACR_INFO_MAIL","REST_BASE_PHYS","COMB_SISM_MODAL","TEST_FICHIER","MACR_ELEM_DYNA","CREA_CHAMP","AFFE_CHAR_MECA","AFE_CHAR_MECA_F")
+atraiter=( "DEFI_MAILLAGE","CALC_VECT_ELEM","DYNA_TRAN_EXPLI","DYNA_NON_LINE","STAT_NON_LINE","FACT_LDLT","FACT_GRAD","RESO_LDLT","RESO_GRAD","DYNA_TRAN_MODAL","NORM_MODE","MACRO_MODE_MECA","POST_RCCM","THER_NON_LINE","THER_NON_LINE_MO","THER_LINEAIRE","THER_NON_LINE_MO","DEFI_CABLE_BP","GENE_VARI_ALEA","DEFI_MATERIAU","IMPR_MATRICE","CALC_G","CALC_MATR_ELEM","MACR_ADAP_MAIL","MACR_INFO_MAIL","REST_BASE_PHYS","COMB_SISM_MODAL","TEST_FICHIER","MACR_ELEM_DYNA","CREA_CHAMP","AFFE_CHAR_MECA","AFE_CHAR_MECA_F","MODI_MAILLAGE","DEFI_FISS_XFEM","AFFE_MODELE","POST_MAIL_XFEM","CALC_NO","LIRE_CHAMP","AFFE_MATERIAU","MACR_ASCOUF_CALC","MACR_ASPIC_CALC","CALC_PRECONT","LIRE_INTE_SPEC","MACR_CARA_POUTRE","MACR_LIGN_COUPE")
+
+dict_erreurs={
+# STA9
+              "POST_RCCM_SITUATION_NUME_PASSAGE":"Utilisation de NUME_PASSAGE pour le type TUYAUTERIE impossible en 9.2. On ne traite pour le moment que les chemins de passage simples.",
+              "POST_RCCM_SITUATION_NB_CYCL_SEISME":"POST_RCCM : maintenant les SITUATIONS sismiques ont leur propre mot clef facteur SEISME, attention, traduction incomplete",
+              "DEFI_MATERIAU_BAZANT_FD" : "le materiau BAZANT_FD a ete supprime",
+              "DEFI_MATERIAU_APPUI_ELAS" : "le materiau APPUI_ELAS a ete supprime",
+              "DEFI_MATERIAU_PORO_JOINT" : "le materiau PORO_JOINT a ete supprime",
+              "DEFI_MATERIAU_ZIRC_CYRA2" : "le materiau ZIRC_CYRA2 a ete supprime",
+              "DEFI_MATERIAU_ZIRC_EPRI" : "le materiau ZIRC_EPRI a ete supprime",
+              "IMPR_MATRICE_MATR_ELEM_FORMAT=RESULTAT" : "IMPR_MATRICE au format RESULTAT a ete supprime",
+              "IMPR_MATRICE_MATR_ASSE_FORMAT=RESULTAT" : "IMPR_MATRICE au format RESULTAT a ete supprime",
+              "CALC_G_OPTION=G_LAGR" : "l'OPTION G_LAGR de CALC_G a ete supprimee",
+              "CALC_G_OPTION=G_LAGR_GLOB" : "l'OPTION G_LAGR_GLOB de CALC_G a ete supprimee",
+              "CALC_MATR_ELEM_THETA" : "l'OPTION RIGI_MECA_LAGR de CALC_MATR_ELEM a ete supprimee",
+              "TEST_FICHIER_NB_CHIFFRE" : "le fonctionnement de TEST_FICHIER a change entre la V8 et la V9, consultez la doc, en particulier pour entrer la bonne valeur de NB_VALE",
+              "DYNA_NON_LINE_PILOTAGE" : "le PILOTAGE n'est pas actif dans DYNA_NON_LINE ",
+              "DYNA_NON_LINE_RECH_LINEAIRE" : "la RECH_LINEAIRE n'est pas active dans DYNA_NON_LINE ",
+              "DEFI_FISS_XFEM_CONTACT" : "en v9, le contact pour XFEM est defini dans un AFFE_CHAR_MECA(CONTACT=_F) en propre",
+              "POST_MAIL_XFEM" : "dans POST_MAIL_XFEM il faut entrer le MODELE et le MAILLAGE_SAIN",
+              "AFFE_MATERIAU_AFFE_TEMP_REF" : "Passage aux variables de commande : definir un materiau dependant de la temperature 'AFFE_MATERIAU(AFFE_VARC=_F(...))' et supprimer TEMP_CALCULEE dans les chargements",
+              "STAT_NON_LINE_LAGR_NON_LOCAL" : "Le solveur NON_LOCAL a ete supprime",
+              "STAT_NON_LINE_SOLV_NON_LOCAL" : "Le solveur NON_LOCAL a ete supprime",
+              "STAT_NON_LINE_ETAT_INIT_VARI_NON_LOCAL" : "Le solveur NON_LOCAL a ete supprime",
+              "DYNA_NON_LINE_LAGR_NON_LOCAL" : "Le solveur NON_LOCAL a ete supprime",
+              "DYNA_NON_LINE_SOLV_NON_LOCAL" : "Le solveur NON_LOCAL a ete supprime",
+              "DYNA_NON_LINE_ETAT_INIT_VARI_NON_LOCAL" : "Le solveur NON_LOCAL a ete supprime",
+              "CALC_PRECONT_LAGR_NON_LOCAL" : "Le solveur NON_LOCAL a ete supprime",
+              "CALC_PRECONT_SOLV_NON_LOCAL" : "Le solveur NON_LOCAL a ete supprime",
+              "CALC_PRECONT_ETAT_INIT_VARI_NON_LOCAL" : "Le solveur NON_LOCAL a ete supprime",
+             }
+
+sys.dict_erreurs=dict_erreurs
 
 def traduc(infile,outfile,flog=None):
 
@@ -35,7 +69,7 @@ def traduc(infile,outfile,flog=None):
     parseKeywords(root)
     
     ####################### traitement erreurs ########################
-    GenereErreurPourCommande(jdc,("POST_RCCM","DEFI_MATERIAU","TEST_FICHIER","DYNA_NON_LINE"))
+    GenereErreurPourCommande(jdc,("POST_RCCM","DEFI_MATERIAU","TEST_FICHIER","DYNA_NON_LINE","DEFI_FISS_XFEM","POST_MAIL_XFEM"))
 
     ####################### traitement Sous-Structuration  #######################
     renameMotCleInFact(jdc,"DEFI_MAILLAGE","DEFI_SUPER_MAILLE","MACR_ELEM_STAT","MACR_ELEM")
@@ -48,10 +82,21 @@ def traduc(infile,outfile,flog=None):
     removeMotCle(jdc,"MACR_ELEM_DYNA","OPTION")
     #########################################################################
 
-    ####################### traitement Resolution lineaire ######################
+    ####################### traitement MODI_MAILLAGE #######################
+    renameMotCle(jdc,"MODI_MAILLAGE","ORIE_SHB8","ORIE_SHB")
+    #########################################################################
+
+    ####################### traitement XFEM #######################
+    dXFEM={"3D_XFEM":"3D", "C_PLAN_X":"C_PLAN", "D_PLAN_X":"D_PLAN"}
+    ChangementValeurDsMCF(jdc,"AFFE_MODELE","AFFE","MODELISATION",dXFEM)
+    renameMotCleInFact(jdc,"DEFI_FISS_XFEM","ORIE_FOND","PT_ORIGIN","POINT_ORIG")
+    removeMotCleAvecErreur(jdc,"DEFI_FISS_XFEM","CONTACT")
+    #########################################################################
+
+    ####################### traitement Resolution lineaire #####################
     renameMotCle(jdc,"RESO_LDLT","MATR_FACT","MATR")
     renameMotCle(jdc,"RESO_GRAD","MATR_ASSE","MATR")
-    renameMotCle(jdc,"RESO_GRAD","MATR_FACT","MATR_FACT")
+    renameMotCle(jdc,"RESO_GRAD","MATR_FACT","MATR_PREC")
     renameOper(jdc,"RESO_LDLT","RESOUDRE")
     renameOper(jdc,"RESO_GRAD","RESOUDRE")
     renameOper(jdc,"FACT_LDLT","FACTORISER")
@@ -84,6 +129,9 @@ def traduc(infile,outfile,flog=None):
     renameMotCle(jdc,"THER_NON_LINE","TEMP_INIT","ETAT_INIT",)
     renameMotCleInFact(jdc,"THER_NON_LINE","INCREMENT","NUME_INIT","NUME_INST_INIT")
     renameMotCleInFact(jdc,"THER_NON_LINE","INCREMENT","NUME_FIN","NUME_INST_FIN")
+
+    renameMotCleInFact(jdc,"THER_NON_LINE_MO","TEMP_INIT","NUME_INIT","NUME_ORDRE")
+    renameMotCle(jdc,"THER_NON_LINE_MO","TEMP_INIT","ETAT_INIT",)
     #########################################################################
 
     ####################### traitement THER_LINEAIRE ############################
@@ -91,6 +139,7 @@ def traduc(infile,outfile,flog=None):
     renameMotCle(jdc,"THER_LINEAIRE","TEMP_INIT","ETAT_INIT",)
     renameMotCleInFact(jdc,"THER_LINEAIRE","INCREMENT","NUME_INIT","NUME_INST_INIT")
     renameMotCleInFact(jdc,"THER_LINEAIRE","INCREMENT","NUME_FIN","NUME_INST_FIN")
+    renameMotCleInFact(jdc,"THER_LINEAIRE","ARCHIVAGE","LIST_ARCH","LIST_INST")
     #########################################################################
 
     ####################### traitement THER_NON_LINE ############################
@@ -122,8 +171,8 @@ def traduc(infile,outfile,flog=None):
     moveMotCleFromFactToFact(jdc,"DEFI_MATERIAU","CAM_CLAY","PA","BARCELONE")
     renameMotCleInFact(jdc,"DEFI_MATERIAU","CAM_CLAY","PA","KCAM")
     # CAM_CLAY
-    AjouteMotClefDansFacteur(jdc,"DEFI_MATERIAU","CAM_CLAY","MU=xxx",)
-    AjouteMotClefDansFacteurSiRegle(jdc,"DEFI_MATERIAU","CAM_CLAY","PTRAC=XXX",((("CAM_CLAY","KCAM"),"existeMCsousMCF"),))
+#    AjouteMotClefDansFacteur(jdc,"DEFI_MATERIAU","CAM_CLAY","MU=xxx",)
+#    AjouteMotClefDansFacteurSiRegle(jdc,"DEFI_MATERIAU","CAM_CLAY","PTRAC=XXX",((("CAM_CLAY","KCAM"),"existeMCsousMCF"),))
     # VENDOCHAB
     renameMotCleInFact(jdc,"DEFI_MATERIAU","VENDOCHAB","S_VP","S")
     renameMotCleInFact(jdc,"DEFI_MATERIAU","VENDOCHAB","N_VP","N")
@@ -147,7 +196,7 @@ def traduc(infile,outfile,flog=None):
     #########################################################################
 
     ####################### traitement MACR_ADAP/INFO_MAIL ######################
-    dadap_mail={"V8_11":"V9_5", "V8_N":"V9_N", "V8_N_PERSO":"V9_N_PERSO"}
+    dadap_mail={ "V8_5":"V9_5", "V8_N":"V9_N", "V8_N_PERSO":"V9_N_PERSO"}
     ChangementValeur(jdc,"MACR_ADAP_MAIL","VERSION_HOMARD",dadap_mail)
     ChangementValeur(jdc,"MACR_INFO_MAIL","VERSION_HOMARD",dadap_mail)
     #########################################################################
@@ -238,7 +287,7 @@ def traduc(infile,outfile,flog=None):
     ChangementValeurDsMCF(jdc,"DYNA_NON_LINE","COMP_INCR","RELATION",dDis_Choc)
     renameMotCleInFact(jdc,"STAT_NON_LINE","COMP_INCR","DIS_CONTACT","DIS_CHOC")
     renameMotCleInFact(jdc,"DYNA_NON_LINE","COMP_INCR","DIS_CONTACT","DIS_CHOC")
-    dGrilles={"DIS_GRICRA":"GRILLE_CRAYONS"}
+    dGrilles={"GRILLE_CRAYONS":"DIS_GRICRA"}
     ChangementValeurDsMCF(jdc,"STAT_NON_LINE","COMP_INCR","RELATION",dGrilles)
     ChangementValeurDsMCF(jdc,"DYNA_NON_LINE","COMP_INCR","RELATION",dGrilles)
 
@@ -251,12 +300,103 @@ def traduc(infile,outfile,flog=None):
     dAppariement={"MAIT_ESCL_SYME":"MAIT_ESCL"}
     ChangementValeurDsMCF(jdc,"AFFE_CHAR_MECA","CONTACT","APPARIEMENT",dAppariement)
 
+    AjouteMotClefDansFacteurSiRegle(jdc,"AFFE_CHAR_MECA","CONTACT","TYPE_APPA='FIXE'",((("CONTACT","DIRE_APPA",),"existeMCsousMCF"),))
     #########################################################################
 
     ####################### traitement CREA_CHAMP ######################
     chercheOperInsereFacteurSiRegle(jdc,"CREA_CHAMP","PRECISION=1.E-3,", ((("PRECISION",),"nexistepas"),(("CRITERE",),"existe"),),0)
+    dTypeChamp={"ELEM_ERREUR":"ELEM_ERRE_R"}
+    ChangementValeur(jdc,"CREA_CHAMP","TYPE_CHAM",dTypeChamp)
+    #########################################################################
+
+    ####################### traitement CALC_NO ######################
+    chercheOperInsereFacteurSiRegle(jdc,"CALC_NO","PRECISION=1.E-3,", ((("PRECISION",),"nexistepas"),(("CRITERE",),"existe"),),0)
+    #########################################################################
+
+    ######### traitement variables de commandes TEMP_CALCULEE/TEMP_REF ##############
+    GenereErreurMotCleInFact(jdc,"AFFE_MATERIAU","AFFE","TEMP_REF")
+    ################################################################################
+
+    ################# traitement LIRE_CHAMP  #######################################
+#    dTypeChamp={"ELEM_ERREUR":"ELEM_ERRE_R"}
+    ChangementValeur(jdc,"LIRE_CHAMP","TYPE_CHAM",dTypeChamp)
+    ################################################################################
+
+
+    ######### traitement SUIVI_DDL #################################################
+# en pre-traitement il faudrait une methode qui separe tous les mots clefs facteurs en les dupliquant
+# par exemple ici mettre autant de mots clefs facteurs SUIVI_DDL qu'il a de _F
+    AjouteMotClefDansFacteur(jdc,"STAT_NON_LINE","SUIVI_DDL","SUIVI_DDL='OUI'")
+    renameMotCle(jdc,"STAT_NON_LINE","SUIVI_DDL","OBSERVATION")
+# en post-traitement il faudrait une methode qui fusionne tous les mots clefs facteurs en double
+# par exemple ici les OBSERVATION
+    ################################################################################
+
+
+    ######### traitement EVOLUTION in STAT/DYNA_NON_LINE ###########################
+    removeMotCleInFact(jdc,"STAT_NON_LINE","INCREMENT","EVOLUTION")
+    removeMotCleInFact(jdc,"DYNA_NON_LINE","INCREMENT","EVOLUTION")
+    ################################################################################
+
+    ######### traitement du MODELE GRILLE ##############################################
+    dGrille={"GRILLE":"GRILLE_EXCENTRE"}
+    ChangementValeurDsMCF(jdc,"AFFE_MODELE","AFFE","MODELISATION",dGrille)
+    ################################################################################
+
+    ######### traitement de MACR_ASPIC/ASCOUF_CALC GRILLE ##########################
+    removeMotCle(jdc,"MACR_ASCOUF_CALC","CHARGE")
+    removeMotCle(jdc,"MACR_ASPIC_CALC","CHARGE")
+    ################################################################################
+
+
+    ############ suppression de NON_LOCAL ##########################################
+    removeMotCleAvecErreur(jdc,"STAT_NON_LINE","LAGR_NON_LOCAL")
+    removeMotCleAvecErreur(jdc,"STAT_NON_LINE","SOLV_NON_LOCAL")
+    removeMotCleInFact(jdc,"STAT_NON_LINE","ETAT_INIT","VARI_NON_LOCAL",erreur=1)
+
+    removeMotCleAvecErreur(jdc,"DYNA_NON_LINE","LAGR_NON_LOCAL")
+    removeMotCleAvecErreur(jdc,"DYNA_NON_LINE","SOLV_NON_LOCAL")
+    removeMotCleInFact(jdc,"DYNA_NON_LINE","ETAT_INIT","VARI_NON_LOCAL",erreur=1)
+
+    removeMotCleAvecErreur(jdc,"CALC_PRECONT","LAGR_NON_LOCAL")
+    removeMotCleAvecErreur(jdc,"CALC_PRECONT","SOLV_NON_LOCAL")
+    removeMotCleInFact(jdc,"CALC_PRECONT","ETAT_INIT","VARI_NON_LOCAL",erreur=1)
+    ################################################################################
+
+    ######### traitement de LIRE_INTE_SPEC #########################################
+    renameMotCle(jdc,"LIRE_INTE_SPEC","FORMAT","FORMAT_C")
+    ################################################################################
+
+    ######### traitement de MACR_CARA_POUTRE  ######################################
+    chercheOperInsereFacteurSiRegle(jdc,"MACR_CARA_POUTRE","FORMAT='ASTER'", ((("UNITE_MAILLAGE",),"existe"),),0)
+    renameMotCle(jdc,"MACR_CARA_POUTRE","UNITE_MAILLAGE","UNITE")
+    ################################################################################
+
+    ######### traitement de MACR_LIGN_COUPE  ######################################
+# il y a un probleme s'il y a plusieurs mots clefs facteurs LIGN_COUPE : la regle ne marche qu'une fois par commande
+    AjouteMotClefDansFacteurSiRegle(jdc,"MACR_LIGN_COUPE","LIGN_COUPE","REPERE='LOCAL'", ((("LIGN_COUPE","VECT_Y",),"existeMCsousMCF"),),0)
+# autre probleme : s'il y a plusieurs mots clefs facteurs le traducteur peut, dans l'insertion, se tromper de mot clef facteur
+    AjouteMotClefDansFacteurSiRegle(jdc,"MACR_LIGN_COUPE","LIGN_COUPE","TYPE='GROUP_NO'", ((("LIGN_COUPE","GROUP_NO",),"existeMCsousMCF"),),0)
+    AjouteMotClefDansFacteurSiRegle(jdc,"MACR_LIGN_COUPE","LIGN_COUPE","TYPE='GROUP_MA'", ((("LIGN_COUPE","GROUP_MA",),"existeMCsousMCF"),),0)
+    ################################################################################
+
+    ####################### traitement DRUCKER_PRAGER #######################
+    dPRAGER={"DRUCKER_PRAGER":"DRUCK_PRAGER",}
+    ChangementValeurDsMCF(jdc,"STAT_NON_LINE","COMP_INCR","RELATION",dPRAGER)
+    ChangementValeurDsMCF(jdc,"DYNA_NON_LINE","COMP_INCR","RELATION",dPRAGER)
+    ChangementValeurDsMCF(jdc,"SIMU_POINT_MAT","COMP_INCR","RELATION",dPRAGER)
+    ChangementValeurDsMCF(jdc,"CALC_PRECONT","COMP_INCR","RELATION",dPRAGER)
+    #########################################################################
+
+    ####################### traitement RELATION_KIT #######################
+    dKIT={"ELAS_THER":"ELAS",}
+    ChangementValeurDsMCF(jdc,"STAT_NON_LINE","COMP_INCR","RELATION_KIT",dKIT)
+    ChangementValeurDsMCF(jdc,"DYNA_NON_LINE","COMP_INCR","RELATION_KIT",dKIT)
+    ChangementValeurDsMCF(jdc,"SIMU_POINT_MAT","COMP_INCR","RELATION_KIT",dKIT)
+    ChangementValeurDsMCF(jdc,"CALC_PRECONT","COMP_INCR","RELATION_KIT",dKIT)
     #########################################################################
 
+
     f=open(outfile,'w')
     f.write(jdc.getSource())
     f.close()
index efd47e7feef4e1484ca7fa4b9869ccd5d7ec6bc6..f674b1edda8030a9a756d90ae3cee36b016a18b3 100644 (file)
@@ -2,8 +2,8 @@
 
 # Form implementation generated from reading ui file 'OptionsEditeur.ui'
 #
-# Created: Tue Nov 18 17:37:26 2008
-#      by: PyQt4 UI code generator 4.4.2
+# Created: Fri Apr 24 13:21:13 2009
+#      by: PyQt4 UI code generator 4.4.3
 #
 # WARNING! All changes made in this file will be lost!
 
@@ -12,68 +12,82 @@ from PyQt4 import QtCore, QtGui
 class Ui_desOptions(object):
     def setupUi(self, desOptions):
         desOptions.setObjectName("desOptions")
-        desOptions.resize(570,474)
+        desOptions.resize(570, 474)
+        self.gridLayout = QtGui.QGridLayout(desOptions)
+        self.gridLayout.setObjectName("gridLayout")
         self.groupBox1 = QtGui.QGroupBox(desOptions)
-        self.groupBox1.setGeometry(QtCore.QRect(11,11,548,191))
+        self.groupBox1.setMinimumSize(QtCore.QSize(548, 191))
         self.groupBox1.setObjectName("groupBox1")
         self.textLabel1_3 = QtGui.QLabel(self.groupBox1)
-        self.textLabel1_3.setGeometry(QtCore.QRect(30,60,280,20))
+        self.textLabel1_3.setGeometry(QtCore.QRect(30, 60, 280, 20))
         self.textLabel1_3.setWordWrap(False)
         self.textLabel1_3.setObjectName("textLabel1_3")
         self.textLabel1_2_2 = QtGui.QLabel(self.groupBox1)
-        self.textLabel1_2_2.setGeometry(QtCore.QRect(30,120,280,20))
+        self.textLabel1_2_2.setGeometry(QtCore.QRect(30, 120, 280, 20))
         self.textLabel1_2_2.setWordWrap(False)
         self.textLabel1_2_2.setObjectName("textLabel1_2_2")
         self.CBVersions = QtGui.QComboBox(self.groupBox1)
-        self.CBVersions.setGeometry(QtCore.QRect(30,20,90,30))
+        self.CBVersions.setGeometry(QtCore.QRect(30, 20, 90, 30))
         self.CBVersions.setObjectName("CBVersions")
         self.LERepMat = QtGui.QLineEdit(self.groupBox1)
-        self.LERepMat.setGeometry(QtCore.QRect(30,140,501,31))
+        self.LERepMat.setGeometry(QtCore.QRect(30, 140, 501, 31))
+        self.LERepMat.setMinimumSize(QtCore.QSize(501, 31))
         self.LERepMat.setObjectName("LERepMat")
         self.LERepCata = QtGui.QLineEdit(self.groupBox1)
-        self.LERepCata.setGeometry(QtCore.QRect(30,80,501,31))
+        self.LERepCata.setGeometry(QtCore.QRect(30, 80, 501, 31))
+        self.LERepCata.setMinimumSize(QtCore.QSize(501, 31))
         self.LERepCata.setObjectName("LERepCata")
         self.Bok = QtGui.QPushButton(self.groupBox1)
-        self.Bok.setGeometry(QtCore.QRect(440,20,90,31))
+        self.Bok.setGeometry(QtCore.QRect(440, 20, 90, 31))
+        self.Bok.setMinimumSize(QtCore.QSize(90, 31))
         self.Bok.setAutoDefault(False)
         self.Bok.setObjectName("Bok")
+        self.gridLayout.addWidget(self.groupBox1, 0, 0, 1, 2)
         self.groupBox2 = QtGui.QGroupBox(desOptions)
-        self.groupBox2.setGeometry(QtCore.QRect(11,208,548,90))
+        self.groupBox2.setMinimumSize(QtCore.QSize(548, 90))
         self.groupBox2.setObjectName("groupBox2")
         self.LEVersionAjout = QtGui.QLineEdit(self.groupBox2)
-        self.LEVersionAjout.setGeometry(QtCore.QRect(120,31,101,30))
+        self.LEVersionAjout.setGeometry(QtCore.QRect(120, 31, 101, 30))
+        self.LEVersionAjout.setMinimumSize(QtCore.QSize(101, 30))
         self.LEVersionAjout.setObjectName("LEVersionAjout")
         self.LEVersionSup = QtGui.QLineEdit(self.groupBox2)
-        self.LEVersionSup.setGeometry(QtCore.QRect(410,30,101,30))
+        self.LEVersionSup.setGeometry(QtCore.QRect(410, 30, 101, 30))
         self.LEVersionSup.setObjectName("LEVersionSup")
         self.PBSup = QtGui.QPushButton(self.groupBox2)
-        self.PBSup.setGeometry(QtCore.QRect(300,20,101,41))
+        self.PBSup.setGeometry(QtCore.QRect(300, 20, 101, 41))
+        self.PBSup.setMinimumSize(QtCore.QSize(101, 41))
         self.PBSup.setObjectName("PBSup")
         self.PBajout = QtGui.QPushButton(self.groupBox2)
-        self.PBajout.setGeometry(QtCore.QRect(10,20,101,41))
+        self.PBajout.setGeometry(QtCore.QRect(10, 20, 101, 41))
+        self.PBajout.setMinimumSize(QtCore.QSize(101, 41))
         self.PBajout.setObjectName("PBajout")
-        self.PBQuit = QtGui.QPushButton(desOptions)
-        self.PBQuit.setGeometry(QtCore.QRect(400,420,151,31))
-        self.PBQuit.setMinimumSize(QtCore.QSize(0,30))
-        self.PBQuit.setObjectName("PBQuit")
+        self.gridLayout.addWidget(self.groupBox2, 1, 0, 1, 2)
         self.groupBox3 = QtGui.QGroupBox(desOptions)
-        self.groupBox3.setGeometry(QtCore.QRect(10,310,548,90))
+        self.groupBox3.setMinimumSize(QtCore.QSize(548, 90))
         self.groupBox3.setObjectName("groupBox3")
         self.LERepDoc = QtGui.QLineEdit(self.groupBox3)
-        self.LERepDoc.setGeometry(QtCore.QRect(20,50,520,31))
+        self.LERepDoc.setGeometry(QtCore.QRect(20, 50, 520, 31))
+        self.LERepDoc.setMinimumSize(QtCore.QSize(520, 31))
         self.LERepDoc.setObjectName("LERepDoc")
         self.textLabel1 = QtGui.QLabel(self.groupBox3)
-        self.textLabel1.setGeometry(QtCore.QRect(20,20,280,30))
+        self.textLabel1.setGeometry(QtCore.QRect(20, 20, 280, 30))
         self.textLabel1.setWordWrap(False)
         self.textLabel1.setObjectName("textLabel1")
+        self.gridLayout.addWidget(self.groupBox3, 2, 0, 1, 2)
         self.Bdefaut = QtGui.QCheckBox(desOptions)
-        self.Bdefaut.setGeometry(QtCore.QRect(10,430,340,20))
+        self.Bdefaut.setMinimumSize(QtCore.QSize(340, 20))
         font = QtGui.QFont()
         font.setPointSize(12)
         self.Bdefaut.setFont(font)
         self.Bdefaut.setObjectName("Bdefaut")
+        self.gridLayout.addWidget(self.Bdefaut, 3, 0, 1, 1)
+        self.PBQuit = QtGui.QPushButton(desOptions)
+        self.PBQuit.setMinimumSize(QtCore.QSize(151, 31))
+        self.PBQuit.setObjectName("PBQuit")
+        self.gridLayout.addWidget(self.PBQuit, 3, 1, 1, 1)
 
         self.retranslateUi(desOptions)
+        QtCore.QMetaObject.connectSlotsByName(desOptions)
 
     def retranslateUi(self, desOptions):
         desOptions.setWindowTitle(QtGui.QApplication.translate("desOptions", "Options Aster", None, QtGui.QApplication.UnicodeUTF8))
@@ -86,10 +100,10 @@ class Ui_desOptions(object):
 "Version :", None, QtGui.QApplication.UnicodeUTF8))
         self.PBajout.setText(QtGui.QApplication.translate("desOptions", "Ajouter\n"
 "Version :", None, QtGui.QApplication.UnicodeUTF8))
-        self.PBQuit.setText(QtGui.QApplication.translate("desOptions", "Quitter", None, QtGui.QApplication.UnicodeUTF8))
         self.groupBox3.setTitle(QtGui.QApplication.translate("desOptions", "Doc", None, QtGui.QApplication.UnicodeUTF8))
         self.textLabel1.setText(QtGui.QApplication.translate("desOptions", "Repertoire d\'acces à la documentation :", None, QtGui.QApplication.UnicodeUTF8))
         self.Bdefaut.setText(QtGui.QApplication.translate("desOptions", "Reinitialiser avec les valeurs par defaut", None, QtGui.QApplication.UnicodeUTF8))
+        self.PBQuit.setText(QtGui.QApplication.translate("desOptions", "Quitter", None, QtGui.QApplication.UnicodeUTF8))
 
 
 if __name__ == "__main__":
index bbe72dd48fea3e1650cf8a45fdf4319e741cc790..91f63f3f95e255ff311688115f172739fb992797 100644 (file)
-<ui version="4.0" stdsetdef="1" >
-  <author></author>
-  <comment></comment>
-  <exportmacro></exportmacro>
-  <class>desOptions</class>
-  <widget class="QDialog" name="desOptions" >
-    <property name="geometry" >
-      <rect>
-        <x>0</x>
-        <y>0</y>
-        <width>570</width>
-        <height>474</height>
-      </rect>
-    </property>
-    <property name="windowTitle" >
-      <string>Options Aster</string>
-    </property>
+<ui version="4.0" >
+ <class>desOptions</class>
+ <widget class="QDialog" name="desOptions" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>570</width>
+    <height>474</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>Options Aster</string>
+  </property>
+  <layout class="QGridLayout" name="gridLayout" >
+   <item row="0" column="0" colspan="2" >
     <widget class="QGroupBox" name="groupBox1" >
+     <property name="minimumSize" >
+      <size>
+       <width>548</width>
+       <height>191</height>
+      </size>
+     </property>
+     <property name="title" >
+      <string>Configurer une Version</string>
+     </property>
+     <widget class="QLabel" name="textLabel1_3" >
       <property name="geometry" >
-        <rect>
-          <x>11</x>
-          <y>11</y>
-          <width>548</width>
-          <height>191</height>
-        </rect>
-      </property>
-      <property name="title" >
-        <string>Configurer une Version</string>
-      </property>
-      <widget class="QLabel" name="textLabel1_3" >
-        <property name="geometry" >
-          <rect>
-            <x>30</x>
-            <y>60</y>
-            <width>280</width>
-            <height>20</height>
-          </rect>
-        </property>
-        <property name="text" >
-          <string>Répertoire d'accès au catalogue :</string>
-        </property>
-        <property name="wordWrap" >
-          <bool>false</bool>
-        </property>
-      </widget>
-      <widget class="QLabel" name="textLabel1_2_2" >
-        <property name="geometry" >
-          <rect>
-            <x>30</x>
-            <y>120</y>
-            <width>280</width>
-            <height>20</height>
-          </rect>
-        </property>
-        <property name="text" >
-          <string>Répertoire d'accès aux matériaux :</string>
-        </property>
-        <property name="wordWrap" >
-          <bool>false</bool>
-        </property>
-      </widget>
-      <widget class="QComboBox" name="CBVersions" >
-        <property name="geometry" >
-          <rect>
-            <x>30</x>
-            <y>20</y>
-            <width>90</width>
-            <height>30</height>
-          </rect>
-        </property>
-      </widget>
-      <widget class="QLineEdit" name="LERepMat" >
-        <property name="geometry" >
-          <rect>
-            <x>30</x>
-            <y>140</y>
-            <width>501</width>
-            <height>31</height>
-          </rect>
-        </property>
-        <property name="text" >
-          <string/>
-        </property>
-      </widget>
-      <widget class="QLineEdit" name="LERepCata" >
-        <property name="geometry" >
-          <rect>
-            <x>30</x>
-            <y>80</y>
-            <width>501</width>
-            <height>31</height>
-          </rect>
-        </property>
-        <property name="text" >
-          <string/>
-        </property>
-      </widget>
-      <widget class="QPushButton" name="Bok" >
-        <property name="geometry" >
-          <rect>
-            <x>440</x>
-            <y>20</y>
-            <width>90</width>
-            <height>31</height>
-          </rect>
-        </property>
-        <property name="text" >
-          <string>Valider</string>
-        </property>
-        <property name="autoDefault" >
-          <bool>false</bool>
-        </property>
-      </widget>
+       <rect>
+        <x>30</x>
+        <y>60</y>
+        <width>280</width>
+        <height>20</height>
+       </rect>
+      </property>
+      <property name="text" >
+       <string>Répertoire d'accès au catalogue :</string>
+      </property>
+      <property name="wordWrap" >
+       <bool>false</bool>
+      </property>
+     </widget>
+     <widget class="QLabel" name="textLabel1_2_2" >
+      <property name="geometry" >
+       <rect>
+        <x>30</x>
+        <y>120</y>
+        <width>280</width>
+        <height>20</height>
+       </rect>
+      </property>
+      <property name="text" >
+       <string>Répertoire d'accès aux matériaux :</string>
+      </property>
+      <property name="wordWrap" >
+       <bool>false</bool>
+      </property>
+     </widget>
+     <widget class="QComboBox" name="CBVersions" >
+      <property name="geometry" >
+       <rect>
+        <x>30</x>
+        <y>20</y>
+        <width>90</width>
+        <height>30</height>
+       </rect>
+      </property>
+     </widget>
+     <widget class="QLineEdit" name="LERepMat" >
+      <property name="geometry" >
+       <rect>
+        <x>30</x>
+        <y>140</y>
+        <width>501</width>
+        <height>31</height>
+       </rect>
+      </property>
+      <property name="minimumSize" >
+       <size>
+        <width>501</width>
+        <height>31</height>
+       </size>
+      </property>
+      <property name="text" >
+       <string/>
+      </property>
+     </widget>
+     <widget class="QLineEdit" name="LERepCata" >
+      <property name="geometry" >
+       <rect>
+        <x>30</x>
+        <y>80</y>
+        <width>501</width>
+        <height>31</height>
+       </rect>
+      </property>
+      <property name="minimumSize" >
+       <size>
+        <width>501</width>
+        <height>31</height>
+       </size>
+      </property>
+      <property name="text" >
+       <string/>
+      </property>
+     </widget>
+     <widget class="QPushButton" name="Bok" >
+      <property name="geometry" >
+       <rect>
+        <x>440</x>
+        <y>20</y>
+        <width>90</width>
+        <height>31</height>
+       </rect>
+      </property>
+      <property name="minimumSize" >
+       <size>
+        <width>90</width>
+        <height>31</height>
+       </size>
+      </property>
+      <property name="text" >
+       <string>Valider</string>
+      </property>
+      <property name="autoDefault" >
+       <bool>false</bool>
+      </property>
+     </widget>
     </widget>
+   </item>
+   <item row="1" column="0" colspan="2" >
     <widget class="QGroupBox" name="groupBox2" >
+     <property name="minimumSize" >
+      <size>
+       <width>548</width>
+       <height>90</height>
+      </size>
+     </property>
+     <property name="title" >
+      <string>Gérer les versions</string>
+     </property>
+     <widget class="QLineEdit" name="LEVersionAjout" >
       <property name="geometry" >
-        <rect>
-          <x>11</x>
-          <y>208</y>
-          <width>548</width>
-          <height>90</height>
-        </rect>
-      </property>
-      <property name="title" >
-        <string>Gérer les versions</string>
-      </property>
-      <widget class="QLineEdit" name="LEVersionAjout" >
-        <property name="geometry" >
-          <rect>
-            <x>120</x>
-            <y>31</y>
-            <width>101</width>
-            <height>30</height>
-          </rect>
-        </property>
-      </widget>
-      <widget class="QLineEdit" name="LEVersionSup" >
-        <property name="geometry" >
-          <rect>
-            <x>410</x>
-            <y>30</y>
-            <width>101</width>
-            <height>30</height>
-          </rect>
-        </property>
-      </widget>
-      <widget class="QPushButton" name="PBSup" >
-        <property name="geometry" >
-          <rect>
-            <x>300</x>
-            <y>20</y>
-            <width>101</width>
-            <height>41</height>
-          </rect>
-        </property>
-        <property name="text" >
-          <string>Supprimer
-Version :</string>
-        </property>
-      </widget>
-      <widget class="QPushButton" name="PBajout" >
-        <property name="geometry" >
-          <rect>
-            <x>10</x>
-            <y>20</y>
-            <width>101</width>
-            <height>41</height>
-          </rect>
-        </property>
-        <property name="text" >
-          <string>Ajouter
+       <rect>
+        <x>120</x>
+        <y>31</y>
+        <width>101</width>
+        <height>30</height>
+       </rect>
+      </property>
+      <property name="minimumSize" >
+       <size>
+        <width>101</width>
+        <height>30</height>
+       </size>
+      </property>
+     </widget>
+     <widget class="QLineEdit" name="LEVersionSup" >
+      <property name="geometry" >
+       <rect>
+        <x>410</x>
+        <y>30</y>
+        <width>101</width>
+        <height>30</height>
+       </rect>
+      </property>
+     </widget>
+     <widget class="QPushButton" name="PBSup" >
+      <property name="geometry" >
+       <rect>
+        <x>300</x>
+        <y>20</y>
+        <width>101</width>
+        <height>41</height>
+       </rect>
+      </property>
+      <property name="minimumSize" >
+       <size>
+        <width>101</width>
+        <height>41</height>
+       </size>
+      </property>
+      <property name="text" >
+       <string>Supprimer
 Version :</string>
-        </property>
-      </widget>
-    </widget>
-    <widget class="QPushButton" name="PBQuit" >
+      </property>
+     </widget>
+     <widget class="QPushButton" name="PBajout" >
       <property name="geometry" >
-        <rect>
-          <x>400</x>
-          <y>420</y>
-          <width>151</width>
-          <height>31</height>
-        </rect>
+       <rect>
+        <x>10</x>
+        <y>20</y>
+        <width>101</width>
+        <height>41</height>
+       </rect>
       </property>
       <property name="minimumSize" >
-        <size>
-          <width>0</width>
-          <height>30</height>
-        </size>
+       <size>
+        <width>101</width>
+        <height>41</height>
+       </size>
       </property>
       <property name="text" >
-        <string>Quitter</string>
+       <string>Ajouter
+Version :</string>
       </property>
+     </widget>
     </widget>
+   </item>
+   <item row="2" column="0" colspan="2" >
     <widget class="QGroupBox" name="groupBox3" >
+     <property name="minimumSize" >
+      <size>
+       <width>548</width>
+       <height>90</height>
+      </size>
+     </property>
+     <property name="title" >
+      <string>Doc</string>
+     </property>
+     <widget class="QLineEdit" name="LERepDoc" >
       <property name="geometry" >
-        <rect>
-          <x>10</x>
-          <y>310</y>
-          <width>548</width>
-          <height>90</height>
-        </rect>
-      </property>
-      <property name="title" >
-        <string>Doc</string>
-      </property>
-      <widget class="QLineEdit" name="LERepDoc" >
-        <property name="geometry" >
-          <rect>
-            <x>20</x>
-            <y>50</y>
-            <width>520</width>
-            <height>31</height>
-          </rect>
-        </property>
-        <property name="text" >
-          <string/>
-        </property>
-      </widget>
-      <widget class="QLabel" name="textLabel1" >
-        <property name="geometry" >
-          <rect>
-            <x>20</x>
-            <y>20</y>
-            <width>280</width>
-            <height>30</height>
-          </rect>
-        </property>
-        <property name="text" >
-          <string>Repertoire d'acces à la documentation :</string>
-        </property>
-        <property name="wordWrap" >
-          <bool>false</bool>
-        </property>
-      </widget>
-    </widget>
-    <widget class="QCheckBox" name="Bdefaut" >
+       <rect>
+        <x>20</x>
+        <y>50</y>
+        <width>520</width>
+        <height>31</height>
+       </rect>
+      </property>
+      <property name="minimumSize" >
+       <size>
+        <width>520</width>
+        <height>31</height>
+       </size>
+      </property>
+      <property name="text" >
+       <string/>
+      </property>
+     </widget>
+     <widget class="QLabel" name="textLabel1" >
       <property name="geometry" >
-        <rect>
-          <x>10</x>
-          <y>430</y>
-          <width>340</width>
-          <height>20</height>
-        </rect>
-      </property>
-      <property name="font" >
-        <font>
-          <pointsize>12</pointsize>
-        </font>
+       <rect>
+        <x>20</x>
+        <y>20</y>
+        <width>280</width>
+        <height>30</height>
+       </rect>
       </property>
       <property name="text" >
-        <string>Reinitialiser avec les valeurs par defaut</string>
+       <string>Repertoire d'acces à la documentation :</string>
       </property>
+      <property name="wordWrap" >
+       <bool>false</bool>
+      </property>
+     </widget>
+    </widget>
+   </item>
+   <item row="3" column="0" >
+    <widget class="QCheckBox" name="Bdefaut" >
+     <property name="minimumSize" >
+      <size>
+       <width>340</width>
+       <height>20</height>
+      </size>
+     </property>
+     <property name="font" >
+      <font>
+       <pointsize>12</pointsize>
+      </font>
+     </property>
+     <property name="text" >
+      <string>Reinitialiser avec les valeurs par defaut</string>
+     </property>
+    </widget>
+   </item>
+   <item row="3" column="1" >
+    <widget class="QPushButton" name="PBQuit" >
+     <property name="minimumSize" >
+      <size>
+       <width>151</width>
+       <height>31</height>
+      </size>
+     </property>
+     <property name="text" >
+      <string>Quitter</string>
+     </property>
     </widget>
-  </widget>
-  <layoutdefault spacing="6" margin="11" />
-  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
+   </item>
+  </layout>
+ </widget>
+ <layoutdefault spacing="6" margin="11" />
+ <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
+ <resources/>
+ <connections/>
 </ui>
index 6b8ac238241ffdd3a1654269f577f6701032e4cc..d23873c23a10e17cea70aa347895865bfd5214eb 100644 (file)
@@ -2,8 +2,8 @@
 
 # Form implementation generated from reading ui file 'OptionsPdf.ui'
 #
-# Created: Tue Nov 18 17:37:26 2008
-#      by: PyQt4 UI code generator 4.4.2
+# Created: Tue Jan 27 12:25:38 2009
+#      by: PyQt4 UI code generator 4.4.3
 #
 # WARNING! All changes made in this file will be lost!
 
@@ -12,24 +12,24 @@ from PyQt4 import QtCore, QtGui
 class Ui_desPdf(object):
     def setupUi(self, desPdf):
         desPdf.setObjectName("desPdf")
-        desPdf.resize(538,142)
+        desPdf.resize(538, 142)
         self.textLabel1_2 = QtGui.QLabel(desPdf)
-        self.textLabel1_2.setGeometry(QtCore.QRect(20,10,280,20))
+        self.textLabel1_2.setGeometry(QtCore.QRect(20, 10, 280, 20))
         self.textLabel1_2.setWordWrap(False)
         self.textLabel1_2.setObjectName("textLabel1_2")
         self.BCancel = QtGui.QPushButton(desPdf)
-        self.BCancel.setGeometry(QtCore.QRect(450,90,70,31))
+        self.BCancel.setGeometry(QtCore.QRect(450, 90, 70, 31))
         self.BCancel.setObjectName("BCancel")
         self.LERepPdf = QtGui.QLineEdit(desPdf)
-        self.LERepPdf.setGeometry(QtCore.QRect(20,40,501,31))
+        self.LERepPdf.setGeometry(QtCore.QRect(20, 40, 501, 31))
         self.LERepPdf.setObjectName("LERepPdf")
         self.Bok = QtGui.QPushButton(desPdf)
-        self.Bok.setGeometry(QtCore.QRect(350,90,70,31))
+        self.Bok.setGeometry(QtCore.QRect(350, 90, 70, 31))
         self.Bok.setObjectName("Bok")
 
         self.retranslateUi(desPdf)
-        desPdf.setTabOrder(self.LERepPdf,self.Bok)
-        desPdf.setTabOrder(self.Bok,self.BCancel)
+        desPdf.setTabOrder(self.LERepPdf, self.Bok)
+        desPdf.setTabOrder(self.Bok, self.BCancel)
 
     def retranslateUi(self, desPdf):
         desPdf.setWindowTitle(QtGui.QApplication.translate("desPdf", "desPdf", None, QtGui.QApplication.UnicodeUTF8))
index 42b7e751db31c41a35303cefa94caa7895b0f539..916f3b9f50d706a260375000ae06a9a2a4277cac 100644 (file)
@@ -2,8 +2,8 @@
 
 # Form implementation generated from reading ui file 'aideQT.ui'
 #
-# Created: Tue Nov 18 17:37:26 2008
-#      by: PyQt4 UI code generator 4.4.2
+# Created: Tue Jan 27 12:25:38 2009
+#      by: PyQt4 UI code generator 4.4.3
 #
 # WARNING! All changes made in this file will be lost!
 
@@ -12,28 +12,28 @@ from PyQt4 import QtCore, QtGui
 class Ui_Aide(object):
     def setupUi(self, Aide):
         Aide.setObjectName("Aide")
-        Aide.resize(602,480)
+        Aide.resize(602, 480)
         self.gridLayout = QtGui.QGridLayout(Aide)
         self.gridLayout.setObjectName("gridLayout")
         self.TB1 = QtGui.QTextBrowser(Aide)
         self.TB1.setObjectName("TB1")
-        self.gridLayout.addWidget(self.TB1,0,0,1,4)
+        self.gridLayout.addWidget(self.TB1, 0, 0, 1, 4)
         self.PBIndex = QtGui.QPushButton(Aide)
-        self.PBIndex.setMinimumSize(QtCore.QSize(0,30))
+        self.PBIndex.setMinimumSize(QtCore.QSize(0, 30))
         self.PBIndex.setObjectName("PBIndex")
-        self.gridLayout.addWidget(self.PBIndex,1,0,1,1)
+        self.gridLayout.addWidget(self.PBIndex, 1, 0, 1, 1)
         self.PBBack = QtGui.QPushButton(Aide)
         self.PBBack.setEnabled(True)
-        self.PBBack.setMinimumSize(QtCore.QSize(0,30))
+        self.PBBack.setMinimumSize(QtCore.QSize(0, 30))
         self.PBBack.setObjectName("PBBack")
-        self.gridLayout.addWidget(self.PBBack,1,1,1,1)
+        self.gridLayout.addWidget(self.PBBack, 1, 1, 1, 1)
         self.PBForward = QtGui.QPushButton(Aide)
         self.PBForward.setEnabled(True)
-        self.PBForward.setMinimumSize(QtCore.QSize(0,30))
+        self.PBForward.setMinimumSize(QtCore.QSize(0, 30))
         self.PBForward.setObjectName("PBForward")
-        self.gridLayout.addWidget(self.PBForward,1,2,1,1)
-        spacerItem = QtGui.QSpacerItem(311,20,QtGui.QSizePolicy.Expanding,QtGui.QSizePolicy.Minimum)
-        self.gridLayout.addItem(spacerItem,1,3,1,1)
+        self.gridLayout.addWidget(self.PBForward, 1, 2, 1, 1)
+        spacerItem = QtGui.QSpacerItem(311, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
+        self.gridLayout.addItem(spacerItem, 1, 3, 1, 1)
 
         self.retranslateUi(Aide)
         QtCore.QMetaObject.connectSlotsByName(Aide)
index 7da381db928c21bb4f8a33851b6723f623a555ce..4e7eecd6683e16404ded2221fdc1cd05d734a60c 100644 (file)
@@ -2,8 +2,8 @@
 
 # Form implementation generated from reading ui file 'desChoixCata.ui'
 #
-# Created: Tue Nov 18 17:37:24 2008
-#      by: PyQt4 UI code generator 4.4.2
+# Created: Tue Jun  9 14:49:19 2009
+#      by: PyQt4 UI code generator 4.4.3
 #
 # WARNING! All changes made in this file will be lost!
 
@@ -12,51 +12,52 @@ from PyQt4 import QtCore, QtGui
 class Ui_DChoixCata(object):
     def setupUi(self, DChoixCata):
         DChoixCata.setObjectName("DChoixCata")
-        DChoixCata.resize(547,192)
+        DChoixCata.resize(547, 215)
         DChoixCata.setSizeGripEnabled(True)
         self.gridLayout = QtGui.QGridLayout(DChoixCata)
         self.gridLayout.setObjectName("gridLayout")
         self.TLNb = QtGui.QLabel(DChoixCata)
-        self.TLNb.setMinimumSize(QtCore.QSize(30,0))
+        self.TLNb.setMinimumSize(QtCore.QSize(30, 0))
         self.TLNb.setWordWrap(False)
         self.TLNb.setObjectName("TLNb")
-        self.gridLayout.addWidget(self.TLNb,0,0,1,1)
+        self.gridLayout.addWidget(self.TLNb, 0, 0, 1, 1)
         self.CBChoixCata = QtGui.QComboBox(DChoixCata)
         self.CBChoixCata.setEnabled(True)
-        self.CBChoixCata.setMinimumSize(QtCore.QSize(125,41))
-        self.CBChoixCata.setMaximumSize(QtCore.QSize(150,16777215))
+        self.CBChoixCata.setMinimumSize(QtCore.QSize(125, 41))
+        self.CBChoixCata.setMaximumSize(QtCore.QSize(150, 16777215))
         self.CBChoixCata.setObjectName("CBChoixCata")
-        self.gridLayout.addWidget(self.CBChoixCata,0,1,2,1)
+        self.gridLayout.addWidget(self.CBChoixCata, 0, 1, 2, 1)
         self.textLabel1_2 = QtGui.QLabel(DChoixCata)
-        self.textLabel1_2.setMinimumSize(QtCore.QSize(60,60))
+        self.textLabel1_2.setMinimumSize(QtCore.QSize(60, 60))
         self.textLabel1_2.setWordWrap(False)
         self.textLabel1_2.setObjectName("textLabel1_2")
-        self.gridLayout.addWidget(self.textLabel1_2,1,0,1,1)
+        self.gridLayout.addWidget(self.textLabel1_2, 1, 0, 1, 1)
         self.frame3 = QtGui.QFrame(DChoixCata)
         self.frame3.setFrameShape(QtGui.QFrame.StyledPanel)
         self.frame3.setFrameShadow(QtGui.QFrame.Raised)
         self.frame3.setObjectName("frame3")
-        self.horizontalLayout = QtGui.QHBoxLayout(self.frame3)
-        self.horizontalLayout.setObjectName("horizontalLayout")
         self.buttonOk = QtGui.QPushButton(self.frame3)
+        self.buttonOk.setGeometry(QtCore.QRect(11, 13, 91, 41))
         self.buttonOk.setAutoDefault(True)
         self.buttonOk.setDefault(True)
         self.buttonOk.setObjectName("buttonOk")
-        self.horizontalLayout.addWidget(self.buttonOk)
-        spacerItem = QtGui.QSpacerItem(334,20,QtGui.QSizePolicy.Expanding,QtGui.QSizePolicy.Minimum)
-        self.horizontalLayout.addItem(spacerItem)
         self.buttonCancel = QtGui.QPushButton(self.frame3)
+        self.buttonCancel.setGeometry(QtCore.QRect(437, 13, 81, 41))
+        self.buttonCancel.setMinimumSize(QtCore.QSize(81, 41))
         self.buttonCancel.setAutoDefault(True)
         self.buttonCancel.setObjectName("buttonCancel")
-        self.horizontalLayout.addWidget(self.buttonCancel)
-        self.gridLayout.addWidget(self.frame3,2,0,1,2)
+        self.gridLayout.addWidget(self.frame3, 2, 0, 1, 2)
 
         self.retranslateUi(DChoixCata)
         QtCore.QMetaObject.connectSlotsByName(DChoixCata)
 
     def retranslateUi(self, DChoixCata):
         DChoixCata.setWindowTitle(QtGui.QApplication.translate("DChoixCata", "Choix d\'une version du code Aster", None, QtGui.QApplication.UnicodeUTF8))
-        self.TLNb.setText(QtGui.QApplication.translate("DChoixCata", "2 versions sont disponibles", None, QtGui.QApplication.UnicodeUTF8))
+        self.TLNb.setText(QtGui.QApplication.translate("DChoixCata", "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
+"<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\n"
+"p, li { white-space: pre-wrap; }\n"
+"</style></head><body style=\" font-family:\'Sans Serif\'; font-size:9pt; font-weight:400; font-style:normal;\">\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:11pt;\">2 versions sont disponibles</span></p></body></html>", None, QtGui.QApplication.UnicodeUTF8))
         self.textLabel1_2.setText(QtGui.QApplication.translate("DChoixCata", "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
 "<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\n"
 "p, li { white-space: pre-wrap; }\n"
index a59643f77e5d797e0c3dcbe12146cbad38265b45..07de12334718b2736de05cdbba56d66542f72a2b 100644 (file)
@@ -6,7 +6,7 @@
     <x>0</x>
     <y>0</y>
     <width>547</width>
-    <height>192</height>
+    <height>215</height>
    </rect>
   </property>
   <property name="windowTitle" >
       </size>
      </property>
      <property name="text" >
-      <string>2 versions sont disponibles</string>
+      <string>&lt;!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
+&lt;html>&lt;head>&lt;meta name="qrichtext" content="1" />&lt;style type="text/css">
+p, li { white-space: pre-wrap; }
+&lt;/style>&lt;/head>&lt;body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;">
+&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">&lt;span style=" font-size:11pt;">2 versions sont disponibles&lt;/span>&lt;/p>&lt;/body>&lt;/html></string>
      </property>
      <property name="wordWrap" >
       <bool>false</bool>
@@ -80,57 +84,60 @@ p, li { white-space: pre-wrap; }
      <property name="frameShadow" >
       <enum>QFrame::Raised</enum>
      </property>
-     <layout class="QHBoxLayout" name="horizontalLayout" >
-      <item>
-       <widget class="QPushButton" name="buttonOk" >
-        <property name="text" >
-         <string>&amp;OK</string>
-        </property>
-        <property name="shortcut" >
-         <string/>
-        </property>
-        <property name="autoDefault" >
-         <bool>true</bool>
-        </property>
-        <property name="default" >
-         <bool>true</bool>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <spacer name="horizontalSpacer" >
-        <property name="orientation" >
-         <enum>Qt::Horizontal</enum>
-        </property>
-        <property name="sizeHint" stdset="0" >
-         <size>
-          <width>334</width>
-          <height>20</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
-      <item>
-       <widget class="QPushButton" name="buttonCancel" >
-        <property name="text" >
-         <string>&amp;Cancel</string>
-        </property>
-        <property name="shortcut" >
-         <string/>
-        </property>
-        <property name="autoDefault" >
-         <bool>true</bool>
-        </property>
-       </widget>
-      </item>
-     </layout>
+     <widget class="QPushButton" name="buttonOk" >
+      <property name="geometry" >
+       <rect>
+        <x>11</x>
+        <y>13</y>
+        <width>91</width>
+        <height>41</height>
+       </rect>
+      </property>
+      <property name="text" >
+       <string>&amp;OK</string>
+      </property>
+      <property name="shortcut" >
+       <string/>
+      </property>
+      <property name="autoDefault" >
+       <bool>true</bool>
+      </property>
+      <property name="default" >
+       <bool>true</bool>
+      </property>
+     </widget>
+     <widget class="QPushButton" name="buttonCancel" >
+      <property name="geometry" >
+       <rect>
+        <x>437</x>
+        <y>13</y>
+        <width>81</width>
+        <height>41</height>
+       </rect>
+      </property>
+      <property name="minimumSize" >
+       <size>
+        <width>81</width>
+        <height>41</height>
+       </size>
+      </property>
+      <property name="text" >
+       <string>&amp;Cancel</string>
+      </property>
+      <property name="shortcut" >
+       <string/>
+      </property>
+      <property name="autoDefault" >
+       <bool>true</bool>
+      </property>
+     </widget>
     </widget>
    </item>
   </layout>
-  <zorder>frame3</zorder>
   <zorder>TLNb</zorder>
   <zorder>textLabel1_2</zorder>
   <zorder>CBChoixCata</zorder>
+  <zorder>frame3</zorder>
  </widget>
  <layoutdefault spacing="6" margin="11" />
  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
index 749cd0378b5dd970f3e2eb3f6e302221fcfb1dfd..62a7a3db5161aac80c84c06813a5d66c64488bb7 100644 (file)
@@ -2,8 +2,8 @@
 
 # Form implementation generated from reading ui file 'desCommande.ui'
 #
-# Created: Tue Nov 18 17:37:24 2008
-#      by: PyQt4 UI code generator 4.4.2
+# Created: Fri Apr 24 13:21:13 2009
+#      by: PyQt4 UI code generator 4.4.3
 #
 # WARNING! All changes made in this file will be lost!
 
@@ -12,150 +12,177 @@ from PyQt4 import QtCore, QtGui
 class Ui_DComm(object):
     def setupUi(self, DComm):
         DComm.setObjectName("DComm")
-        DComm.resize(505,483)
-        DComm.setMinimumSize(QtCore.QSize(505,0))
-        self.gridlayout = QtGui.QGridLayout(DComm)
-        self.gridlayout.setObjectName("gridlayout")
+        DComm.resize(792, 770)
+        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Expanding)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(DComm.sizePolicy().hasHeightForWidth())
+        DComm.setSizePolicy(sizePolicy)
+        DComm.setMinimumSize(QtCore.QSize(505, 0))
+        self.gridLayout_3 = QtGui.QGridLayout(DComm)
+        self.gridLayout_3.setObjectName("gridLayout_3")
         self.Commentaire = QtGui.QLabel(DComm)
+        self.Commentaire.setMaximumSize(QtCore.QSize(793, 20))
         self.Commentaire.setFrameShape(QtGui.QFrame.NoFrame)
         self.Commentaire.setFrameShadow(QtGui.QFrame.Plain)
         self.Commentaire.setWordWrap(False)
         self.Commentaire.setObjectName("Commentaire")
-        self.gridlayout.addWidget(self.Commentaire,1,0,1,3)
+        self.gridLayout_3.addWidget(self.Commentaire, 1, 0, 1, 1)
+        self.horizontalLayout = QtGui.QHBoxLayout()
+        self.horizontalLayout.setObjectName("horizontalLayout")
+        spacerItem = QtGui.QSpacerItem(263, 27, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
+        self.horizontalLayout.addItem(spacerItem)
         self.bOk = QtGui.QPushButton(DComm)
-        self.bOk.setMinimumSize(QtCore.QSize(0,30))
+        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.bOk.sizePolicy().hasHeightForWidth())
+        self.bOk.setSizePolicy(sizePolicy)
+        self.bOk.setMinimumSize(QtCore.QSize(160, 30))
+        self.bOk.setMaximumSize(QtCore.QSize(16777215, 30))
         self.bOk.setAutoDefault(True)
         self.bOk.setDefault(True)
         self.bOk.setObjectName("bOk")
-        self.gridlayout.addWidget(self.bOk,2,1,1,1)
-        self.bSup = QtGui.QPushButton(DComm)
-        self.bSup.setMinimumSize(QtCore.QSize(0,30))
-        self.bSup.setAutoDefault(True)
-        self.bSup.setObjectName("bSup")
-        self.gridlayout.addWidget(self.bSup,2,0,1,1)
-        self.bHelp = QtGui.QPushButton(DComm)
-        self.bHelp.setMinimumSize(QtCore.QSize(0,30))
-        self.bHelp.setAutoDefault(True)
-        self.bHelp.setObjectName("bHelp")
-        self.gridlayout.addWidget(self.bHelp,2,2,1,1)
+        self.horizontalLayout.addWidget(self.bOk)
+        spacerItem1 = QtGui.QSpacerItem(254, 27, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
+        self.horizontalLayout.addItem(spacerItem1)
+        self.gridLayout_3.addLayout(self.horizontalLayout, 2, 0, 1, 1)
         self.TWChoix = QtGui.QTabWidget(DComm)
         self.TWChoix.setObjectName("TWChoix")
         self.MotClef = QtGui.QWidget()
-        self.MotClef.setGeometry(QtCore.QRect(0,0,483,372))
         self.MotClef.setObjectName("MotClef")
-        self.gridLayout_3 = QtGui.QGridLayout(self.MotClef)
-        self.gridLayout_3.setObjectName("gridLayout_3")
+        self.gridLayout_6 = QtGui.QGridLayout(self.MotClef)
+        self.gridLayout_6.setObjectName("gridLayout_6")
+        self.gridLayout_5 = QtGui.QGridLayout()
+        self.gridLayout_5.setObjectName("gridLayout_5")
         self.textLabel1 = QtGui.QLabel(self.MotClef)
-        self.textLabel1.setMinimumSize(QtCore.QSize(0,0))
+        self.textLabel1.setMinimumSize(QtCore.QSize(0, 0))
         self.textLabel1.setWordWrap(False)
         self.textLabel1.setObjectName("textLabel1")
-        self.gridLayout_3.addWidget(self.textLabel1,0,0,1,1)
+        self.gridLayout_5.addWidget(self.textLabel1, 0, 0, 1, 1)
         self.textLabel1_2 = QtGui.QLabel(self.MotClef)
         self.textLabel1_2.setWordWrap(False)
         self.textLabel1_2.setObjectName("textLabel1_2")
-        self.gridLayout_3.addWidget(self.textLabel1_2,0,1,1,1)
+        self.gridLayout_5.addWidget(self.textLabel1_2, 0, 1, 1, 1)
         self.LBMCPermis = QtGui.QListWidget(self.MotClef)
         self.LBMCPermis.setObjectName("LBMCPermis")
-        self.gridLayout_3.addWidget(self.LBMCPermis,1,0,1,1)
+        self.gridLayout_5.addWidget(self.LBMCPermis, 1, 0, 1, 1)
         self.LBRegles = QtGui.QListWidget(self.MotClef)
         self.LBRegles.setObjectName("LBRegles")
-        self.gridLayout_3.addWidget(self.LBRegles,1,1,1,1)
-        self.TWChoix.addTab(self.MotClef,"")
+        self.gridLayout_5.addWidget(self.LBRegles, 1, 1, 1, 1)
+        self.gridLayout_6.addLayout(self.gridLayout_5, 0, 0, 1, 1)
+        self.TWChoix.addTab(self.MotClef, "")
         self.Concept = QtGui.QWidget()
-        self.Concept.setGeometry(QtCore.QRect(0,0,483,372))
         self.Concept.setObjectName("Concept")
-        self.gridlayout1 = QtGui.QGridLayout(self.Concept)
-        self.gridlayout1.setObjectName("gridlayout1")
+        self.gridLayout_9 = QtGui.QGridLayout(self.Concept)
+        self.gridLayout_9.setObjectName("gridLayout_9")
         self.groupBox1 = QtGui.QGroupBox(self.Concept)
         self.groupBox1.setObjectName("groupBox1")
-        self.textLabel1_3 = QtGui.QLabel(self.groupBox1)
-        self.textLabel1_3.setGeometry(QtCore.QRect(80,50,130,31))
+        self.gridLayout_8 = QtGui.QGridLayout(self.groupBox1)
+        self.gridLayout_8.setObjectName("gridLayout_8")
+        self.splitter = QtGui.QSplitter(self.groupBox1)
+        self.splitter.setOrientation(QtCore.Qt.Horizontal)
+        self.splitter.setObjectName("splitter")
+        self.textLabel1_3 = QtGui.QLabel(self.splitter)
         self.textLabel1_3.setWordWrap(False)
         self.textLabel1_3.setObjectName("textLabel1_3")
+        self.gridLayout_8.addWidget(self.splitter, 0, 0, 1, 1)
+        self.horizontalLayout_2 = QtGui.QHBoxLayout()
+        self.horizontalLayout_2.setObjectName("horizontalLayout_2")
+        self.LENomConcept = QtGui.QLineEdit(self.groupBox1)
+        self.LENomConcept.setMinimumSize(QtCore.QSize(360, 40))
+        self.LENomConcept.setObjectName("LENomConcept")
+        self.horizontalLayout_2.addWidget(self.LENomConcept)
+        spacerItem2 = QtGui.QSpacerItem(356, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
+        self.horizontalLayout_2.addItem(spacerItem2)
+        self.gridLayout_8.addLayout(self.horizontalLayout_2, 1, 0, 1, 1)
+        spacerItem3 = QtGui.QSpacerItem(20, 51, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding)
+        self.gridLayout_8.addItem(spacerItem3, 2, 0, 1, 1)
+        self.verticalLayout = QtGui.QVBoxLayout()
+        self.verticalLayout.setObjectName("verticalLayout")
+        self.gridLayout_7 = QtGui.QGridLayout()
+        self.gridLayout_7.setObjectName("gridLayout_7")
         self.textLabel1_3_2 = QtGui.QLabel(self.groupBox1)
-        self.textLabel1_3_2.setGeometry(QtCore.QRect(80,170,150,31))
         self.textLabel1_3_2.setWordWrap(False)
         self.textLabel1_3_2.setObjectName("textLabel1_3_2")
-        self.LENomConcept = QtGui.QLineEdit(self.groupBox1)
-        self.LENomConcept.setGeometry(QtCore.QRect(80,110,310,30))
-        self.LENomConcept.setObjectName("LENomConcept")
+        self.gridLayout_7.addWidget(self.textLabel1_3_2, 0, 0, 1, 1)
         self.textLabel3 = QtGui.QLabel(self.groupBox1)
-        self.textLabel3.setGeometry(QtCore.QRect(10,200,290,31))
         self.textLabel3.setWordWrap(False)
         self.textLabel3.setObjectName("textLabel3")
+        self.gridLayout_7.addWidget(self.textLabel3, 1, 0, 1, 1)
         self.typeConcept = QtGui.QLabel(self.groupBox1)
-        self.typeConcept.setGeometry(QtCore.QRect(310,200,130,31))
         self.typeConcept.setWordWrap(False)
         self.typeConcept.setObjectName("typeConcept")
-        self.gridlayout1.addWidget(self.groupBox1,0,0,1,1)
-        self.TWChoix.addTab(self.Concept,"")
+        self.gridLayout_7.addWidget(self.typeConcept, 1, 1, 1, 1)
+        self.verticalLayout.addLayout(self.gridLayout_7)
+        spacerItem4 = QtGui.QSpacerItem(20, 338, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding)
+        self.verticalLayout.addItem(spacerItem4)
+        self.gridLayout_8.addLayout(self.verticalLayout, 3, 0, 1, 1)
+        self.gridLayout_9.addWidget(self.groupBox1, 0, 0, 1, 1)
+        self.TWChoix.addTab(self.Concept, "")
         self.Commande = QtGui.QWidget()
-        self.Commande.setGeometry(QtCore.QRect(0,0,483,372))
         self.Commande.setObjectName("Commande")
-        self.gridLayout_2 = QtGui.QGridLayout(self.Commande)
+        self.gridLayout_4 = QtGui.QGridLayout(self.Commande)
+        self.gridLayout_4.setObjectName("gridLayout_4")
+        self.gridLayout_2 = QtGui.QGridLayout()
         self.gridLayout_2.setObjectName("gridLayout_2")
         self.textLabel1_4 = QtGui.QLabel(self.Commande)
         self.textLabel1_4.setWordWrap(False)
         self.textLabel1_4.setObjectName("textLabel1_4")
-        self.gridLayout_2.addWidget(self.textLabel1_4,0,0,1,1)
-        self.horizontalLayout = QtGui.QHBoxLayout()
-        self.horizontalLayout.setObjectName("horizontalLayout")
-        self.textLabel6 = QtGui.QLabel(self.Commande)
-        self.textLabel6.setMinimumSize(QtCore.QSize(50,30))
-        self.textLabel6.setWordWrap(False)
-        self.textLabel6.setObjectName("textLabel6")
-        self.horizontalLayout.addWidget(self.textLabel6)
-        self.LEFiltre = QtGui.QLineEdit(self.Commande)
-        self.LEFiltre.setMinimumSize(QtCore.QSize(160,30))
-        self.LEFiltre.setObjectName("LEFiltre")
-        self.horizontalLayout.addWidget(self.LEFiltre)
-        self.BNext = QtGui.QPushButton(self.Commande)
-        self.BNext.setObjectName("BNext")
-        self.horizontalLayout.addWidget(self.BNext)
-        self.gridLayout_2.addLayout(self.horizontalLayout,1,0,1,1)
+        self.gridLayout_2.addWidget(self.textLabel1_4, 0, 0, 1, 2)
         self.groupBox = QtGui.QGroupBox(self.Commande)
+        self.groupBox.setMinimumSize(QtCore.QSize(171, 71))
         self.groupBox.setObjectName("groupBox")
         self.gridLayout = QtGui.QGridLayout(self.groupBox)
         self.gridLayout.setObjectName("gridLayout")
         self.RBalpha = QtGui.QRadioButton(self.groupBox)
+        self.RBalpha.setMinimumSize(QtCore.QSize(149, 16))
+        self.RBalpha.setMaximumSize(QtCore.QSize(149, 16))
         self.RBalpha.setChecked(True)
         self.RBalpha.setObjectName("RBalpha")
-        self.gridLayout.addWidget(self.RBalpha,0,0,1,1)
+        self.gridLayout.addWidget(self.RBalpha, 0, 0, 1, 1)
         self.RBGroupe = QtGui.QRadioButton(self.groupBox)
         self.RBGroupe.setObjectName("RBGroupe")
-        self.gridLayout.addWidget(self.RBGroupe,1,0,1,1)
-        self.gridLayout_2.addWidget(self.groupBox,0,1,2,1)
+        self.gridLayout.addWidget(self.RBGroupe, 1, 0, 1, 1)
+        self.gridLayout_2.addWidget(self.groupBox, 0, 4, 2, 1)
+        self.textLabel6 = QtGui.QLabel(self.Commande)
+        self.textLabel6.setMinimumSize(QtCore.QSize(91, 30))
+        self.textLabel6.setWordWrap(False)
+        self.textLabel6.setObjectName("textLabel6")
+        self.gridLayout_2.addWidget(self.textLabel6, 1, 0, 1, 1)
+        self.LEFiltre = QtGui.QLineEdit(self.Commande)
+        self.LEFiltre.setMinimumSize(QtCore.QSize(231, 30))
+        self.LEFiltre.setObjectName("LEFiltre")
+        self.gridLayout_2.addWidget(self.LEFiltre, 1, 1, 1, 1)
+        self.BNext = QtGui.QPushButton(self.Commande)
+        self.BNext.setMinimumSize(QtCore.QSize(90, 30))
+        self.BNext.setObjectName("BNext")
+        self.gridLayout_2.addWidget(self.BNext, 1, 2, 1, 1)
+        spacerItem5 = QtGui.QSpacerItem(108, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
+        self.gridLayout_2.addItem(spacerItem5, 1, 3, 1, 1)
+        self.gridLayout_4.addLayout(self.gridLayout_2, 0, 0, 1, 1)
         self.LBNouvCommande = QtGui.QListWidget(self.Commande)
         self.LBNouvCommande.setObjectName("LBNouvCommande")
-        self.gridLayout_2.addWidget(self.LBNouvCommande,2,0,1,2)
+        self.gridLayout_4.addWidget(self.LBNouvCommande, 1, 0, 1, 1)
         self.textLabel4 = QtGui.QLabel(self.Commande)
+        self.textLabel4.setMaximumSize(QtCore.QSize(721, 20))
         self.textLabel4.setWordWrap(False)
         self.textLabel4.setObjectName("textLabel4")
-        self.gridLayout_2.addWidget(self.textLabel4,3,0,1,2)
-        self.TWChoix.addTab(self.Commande,"")
-        self.gridlayout.addWidget(self.TWChoix,0,0,1,3)
+        self.gridLayout_4.addWidget(self.textLabel4, 2, 0, 1, 1)
+        self.TWChoix.addTab(self.Commande, "")
+        self.gridLayout_3.addWidget(self.TWChoix, 0, 0, 1, 1)
 
         self.retranslateUi(DComm)
         self.TWChoix.setCurrentIndex(0)
         QtCore.QMetaObject.connectSlotsByName(DComm)
-        DComm.setTabOrder(self.LEFiltre,self.LENomConcept)
-        DComm.setTabOrder(self.LENomConcept,self.TWChoix)
-        DComm.setTabOrder(self.TWChoix,self.LBNouvCommande)
-        DComm.setTabOrder(self.LBNouvCommande,self.bOk)
-        DComm.setTabOrder(self.bOk,self.bSup)
-        DComm.setTabOrder(self.bSup,self.bHelp)
+        DComm.setTabOrder(self.TWChoix, self.LBNouvCommande)
+        DComm.setTabOrder(self.LBNouvCommande, self.bOk)
 
     def retranslateUi(self, DComm):
         DComm.setWindowTitle(QtGui.QApplication.translate("DComm", "DComm", None, QtGui.QApplication.UnicodeUTF8))
         self.bOk.setToolTip(QtGui.QApplication.translate("DComm", "validation de la saisie", None, QtGui.QApplication.UnicodeUTF8))
         self.bOk.setText(QtGui.QApplication.translate("DComm", "&Valider", None, QtGui.QApplication.UnicodeUTF8))
         self.bOk.setShortcut(QtGui.QApplication.translate("DComm", "Shift+A, Alt+A, Alt+A, Alt+A", None, QtGui.QApplication.UnicodeUTF8))
-        self.bSup.setToolTip(QtGui.QApplication.translate("DComm", "suppression du mot clef", None, QtGui.QApplication.UnicodeUTF8))
-        self.bSup.setText(QtGui.QApplication.translate("DComm", "&Supprimer", None, QtGui.QApplication.UnicodeUTF8))
-        self.bSup.setShortcut(QtGui.QApplication.translate("DComm", "Alt+S", None, QtGui.QApplication.UnicodeUTF8))
-        self.bHelp.setToolTip(QtGui.QApplication.translate("DComm", "affichage documentation aster", None, QtGui.QApplication.UnicodeUTF8))
-        self.bHelp.setText(QtGui.QApplication.translate("DComm", "&Documentation", None, QtGui.QApplication.UnicodeUTF8))
-        self.bHelp.setShortcut(QtGui.QApplication.translate("DComm", "Alt+D", None, QtGui.QApplication.UnicodeUTF8))
         self.textLabel1.setText(QtGui.QApplication.translate("DComm", "<h3><p align=\"center\"><u><b>Mots Clefs Permis</b></u></p></h3>", None, QtGui.QApplication.UnicodeUTF8))
         self.textLabel1_2.setText(QtGui.QApplication.translate("DComm", "<h3><p align=\"center\"><u><b>Règles</b></u></p></h3>", None, QtGui.QApplication.UnicodeUTF8))
         self.TWChoix.setTabText(self.TWChoix.indexOf(self.MotClef), QtGui.QApplication.translate("DComm", "Ajouter Mot-Clef", None, QtGui.QApplication.UnicodeUTF8))
@@ -166,11 +193,11 @@ class Ui_DComm(object):
         self.typeConcept.setText(QtGui.QApplication.translate("DComm", "TypeDuConcept", None, QtGui.QApplication.UnicodeUTF8))
         self.TWChoix.setTabText(self.TWChoix.indexOf(self.Concept), QtGui.QApplication.translate("DComm", "Nommer Concept", None, QtGui.QApplication.UnicodeUTF8))
         self.textLabel1_4.setText(QtGui.QApplication.translate("DComm", "<b><u>Commandes :</u></b>", None, QtGui.QApplication.UnicodeUTF8))
-        self.textLabel6.setText(QtGui.QApplication.translate("DComm", "Filtre", None, QtGui.QApplication.UnicodeUTF8))
-        self.BNext.setText(QtGui.QApplication.translate("DComm", "Suivant", None, QtGui.QApplication.UnicodeUTF8))
         self.groupBox.setTitle(QtGui.QApplication.translate("DComm", "Affichage", None, QtGui.QApplication.UnicodeUTF8))
         self.RBalpha.setText(QtGui.QApplication.translate("DComm", "alphabétique", None, QtGui.QApplication.UnicodeUTF8))
         self.RBGroupe.setText(QtGui.QApplication.translate("DComm", "par groupe", None, QtGui.QApplication.UnicodeUTF8))
+        self.textLabel6.setText(QtGui.QApplication.translate("DComm", "Filtre", None, QtGui.QApplication.UnicodeUTF8))
+        self.BNext.setText(QtGui.QApplication.translate("DComm", "Suivant", None, QtGui.QApplication.UnicodeUTF8))
         self.textLabel4.setText(QtGui.QApplication.translate("DComm", "La commande choisie sera ajoutée APRES la commande courante", None, QtGui.QApplication.UnicodeUTF8))
         self.TWChoix.setTabText(self.TWChoix.indexOf(self.Commande), QtGui.QApplication.translate("DComm", "Nouvelle Commande", None, QtGui.QApplication.UnicodeUTF8))
 
index 9cdc1812c758b0fc65d5f24a4658384ecaf89456..72b3a67f2bf84931093f4fbabc104cc12109fb0f 100644 (file)
@@ -5,10 +5,16 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>505</width>
-    <height>483</height>
+    <width>792</width>
+    <height>770</height>
    </rect>
   </property>
+  <property name="sizePolicy" >
+   <sizepolicy vsizetype="Expanding" hsizetype="Expanding" >
+    <horstretch>0</horstretch>
+    <verstretch>0</verstretch>
+   </sizepolicy>
+  </property>
   <property name="minimumSize" >
    <size>
     <width>505</width>
   <property name="windowTitle" >
    <string>DComm</string>
   </property>
-  <layout class="QGridLayout" >
-   <item row="1" column="0" colspan="3" >
+  <layout class="QGridLayout" name="gridLayout_3" >
+   <item row="1" column="0" >
     <widget class="QLabel" name="Commentaire" >
+     <property name="maximumSize" >
+      <size>
+       <width>793</width>
+       <height>20</height>
+      </size>
+     </property>
      <property name="frameShape" >
       <enum>QFrame::NoFrame</enum>
      </property>
      </property>
     </widget>
    </item>
-   <item row="2" column="1" >
-    <widget class="QPushButton" name="bOk" >
-     <property name="minimumSize" >
-      <size>
-       <width>0</width>
-       <height>30</height>
-      </size>
-     </property>
-     <property name="toolTip" >
-      <string>validation de la saisie</string>
-     </property>
-     <property name="text" >
-      <string>&amp;Valider</string>
-     </property>
-     <property name="shortcut" >
-      <string>Shift+A, Alt+A, Alt+A, Alt+A</string>
-     </property>
-     <property name="autoDefault" >
-      <bool>true</bool>
-     </property>
-     <property name="default" >
-      <bool>true</bool>
-     </property>
-    </widget>
-   </item>
    <item row="2" column="0" >
-    <widget class="QPushButton" name="bSup" >
-     <property name="minimumSize" >
-      <size>
-       <width>0</width>
-       <height>30</height>
-      </size>
-     </property>
-     <property name="toolTip" >
-      <string>suppression du mot clef</string>
-     </property>
-     <property name="text" >
-      <string>&amp;Supprimer</string>
-     </property>
-     <property name="shortcut" >
-      <string>Alt+S</string>
-     </property>
-     <property name="autoDefault" >
-      <bool>true</bool>
-     </property>
-    </widget>
-   </item>
-   <item row="2" column="2" >
-    <widget class="QPushButton" name="bHelp" >
-     <property name="minimumSize" >
-      <size>
-       <width>0</width>
-       <height>30</height>
-      </size>
-     </property>
-     <property name="toolTip" >
-      <string>affichage documentation aster</string>
-     </property>
-     <property name="text" >
-      <string>&amp;Documentation</string>
-     </property>
-     <property name="shortcut" >
-      <string>Alt+D</string>
-     </property>
-     <property name="autoDefault" >
-      <bool>true</bool>
-     </property>
-    </widget>
+    <layout class="QHBoxLayout" name="horizontalLayout" >
+     <item>
+      <spacer name="horizontalSpacer" >
+       <property name="orientation" >
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0" >
+        <size>
+         <width>263</width>
+         <height>27</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QPushButton" name="bOk" >
+       <property name="sizePolicy" >
+        <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="minimumSize" >
+        <size>
+         <width>160</width>
+         <height>30</height>
+        </size>
+       </property>
+       <property name="maximumSize" >
+        <size>
+         <width>16777215</width>
+         <height>30</height>
+        </size>
+       </property>
+       <property name="toolTip" >
+        <string>validation de la saisie</string>
+       </property>
+       <property name="text" >
+        <string>&amp;Valider</string>
+       </property>
+       <property name="shortcut" >
+        <string>Shift+A, Alt+A, Alt+A, Alt+A</string>
+       </property>
+       <property name="autoDefault" >
+        <bool>true</bool>
+       </property>
+       <property name="default" >
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <spacer name="horizontalSpacer_2" >
+       <property name="orientation" >
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0" >
+        <size>
+         <width>254</width>
+         <height>27</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+    </layout>
    </item>
-   <item row="0" column="0" colspan="3" >
+   <item row="0" column="0" >
     <widget class="QTabWidget" name="TWChoix" >
      <property name="currentIndex" >
       <number>0</number>
      </property>
      <widget class="QWidget" name="MotClef" >
-      <property name="geometry" >
-       <rect>
-        <x>0</x>
-        <y>0</y>
-        <width>483</width>
-        <height>372</height>
-       </rect>
-      </property>
       <attribute name="title" >
        <string>Ajouter Mot-Clef</string>
       </attribute>
-      <layout class="QGridLayout" name="gridLayout_3" >
+      <layout class="QGridLayout" name="gridLayout_6" >
        <item row="0" column="0" >
-        <widget class="QLabel" name="textLabel1" >
-         <property name="minimumSize" >
-          <size>
-           <width>0</width>
-           <height>0</height>
-          </size>
-         </property>
-         <property name="text" >
-          <string>&lt;h3>&lt;p align="center">&lt;u>&lt;b>Mots Clefs Permis&lt;/b>&lt;/u>&lt;/p>&lt;/h3></string>
-         </property>
-         <property name="wordWrap" >
-          <bool>false</bool>
-         </property>
-        </widget>
-       </item>
-       <item row="0" column="1" >
-        <widget class="QLabel" name="textLabel1_2" >
-         <property name="text" >
-          <string>&lt;h3>&lt;p align="center">&lt;u>&lt;b>Règles&lt;/b>&lt;/u>&lt;/p>&lt;/h3></string>
-         </property>
-         <property name="wordWrap" >
-          <bool>false</bool>
-         </property>
-        </widget>
-       </item>
-       <item row="1" column="0" >
-        <widget class="QListWidget" name="LBMCPermis" />
-       </item>
-       <item row="1" column="1" >
-        <widget class="QListWidget" name="LBRegles" />
+        <layout class="QGridLayout" name="gridLayout_5" >
+         <item row="0" column="0" >
+          <widget class="QLabel" name="textLabel1" >
+           <property name="minimumSize" >
+            <size>
+             <width>0</width>
+             <height>0</height>
+            </size>
+           </property>
+           <property name="text" >
+            <string>&lt;h3>&lt;p align="center">&lt;u>&lt;b>Mots Clefs Permis&lt;/b>&lt;/u>&lt;/p>&lt;/h3></string>
+           </property>
+           <property name="wordWrap" >
+            <bool>false</bool>
+           </property>
+          </widget>
+         </item>
+         <item row="0" column="1" >
+          <widget class="QLabel" name="textLabel1_2" >
+           <property name="text" >
+            <string>&lt;h3>&lt;p align="center">&lt;u>&lt;b>Règles&lt;/b>&lt;/u>&lt;/p>&lt;/h3></string>
+           </property>
+           <property name="wordWrap" >
+            <bool>false</bool>
+           </property>
+          </widget>
+         </item>
+         <item row="1" column="0" >
+          <widget class="QListWidget" name="LBMCPermis" />
+         </item>
+         <item row="1" column="1" >
+          <widget class="QListWidget" name="LBRegles" />
+         </item>
+        </layout>
        </item>
       </layout>
      </widget>
      <widget class="QWidget" name="Concept" >
-      <property name="geometry" >
-       <rect>
-        <x>0</x>
-        <y>0</y>
-        <width>483</width>
-        <height>372</height>
-       </rect>
-      </property>
       <attribute name="title" >
        <string>Nommer Concept</string>
       </attribute>
-      <layout class="QGridLayout" >
+      <layout class="QGridLayout" name="gridLayout_9" >
        <item row="0" column="0" >
         <widget class="QGroupBox" name="groupBox1" >
          <property name="title" >
           <string>Concept</string>
          </property>
-         <widget class="QLabel" name="textLabel1_3" >
-          <property name="geometry" >
-           <rect>
-            <x>80</x>
-            <y>50</y>
-            <width>130</width>
-            <height>31</height>
-           </rect>
-          </property>
-          <property name="text" >
-           <string>&lt;u>Nom du concept :&lt;/u></string>
-          </property>
-          <property name="wordWrap" >
-           <bool>false</bool>
-          </property>
-         </widget>
-         <widget class="QLabel" name="textLabel1_3_2" >
-          <property name="geometry" >
-           <rect>
-            <x>80</x>
-            <y>170</y>
-            <width>150</width>
-            <height>31</height>
-           </rect>
-          </property>
-          <property name="text" >
-           <string>&lt;u>Type du concept :&lt;/u></string>
-          </property>
-          <property name="wordWrap" >
-           <bool>false</bool>
-          </property>
-         </widget>
-         <widget class="QLineEdit" name="LENomConcept" >
-          <property name="geometry" >
-           <rect>
-            <x>80</x>
-            <y>110</y>
-            <width>310</width>
-            <height>30</height>
-           </rect>
-          </property>
-         </widget>
-         <widget class="QLabel" name="textLabel3" >
-          <property name="geometry" >
-           <rect>
-            <x>10</x>
-            <y>200</y>
-            <width>290</width>
-            <height>31</height>
-           </rect>
-          </property>
-          <property name="text" >
-           <string>L'opérateur retourne un concept de type :</string>
-          </property>
-          <property name="wordWrap" >
-           <bool>false</bool>
-          </property>
-         </widget>
-         <widget class="QLabel" name="typeConcept" >
-          <property name="geometry" >
-           <rect>
-            <x>310</x>
-            <y>200</y>
-            <width>130</width>
-            <height>31</height>
-           </rect>
-          </property>
-          <property name="text" >
-           <string>TypeDuConcept</string>
-          </property>
-          <property name="wordWrap" >
-           <bool>false</bool>
-          </property>
-         </widget>
+         <layout class="QGridLayout" name="gridLayout_8" >
+          <item row="0" column="0" >
+           <widget class="QSplitter" name="splitter" >
+            <property name="orientation" >
+             <enum>Qt::Horizontal</enum>
+            </property>
+            <widget class="QLabel" name="textLabel1_3" >
+             <property name="text" >
+              <string>&lt;u>Nom du concept :&lt;/u></string>
+             </property>
+             <property name="wordWrap" >
+              <bool>false</bool>
+             </property>
+            </widget>
+           </widget>
+          </item>
+          <item row="1" column="0" >
+           <layout class="QHBoxLayout" name="horizontalLayout_2" >
+            <item>
+             <widget class="QLineEdit" name="LENomConcept" >
+              <property name="minimumSize" >
+               <size>
+                <width>360</width>
+                <height>40</height>
+               </size>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <spacer name="horizontalSpacer_3" >
+              <property name="orientation" >
+               <enum>Qt::Horizontal</enum>
+              </property>
+              <property name="sizeHint" stdset="0" >
+               <size>
+                <width>356</width>
+                <height>20</height>
+               </size>
+              </property>
+             </spacer>
+            </item>
+           </layout>
+          </item>
+          <item row="2" column="0" >
+           <spacer name="verticalSpacer_3" >
+            <property name="orientation" >
+             <enum>Qt::Vertical</enum>
+            </property>
+            <property name="sizeHint" stdset="0" >
+             <size>
+              <width>20</width>
+              <height>51</height>
+             </size>
+            </property>
+           </spacer>
+          </item>
+          <item row="3" column="0" >
+           <layout class="QVBoxLayout" name="verticalLayout" >
+            <item>
+             <layout class="QGridLayout" name="gridLayout_7" >
+              <item row="0" column="0" >
+               <widget class="QLabel" name="textLabel1_3_2" >
+                <property name="text" >
+                 <string>&lt;u>Type du concept :&lt;/u></string>
+                </property>
+                <property name="wordWrap" >
+                 <bool>false</bool>
+                </property>
+               </widget>
+              </item>
+              <item row="1" column="0" >
+               <widget class="QLabel" name="textLabel3" >
+                <property name="text" >
+                 <string>L'opérateur retourne un concept de type :</string>
+                </property>
+                <property name="wordWrap" >
+                 <bool>false</bool>
+                </property>
+               </widget>
+              </item>
+              <item row="1" column="1" >
+               <widget class="QLabel" name="typeConcept" >
+                <property name="text" >
+                 <string>TypeDuConcept</string>
+                </property>
+                <property name="wordWrap" >
+                 <bool>false</bool>
+                </property>
+               </widget>
+              </item>
+             </layout>
+            </item>
+            <item>
+             <spacer name="verticalSpacer" >
+              <property name="orientation" >
+               <enum>Qt::Vertical</enum>
+              </property>
+              <property name="sizeHint" stdset="0" >
+               <size>
+                <width>20</width>
+                <height>338</height>
+               </size>
+              </property>
+             </spacer>
+            </item>
+           </layout>
+          </item>
+         </layout>
         </widget>
        </item>
       </layout>
      </widget>
      <widget class="QWidget" name="Commande" >
-      <property name="geometry" >
-       <rect>
-        <x>0</x>
-        <y>0</y>
-        <width>483</width>
-        <height>372</height>
-       </rect>
-      </property>
       <attribute name="title" >
        <string>Nouvelle Commande</string>
       </attribute>
-      <layout class="QGridLayout" name="gridLayout_2" >
+      <layout class="QGridLayout" name="gridLayout_4" >
        <item row="0" column="0" >
-        <widget class="QLabel" name="textLabel1_4" >
-         <property name="text" >
-          <string>&lt;b>&lt;u>Commandes :&lt;/u>&lt;/b></string>
-         </property>
-         <property name="wordWrap" >
-          <bool>false</bool>
-         </property>
-        </widget>
-       </item>
-       <item row="1" column="0" >
-        <layout class="QHBoxLayout" name="horizontalLayout" >
-         <item>
+        <layout class="QGridLayout" name="gridLayout_2" >
+         <item row="0" column="0" colspan="2" >
+          <widget class="QLabel" name="textLabel1_4" >
+           <property name="text" >
+            <string>&lt;b>&lt;u>Commandes :&lt;/u>&lt;/b></string>
+           </property>
+           <property name="wordWrap" >
+            <bool>false</bool>
+           </property>
+          </widget>
+         </item>
+         <item rowspan="2" row="0" column="4" >
+          <widget class="QGroupBox" name="groupBox" >
+           <property name="minimumSize" >
+            <size>
+             <width>171</width>
+             <height>71</height>
+            </size>
+           </property>
+           <property name="title" >
+            <string>Affichage</string>
+           </property>
+           <layout class="QGridLayout" name="gridLayout" >
+            <item row="0" column="0" >
+             <widget class="QRadioButton" name="RBalpha" >
+              <property name="minimumSize" >
+               <size>
+                <width>149</width>
+                <height>16</height>
+               </size>
+              </property>
+              <property name="maximumSize" >
+               <size>
+                <width>149</width>
+                <height>16</height>
+               </size>
+              </property>
+              <property name="text" >
+               <string>alphabétique</string>
+              </property>
+              <property name="checked" >
+               <bool>true</bool>
+              </property>
+             </widget>
+            </item>
+            <item row="1" column="0" >
+             <widget class="QRadioButton" name="RBGroupe" >
+              <property name="text" >
+               <string>par groupe</string>
+              </property>
+             </widget>
+            </item>
+           </layout>
+          </widget>
+         </item>
+         <item row="1" column="0" >
           <widget class="QLabel" name="textLabel6" >
            <property name="minimumSize" >
             <size>
-             <width>50</width>
+             <width>91</width>
              <height>30</height>
             </size>
            </property>
            </property>
           </widget>
          </item>
-         <item>
+         <item row="1" column="1" >
           <widget class="QLineEdit" name="LEFiltre" >
            <property name="minimumSize" >
             <size>
-             <width>160</width>
+             <width>231</width>
              <height>30</height>
             </size>
            </property>
           </widget>
          </item>
-         <item>
+         <item row="1" column="2" >
           <widget class="QPushButton" name="BNext" >
+           <property name="minimumSize" >
+            <size>
+             <width>90</width>
+             <height>30</height>
+            </size>
+           </property>
            <property name="text" >
             <string>Suivant</string>
            </property>
           </widget>
          </item>
+         <item row="1" column="3" >
+          <spacer name="horizontalSpacer_4" >
+           <property name="orientation" >
+            <enum>Qt::Horizontal</enum>
+           </property>
+           <property name="sizeHint" stdset="0" >
+            <size>
+             <width>108</width>
+             <height>20</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
         </layout>
        </item>
-       <item rowspan="2" row="0" column="1" >
-        <widget class="QGroupBox" name="groupBox" >
-         <property name="title" >
-          <string>Affichage</string>
-         </property>
-         <layout class="QGridLayout" name="gridLayout" >
-          <item row="0" column="0" >
-           <widget class="QRadioButton" name="RBalpha" >
-            <property name="text" >
-             <string>alphabétique</string>
-            </property>
-            <property name="checked" >
-             <bool>true</bool>
-            </property>
-           </widget>
-          </item>
-          <item row="1" column="0" >
-           <widget class="QRadioButton" name="RBGroupe" >
-            <property name="text" >
-             <string>par groupe</string>
-            </property>
-           </widget>
-          </item>
-         </layout>
-        </widget>
-       </item>
-       <item row="2" column="0" colspan="2" >
+       <item row="1" column="0" >
         <widget class="QListWidget" name="LBNouvCommande" />
        </item>
-       <item row="3" column="0" colspan="2" >
+       <item row="2" column="0" >
         <widget class="QLabel" name="textLabel4" >
+         <property name="maximumSize" >
+          <size>
+           <width>721</width>
+           <height>20</height>
+          </size>
+         </property>
          <property name="text" >
           <string>La commande choisie sera ajoutée APRES la commande courante</string>
          </property>
  <layoutdefault spacing="6" margin="11" />
  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
  <tabstops>
-  <tabstop>LEFiltre</tabstop>
-  <tabstop>LENomConcept</tabstop>
   <tabstop>TWChoix</tabstop>
   <tabstop>LBNouvCommande</tabstop>
   <tabstop>bOk</tabstop>
-  <tabstop>bSup</tabstop>
-  <tabstop>bHelp</tabstop>
  </tabstops>
  <resources/>
  <connections/>
index c89681d22fa36b0f8ac727ede172ac9c5538789c..4217847c3d025ca00afc2cef46fd3fb7fb9edbd2 100644 (file)
@@ -2,8 +2,8 @@
 
 # Form implementation generated from reading ui file 'desCommentaire.ui'
 #
-# Created: Tue Nov 18 17:37:24 2008
-#      by: PyQt4 UI code generator 4.4.2
+# Created: Fri Apr 24 12:05:46 2009
+#      by: PyQt4 UI code generator 4.4.3
 #
 # WARNING! All changes made in this file will be lost!
 
@@ -12,113 +12,105 @@ from PyQt4 import QtCore, QtGui
 class Ui_DComment(object):
     def setupUi(self, DComment):
         DComment.setObjectName("DComment")
-        DComment.resize(505,482)
-        DComment.setMinimumSize(QtCore.QSize(505,0))
-        self.gridlayout = QtGui.QGridLayout(DComment)
-        self.gridlayout.setObjectName("gridlayout")
-        self.bOk = QtGui.QPushButton(DComment)
-        self.bOk.setMinimumSize(QtCore.QSize(0,30))
-        self.bOk.setAutoDefault(True)
-        self.bOk.setDefault(True)
-        self.bOk.setObjectName("bOk")
-        self.gridlayout.addWidget(self.bOk,2,1,1,1)
-        self.bSup = QtGui.QPushButton(DComment)
-        self.bSup.setMinimumSize(QtCore.QSize(0,30))
-        self.bSup.setAutoDefault(True)
-        self.bSup.setObjectName("bSup")
-        self.gridlayout.addWidget(self.bSup,2,0,1,1)
-        self.bHelp = QtGui.QPushButton(DComment)
-        self.bHelp.setMinimumSize(QtCore.QSize(0,30))
-        self.bHelp.setAutoDefault(True)
-        self.bHelp.setObjectName("bHelp")
-        self.gridlayout.addWidget(self.bHelp,2,2,1,1)
-        self.Commentaire = QtGui.QLabel(DComment)
-        self.Commentaire.setFrameShape(QtGui.QFrame.NoFrame)
-        self.Commentaire.setFrameShadow(QtGui.QFrame.Plain)
-        self.Commentaire.setWordWrap(False)
-        self.Commentaire.setObjectName("Commentaire")
-        self.gridlayout.addWidget(self.Commentaire,1,0,1,3)
+        DComment.resize(796, 618)
+        DComment.setMinimumSize(QtCore.QSize(505, 0))
+        self.gridLayout_3 = QtGui.QGridLayout(DComment)
+        self.gridLayout_3.setObjectName("gridLayout_3")
         self.TWChoix = QtGui.QTabWidget(DComment)
         self.TWChoix.setObjectName("TWChoix")
         self.Valeur_Parametre = QtGui.QWidget()
-        self.Valeur_Parametre.setGeometry(QtCore.QRect(0,0,483,371))
         self.Valeur_Parametre.setObjectName("Valeur_Parametre")
         self.gridLayout = QtGui.QGridLayout(self.Valeur_Parametre)
         self.gridLayout.setObjectName("gridLayout")
         self.textCommentaire = QtGui.QTextEdit(self.Valeur_Parametre)
         self.textCommentaire.setObjectName("textCommentaire")
-        self.gridLayout.addWidget(self.textCommentaire,0,0,1,1)
-        self.TWChoix.addTab(self.Valeur_Parametre,"")
+        self.gridLayout.addWidget(self.textCommentaire, 0, 0, 1, 1)
+        self.TWChoix.addTab(self.Valeur_Parametre, "")
         self.Commande = QtGui.QWidget()
-        self.Commande.setGeometry(QtCore.QRect(0,0,483,371))
         self.Commande.setObjectName("Commande")
         self.gridLayout_4 = QtGui.QGridLayout(self.Commande)
         self.gridLayout_4.setObjectName("gridLayout_4")
+        self.gridLayout_2 = QtGui.QGridLayout()
+        self.gridLayout_2.setObjectName("gridLayout_2")
         self.textLabel1_4 = QtGui.QLabel(self.Commande)
         self.textLabel1_4.setWordWrap(False)
         self.textLabel1_4.setObjectName("textLabel1_4")
-        self.gridLayout_4.addWidget(self.textLabel1_4,0,0,1,3)
+        self.gridLayout_2.addWidget(self.textLabel1_4, 0, 0, 1, 2)
         self.groupBox = QtGui.QGroupBox(self.Commande)
+        self.groupBox.setMinimumSize(QtCore.QSize(171, 71))
         self.groupBox.setObjectName("groupBox")
-        self.gridLayout_3 = QtGui.QGridLayout(self.groupBox)
-        self.gridLayout_3.setObjectName("gridLayout_3")
+        self.gridLayout1 = QtGui.QGridLayout(self.groupBox)
+        self.gridLayout1.setObjectName("gridLayout1")
         self.RBalpha = QtGui.QRadioButton(self.groupBox)
+        self.RBalpha.setMinimumSize(QtCore.QSize(149, 16))
+        self.RBalpha.setMaximumSize(QtCore.QSize(149, 16))
         self.RBalpha.setChecked(True)
         self.RBalpha.setObjectName("RBalpha")
-        self.gridLayout_3.addWidget(self.RBalpha,0,0,1,1)
+        self.gridLayout1.addWidget(self.RBalpha, 0, 0, 1, 1)
         self.RBGroupe = QtGui.QRadioButton(self.groupBox)
         self.RBGroupe.setObjectName("RBGroupe")
-        self.gridLayout_3.addWidget(self.RBGroupe,1,0,1,1)
-        self.gridLayout_4.addWidget(self.groupBox,0,3,2,1)
-        self.textLabel6_2 = QtGui.QLabel(self.Commande)
-        self.textLabel6_2.setMinimumSize(QtCore.QSize(50,30))
-        self.textLabel6_2.setWordWrap(False)
-        self.textLabel6_2.setObjectName("textLabel6_2")
-        self.gridLayout_4.addWidget(self.textLabel6_2,1,0,1,1)
+        self.gridLayout1.addWidget(self.RBGroupe, 1, 0, 1, 1)
+        self.gridLayout_2.addWidget(self.groupBox, 0, 4, 2, 1)
+        self.textLabel6 = QtGui.QLabel(self.Commande)
+        self.textLabel6.setMinimumSize(QtCore.QSize(91, 30))
+        self.textLabel6.setWordWrap(False)
+        self.textLabel6.setObjectName("textLabel6")
+        self.gridLayout_2.addWidget(self.textLabel6, 1, 0, 1, 1)
         self.LEFiltre = QtGui.QLineEdit(self.Commande)
-        self.LEFiltre.setMinimumSize(QtCore.QSize(160,30))
+        self.LEFiltre.setMinimumSize(QtCore.QSize(231, 30))
         self.LEFiltre.setObjectName("LEFiltre")
-        self.gridLayout_4.addWidget(self.LEFiltre,1,1,1,1)
+        self.gridLayout_2.addWidget(self.LEFiltre, 1, 1, 1, 1)
         self.BNext = QtGui.QPushButton(self.Commande)
+        self.BNext.setMinimumSize(QtCore.QSize(90, 30))
         self.BNext.setObjectName("BNext")
-        self.gridLayout_4.addWidget(self.BNext,1,2,1,1)
+        self.gridLayout_2.addWidget(self.BNext, 1, 2, 1, 1)
+        spacerItem = QtGui.QSpacerItem(108, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
+        self.gridLayout_2.addItem(spacerItem, 1, 3, 1, 1)
+        self.gridLayout_4.addLayout(self.gridLayout_2, 0, 0, 1, 1)
         self.LBNouvCommande = QtGui.QListWidget(self.Commande)
         self.LBNouvCommande.setObjectName("LBNouvCommande")
-        self.gridLayout_4.addWidget(self.LBNouvCommande,2,0,1,4)
+        self.gridLayout_4.addWidget(self.LBNouvCommande, 1, 0, 1, 1)
         self.textLabel4 = QtGui.QLabel(self.Commande)
+        self.textLabel4.setMaximumSize(QtCore.QSize(721, 20))
         self.textLabel4.setWordWrap(False)
         self.textLabel4.setObjectName("textLabel4")
-        self.gridLayout_4.addWidget(self.textLabel4,3,0,1,4)
-        self.TWChoix.addTab(self.Commande,"")
-        self.gridlayout.addWidget(self.TWChoix,0,0,1,3)
+        self.gridLayout_4.addWidget(self.textLabel4, 2, 0, 1, 1)
+        self.TWChoix.addTab(self.Commande, "")
+        self.gridLayout_3.addWidget(self.TWChoix, 0, 0, 1, 1)
+        self.horizontalLayout = QtGui.QHBoxLayout()
+        self.horizontalLayout.setObjectName("horizontalLayout")
+        spacerItem1 = QtGui.QSpacerItem(268, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
+        self.horizontalLayout.addItem(spacerItem1)
+        self.bOk = QtGui.QPushButton(DComment)
+        self.bOk.setMinimumSize(QtCore.QSize(160, 30))
+        self.bOk.setMaximumSize(QtCore.QSize(160, 30))
+        self.bOk.setAutoDefault(True)
+        self.bOk.setDefault(True)
+        self.bOk.setObjectName("bOk")
+        self.horizontalLayout.addWidget(self.bOk)
+        spacerItem2 = QtGui.QSpacerItem(328, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
+        self.horizontalLayout.addItem(spacerItem2)
+        self.gridLayout_3.addLayout(self.horizontalLayout, 1, 0, 1, 1)
 
         self.retranslateUi(DComment)
         self.TWChoix.setCurrentIndex(0)
         QtCore.QMetaObject.connectSlotsByName(DComment)
-        DComment.setTabOrder(self.TWChoix,self.bOk)
-        DComment.setTabOrder(self.bOk,self.bSup)
-        DComment.setTabOrder(self.bSup,self.bHelp)
+        DComment.setTabOrder(self.TWChoix, self.bOk)
 
     def retranslateUi(self, DComment):
         DComment.setWindowTitle(QtGui.QApplication.translate("DComment", "DComm", None, QtGui.QApplication.UnicodeUTF8))
-        self.bOk.setToolTip(QtGui.QApplication.translate("DComment", "validation de la saisie", None, QtGui.QApplication.UnicodeUTF8))
-        self.bOk.setText(QtGui.QApplication.translate("DComment", "&Valider", None, QtGui.QApplication.UnicodeUTF8))
-        self.bOk.setShortcut(QtGui.QApplication.translate("DComment", "Shift+A, Alt+A, Alt+A, Alt+A", None, QtGui.QApplication.UnicodeUTF8))
-        self.bSup.setToolTip(QtGui.QApplication.translate("DComment", "suppression du mot clef", None, QtGui.QApplication.UnicodeUTF8))
-        self.bSup.setText(QtGui.QApplication.translate("DComment", "&Supprimer", None, QtGui.QApplication.UnicodeUTF8))
-        self.bSup.setShortcut(QtGui.QApplication.translate("DComment", "Alt+S", None, QtGui.QApplication.UnicodeUTF8))
-        self.bHelp.setToolTip(QtGui.QApplication.translate("DComment", "affichage documentation aster", None, QtGui.QApplication.UnicodeUTF8))
-        self.bHelp.setText(QtGui.QApplication.translate("DComment", "&Documentation", None, QtGui.QApplication.UnicodeUTF8))
-        self.bHelp.setShortcut(QtGui.QApplication.translate("DComment", "Alt+D", None, QtGui.QApplication.UnicodeUTF8))
         self.TWChoix.setTabText(self.TWChoix.indexOf(self.Valeur_Parametre), QtGui.QApplication.translate("DComment", "Commentaire", None, QtGui.QApplication.UnicodeUTF8))
         self.textLabel1_4.setText(QtGui.QApplication.translate("DComment", "<b><u>Commandes :</u></b>", None, QtGui.QApplication.UnicodeUTF8))
         self.groupBox.setTitle(QtGui.QApplication.translate("DComment", "Affichage", None, QtGui.QApplication.UnicodeUTF8))
         self.RBalpha.setText(QtGui.QApplication.translate("DComment", "alphabétique", None, QtGui.QApplication.UnicodeUTF8))
         self.RBGroupe.setText(QtGui.QApplication.translate("DComment", "par groupe", None, QtGui.QApplication.UnicodeUTF8))
-        self.textLabel6_2.setText(QtGui.QApplication.translate("DComment", "Filtre", None, QtGui.QApplication.UnicodeUTF8))
+        self.textLabel6.setText(QtGui.QApplication.translate("DComment", "Filtre", None, QtGui.QApplication.UnicodeUTF8))
         self.BNext.setText(QtGui.QApplication.translate("DComment", "Suivant", None, QtGui.QApplication.UnicodeUTF8))
         self.textLabel4.setText(QtGui.QApplication.translate("DComment", "La commande choisie sera ajoutée APRES la commande courante", None, QtGui.QApplication.UnicodeUTF8))
         self.TWChoix.setTabText(self.TWChoix.indexOf(self.Commande), QtGui.QApplication.translate("DComment", "Nouvelle Commande", None, QtGui.QApplication.UnicodeUTF8))
+        self.bOk.setToolTip(QtGui.QApplication.translate("DComment", "validation de la saisie", None, QtGui.QApplication.UnicodeUTF8))
+        self.bOk.setText(QtGui.QApplication.translate("DComment", "&Valider", None, QtGui.QApplication.UnicodeUTF8))
+        self.bOk.setShortcut(QtGui.QApplication.translate("DComment", "Shift+A, Alt+A, Alt+A, Alt+A", None, QtGui.QApplication.UnicodeUTF8))
 
 
 if __name__ == "__main__":
index 1202e7b5d1da37eb25de8e1da45900dbe70c9618..98bed3e28b2c36772d14058d9374428661ec37c7 100644 (file)
@@ -5,8 +5,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>505</width>
-    <height>482</height>
+    <width>796</width>
+    <height>618</height>
    </rect>
   </property>
   <property name="minimumSize" >
   <property name="windowTitle" >
    <string>DComm</string>
   </property>
-  <layout class="QGridLayout" >
-   <item row="2" column="1" >
-    <widget class="QPushButton" name="bOk" >
-     <property name="minimumSize" >
-      <size>
-       <width>0</width>
-       <height>30</height>
-      </size>
-     </property>
-     <property name="toolTip" >
-      <string>validation de la saisie</string>
-     </property>
-     <property name="text" >
-      <string>&amp;Valider</string>
-     </property>
-     <property name="shortcut" >
-      <string>Shift+A, Alt+A, Alt+A, Alt+A</string>
-     </property>
-     <property name="autoDefault" >
-      <bool>true</bool>
-     </property>
-     <property name="default" >
-      <bool>true</bool>
-     </property>
-    </widget>
-   </item>
-   <item row="2" column="0" >
-    <widget class="QPushButton" name="bSup" >
-     <property name="minimumSize" >
-      <size>
-       <width>0</width>
-       <height>30</height>
-      </size>
-     </property>
-     <property name="toolTip" >
-      <string>suppression du mot clef</string>
-     </property>
-     <property name="text" >
-      <string>&amp;Supprimer</string>
-     </property>
-     <property name="shortcut" >
-      <string>Alt+S</string>
-     </property>
-     <property name="autoDefault" >
-      <bool>true</bool>
-     </property>
-    </widget>
-   </item>
-   <item row="2" column="2" >
-    <widget class="QPushButton" name="bHelp" >
-     <property name="minimumSize" >
-      <size>
-       <width>0</width>
-       <height>30</height>
-      </size>
-     </property>
-     <property name="toolTip" >
-      <string>affichage documentation aster</string>
-     </property>
-     <property name="text" >
-      <string>&amp;Documentation</string>
-     </property>
-     <property name="shortcut" >
-      <string>Alt+D</string>
-     </property>
-     <property name="autoDefault" >
-      <bool>true</bool>
-     </property>
-    </widget>
-   </item>
-   <item row="1" column="0" colspan="3" >
-    <widget class="QLabel" name="Commentaire" >
-     <property name="frameShape" >
-      <enum>QFrame::NoFrame</enum>
-     </property>
-     <property name="frameShadow" >
-      <enum>QFrame::Plain</enum>
-     </property>
-     <property name="text" >
-      <string/>
-     </property>
-     <property name="wordWrap" >
-      <bool>false</bool>
-     </property>
-    </widget>
-   </item>
-   <item row="0" column="0" colspan="3" >
+  <layout class="QGridLayout" name="gridLayout_3" >
+   <item row="0" column="0" >
     <widget class="QTabWidget" name="TWChoix" >
      <property name="currentIndex" >
       <number>0</number>
      </property>
      <widget class="QWidget" name="Valeur_Parametre" >
-      <property name="geometry" >
-       <rect>
-        <x>0</x>
-        <y>0</y>
-        <width>483</width>
-        <height>371</height>
-       </rect>
-      </property>
       <attribute name="title" >
        <string>Commentaire</string>
       </attribute>
         <widget class="QTextEdit" name="textCommentaire" />
        </item>
       </layout>
+      <zorder>textCommentaire</zorder>
+      <zorder>bOk</zorder>
      </widget>
      <widget class="QWidget" name="Commande" >
-      <property name="geometry" >
-       <rect>
-        <x>0</x>
-        <y>0</y>
-        <width>483</width>
-        <height>371</height>
-       </rect>
-      </property>
       <attribute name="title" >
        <string>Nouvelle Commande</string>
       </attribute>
       <layout class="QGridLayout" name="gridLayout_4" >
-       <item row="0" column="0" colspan="3" >
-        <widget class="QLabel" name="textLabel1_4" >
-         <property name="text" >
-          <string>&lt;b>&lt;u>Commandes :&lt;/u>&lt;/b></string>
-         </property>
-         <property name="wordWrap" >
-          <bool>false</bool>
-         </property>
-        </widget>
-       </item>
-       <item rowspan="2" row="0" column="3" >
-        <widget class="QGroupBox" name="groupBox" >
-         <property name="title" >
-          <string>Affichage</string>
-         </property>
-         <layout class="QGridLayout" name="gridLayout_3" >
-          <item row="0" column="0" >
-           <widget class="QRadioButton" name="RBalpha" >
-            <property name="text" >
-             <string>alphabétique</string>
-            </property>
-            <property name="checked" >
-             <bool>true</bool>
-            </property>
-           </widget>
-          </item>
-          <item row="1" column="0" >
-           <widget class="QRadioButton" name="RBGroupe" >
-            <property name="text" >
-             <string>par groupe</string>
-            </property>
-           </widget>
-          </item>
-         </layout>
-        </widget>
+       <item row="0" column="0" >
+        <layout class="QGridLayout" name="gridLayout_2" >
+         <item row="0" column="0" colspan="2" >
+          <widget class="QLabel" name="textLabel1_4" >
+           <property name="text" >
+            <string>&lt;b>&lt;u>Commandes :&lt;/u>&lt;/b></string>
+           </property>
+           <property name="wordWrap" >
+            <bool>false</bool>
+           </property>
+          </widget>
+         </item>
+         <item rowspan="2" row="0" column="4" >
+          <widget class="QGroupBox" name="groupBox" >
+           <property name="minimumSize" >
+            <size>
+             <width>171</width>
+             <height>71</height>
+            </size>
+           </property>
+           <property name="title" >
+            <string>Affichage</string>
+           </property>
+           <layout class="QGridLayout" name="gridLayout" >
+            <item row="0" column="0" >
+             <widget class="QRadioButton" name="RBalpha" >
+              <property name="minimumSize" >
+               <size>
+                <width>149</width>
+                <height>16</height>
+               </size>
+              </property>
+              <property name="maximumSize" >
+               <size>
+                <width>149</width>
+                <height>16</height>
+               </size>
+              </property>
+              <property name="text" >
+               <string>alphabétique</string>
+              </property>
+              <property name="checked" >
+               <bool>true</bool>
+              </property>
+             </widget>
+            </item>
+            <item row="1" column="0" >
+             <widget class="QRadioButton" name="RBGroupe" >
+              <property name="text" >
+               <string>par groupe</string>
+              </property>
+             </widget>
+            </item>
+           </layout>
+          </widget>
+         </item>
+         <item row="1" column="0" >
+          <widget class="QLabel" name="textLabel6" >
+           <property name="minimumSize" >
+            <size>
+             <width>91</width>
+             <height>30</height>
+            </size>
+           </property>
+           <property name="text" >
+            <string>Filtre</string>
+           </property>
+           <property name="wordWrap" >
+            <bool>false</bool>
+           </property>
+          </widget>
+         </item>
+         <item row="1" column="1" >
+          <widget class="QLineEdit" name="LEFiltre" >
+           <property name="minimumSize" >
+            <size>
+             <width>231</width>
+             <height>30</height>
+            </size>
+           </property>
+          </widget>
+         </item>
+         <item row="1" column="2" >
+          <widget class="QPushButton" name="BNext" >
+           <property name="minimumSize" >
+            <size>
+             <width>90</width>
+             <height>30</height>
+            </size>
+           </property>
+           <property name="text" >
+            <string>Suivant</string>
+           </property>
+          </widget>
+         </item>
+         <item row="1" column="3" >
+          <spacer name="horizontalSpacer_4" >
+           <property name="orientation" >
+            <enum>Qt::Horizontal</enum>
+           </property>
+           <property name="sizeHint" stdset="0" >
+            <size>
+             <width>108</width>
+             <height>20</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
+        </layout>
        </item>
        <item row="1" column="0" >
-        <widget class="QLabel" name="textLabel6_2" >
-         <property name="minimumSize" >
-          <size>
-           <width>50</width>
-           <height>30</height>
-          </size>
-         </property>
-         <property name="text" >
-          <string>Filtre</string>
-         </property>
-         <property name="wordWrap" >
-          <bool>false</bool>
-         </property>
-        </widget>
+        <widget class="QListWidget" name="LBNouvCommande" />
        </item>
-       <item row="1" column="1" >
-        <widget class="QLineEdit" name="LEFiltre" >
-         <property name="minimumSize" >
+       <item row="2" column="0" >
+        <widget class="QLabel" name="textLabel4" >
+         <property name="maximumSize" >
           <size>
-           <width>160</width>
-           <height>30</height>
+           <width>721</width>
+           <height>20</height>
           </size>
          </property>
-        </widget>
-       </item>
-       <item row="1" column="2" >
-        <widget class="QPushButton" name="BNext" >
-         <property name="text" >
-          <string>Suivant</string>
-         </property>
-        </widget>
-       </item>
-       <item row="2" column="0" colspan="4" >
-        <widget class="QListWidget" name="LBNouvCommande" />
-       </item>
-       <item row="3" column="0" colspan="4" >
-        <widget class="QLabel" name="textLabel4" >
          <property name="text" >
           <string>La commande choisie sera ajoutée APRES la commande courante</string>
          </property>
      </widget>
     </widget>
    </item>
+   <item row="1" column="0" >
+    <layout class="QHBoxLayout" name="horizontalLayout" >
+     <item>
+      <spacer name="horizontalSpacer" >
+       <property name="orientation" >
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0" >
+        <size>
+         <width>268</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QPushButton" name="bOk" >
+       <property name="minimumSize" >
+        <size>
+         <width>160</width>
+         <height>30</height>
+        </size>
+       </property>
+       <property name="maximumSize" >
+        <size>
+         <width>160</width>
+         <height>30</height>
+        </size>
+       </property>
+       <property name="toolTip" >
+        <string>validation de la saisie</string>
+       </property>
+       <property name="text" >
+        <string>&amp;Valider</string>
+       </property>
+       <property name="shortcut" >
+        <string>Shift+A, Alt+A, Alt+A, Alt+A</string>
+       </property>
+       <property name="autoDefault" >
+        <bool>true</bool>
+       </property>
+       <property name="default" >
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <spacer name="horizontalSpacer_2" >
+       <property name="orientation" >
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0" >
+        <size>
+         <width>328</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+    </layout>
+   </item>
   </layout>
  </widget>
  <layoutdefault spacing="6" margin="11" />
  <tabstops>
   <tabstop>TWChoix</tabstop>
   <tabstop>bOk</tabstop>
-  <tabstop>bSup</tabstop>
-  <tabstop>bHelp</tabstop>
  </tabstops>
  <resources/>
  <connections/>
index 39e994fac77b87e82d4797ca1079bc1cd3681b18..2fddae4bb9c8533379d47523be4a318a2c1a164b 100644 (file)
@@ -2,8 +2,8 @@
 
 # Form implementation generated from reading ui file 'desError.ui'
 #
-# Created: Tue Nov 18 17:37:24 2008
-#      by: PyQt4 UI code generator 4.4.2
+# Created: Tue Jan 27 12:25:36 2009
+#      by: PyQt4 UI code generator 4.4.3
 #
 # WARNING! All changes made in this file will be lost!
 
@@ -12,24 +12,24 @@ from PyQt4 import QtCore, QtGui
 class Ui_DError(object):
     def setupUi(self, DError):
         DError.setObjectName("DError")
-        DError.resize(482,480)
-        DError.setMinimumSize(QtCore.QSize(350,0))
+        DError.resize(482, 480)
+        DError.setMinimumSize(QtCore.QSize(350, 0))
         self.gridLayout = QtGui.QGridLayout(DError)
         self.gridLayout.setObjectName("gridLayout")
         self.textBrowser = QtGui.QTextBrowser(DError)
         self.textBrowser.setObjectName("textBrowser")
-        self.gridLayout.addWidget(self.textBrowser,0,0,1,1)
+        self.gridLayout.addWidget(self.textBrowser, 0, 0, 1, 1)
         self.hboxlayout = QtGui.QHBoxLayout()
         self.hboxlayout.setObjectName("hboxlayout")
-        spacerItem = QtGui.QSpacerItem(171,20,QtGui.QSizePolicy.Expanding,QtGui.QSizePolicy.Minimum)
+        spacerItem = QtGui.QSpacerItem(171, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
         self.hboxlayout.addItem(spacerItem)
         self.bSup = QtGui.QPushButton(DError)
         self.bSup.setAutoDefault(True)
         self.bSup.setObjectName("bSup")
         self.hboxlayout.addWidget(self.bSup)
-        spacerItem1 = QtGui.QSpacerItem(171,20,QtGui.QSizePolicy.Expanding,QtGui.QSizePolicy.Minimum)
+        spacerItem1 = QtGui.QSpacerItem(171, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
         self.hboxlayout.addItem(spacerItem1)
-        self.gridLayout.addLayout(self.hboxlayout,1,0,1,1)
+        self.gridLayout.addLayout(self.hboxlayout, 1, 0, 1, 1)
 
         self.retranslateUi(DError)
         QtCore.QMetaObject.connectSlotsByName(DError)
index 95d721ae84f9c9642a443c0b50c3de7fbb6187da..8eb796aea4bf8ad410695c0d27ba69f0339b988e 100644 (file)
@@ -2,8 +2,8 @@
 
 # Form implementation generated from reading ui file 'desFormule.ui'
 #
-# Created: Tue Nov 18 17:37:24 2008
-#      by: PyQt4 UI code generator 4.4.2
+# Created: Fri Apr 24 14:18:26 2009
+#      by: PyQt4 UI code generator 4.4.3
 #
 # WARNING! All changes made in this file will be lost!
 
@@ -12,168 +12,156 @@ from PyQt4 import QtCore, QtGui
 class Ui_DFormule(object):
     def setupUi(self, DFormule):
         DFormule.setObjectName("DFormule")
-        DFormule.resize(529,493)
-        DFormule.setMinimumSize(QtCore.QSize(505,0))
-        self.gridlayout = QtGui.QGridLayout(DFormule)
-        self.gridlayout.setObjectName("gridlayout")
-        self.hboxlayout = QtGui.QHBoxLayout()
-        self.hboxlayout.setObjectName("hboxlayout")
-        self.bSup = QtGui.QPushButton(DFormule)
-        self.bSup.setMinimumSize(QtCore.QSize(0,30))
-        self.bSup.setAutoDefault(True)
-        self.bSup.setObjectName("bSup")
-        self.hboxlayout.addWidget(self.bSup)
-        self.bOk = QtGui.QPushButton(DFormule)
-        self.bOk.setMinimumSize(QtCore.QSize(0,30))
-        self.bOk.setAutoDefault(True)
-        self.bOk.setDefault(True)
-        self.bOk.setObjectName("bOk")
-        self.hboxlayout.addWidget(self.bOk)
-        self.bHelp = QtGui.QPushButton(DFormule)
-        self.bHelp.setMinimumSize(QtCore.QSize(0,30))
-        self.bHelp.setAutoDefault(True)
-        self.bHelp.setObjectName("bHelp")
-        self.hboxlayout.addWidget(self.bHelp)
-        self.gridlayout.addLayout(self.hboxlayout,2,0,1,1)
-        self.Commentaire = QtGui.QLabel(DFormule)
-        self.Commentaire.setWordWrap(False)
-        self.Commentaire.setObjectName("Commentaire")
-        self.gridlayout.addWidget(self.Commentaire,1,0,1,1)
+        DFormule.resize(529, 493)
+        DFormule.setMinimumSize(QtCore.QSize(505, 0))
+        self.gridLayout_3 = QtGui.QGridLayout(DFormule)
+        self.gridLayout_3.setObjectName("gridLayout_3")
         self.TWChoix = QtGui.QTabWidget(DFormule)
         self.TWChoix.setObjectName("TWChoix")
         self.Formule = QtGui.QWidget()
-        self.Formule.setGeometry(QtCore.QRect(0,0,507,384))
         self.Formule.setObjectName("Formule")
-        self.gridlayout1 = QtGui.QGridLayout(self.Formule)
-        self.gridlayout1.setObjectName("gridlayout1")
+        self.gridlayout = QtGui.QGridLayout(self.Formule)
+        self.gridlayout.setObjectName("gridlayout")
         self.textLabel1 = QtGui.QLabel(self.Formule)
-        self.textLabel1.setMinimumSize(QtCore.QSize(0,0))
+        self.textLabel1.setMinimumSize(QtCore.QSize(0, 0))
         self.textLabel1.setWordWrap(False)
         self.textLabel1.setObjectName("textLabel1")
-        self.gridlayout1.addWidget(self.textLabel1,0,0,1,1)
+        self.gridlayout.addWidget(self.textLabel1, 0, 0, 1, 1)
         self.textLabel1_3 = QtGui.QLabel(self.Formule)
         self.textLabel1_3.setWordWrap(False)
         self.textLabel1_3.setObjectName("textLabel1_3")
-        self.gridlayout1.addWidget(self.textLabel1_3,6,0,1,2)
-        self.hboxlayout1 = QtGui.QHBoxLayout()
-        self.hboxlayout1.setObjectName("hboxlayout1")
+        self.gridlayout.addWidget(self.textLabel1_3, 6, 0, 1, 2)
+        self.hboxlayout = QtGui.QHBoxLayout()
+        self.hboxlayout.setObjectName("hboxlayout")
         self.LENomFormule = QtGui.QLineEdit(self.Formule)
-        self.LENomFormule.setMinimumSize(QtCore.QSize(0,40))
+        self.LENomFormule.setMinimumSize(QtCore.QSize(0, 40))
         self.LENomFormule.setObjectName("LENomFormule")
-        self.hboxlayout1.addWidget(self.LENomFormule)
-        self.hboxlayout2 = QtGui.QHBoxLayout()
-        self.hboxlayout2.setObjectName("hboxlayout2")
+        self.hboxlayout.addWidget(self.LENomFormule)
+        self.hboxlayout1 = QtGui.QHBoxLayout()
+        self.hboxlayout1.setObjectName("hboxlayout1")
         self.textLabel1_6 = QtGui.QLabel(self.Formule)
         self.textLabel1_6.setWordWrap(False)
         self.textLabel1_6.setObjectName("textLabel1_6")
-        self.hboxlayout2.addWidget(self.textLabel1_6)
+        self.hboxlayout1.addWidget(self.textLabel1_6)
         self.LENomsArgs = QtGui.QLineEdit(self.Formule)
-        self.LENomsArgs.setMinimumSize(QtCore.QSize(230,40))
+        self.LENomsArgs.setMinimumSize(QtCore.QSize(230, 40))
         self.LENomsArgs.setObjectName("LENomsArgs")
-        self.hboxlayout2.addWidget(self.LENomsArgs)
+        self.hboxlayout1.addWidget(self.LENomsArgs)
         self.textLabel1_6_2 = QtGui.QLabel(self.Formule)
         self.textLabel1_6_2.setWordWrap(False)
         self.textLabel1_6_2.setObjectName("textLabel1_6_2")
-        self.hboxlayout2.addWidget(self.textLabel1_6_2)
-        self.hboxlayout1.addLayout(self.hboxlayout2)
-        self.gridlayout1.addLayout(self.hboxlayout1,2,0,1,2)
+        self.hboxlayout1.addWidget(self.textLabel1_6_2)
+        self.hboxlayout.addLayout(self.hboxlayout1)
+        self.gridlayout.addLayout(self.hboxlayout, 2, 0, 1, 2)
         self.textLabel2 = QtGui.QLabel(self.Formule)
         self.textLabel2.setWordWrap(False)
         self.textLabel2.setObjectName("textLabel2")
-        self.gridlayout1.addWidget(self.textLabel2,1,1,1,1)
+        self.gridlayout.addWidget(self.textLabel2, 1, 1, 1, 1)
         self.textLabel1_3_2 = QtGui.QLabel(self.Formule)
         self.textLabel1_3_2.setWordWrap(False)
         self.textLabel1_3_2.setObjectName("textLabel1_3_2")
-        self.gridlayout1.addWidget(self.textLabel1_3_2,7,0,1,2)
+        self.gridlayout.addWidget(self.textLabel1_3_2, 7, 0, 1, 2)
         self.textLabel2_2 = QtGui.QLabel(self.Formule)
         self.textLabel2_2.setWordWrap(False)
         self.textLabel2_2.setObjectName("textLabel2_2")
-        self.gridlayout1.addWidget(self.textLabel2_2,3,0,1,2)
+        self.gridlayout.addWidget(self.textLabel2_2, 3, 0, 1, 2)
         self.textLabel1_5 = QtGui.QLabel(self.Formule)
-        self.textLabel1_5.setMinimumSize(QtCore.QSize(0,0))
+        self.textLabel1_5.setMinimumSize(QtCore.QSize(0, 0))
         self.textLabel1_5.setWordWrap(False)
         self.textLabel1_5.setObjectName("textLabel1_5")
-        self.gridlayout1.addWidget(self.textLabel1_5,4,0,1,2)
+        self.gridlayout.addWidget(self.textLabel1_5, 4, 0, 1, 2)
         self.LECorpsFormule = QtGui.QLineEdit(self.Formule)
-        self.LECorpsFormule.setMinimumSize(QtCore.QSize(0,30))
+        self.LECorpsFormule.setMinimumSize(QtCore.QSize(0, 30))
         self.LECorpsFormule.setObjectName("LECorpsFormule")
-        self.gridlayout1.addWidget(self.LECorpsFormule,5,0,1,2)
+        self.gridlayout.addWidget(self.LECorpsFormule, 5, 0, 1, 2)
         self.textLabel1_2 = QtGui.QLabel(self.Formule)
         self.textLabel1_2.setWordWrap(False)
         self.textLabel1_2.setObjectName("textLabel1_2")
-        self.gridlayout1.addWidget(self.textLabel1_2,0,1,1,1)
-        self.TWChoix.addTab(self.Formule,"")
+        self.gridlayout.addWidget(self.textLabel1_2, 0, 1, 1, 1)
+        self.TWChoix.addTab(self.Formule, "")
         self.Commande = QtGui.QWidget()
-        self.Commande.setGeometry(QtCore.QRect(0,0,507,384))
         self.Commande.setObjectName("Commande")
-        self.gridLayout_2 = QtGui.QGridLayout(self.Commande)
+        self.gridLayout_4 = QtGui.QGridLayout(self.Commande)
+        self.gridLayout_4.setObjectName("gridLayout_4")
+        self.gridLayout_2 = QtGui.QGridLayout()
         self.gridLayout_2.setObjectName("gridLayout_2")
         self.textLabel1_4 = QtGui.QLabel(self.Commande)
         self.textLabel1_4.setWordWrap(False)
         self.textLabel1_4.setObjectName("textLabel1_4")
-        self.gridLayout_2.addWidget(self.textLabel1_4,0,0,1,1)
+        self.gridLayout_2.addWidget(self.textLabel1_4, 0, 0, 1, 2)
         self.groupBox = QtGui.QGroupBox(self.Commande)
+        self.groupBox.setMinimumSize(QtCore.QSize(171, 71))
         self.groupBox.setObjectName("groupBox")
         self.gridLayout = QtGui.QGridLayout(self.groupBox)
         self.gridLayout.setObjectName("gridLayout")
         self.RBalpha = QtGui.QRadioButton(self.groupBox)
+        self.RBalpha.setMinimumSize(QtCore.QSize(149, 16))
+        self.RBalpha.setMaximumSize(QtCore.QSize(149, 16))
         self.RBalpha.setChecked(True)
         self.RBalpha.setObjectName("RBalpha")
-        self.gridLayout.addWidget(self.RBalpha,0,0,1,1)
+        self.gridLayout.addWidget(self.RBalpha, 0, 0, 1, 1)
         self.RBGroupe = QtGui.QRadioButton(self.groupBox)
         self.RBGroupe.setObjectName("RBGroupe")
-        self.gridLayout.addWidget(self.RBGroupe,1,0,1,1)
-        self.gridLayout_2.addWidget(self.groupBox,0,1,2,1)
-        self.horizontalLayout = QtGui.QHBoxLayout()
-        self.horizontalLayout.setObjectName("horizontalLayout")
+        self.gridLayout.addWidget(self.RBGroupe, 1, 0, 1, 1)
+        self.gridLayout_2.addWidget(self.groupBox, 0, 4, 2, 1)
         self.textLabel6 = QtGui.QLabel(self.Commande)
-        self.textLabel6.setMinimumSize(QtCore.QSize(50,30))
+        self.textLabel6.setMinimumSize(QtCore.QSize(91, 30))
         self.textLabel6.setWordWrap(False)
         self.textLabel6.setObjectName("textLabel6")
-        self.horizontalLayout.addWidget(self.textLabel6)
+        self.gridLayout_2.addWidget(self.textLabel6, 1, 0, 1, 1)
         self.LEFiltre = QtGui.QLineEdit(self.Commande)
-        self.LEFiltre.setMinimumSize(QtCore.QSize(160,30))
+        self.LEFiltre.setMinimumSize(QtCore.QSize(231, 30))
         self.LEFiltre.setObjectName("LEFiltre")
-        self.horizontalLayout.addWidget(self.LEFiltre)
+        self.gridLayout_2.addWidget(self.LEFiltre, 1, 1, 1, 1)
         self.BNext = QtGui.QPushButton(self.Commande)
+        self.BNext.setMinimumSize(QtCore.QSize(90, 30))
         self.BNext.setObjectName("BNext")
-        self.horizontalLayout.addWidget(self.BNext)
-        self.gridLayout_2.addLayout(self.horizontalLayout,1,0,1,1)
+        self.gridLayout_2.addWidget(self.BNext, 1, 2, 1, 1)
+        spacerItem = QtGui.QSpacerItem(108, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
+        self.gridLayout_2.addItem(spacerItem, 1, 3, 1, 1)
+        self.gridLayout_4.addLayout(self.gridLayout_2, 0, 0, 1, 1)
         self.LBNouvCommande = QtGui.QListWidget(self.Commande)
         self.LBNouvCommande.setObjectName("LBNouvCommande")
-        self.gridLayout_2.addWidget(self.LBNouvCommande,2,0,1,2)
+        self.gridLayout_4.addWidget(self.LBNouvCommande, 1, 0, 1, 1)
         self.textLabel4 = QtGui.QLabel(self.Commande)
+        self.textLabel4.setMaximumSize(QtCore.QSize(721, 20))
         self.textLabel4.setWordWrap(False)
         self.textLabel4.setObjectName("textLabel4")
-        self.gridLayout_2.addWidget(self.textLabel4,3,0,1,2)
-        self.TWChoix.addTab(self.Commande,"")
-        self.gridlayout.addWidget(self.TWChoix,0,0,1,1)
+        self.gridLayout_4.addWidget(self.textLabel4, 2, 0, 1, 1)
+        self.TWChoix.addTab(self.Commande, "")
+        self.gridLayout_3.addWidget(self.TWChoix, 0, 0, 1, 1)
+        self.Commentaire = QtGui.QLabel(DFormule)
+        self.Commentaire.setWordWrap(False)
+        self.Commentaire.setObjectName("Commentaire")
+        self.gridLayout_3.addWidget(self.Commentaire, 1, 0, 1, 1)
+        self.horizontalLayout = QtGui.QHBoxLayout()
+        self.horizontalLayout.setObjectName("horizontalLayout")
+        spacerItem1 = QtGui.QSpacerItem(158, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
+        self.horizontalLayout.addItem(spacerItem1)
+        self.bOk = QtGui.QPushButton(DFormule)
+        self.bOk.setMinimumSize(QtCore.QSize(163, 30))
+        self.bOk.setAutoDefault(True)
+        self.bOk.setDefault(True)
+        self.bOk.setObjectName("bOk")
+        self.horizontalLayout.addWidget(self.bOk)
+        spacerItem2 = QtGui.QSpacerItem(158, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
+        self.horizontalLayout.addItem(spacerItem2)
+        self.gridLayout_3.addLayout(self.horizontalLayout, 2, 0, 1, 1)
 
         self.retranslateUi(DFormule)
         self.TWChoix.setCurrentIndex(0)
         QtCore.QMetaObject.connectSlotsByName(DFormule)
-        DFormule.setTabOrder(self.LEFiltre,self.LENomFormule)
-        DFormule.setTabOrder(self.LENomFormule,self.LENomsArgs)
-        DFormule.setTabOrder(self.LENomsArgs,self.LECorpsFormule)
-        DFormule.setTabOrder(self.LECorpsFormule,self.bSup)
-        DFormule.setTabOrder(self.bSup,self.bOk)
-        DFormule.setTabOrder(self.bOk,self.bHelp)
-        DFormule.setTabOrder(self.bHelp,self.TWChoix)
-        DFormule.setTabOrder(self.TWChoix,self.RBalpha)
-        DFormule.setTabOrder(self.RBalpha,self.RBGroupe)
-        DFormule.setTabOrder(self.RBGroupe,self.LBNouvCommande)
+        DFormule.setTabOrder(self.LEFiltre, self.LENomFormule)
+        DFormule.setTabOrder(self.LENomFormule, self.LENomsArgs)
+        DFormule.setTabOrder(self.LENomsArgs, self.LECorpsFormule)
+        DFormule.setTabOrder(self.LECorpsFormule, self.bOk)
+        DFormule.setTabOrder(self.bOk, self.TWChoix)
+        DFormule.setTabOrder(self.TWChoix, self.RBalpha)
+        DFormule.setTabOrder(self.RBalpha, self.RBGroupe)
+        DFormule.setTabOrder(self.RBGroupe, self.LBNouvCommande)
 
     def retranslateUi(self, DFormule):
         DFormule.setWindowTitle(QtGui.QApplication.translate("DFormule", "DMacro", None, QtGui.QApplication.UnicodeUTF8))
-        self.bSup.setToolTip(QtGui.QApplication.translate("DFormule", "suppression du mot clef", None, QtGui.QApplication.UnicodeUTF8))
-        self.bSup.setText(QtGui.QApplication.translate("DFormule", "&Supprimer", None, QtGui.QApplication.UnicodeUTF8))
-        self.bSup.setShortcut(QtGui.QApplication.translate("DFormule", "Alt+S", None, QtGui.QApplication.UnicodeUTF8))
-        self.bOk.setToolTip(QtGui.QApplication.translate("DFormule", "validation de la saisie", None, QtGui.QApplication.UnicodeUTF8))
-        self.bOk.setText(QtGui.QApplication.translate("DFormule", "&Valider", None, QtGui.QApplication.UnicodeUTF8))
-        self.bOk.setShortcut(QtGui.QApplication.translate("DFormule", "Shift+A, Alt+A, Alt+A, Alt+A", None, QtGui.QApplication.UnicodeUTF8))
-        self.bHelp.setToolTip(QtGui.QApplication.translate("DFormule", "affichage documentation aster", None, QtGui.QApplication.UnicodeUTF8))
-        self.bHelp.setText(QtGui.QApplication.translate("DFormule", "&Documentation", None, QtGui.QApplication.UnicodeUTF8))
-        self.bHelp.setShortcut(QtGui.QApplication.translate("DFormule", "Alt+D", None, QtGui.QApplication.UnicodeUTF8))
         self.textLabel1.setText(QtGui.QApplication.translate("DFormule", "<h3><p align=\"center\"><u><b>Nom de la formule</b></u></p></h3>", None, QtGui.QApplication.UnicodeUTF8))
         self.textLabel1_3.setText(QtGui.QApplication.translate("DFormule", "Retour-Chariot permet de vérifier que l\'expression est valide.", None, QtGui.QApplication.UnicodeUTF8))
         self.textLabel1_6.setText(QtGui.QApplication.translate("DFormule", "<h1><b>(</b></h1>", None, QtGui.QApplication.UnicodeUTF8))
@@ -194,6 +182,9 @@ class Ui_DFormule(object):
         self.BNext.setText(QtGui.QApplication.translate("DFormule", "Suivant", None, QtGui.QApplication.UnicodeUTF8))
         self.textLabel4.setText(QtGui.QApplication.translate("DFormule", "La commande choisie sera ajoutée APRES la commande courante", None, QtGui.QApplication.UnicodeUTF8))
         self.TWChoix.setTabText(self.TWChoix.indexOf(self.Commande), QtGui.QApplication.translate("DFormule", "Nouvelle Commande", None, QtGui.QApplication.UnicodeUTF8))
+        self.bOk.setToolTip(QtGui.QApplication.translate("DFormule", "validation de la saisie", None, QtGui.QApplication.UnicodeUTF8))
+        self.bOk.setText(QtGui.QApplication.translate("DFormule", "&Valider", None, QtGui.QApplication.UnicodeUTF8))
+        self.bOk.setShortcut(QtGui.QApplication.translate("DFormule", "Shift+A, Alt+A, Alt+A, Alt+A", None, QtGui.QApplication.UnicodeUTF8))
 
 
 if __name__ == "__main__":
index e0d4f44a3dd86269794498dd1844491921d9c096..984a27d3d9921ea3b53d2b80b19f9ad7d8c1d7de 100644 (file)
   <property name="windowTitle" >
    <string>DMacro</string>
   </property>
-  <layout class="QGridLayout" >
-   <item row="2" column="0" >
-    <layout class="QHBoxLayout" >
-     <item>
-      <widget class="QPushButton" name="bSup" >
-       <property name="minimumSize" >
-        <size>
-         <width>0</width>
-         <height>30</height>
-        </size>
-       </property>
-       <property name="toolTip" >
-        <string>suppression du mot clef</string>
-       </property>
-       <property name="text" >
-        <string>&amp;Supprimer</string>
-       </property>
-       <property name="shortcut" >
-        <string>Alt+S</string>
-       </property>
-       <property name="autoDefault" >
-        <bool>true</bool>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QPushButton" name="bOk" >
-       <property name="minimumSize" >
-        <size>
-         <width>0</width>
-         <height>30</height>
-        </size>
-       </property>
-       <property name="toolTip" >
-        <string>validation de la saisie</string>
-       </property>
-       <property name="text" >
-        <string>&amp;Valider</string>
-       </property>
-       <property name="shortcut" >
-        <string>Shift+A, Alt+A, Alt+A, Alt+A</string>
-       </property>
-       <property name="autoDefault" >
-        <bool>true</bool>
-       </property>
-       <property name="default" >
-        <bool>true</bool>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QPushButton" name="bHelp" >
-       <property name="minimumSize" >
-        <size>
-         <width>0</width>
-         <height>30</height>
-        </size>
-       </property>
-       <property name="toolTip" >
-        <string>affichage documentation aster</string>
-       </property>
-       <property name="text" >
-        <string>&amp;Documentation</string>
-       </property>
-       <property name="shortcut" >
-        <string>Alt+D</string>
-       </property>
-       <property name="autoDefault" >
-        <bool>true</bool>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </item>
-   <item row="1" column="0" >
-    <widget class="QLabel" name="Commentaire" >
-     <property name="text" >
-      <string/>
-     </property>
-     <property name="wordWrap" >
-      <bool>false</bool>
-     </property>
-    </widget>
-   </item>
+  <layout class="QGridLayout" name="gridLayout_3" >
    <item row="0" column="0" >
     <widget class="QTabWidget" name="TWChoix" >
      <property name="currentIndex" >
       <number>0</number>
      </property>
      <widget class="QWidget" name="Formule" >
-      <property name="geometry" >
-       <rect>
-        <x>0</x>
-        <y>0</y>
-        <width>507</width>
-        <height>384</height>
-       </rect>
-      </property>
       <attribute name="title" >
        <string>Définition Formule</string>
       </attribute>
@@ -265,61 +174,71 @@ valeurs seront effectivement prises en compte</string>
       </layout>
      </widget>
      <widget class="QWidget" name="Commande" >
-      <property name="geometry" >
-       <rect>
-        <x>0</x>
-        <y>0</y>
-        <width>507</width>
-        <height>384</height>
-       </rect>
-      </property>
       <attribute name="title" >
        <string>Nouvelle Commande</string>
       </attribute>
-      <layout class="QGridLayout" name="gridLayout_2" >
+      <layout class="QGridLayout" name="gridLayout_4" >
        <item row="0" column="0" >
-        <widget class="QLabel" name="textLabel1_4" >
-         <property name="text" >
-          <string>&lt;b>&lt;u>Commandes :&lt;/u>&lt;/b></string>
-         </property>
-         <property name="wordWrap" >
-          <bool>false</bool>
-         </property>
-        </widget>
-       </item>
-       <item rowspan="2" row="0" column="1" >
-        <widget class="QGroupBox" name="groupBox" >
-         <property name="title" >
-          <string>Affichage</string>
-         </property>
-         <layout class="QGridLayout" name="gridLayout" >
-          <item row="0" column="0" >
-           <widget class="QRadioButton" name="RBalpha" >
-            <property name="text" >
-             <string>alphabétique</string>
-            </property>
-            <property name="checked" >
-             <bool>true</bool>
-            </property>
-           </widget>
-          </item>
-          <item row="1" column="0" >
-           <widget class="QRadioButton" name="RBGroupe" >
-            <property name="text" >
-             <string>par groupe</string>
-            </property>
-           </widget>
-          </item>
-         </layout>
-        </widget>
-       </item>
-       <item row="1" column="0" >
-        <layout class="QHBoxLayout" name="horizontalLayout" >
-         <item>
+        <layout class="QGridLayout" name="gridLayout_2" >
+         <item row="0" column="0" colspan="2" >
+          <widget class="QLabel" name="textLabel1_4" >
+           <property name="text" >
+            <string>&lt;b>&lt;u>Commandes :&lt;/u>&lt;/b></string>
+           </property>
+           <property name="wordWrap" >
+            <bool>false</bool>
+           </property>
+          </widget>
+         </item>
+         <item rowspan="2" row="0" column="4" >
+          <widget class="QGroupBox" name="groupBox" >
+           <property name="minimumSize" >
+            <size>
+             <width>171</width>
+             <height>71</height>
+            </size>
+           </property>
+           <property name="title" >
+            <string>Affichage</string>
+           </property>
+           <layout class="QGridLayout" name="gridLayout" >
+            <item row="0" column="0" >
+             <widget class="QRadioButton" name="RBalpha" >
+              <property name="minimumSize" >
+               <size>
+                <width>149</width>
+                <height>16</height>
+               </size>
+              </property>
+              <property name="maximumSize" >
+               <size>
+                <width>149</width>
+                <height>16</height>
+               </size>
+              </property>
+              <property name="text" >
+               <string>alphabétique</string>
+              </property>
+              <property name="checked" >
+               <bool>true</bool>
+              </property>
+             </widget>
+            </item>
+            <item row="1" column="0" >
+             <widget class="QRadioButton" name="RBGroupe" >
+              <property name="text" >
+               <string>par groupe</string>
+              </property>
+             </widget>
+            </item>
+           </layout>
+          </widget>
+         </item>
+         <item row="1" column="0" >
           <widget class="QLabel" name="textLabel6" >
            <property name="minimumSize" >
             <size>
-             <width>50</width>
+             <width>91</width>
              <height>30</height>
             </size>
            </property>
@@ -331,30 +250,55 @@ valeurs seront effectivement prises en compte</string>
            </property>
           </widget>
          </item>
-         <item>
+         <item row="1" column="1" >
           <widget class="QLineEdit" name="LEFiltre" >
            <property name="minimumSize" >
             <size>
-             <width>160</width>
+             <width>231</width>
              <height>30</height>
             </size>
            </property>
           </widget>
          </item>
-         <item>
+         <item row="1" column="2" >
           <widget class="QPushButton" name="BNext" >
+           <property name="minimumSize" >
+            <size>
+             <width>90</width>
+             <height>30</height>
+            </size>
+           </property>
            <property name="text" >
             <string>Suivant</string>
            </property>
           </widget>
          </item>
+         <item row="1" column="3" >
+          <spacer name="horizontalSpacer_4" >
+           <property name="orientation" >
+            <enum>Qt::Horizontal</enum>
+           </property>
+           <property name="sizeHint" stdset="0" >
+            <size>
+             <width>108</width>
+             <height>20</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
         </layout>
        </item>
-       <item row="2" column="0" colspan="2" >
+       <item row="1" column="0" >
         <widget class="QListWidget" name="LBNouvCommande" />
        </item>
-       <item row="3" column="0" colspan="2" >
+       <item row="2" column="0" >
         <widget class="QLabel" name="textLabel4" >
+         <property name="maximumSize" >
+          <size>
+           <width>721</width>
+           <height>20</height>
+          </size>
+         </property>
          <property name="text" >
           <string>La commande choisie sera ajoutée APRES la commande courante</string>
          </property>
@@ -367,6 +311,71 @@ valeurs seront effectivement prises en compte</string>
      </widget>
     </widget>
    </item>
+   <item row="1" column="0" >
+    <widget class="QLabel" name="Commentaire" >
+     <property name="text" >
+      <string/>
+     </property>
+     <property name="wordWrap" >
+      <bool>false</bool>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="0" >
+    <layout class="QHBoxLayout" name="horizontalLayout" >
+     <item>
+      <spacer name="horizontalSpacer" >
+       <property name="orientation" >
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0" >
+        <size>
+         <width>158</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QPushButton" name="bOk" >
+       <property name="minimumSize" >
+        <size>
+         <width>163</width>
+         <height>30</height>
+        </size>
+       </property>
+       <property name="toolTip" >
+        <string>validation de la saisie</string>
+       </property>
+       <property name="text" >
+        <string>&amp;Valider</string>
+       </property>
+       <property name="shortcut" >
+        <string>Shift+A, Alt+A, Alt+A, Alt+A</string>
+       </property>
+       <property name="autoDefault" >
+        <bool>true</bool>
+       </property>
+       <property name="default" >
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <spacer name="horizontalSpacer_2" >
+       <property name="orientation" >
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0" >
+        <size>
+         <width>158</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+    </layout>
+   </item>
   </layout>
  </widget>
  <layoutdefault spacing="6" margin="11" />
@@ -376,9 +385,7 @@ valeurs seront effectivement prises en compte</string>
   <tabstop>LENomFormule</tabstop>
   <tabstop>LENomsArgs</tabstop>
   <tabstop>LECorpsFormule</tabstop>
-  <tabstop>bSup</tabstop>
   <tabstop>bOk</tabstop>
-  <tabstop>bHelp</tabstop>
   <tabstop>TWChoix</tabstop>
   <tabstop>RBalpha</tabstop>
   <tabstop>RBGroupe</tabstop>
index 33790c95936437e20b113bc4df2bc5d7f70eeb45..a76d9ff78fa063978a3c47cc535a123d97b7044a 100644 (file)
@@ -2,8 +2,8 @@
 
 # Form implementation generated from reading ui file 'desInactif.ui'
 #
-# Created: Tue Nov 18 17:37:24 2008
-#      by: PyQt4 UI code generator 4.4.2
+# Created: Thu Mar 12 12:15:36 2009
+#      by: PyQt4 UI code generator 4.4.3
 #
 # WARNING! All changes made in this file will be lost!
 
@@ -12,26 +12,33 @@ from PyQt4 import QtCore, QtGui
 class Ui_DInactif(object):
     def setupUi(self, DInactif):
         DInactif.setObjectName("DInactif")
-        DInactif.resize(452,480)
-        DInactif.setMinimumSize(QtCore.QSize(350,0))
+        DInactif.resize(452, 480)
+        DInactif.setMinimumSize(QtCore.QSize(350, 0))
         self.gridLayout = QtGui.QGridLayout(DInactif)
         self.gridLayout.setObjectName("gridLayout")
         self.textLabel1_3 = QtGui.QLabel(DInactif)
+        self.textLabel1_3.setMinimumSize(QtCore.QSize(0, 0))
         self.textLabel1_3.setWordWrap(False)
         self.textLabel1_3.setObjectName("textLabel1_3")
-        self.gridLayout.addWidget(self.textLabel1_3,0,0,1,3)
+        self.gridLayout.addWidget(self.textLabel1_3, 0, 0, 1, 3)
         self.textLabel1 = QtGui.QLabel(DInactif)
         self.textLabel1.setWordWrap(False)
         self.textLabel1.setObjectName("textLabel1")
-        self.gridLayout.addWidget(self.textLabel1,1,0,1,3)
-        spacerItem = QtGui.QSpacerItem(167,146,QtGui.QSizePolicy.Expanding,QtGui.QSizePolicy.Minimum)
-        self.gridLayout.addItem(spacerItem,2,0,1,1)
+        self.gridLayout.addWidget(self.textLabel1, 1, 0, 1, 3)
+        spacerItem = QtGui.QSpacerItem(167, 146, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
+        self.gridLayout.addItem(spacerItem, 2, 0, 1, 1)
         self.bSup = QtGui.QPushButton(DInactif)
+        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.bSup.sizePolicy().hasHeightForWidth())
+        self.bSup.setSizePolicy(sizePolicy)
+        self.bSup.setMinimumSize(QtCore.QSize(170, 40))
         self.bSup.setAutoDefault(True)
         self.bSup.setObjectName("bSup")
-        self.gridLayout.addWidget(self.bSup,2,1,1,1)
-        spacerItem1 = QtGui.QSpacerItem(166,146,QtGui.QSizePolicy.Expanding,QtGui.QSizePolicy.Minimum)
-        self.gridLayout.addItem(spacerItem1,2,2,1,1)
+        self.gridLayout.addWidget(self.bSup, 2, 1, 1, 1)
+        spacerItem1 = QtGui.QSpacerItem(166, 146, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
+        self.gridLayout.addItem(spacerItem1, 2, 2, 1, 1)
 
         self.retranslateUi(DInactif)
         QtCore.QMetaObject.connectSlotsByName(DInactif)
index cc49e51ea8193981ce1fb98e6548f12acb1092fc..356f080bc58c6923a9d30d9454e21f694c909d19 100644 (file)
   <layout class="QGridLayout" name="gridLayout" >
    <item row="0" column="0" colspan="3" >
     <widget class="QLabel" name="textLabel1_3" >
+     <property name="minimumSize" >
+      <size>
+       <width>0</width>
+       <height>0</height>
+      </size>
+     </property>
      <property name="text" >
       <string>&lt;!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
 &lt;html>&lt;head>&lt;meta name="qrichtext" content="1" />&lt;style type="text/css">
@@ -67,6 +73,18 @@ p, li { white-space: pre-wrap; }
    </item>
    <item row="2" column="1" >
     <widget class="QPushButton" name="bSup" >
+     <property name="sizePolicy" >
+      <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="minimumSize" >
+      <size>
+       <width>170</width>
+       <height>40</height>
+      </size>
+     </property>
      <property name="toolTip" >
       <string>suppression du mot clef</string>
      </property>
index c78611d645a84d63602a48d2249f36b0bbd6803d..d177ab1b531fa19dcb2945b535b82fb7c0c70feb 100644 (file)
@@ -2,8 +2,8 @@
 
 # Form implementation generated from reading ui file 'desInclude.ui'
 #
-# Created: Tue Nov 18 17:37:24 2008
-#      by: PyQt4 UI code generator 4.4.2
+# Created: Thu Mar 12 10:42:30 2009
+#      by: PyQt4 UI code generator 4.4.3
 #
 # WARNING! All changes made in this file will be lost!
 
@@ -12,63 +12,51 @@ from PyQt4 import QtCore, QtGui
 class Ui_DInc1(object):
     def setupUi(self, DInc1):
         DInc1.setObjectName("DInc1")
-        DInc1.resize(521,511)
-        DInc1.setMinimumSize(QtCore.QSize(505,0))
+        DInc1.resize(521, 511)
+        DInc1.setMinimumSize(QtCore.QSize(505, 0))
         self.gridlayout = QtGui.QGridLayout(DInc1)
         self.gridlayout.setObjectName("gridlayout")
         self.bOk = QtGui.QPushButton(DInc1)
-        self.bOk.setMinimumSize(QtCore.QSize(0,30))
+        self.bOk.setMinimumSize(QtCore.QSize(0, 30))
         self.bOk.setAutoDefault(True)
         self.bOk.setDefault(True)
         self.bOk.setObjectName("bOk")
-        self.gridlayout.addWidget(self.bOk,2,1,1,1)
-        self.bHelp = QtGui.QPushButton(DInc1)
-        self.bHelp.setMinimumSize(QtCore.QSize(0,30))
-        self.bHelp.setAutoDefault(True)
-        self.bHelp.setObjectName("bHelp")
-        self.gridlayout.addWidget(self.bHelp,2,2,1,1)
-        self.bSup = QtGui.QPushButton(DInc1)
-        self.bSup.setMinimumSize(QtCore.QSize(0,30))
-        self.bSup.setAutoDefault(True)
-        self.bSup.setObjectName("bSup")
-        self.gridlayout.addWidget(self.bSup,2,0,1,1)
+        self.gridlayout.addWidget(self.bOk, 2, 1, 1, 1)
         self.Commentaire = QtGui.QLabel(DInc1)
         self.Commentaire.setWordWrap(False)
         self.Commentaire.setObjectName("Commentaire")
-        self.gridlayout.addWidget(self.Commentaire,1,0,1,3)
+        self.gridlayout.addWidget(self.Commentaire, 1, 0, 1, 3)
         self.TWChoix = QtGui.QTabWidget(DInc1)
         self.TWChoix.setObjectName("TWChoix")
         self.MotClef = QtGui.QWidget()
-        self.MotClef.setGeometry(QtCore.QRect(0,0,499,400))
         self.MotClef.setObjectName("MotClef")
         self.gridlayout1 = QtGui.QGridLayout(self.MotClef)
         self.gridlayout1.setObjectName("gridlayout1")
         self.LBMCPermis = QtGui.QListWidget(self.MotClef)
-        self.LBMCPermis.setMinimumSize(QtCore.QSize(0,0))
+        self.LBMCPermis.setMinimumSize(QtCore.QSize(0, 0))
         self.LBMCPermis.setObjectName("LBMCPermis")
-        self.gridlayout1.addWidget(self.LBMCPermis,1,0,1,1)
+        self.gridlayout1.addWidget(self.LBMCPermis, 1, 0, 1, 1)
         self.textLabel1 = QtGui.QLabel(self.MotClef)
-        self.textLabel1.setMinimumSize(QtCore.QSize(0,0))
+        self.textLabel1.setMinimumSize(QtCore.QSize(0, 0))
         self.textLabel1.setWordWrap(False)
         self.textLabel1.setObjectName("textLabel1")
-        self.gridlayout1.addWidget(self.textLabel1,0,0,1,1)
+        self.gridlayout1.addWidget(self.textLabel1, 0, 0, 1, 1)
         self.LBRegles = QtGui.QListWidget(self.MotClef)
         self.LBRegles.setObjectName("LBRegles")
-        self.gridlayout1.addWidget(self.LBRegles,1,1,1,1)
+        self.gridlayout1.addWidget(self.LBRegles, 1, 1, 1, 1)
         self.textLabel1_2 = QtGui.QLabel(self.MotClef)
         self.textLabel1_2.setWordWrap(False)
         self.textLabel1_2.setObjectName("textLabel1_2")
-        self.gridlayout1.addWidget(self.textLabel1_2,0,1,1,1)
-        self.TWChoix.addTab(self.MotClef,"")
+        self.gridlayout1.addWidget(self.textLabel1_2, 0, 1, 1, 1)
+        self.TWChoix.addTab(self.MotClef, "")
         self.Commande = QtGui.QWidget()
-        self.Commande.setGeometry(QtCore.QRect(0,0,499,400))
         self.Commande.setObjectName("Commande")
         self.gridLayout_2 = QtGui.QGridLayout(self.Commande)
         self.gridLayout_2.setObjectName("gridLayout_2")
         self.textLabel1_4 = QtGui.QLabel(self.Commande)
         self.textLabel1_4.setWordWrap(False)
         self.textLabel1_4.setObjectName("textLabel1_4")
-        self.gridLayout_2.addWidget(self.textLabel1_4,0,0,1,3)
+        self.gridLayout_2.addWidget(self.textLabel1_4, 0, 0, 1, 3)
         self.groupBox = QtGui.QGroupBox(self.Commande)
         self.groupBox.setObjectName("groupBox")
         self.gridLayout = QtGui.QGridLayout(self.groupBox)
@@ -76,102 +64,92 @@ class Ui_DInc1(object):
         self.RBalpha = QtGui.QRadioButton(self.groupBox)
         self.RBalpha.setChecked(True)
         self.RBalpha.setObjectName("RBalpha")
-        self.gridLayout.addWidget(self.RBalpha,0,0,1,1)
+        self.gridLayout.addWidget(self.RBalpha, 0, 0, 1, 1)
         self.RBGroupe = QtGui.QRadioButton(self.groupBox)
         self.RBGroupe.setObjectName("RBGroupe")
-        self.gridLayout.addWidget(self.RBGroupe,1,0,1,1)
-        self.gridLayout_2.addWidget(self.groupBox,0,3,2,1)
+        self.gridLayout.addWidget(self.RBGroupe, 1, 0, 1, 1)
+        self.gridLayout_2.addWidget(self.groupBox, 0, 3, 2, 1)
         self.textLabel6 = QtGui.QLabel(self.Commande)
-        self.textLabel6.setMinimumSize(QtCore.QSize(50,30))
+        self.textLabel6.setMinimumSize(QtCore.QSize(50, 30))
         self.textLabel6.setWordWrap(False)
         self.textLabel6.setObjectName("textLabel6")
-        self.gridLayout_2.addWidget(self.textLabel6,1,0,1,1)
+        self.gridLayout_2.addWidget(self.textLabel6, 1, 0, 1, 1)
         self.LEFiltre = QtGui.QLineEdit(self.Commande)
-        self.LEFiltre.setMinimumSize(QtCore.QSize(160,30))
+        self.LEFiltre.setMinimumSize(QtCore.QSize(160, 30))
         self.LEFiltre.setObjectName("LEFiltre")
-        self.gridLayout_2.addWidget(self.LEFiltre,1,1,1,1)
+        self.gridLayout_2.addWidget(self.LEFiltre, 1, 1, 1, 1)
         self.BNext = QtGui.QPushButton(self.Commande)
         self.BNext.setObjectName("BNext")
-        self.gridLayout_2.addWidget(self.BNext,1,2,1,1)
+        self.gridLayout_2.addWidget(self.BNext, 1, 2, 1, 1)
         self.LBNouvCommande = QtGui.QListWidget(self.Commande)
         self.LBNouvCommande.setObjectName("LBNouvCommande")
-        self.gridLayout_2.addWidget(self.LBNouvCommande,2,0,1,4)
+        self.gridLayout_2.addWidget(self.LBNouvCommande, 2, 0, 1, 4)
         self.textLabel4 = QtGui.QLabel(self.Commande)
         self.textLabel4.setWordWrap(False)
         self.textLabel4.setObjectName("textLabel4")
-        self.gridLayout_2.addWidget(self.textLabel4,3,0,1,4)
-        self.TWChoix.addTab(self.Commande,"")
+        self.gridLayout_2.addWidget(self.textLabel4, 3, 0, 1, 4)
+        self.TWChoix.addTab(self.Commande, "")
         self.maPageOk = QtGui.QWidget()
-        self.maPageOk.setGeometry(QtCore.QRect(0,0,499,400))
         self.maPageOk.setObjectName("maPageOk")
         self.textLabel1_3 = QtGui.QLabel(self.maPageOk)
-        self.textLabel1_3.setGeometry(QtCore.QRect(30,40,440,41))
+        self.textLabel1_3.setGeometry(QtCore.QRect(30, 40, 440, 41))
         self.textLabel1_3.setWordWrap(False)
         self.textLabel1_3.setObjectName("textLabel1_3")
         self.LENomFichier = QtGui.QLineEdit(self.maPageOk)
-        self.LENomFichier.setGeometry(QtCore.QRect(18,117,450,40))
-        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed,QtGui.QSizePolicy.Fixed)
+        self.LENomFichier.setGeometry(QtCore.QRect(18, 117, 450, 40))
+        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.LENomFichier.sizePolicy().hasHeightForWidth())
         self.LENomFichier.setSizePolicy(sizePolicy)
-        self.LENomFichier.setMinimumSize(QtCore.QSize(450,40))
+        self.LENomFichier.setMinimumSize(QtCore.QSize(450, 40))
         self.LENomFichier.setObjectName("LENomFichier")
         self.BBrowse = QtGui.QPushButton(self.maPageOk)
-        self.BBrowse.setGeometry(QtCore.QRect(280,240,161,41))
-        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed,QtGui.QSizePolicy.Fixed)
+        self.BBrowse.setGeometry(QtCore.QRect(280, 240, 161, 41))
+        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.BBrowse.sizePolicy().hasHeightForWidth())
         self.BBrowse.setSizePolicy(sizePolicy)
         self.BBrowse.setObjectName("BBrowse")
         self.BChangeFile = QtGui.QPushButton(self.maPageOk)
-        self.BChangeFile.setGeometry(QtCore.QRect(280,290,161,41))
-        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed,QtGui.QSizePolicy.Fixed)
+        self.BChangeFile.setGeometry(QtCore.QRect(280, 290, 161, 41))
+        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.BChangeFile.sizePolicy().hasHeightForWidth())
         self.BChangeFile.setSizePolicy(sizePolicy)
         self.BChangeFile.setObjectName("BChangeFile")
-        self.TWChoix.addTab(self.maPageOk,"")
+        self.TWChoix.addTab(self.maPageOk, "")
         self.maPageBad = QtGui.QWidget()
-        self.maPageBad.setGeometry(QtCore.QRect(0,0,499,400))
         self.maPageBad.setObjectName("maPageBad")
         self.gridlayout2 = QtGui.QGridLayout(self.maPageBad)
         self.gridlayout2.setObjectName("gridlayout2")
         self.textLabel1_5 = QtGui.QLabel(self.maPageBad)
         self.textLabel1_5.setWordWrap(False)
         self.textLabel1_5.setObjectName("textLabel1_5")
-        self.gridlayout2.addWidget(self.textLabel1_5,0,0,1,1)
-        self.TWChoix.addTab(self.maPageBad,"")
-        self.gridlayout.addWidget(self.TWChoix,0,0,1,3)
+        self.gridlayout2.addWidget(self.textLabel1_5, 0, 0, 1, 1)
+        self.TWChoix.addTab(self.maPageBad, "")
+        self.gridlayout.addWidget(self.TWChoix, 0, 0, 1, 3)
 
         self.retranslateUi(DInc1)
-        self.TWChoix.setCurrentIndex(2)
+        self.TWChoix.setCurrentIndex(0)
         QtCore.QMetaObject.connectSlotsByName(DInc1)
-        DInc1.setTabOrder(self.LEFiltre,self.LENomFichier)
-        DInc1.setTabOrder(self.LENomFichier,self.bHelp)
-        DInc1.setTabOrder(self.bHelp,self.bSup)
-        DInc1.setTabOrder(self.bSup,self.bOk)
-        DInc1.setTabOrder(self.bOk,self.TWChoix)
-        DInc1.setTabOrder(self.TWChoix,self.LBMCPermis)
-        DInc1.setTabOrder(self.LBMCPermis,self.LBRegles)
-        DInc1.setTabOrder(self.LBRegles,self.LBNouvCommande)
-        DInc1.setTabOrder(self.LBNouvCommande,self.RBalpha)
-        DInc1.setTabOrder(self.RBalpha,self.BBrowse)
-        DInc1.setTabOrder(self.BBrowse,self.BChangeFile)
+        DInc1.setTabOrder(self.LEFiltre, self.LENomFichier)
+        DInc1.setTabOrder(self.LENomFichier, self.bOk)
+        DInc1.setTabOrder(self.bOk, self.TWChoix)
+        DInc1.setTabOrder(self.TWChoix, self.LBMCPermis)
+        DInc1.setTabOrder(self.LBMCPermis, self.LBRegles)
+        DInc1.setTabOrder(self.LBRegles, self.LBNouvCommande)
+        DInc1.setTabOrder(self.LBNouvCommande, self.RBalpha)
+        DInc1.setTabOrder(self.RBalpha, self.BBrowse)
+        DInc1.setTabOrder(self.BBrowse, self.BChangeFile)
 
     def retranslateUi(self, DInc1):
         DInc1.setWindowTitle(QtGui.QApplication.translate("DInc1", "DMacro", None, QtGui.QApplication.UnicodeUTF8))
         self.bOk.setToolTip(QtGui.QApplication.translate("DInc1", "validation de la saisie", None, QtGui.QApplication.UnicodeUTF8))
         self.bOk.setText(QtGui.QApplication.translate("DInc1", "&Valider", None, QtGui.QApplication.UnicodeUTF8))
         self.bOk.setShortcut(QtGui.QApplication.translate("DInc1", "Shift+A, Alt+A, Alt+A, Alt+A", None, QtGui.QApplication.UnicodeUTF8))
-        self.bHelp.setToolTip(QtGui.QApplication.translate("DInc1", "affichage documentation aster", None, QtGui.QApplication.UnicodeUTF8))
-        self.bHelp.setText(QtGui.QApplication.translate("DInc1", "&Documentation", None, QtGui.QApplication.UnicodeUTF8))
-        self.bHelp.setShortcut(QtGui.QApplication.translate("DInc1", "Alt+D", None, QtGui.QApplication.UnicodeUTF8))
-        self.bSup.setToolTip(QtGui.QApplication.translate("DInc1", "suppression du mot clef", None, QtGui.QApplication.UnicodeUTF8))
-        self.bSup.setText(QtGui.QApplication.translate("DInc1", "&Supprimer", None, QtGui.QApplication.UnicodeUTF8))
-        self.bSup.setShortcut(QtGui.QApplication.translate("DInc1", "Alt+S", None, QtGui.QApplication.UnicodeUTF8))
         self.textLabel1.setText(QtGui.QApplication.translate("DInc1", "<h3><p align=\"center\"><u><b>Mots Clefs Permis</b></u></p></h3>", None, QtGui.QApplication.UnicodeUTF8))
         self.textLabel1_2.setText(QtGui.QApplication.translate("DInc1", "<h3><p align=\"center\"><u><b>Régles</b></u></p></h3>", None, QtGui.QApplication.UnicodeUTF8))
         self.TWChoix.setTabText(self.TWChoix.indexOf(self.MotClef), QtGui.QApplication.translate("DInc1", "Ajouter Mot-Clef", None, QtGui.QApplication.UnicodeUTF8))
index dc21a3f63a48d3a24b9cc852cb6ccd2d3471c621..291b7b33a0facc18bcb7783e0ae06bce2064a4ce 100644 (file)
      </property>
     </widget>
    </item>
-   <item row="2" column="2" >
-    <widget class="QPushButton" name="bHelp" >
-     <property name="minimumSize" >
-      <size>
-       <width>0</width>
-       <height>30</height>
-      </size>
-     </property>
-     <property name="toolTip" >
-      <string>affichage documentation aster</string>
-     </property>
-     <property name="text" >
-      <string>&amp;Documentation</string>
-     </property>
-     <property name="shortcut" >
-      <string>Alt+D</string>
-     </property>
-     <property name="autoDefault" >
-      <bool>true</bool>
-     </property>
-    </widget>
-   </item>
-   <item row="2" column="0" >
-    <widget class="QPushButton" name="bSup" >
-     <property name="minimumSize" >
-      <size>
-       <width>0</width>
-       <height>30</height>
-      </size>
-     </property>
-     <property name="toolTip" >
-      <string>suppression du mot clef</string>
-     </property>
-     <property name="text" >
-      <string>&amp;Supprimer</string>
-     </property>
-     <property name="shortcut" >
-      <string>Alt+S</string>
-     </property>
-     <property name="autoDefault" >
-      <bool>true</bool>
-     </property>
-    </widget>
-   </item>
    <item row="1" column="0" colspan="3" >
     <widget class="QLabel" name="Commentaire" >
      <property name="text" >
    <item row="0" column="0" colspan="3" >
     <widget class="QTabWidget" name="TWChoix" >
      <property name="currentIndex" >
-      <number>2</number>
+      <number>0</number>
      </property>
      <widget class="QWidget" name="MotClef" >
-      <property name="geometry" >
-       <rect>
-        <x>0</x>
-        <y>0</y>
-        <width>499</width>
-        <height>400</height>
-       </rect>
-      </property>
       <attribute name="title" >
        <string>Ajouter Mot-Clef</string>
       </attribute>
       </layout>
      </widget>
      <widget class="QWidget" name="Commande" >
-      <property name="geometry" >
-       <rect>
-        <x>0</x>
-        <y>0</y>
-        <width>499</width>
-        <height>400</height>
-       </rect>
-      </property>
       <attribute name="title" >
        <string>Nouvelle Commande</string>
       </attribute>
       </layout>
      </widget>
      <widget class="QWidget" name="maPageOk" >
-      <property name="geometry" >
-       <rect>
-        <x>0</x>
-        <y>0</y>
-        <width>499</width>
-        <height>400</height>
-       </rect>
-      </property>
       <attribute name="title" >
        <string>Fichier Include</string>
       </attribute>
       </widget>
      </widget>
      <widget class="QWidget" name="maPageBad" >
-      <property name="geometry" >
-       <rect>
-        <x>0</x>
-        <y>0</y>
-        <width>499</width>
-        <height>400</height>
-       </rect>
-      </property>
       <attribute name="title" >
        <string>Fichier Inc</string>
       </attribute>
@@ -382,8 +306,6 @@ p, li { white-space: pre-wrap; }
  <tabstops>
   <tabstop>LEFiltre</tabstop>
   <tabstop>LENomFichier</tabstop>
-  <tabstop>bHelp</tabstop>
-  <tabstop>bSup</tabstop>
   <tabstop>bOk</tabstop>
   <tabstop>TWChoix</tabstop>
   <tabstop>LBMCPermis</tabstop>
index 43c5d350830cb6d915a787e96bc6dbd0532015ad..2546d4ef76b95e5bd8d383b1013828d666af8631 100644 (file)
@@ -2,8 +2,8 @@
 
 # Form implementation generated from reading ui file 'desListeParam.ui'
 #
-# Created: Tue Nov 18 17:37:24 2008
-#      by: PyQt4 UI code generator 4.4.2
+# Created: Tue Jan 27 12:25:36 2009
+#      by: PyQt4 UI code generator 4.4.3
 #
 # WARNING! All changes made in this file will be lost!
 
@@ -12,12 +12,12 @@ from PyQt4 import QtCore, QtGui
 class Ui_DLisParam(object):
     def setupUi(self, DLisParam):
         DLisParam.setObjectName("DLisParam")
-        DLisParam.resize(413,394)
+        DLisParam.resize(413, 394)
         self.gridlayout = QtGui.QGridLayout(DLisParam)
         self.gridlayout.setObjectName("gridlayout")
         self.LBParam = QtGui.QListWidget(DLisParam)
         self.LBParam.setObjectName("LBParam")
-        self.gridlayout.addWidget(self.LBParam,0,0,1,1)
+        self.gridlayout.addWidget(self.LBParam, 0, 0, 1, 1)
 
         self.retranslateUi(DLisParam)
 
index ac6b782e4d3d9b1465d0fbc59e94845679efb2a5..32cedf016a1a455a02234f3e89c6594ab1c59e0b 100644 (file)
@@ -2,8 +2,8 @@
 
 # Form implementation generated from reading ui file 'desMCFact.ui'
 #
-# Created: Tue Nov 18 17:37:24 2008
-#      by: PyQt4 UI code generator 4.4.2
+# Created: Thu Mar 12 10:42:30 2009
+#      by: PyQt4 UI code generator 4.4.3
 #
 # WARNING! All changes made in this file will be lost!
 
@@ -12,8 +12,8 @@ from PyQt4 import QtCore, QtGui
 class Ui_DMCFact(object):
     def setupUi(self, DMCFact):
         DMCFact.setObjectName("DMCFact")
-        DMCFact.resize(511,499)
-        DMCFact.setMinimumSize(QtCore.QSize(505,0))
+        DMCFact.resize(511, 499)
+        DMCFact.setMinimumSize(QtCore.QSize(505, 0))
         self.gridlayout = QtGui.QGridLayout(DMCFact)
         self.gridlayout.setObjectName("gridlayout")
         self.TWChoix = QtGui.QTabWidget(DMCFact)
@@ -23,55 +23,42 @@ class Ui_DMCFact(object):
         self.gridlayout1 = QtGui.QGridLayout(self.MotClef)
         self.gridlayout1.setObjectName("gridlayout1")
         self.textLabel1 = QtGui.QLabel(self.MotClef)
-        self.textLabel1.setMinimumSize(QtCore.QSize(0,0))
+        self.textLabel1.setMinimumSize(QtCore.QSize(0, 0))
         self.textLabel1.setWordWrap(False)
         self.textLabel1.setObjectName("textLabel1")
-        self.gridlayout1.addWidget(self.textLabel1,0,0,1,1)
+        self.gridlayout1.addWidget(self.textLabel1, 0, 0, 1, 1)
         self.LBMCPermis = QtGui.QListWidget(self.MotClef)
-        self.LBMCPermis.setMinimumSize(QtCore.QSize(0,0))
+        self.LBMCPermis.setMinimumSize(QtCore.QSize(0, 0))
         self.LBMCPermis.setObjectName("LBMCPermis")
-        self.gridlayout1.addWidget(self.LBMCPermis,1,0,1,1)
+        self.gridlayout1.addWidget(self.LBMCPermis, 1, 0, 1, 1)
         self.LBRegles = QtGui.QListWidget(self.MotClef)
         self.LBRegles.setObjectName("LBRegles")
-        self.gridlayout1.addWidget(self.LBRegles,1,1,1,1)
+        self.gridlayout1.addWidget(self.LBRegles, 1, 1, 1, 1)
         self.textLabel1_2 = QtGui.QLabel(self.MotClef)
         self.textLabel1_2.setWordWrap(False)
         self.textLabel1_2.setObjectName("textLabel1_2")
-        self.gridlayout1.addWidget(self.textLabel1_2,0,1,1,1)
-        self.TWChoix.addTab(self.MotClef,"")
-        self.gridlayout.addWidget(self.TWChoix,0,0,1,3)
-        self.bSup = QtGui.QPushButton(DMCFact)
-        self.bSup.setAutoDefault(True)
-        self.bSup.setProperty("toolTip",QtCore.QVariant(QtGui.QApplication.translate("DMCFact", "suppression du mot clef", None, QtGui.QApplication.UnicodeUTF8)))
-        self.bSup.setObjectName("bSup")
-        self.gridlayout.addWidget(self.bSup,2,0,1,1)
+        self.gridlayout1.addWidget(self.textLabel1_2, 0, 1, 1, 1)
+        self.TWChoix.addTab(self.MotClef, "")
+        self.gridlayout.addWidget(self.TWChoix, 0, 0, 1, 3)
         self.Commentaire = QtGui.QLabel(DMCFact)
         self.Commentaire.setWordWrap(False)
         self.Commentaire.setObjectName("Commentaire")
-        self.gridlayout.addWidget(self.Commentaire,1,0,1,3)
-        self.bHelp = QtGui.QPushButton(DMCFact)
-        self.bHelp.setAutoDefault(True)
-        self.bHelp.setProperty("toolTip",QtCore.QVariant(QtGui.QApplication.translate("DMCFact", "affichage documentation aster", None, QtGui.QApplication.UnicodeUTF8)))
-        self.bHelp.setObjectName("bHelp")
-        self.gridlayout.addWidget(self.bHelp,2,2,1,1)
+        self.gridlayout.addWidget(self.Commentaire, 1, 0, 1, 3)
         self.bOk = QtGui.QPushButton(DMCFact)
         self.bOk.setAutoDefault(True)
         self.bOk.setDefault(True)
-        self.bOk.setProperty("toolTip",QtCore.QVariant(QtGui.QApplication.translate("DMCFact", "validation de la saisie", None, QtGui.QApplication.UnicodeUTF8)))
         self.bOk.setObjectName("bOk")
-        self.gridlayout.addWidget(self.bOk,2,1,1,1)
+        self.gridlayout.addWidget(self.bOk, 2, 1, 1, 1)
 
         self.retranslateUi(DMCFact)
+        QtCore.QMetaObject.connectSlotsByName(DMCFact)
 
     def retranslateUi(self, DMCFact):
         DMCFact.setWindowTitle(QtGui.QApplication.translate("DMCFact", "DMacro", None, QtGui.QApplication.UnicodeUTF8))
         self.textLabel1.setText(QtGui.QApplication.translate("DMCFact", "<h3><p align=\"center\"><u><b>Mots Clefs Permis</b></u></p></h3>", None, QtGui.QApplication.UnicodeUTF8))
         self.textLabel1_2.setText(QtGui.QApplication.translate("DMCFact", "<h3><p align=\"center\"><u><b>Régles</b></u></p></h3>", None, QtGui.QApplication.UnicodeUTF8))
         self.TWChoix.setTabText(self.TWChoix.indexOf(self.MotClef), QtGui.QApplication.translate("DMCFact", "Ajouter Mot-Clef", None, QtGui.QApplication.UnicodeUTF8))
-        self.bSup.setText(QtGui.QApplication.translate("DMCFact", "&Supprimer", None, QtGui.QApplication.UnicodeUTF8))
-        self.bSup.setShortcut(QtGui.QApplication.translate("DMCFact", "Alt+S", None, QtGui.QApplication.UnicodeUTF8))
-        self.bHelp.setText(QtGui.QApplication.translate("DMCFact", "&Documentation", None, QtGui.QApplication.UnicodeUTF8))
-        self.bHelp.setShortcut(QtGui.QApplication.translate("DMCFact", "Alt+D", None, QtGui.QApplication.UnicodeUTF8))
+        self.bOk.setToolTip(QtGui.QApplication.translate("DMCFact", "validation de la saisie", None, QtGui.QApplication.UnicodeUTF8))
         self.bOk.setText(QtGui.QApplication.translate("DMCFact", "&Valider", None, QtGui.QApplication.UnicodeUTF8))
         self.bOk.setShortcut(QtGui.QApplication.translate("DMCFact", "Shift+A, Alt+A, Alt+A, Alt+A", None, QtGui.QApplication.UnicodeUTF8))
 
index 8eb9080d2587f9dd765b1436742daa930a715b33..b7d6966fc8ee814e4328e51029819f9294fc3cd2 100644 (file)
-<ui version="4.0" stdsetdef="1" >
-  <author></author>
-  <comment></comment>
-  <exportmacro></exportmacro>
-  <class>DMCFact</class>
-  <widget class="QWidget" name="DMCFact" >
-    <property name="geometry" >
-      <rect>
-        <x>0</x>
-        <y>0</y>
-        <width>511</width>
-        <height>499</height>
-      </rect>
-    </property>
-    <property name="minimumSize" >
-      <size>
-        <width>505</width>
-        <height>0</height>
-      </size>
-    </property>
-    <property name="windowTitle" >
-      <string>DMacro</string>
-    </property>
-    <layout class="QGridLayout" >
-      <item rowspan="1" row="0" column="0" colspan="3" >
-        <widget class="QTabWidget" name="TWChoix" >
-          <widget class="QWidget" name="MotClef" >
-            <attribute name="title" >
-              <string>Ajouter Mot-Clef</string>
-            </attribute>
-            <layout class="QGridLayout" >
-              <item row="0" column="0" >
-                <widget class="QLabel" name="textLabel1" >
-                  <property name="minimumSize" >
-                    <size>
-                      <width>0</width>
-                      <height>0</height>
-                    </size>
-                  </property>
-                  <property name="text" >
-                    <string>&lt;h3>&lt;p align="center">&lt;u>&lt;b>Mots Clefs Permis&lt;/b>&lt;/u>&lt;/p>&lt;/h3></string>
-                  </property>
-                  <property name="wordWrap" >
-                    <bool>false</bool>
-                  </property>
-                </widget>
-              </item>
-              <item row="1" column="0" >
-                <widget class="QListWidget" name="LBMCPermis" >
-                  <property name="minimumSize" >
-                    <size>
-                      <width>0</width>
-                      <height>0</height>
-                    </size>
-                  </property>
-                </widget>
-              </item>
-              <item row="1" column="1" >
-                <widget class="QListWidget" name="LBRegles" />
-              </item>
-              <item row="0" column="1" >
-                <widget class="QLabel" name="textLabel1_2" >
-                  <property name="text" >
-                    <string>&lt;h3>&lt;p align="center">&lt;u>&lt;b>Régles&lt;/b>&lt;/u>&lt;/p>&lt;/h3></string>
-                  </property>
-                  <property name="wordWrap" >
-                    <bool>false</bool>
-                  </property>
-                </widget>
-              </item>
-            </layout>
-          </widget>
+<ui version="4.0" >
+ <class>DMCFact</class>
+ <widget class="QWidget" name="DMCFact" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>511</width>
+    <height>499</height>
+   </rect>
+  </property>
+  <property name="minimumSize" >
+   <size>
+    <width>505</width>
+    <height>0</height>
+   </size>
+  </property>
+  <property name="windowTitle" >
+   <string>DMacro</string>
+  </property>
+  <layout class="QGridLayout" >
+   <item row="0" column="0" colspan="3" >
+    <widget class="QTabWidget" name="TWChoix" >
+     <widget class="QWidget" name="MotClef" >
+      <attribute name="title" >
+       <string>Ajouter Mot-Clef</string>
+      </attribute>
+      <layout class="QGridLayout" >
+       <item row="0" column="0" >
+        <widget class="QLabel" name="textLabel1" >
+         <property name="minimumSize" >
+          <size>
+           <width>0</width>
+           <height>0</height>
+          </size>
+         </property>
+         <property name="text" >
+          <string>&lt;h3>&lt;p align="center">&lt;u>&lt;b>Mots Clefs Permis&lt;/b>&lt;/u>&lt;/p>&lt;/h3></string>
+         </property>
+         <property name="wordWrap" >
+          <bool>false</bool>
+         </property>
         </widget>
-      </item>
-      <item row="2" column="0" >
-        <widget class="QPushButton" name="bSup" >
-          <property name="text" >
-            <string>&amp;Supprimer</string>
-          </property>
-          <property name="shortcut" >
-            <string>Alt+S</string>
-          </property>
-          <property name="autoDefault" >
-            <bool>true</bool>
-          </property>
-          <property name="toolTip" stdset="0" >
-            <string>suppression du mot clef</string>
-          </property>
+       </item>
+       <item row="1" column="0" >
+        <widget class="QListWidget" name="LBMCPermis" >
+         <property name="minimumSize" >
+          <size>
+           <width>0</width>
+           <height>0</height>
+          </size>
+         </property>
         </widget>
-      </item>
-      <item rowspan="1" row="1" column="0" colspan="3" >
-        <widget class="QLabel" name="Commentaire" >
-          <property name="text" >
-            <string/>
-          </property>
-          <property name="wordWrap" >
-            <bool>false</bool>
-          </property>
+       </item>
+       <item row="1" column="1" >
+        <widget class="QListWidget" name="LBRegles" />
+       </item>
+       <item row="0" column="1" >
+        <widget class="QLabel" name="textLabel1_2" >
+         <property name="text" >
+          <string>&lt;h3>&lt;p align="center">&lt;u>&lt;b>Régles&lt;/b>&lt;/u>&lt;/p>&lt;/h3></string>
+         </property>
+         <property name="wordWrap" >
+          <bool>false</bool>
+         </property>
         </widget>
-      </item>
-      <item row="2" column="2" >
-        <widget class="QPushButton" name="bHelp" >
-          <property name="text" >
-            <string>&amp;Documentation</string>
-          </property>
-          <property name="shortcut" >
-            <string>Alt+D</string>
-          </property>
-          <property name="autoDefault" >
-            <bool>true</bool>
-          </property>
-          <property name="toolTip" stdset="0" >
-            <string>affichage documentation aster</string>
-          </property>
-        </widget>
-      </item>
-      <item row="2" column="1" >
-        <widget class="QPushButton" name="bOk" >
-          <property name="text" >
-            <string>&amp;Valider</string>
-          </property>
-          <property name="shortcut" >
-            <string>Shift+A, Alt+A, Alt+A, Alt+A</string>
-          </property>
-          <property name="autoDefault" >
-            <bool>true</bool>
-          </property>
-          <property name="default" >
-            <bool>true</bool>
-          </property>
-          <property name="toolTip" stdset="0" >
-            <string>validation de la saisie</string>
-          </property>
-        </widget>
     </item>
   </layout>
 </widget>
 <layoutdefault spacing="6" margin="11" />
 <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
+       </item>
+      </layout>
+     </widget>
+    </widget>
+   </item>
+   <item row="1" column="0" colspan="3" >
+    <widget class="QLabel" name="Commentaire" >
+     <property name="text" >
+      <string/>
+     </property>
+     <property name="wordWrap" >
+      <bool>false</bool>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="1" >
+    <widget class="QPushButton" name="bOk" >
+     <property name="toolTip" >
+      <string>validation de la saisie</string>
+     </property>
+     <property name="text" >
+      <string>&amp;Valider</string>
+     </property>
+     <property name="shortcut" >
+      <string>Shift+A, Alt+A, Alt+A, Alt+A</string>
+     </property>
+     <property name="autoDefault" >
+      <bool>true</bool>
+     </property>
+     <property name="default" >
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
+  </layout>
</widget>
<layoutdefault spacing="6" margin="11" />
<pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
<resources/>
<connections/>
 </ui>
index 69cbc51aa70938df6df1e3dfbcf57b7e28fa89a8..afad760fcf8463022b360ef75d48d1c1c93bbd07 100644 (file)
@@ -2,8 +2,8 @@
 
 # Form implementation generated from reading ui file 'desMCListAjout.ui'
 #
-# Created: Tue Nov 18 17:37:24 2008
-#      by: PyQt4 UI code generator 4.4.2
+# Created: Thu Mar 12 10:42:30 2009
+#      by: PyQt4 UI code generator 4.4.3
 #
 # WARNING! All changes made in this file will be lost!
 
@@ -12,82 +12,61 @@ from PyQt4 import QtCore, QtGui
 class Ui_DMCListAjout(object):
     def setupUi(self, DMCListAjout):
         DMCListAjout.setObjectName("DMCListAjout")
-        DMCListAjout.resize(459,472)
-        DMCListAjout.setMinimumSize(QtCore.QSize(350,0))
+        DMCListAjout.resize(459, 472)
+        DMCListAjout.setMinimumSize(QtCore.QSize(350, 0))
         self.gridlayout = QtGui.QGridLayout(DMCListAjout)
         self.gridlayout.setObjectName("gridlayout")
         self.textLabel1 = QtGui.QLabel(DMCListAjout)
         self.textLabel1.setWordWrap(False)
         self.textLabel1.setObjectName("textLabel1")
-        self.gridlayout.addWidget(self.textLabel1,1,0,1,3)
+        self.gridlayout.addWidget(self.textLabel1, 1, 0, 1, 3)
         self.textLabel1_2 = QtGui.QLabel(DMCListAjout)
         self.textLabel1_2.setWordWrap(False)
         self.textLabel1_2.setObjectName("textLabel1_2")
-        self.gridlayout.addWidget(self.textLabel1_2,2,0,1,3)
+        self.gridlayout.addWidget(self.textLabel1_2, 2, 0, 1, 3)
         self.hboxlayout = QtGui.QHBoxLayout()
         self.hboxlayout.setObjectName("hboxlayout")
-        spacerItem = QtGui.QSpacerItem(60,21,QtGui.QSizePolicy.Expanding,QtGui.QSizePolicy.Minimum)
+        spacerItem = QtGui.QSpacerItem(60, 21, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
         self.hboxlayout.addItem(spacerItem)
         self.bAjout = QtGui.QPushButton(DMCListAjout)
         self.bAjout.setAutoDefault(True)
         self.bAjout.setDefault(True)
-        self.bAjout.setProperty("toolTip",QtCore.QVariant(QtGui.QApplication.translate("DMCListAjout", "validation de la saisie", None, QtGui.QApplication.UnicodeUTF8)))
         self.bAjout.setObjectName("bAjout")
         self.hboxlayout.addWidget(self.bAjout)
-        spacerItem1 = QtGui.QSpacerItem(80,21,QtGui.QSizePolicy.Expanding,QtGui.QSizePolicy.Minimum)
+        spacerItem1 = QtGui.QSpacerItem(80, 21, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
         self.hboxlayout.addItem(spacerItem1)
-        self.gridlayout.addLayout(self.hboxlayout,8,0,1,3)
-        spacerItem2 = QtGui.QSpacerItem(21,40,QtGui.QSizePolicy.Minimum,QtGui.QSizePolicy.Expanding)
-        self.gridlayout.addItem(spacerItem2,9,1,1,1)
+        self.gridlayout.addLayout(self.hboxlayout, 8, 0, 1, 3)
+        spacerItem2 = QtGui.QSpacerItem(21, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding)
+        self.gridlayout.addItem(spacerItem2, 9, 1, 1, 1)
         self.textLabel1_2_2 = QtGui.QLabel(DMCListAjout)
         self.textLabel1_2_2.setWordWrap(False)
         self.textLabel1_2_2.setObjectName("textLabel1_2_2")
-        self.gridlayout.addWidget(self.textLabel1_2_2,6,0,1,3)
-        spacerItem3 = QtGui.QSpacerItem(20,20,QtGui.QSizePolicy.Minimum,QtGui.QSizePolicy.Expanding)
-        self.gridlayout.addItem(spacerItem3,7,1,1,1)
+        self.gridlayout.addWidget(self.textLabel1_2_2, 6, 0, 1, 3)
+        spacerItem3 = QtGui.QSpacerItem(20, 20, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding)
+        self.gridlayout.addItem(spacerItem3, 7, 1, 1, 1)
         self.MCFacteur = QtGui.QLabel(DMCListAjout)
         self.MCFacteur.setWordWrap(False)
         self.MCFacteur.setObjectName("MCFacteur")
-        self.gridlayout.addWidget(self.MCFacteur,4,0,1,3)
-        spacerItem4 = QtGui.QSpacerItem(21,31,QtGui.QSizePolicy.Minimum,QtGui.QSizePolicy.Expanding)
-        self.gridlayout.addItem(spacerItem4,5,1,1,1)
-        spacerItem5 = QtGui.QSpacerItem(21,51,QtGui.QSizePolicy.Minimum,QtGui.QSizePolicy.Expanding)
-        self.gridlayout.addItem(spacerItem5,3,1,1,1)
-        spacerItem6 = QtGui.QSpacerItem(41,51,QtGui.QSizePolicy.Minimum,QtGui.QSizePolicy.Expanding)
-        self.gridlayout.addItem(spacerItem6,0,1,1,1)
-        self.bSup = QtGui.QPushButton(DMCListAjout)
-        self.bSup.setAutoDefault(True)
-        self.bSup.setProperty("toolTip",QtCore.QVariant(QtGui.QApplication.translate("DMCListAjout", "suppression du mot clef", None, QtGui.QApplication.UnicodeUTF8)))
-        self.bSup.setObjectName("bSup")
-        self.gridlayout.addWidget(self.bSup,10,0,1,1)
-        self.bOk = QtGui.QPushButton(DMCListAjout)
-        self.bOk.setAutoDefault(True)
-        self.bOk.setDefault(True)
-        self.bOk.setProperty("toolTip",QtCore.QVariant(QtGui.QApplication.translate("DMCListAjout", "validation de la saisie", None, QtGui.QApplication.UnicodeUTF8)))
-        self.bOk.setObjectName("bOk")
-        self.gridlayout.addWidget(self.bOk,10,1,1,1)
-        self.bHelp = QtGui.QPushButton(DMCListAjout)
-        self.bHelp.setAutoDefault(True)
-        self.bHelp.setProperty("toolTip",QtCore.QVariant(QtGui.QApplication.translate("DMCListAjout", "affichage documentation aster", None, QtGui.QApplication.UnicodeUTF8)))
-        self.bHelp.setObjectName("bHelp")
-        self.gridlayout.addWidget(self.bHelp,10,2,1,1)
+        self.gridlayout.addWidget(self.MCFacteur, 4, 0, 1, 3)
+        spacerItem4 = QtGui.QSpacerItem(21, 31, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding)
+        self.gridlayout.addItem(spacerItem4, 5, 1, 1, 1)
+        spacerItem5 = QtGui.QSpacerItem(21, 51, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding)
+        self.gridlayout.addItem(spacerItem5, 3, 1, 1, 1)
+        spacerItem6 = QtGui.QSpacerItem(41, 51, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding)
+        self.gridlayout.addItem(spacerItem6, 0, 1, 1, 1)
 
         self.retranslateUi(DMCListAjout)
+        QtCore.QMetaObject.connectSlotsByName(DMCListAjout)
 
     def retranslateUi(self, DMCListAjout):
         DMCListAjout.setWindowTitle(QtGui.QApplication.translate("DMCListAjout", "Form1", None, QtGui.QApplication.UnicodeUTF8))
         self.textLabel1.setText(QtGui.QApplication.translate("DMCListAjout", "<p align=\"center\"><font size=\"+1\">Pour ajouter une autre occurrence</font></p>", None, QtGui.QApplication.UnicodeUTF8))
         self.textLabel1_2.setText(QtGui.QApplication.translate("DMCListAjout", "<p align=\"center\"><font size=\"+1\">du mot clef-facteur</font> </p>", None, QtGui.QApplication.UnicodeUTF8))
+        self.bAjout.setToolTip(QtGui.QApplication.translate("DMCListAjout", "validation de la saisie", None, QtGui.QApplication.UnicodeUTF8))
         self.bAjout.setText(QtGui.QApplication.translate("DMCListAjout", "&Ajouter", None, QtGui.QApplication.UnicodeUTF8))
         self.bAjout.setShortcut(QtGui.QApplication.translate("DMCListAjout", "Alt+A", None, QtGui.QApplication.UnicodeUTF8))
         self.textLabel1_2_2.setText(QtGui.QApplication.translate("DMCListAjout", "<p align=\"center\"><font size=\"+1\">cliquez ci-dessous</font> </p>", None, QtGui.QApplication.UnicodeUTF8))
         self.MCFacteur.setText(QtGui.QApplication.translate("DMCListAjout", "<p align=\"center\">AFFE</p>", None, QtGui.QApplication.UnicodeUTF8))
-        self.bSup.setText(QtGui.QApplication.translate("DMCListAjout", "&Supprimer", None, QtGui.QApplication.UnicodeUTF8))
-        self.bSup.setShortcut(QtGui.QApplication.translate("DMCListAjout", "Alt+S", None, QtGui.QApplication.UnicodeUTF8))
-        self.bOk.setText(QtGui.QApplication.translate("DMCListAjout", "&Valider", None, QtGui.QApplication.UnicodeUTF8))
-        self.bOk.setShortcut(QtGui.QApplication.translate("DMCListAjout", "Shift+A, Alt+A, Alt+A, Alt+A", None, QtGui.QApplication.UnicodeUTF8))
-        self.bHelp.setText(QtGui.QApplication.translate("DMCListAjout", "&Documentation", None, QtGui.QApplication.UnicodeUTF8))
-        self.bHelp.setShortcut(QtGui.QApplication.translate("DMCListAjout", "Alt+D", None, QtGui.QApplication.UnicodeUTF8))
 
 
 if __name__ == "__main__":
index e36dbfae1b01be6949bf51d2bba7471f7a332b1e..8982d14b25970d10382aba55a9f2148349e0d9f6 100644 (file)
-<ui version="4.0" stdsetdef="1" >
-  <author></author>
-  <comment></comment>
-  <exportmacro></exportmacro>
-  <class>DMCListAjout</class>
-  <widget class="QWidget" name="DMCListAjout" >
-    <property name="geometry" >
-      <rect>
-        <x>0</x>
-        <y>0</y>
-        <width>459</width>
-        <height>472</height>
-      </rect>
-    </property>
-    <property name="minimumSize" >
+<ui version="4.0" >
+ <class>DMCListAjout</class>
+ <widget class="QWidget" name="DMCListAjout" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>459</width>
+    <height>472</height>
+   </rect>
+  </property>
+  <property name="minimumSize" >
+   <size>
+    <width>350</width>
+    <height>0</height>
+   </size>
+  </property>
+  <property name="windowTitle" >
+   <string>Form1</string>
+  </property>
+  <layout class="QGridLayout" >
+   <item row="1" column="0" colspan="3" >
+    <widget class="QLabel" name="textLabel1" >
+     <property name="text" >
+      <string>&lt;p align="center">&lt;font size="+1">Pour ajouter une autre occurrence&lt;/font>&lt;/p></string>
+     </property>
+     <property name="wordWrap" >
+      <bool>false</bool>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="0" colspan="3" >
+    <widget class="QLabel" name="textLabel1_2" >
+     <property name="text" >
+      <string>&lt;p align="center">&lt;font size="+1">du mot clef-facteur&lt;/font> &lt;/p></string>
+     </property>
+     <property name="wordWrap" >
+      <bool>false</bool>
+     </property>
+    </widget>
+   </item>
+   <item row="8" column="0" colspan="3" >
+    <layout class="QHBoxLayout" >
+     <item>
+      <spacer name="spacer4" >
+       <property name="orientation" >
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeType" >
+        <enum>QSizePolicy::Expanding</enum>
+       </property>
+       <property name="sizeHint" stdset="0" >
+        <size>
+         <width>60</width>
+         <height>21</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QPushButton" name="bAjout" >
+       <property name="toolTip" >
+        <string>validation de la saisie</string>
+       </property>
+       <property name="text" >
+        <string>&amp;Ajouter</string>
+       </property>
+       <property name="shortcut" >
+        <string>Alt+A</string>
+       </property>
+       <property name="autoDefault" >
+        <bool>true</bool>
+       </property>
+       <property name="default" >
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <spacer name="spacer2" >
+       <property name="orientation" >
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeType" >
+        <enum>QSizePolicy::Expanding</enum>
+       </property>
+       <property name="sizeHint" stdset="0" >
+        <size>
+         <width>80</width>
+         <height>21</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+    </layout>
+   </item>
+   <item row="9" column="1" >
+    <spacer name="spacer1" >
+     <property name="orientation" >
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeType" >
+      <enum>QSizePolicy::Expanding</enum>
+     </property>
+     <property name="sizeHint" stdset="0" >
       <size>
-        <width>350</width>
-        <height>0</height>
+       <width>21</width>
+       <height>40</height>
       </size>
-    </property>
-    <property name="windowTitle" >
-      <string>Form1</string>
-    </property>
-    <layout class="QGridLayout" >
-      <item rowspan="1" row="1" column="0" colspan="3" >
-        <widget class="QLabel" name="textLabel1" >
-          <property name="text" >
-            <string>&lt;p align="center">&lt;font size="+1">Pour ajouter une autre occurrence&lt;/font>&lt;/p></string>
-          </property>
-          <property name="wordWrap" >
-            <bool>false</bool>
-          </property>
-        </widget>
-      </item>
-      <item rowspan="1" row="2" column="0" colspan="3" >
-        <widget class="QLabel" name="textLabel1_2" >
-          <property name="text" >
-            <string>&lt;p align="center">&lt;font size="+1">du mot clef-facteur&lt;/font> &lt;/p></string>
-          </property>
-          <property name="wordWrap" >
-            <bool>false</bool>
-          </property>
-        </widget>
-      </item>
-      <item rowspan="1" row="8" column="0" colspan="3" >
-        <layout class="QHBoxLayout" >
-          <item>
-            <spacer name="spacer4" >
-              <property name="sizeHint" >
-                <size>
-                  <width>60</width>
-                  <height>21</height>
-                </size>
-              </property>
-              <property name="sizeType" >
-                <enum>QSizePolicy::Expanding</enum>
-              </property>
-              <property name="orientation" >
-                <enum>Qt::Horizontal</enum>
-              </property>
-            </spacer>
-          </item>
-          <item>
-            <widget class="QPushButton" name="bAjout" >
-              <property name="text" >
-                <string>&amp;Ajouter</string>
-              </property>
-              <property name="shortcut" >
-                <string>Alt+A</string>
-              </property>
-              <property name="autoDefault" >
-                <bool>true</bool>
-              </property>
-              <property name="default" >
-                <bool>true</bool>
-              </property>
-              <property name="toolTip" stdset="0" >
-                <string>validation de la saisie</string>
-              </property>
-            </widget>
-          </item>
-          <item>
-            <spacer name="spacer2" >
-              <property name="sizeHint" >
-                <size>
-                  <width>80</width>
-                  <height>21</height>
-                </size>
-              </property>
-              <property name="sizeType" >
-                <enum>QSizePolicy::Expanding</enum>
-              </property>
-              <property name="orientation" >
-                <enum>Qt::Horizontal</enum>
-              </property>
-            </spacer>
-          </item>
-        </layout>
-      </item>
-      <item row="9" column="1" >
-        <spacer name="spacer1" >
-          <property name="sizeHint" >
-            <size>
-              <width>21</width>
-              <height>40</height>
-            </size>
-          </property>
-          <property name="sizeType" >
-            <enum>QSizePolicy::Expanding</enum>
-          </property>
-          <property name="orientation" >
-            <enum>Qt::Vertical</enum>
-          </property>
-        </spacer>
-      </item>
-      <item rowspan="1" row="6" column="0" colspan="3" >
-        <widget class="QLabel" name="textLabel1_2_2" >
-          <property name="text" >
-            <string>&lt;p align="center">&lt;font size="+1">cliquez ci-dessous&lt;/font> &lt;/p></string>
-          </property>
-          <property name="wordWrap" >
-            <bool>false</bool>
-          </property>
-        </widget>
-      </item>
-      <item row="7" column="1" >
-        <spacer name="spacer5" >
-          <property name="sizeHint" >
-            <size>
-              <width>20</width>
-              <height>20</height>
-            </size>
-          </property>
-          <property name="sizeType" >
-            <enum>QSizePolicy::Expanding</enum>
-          </property>
-          <property name="orientation" >
-            <enum>Qt::Vertical</enum>
-          </property>
-        </spacer>
-      </item>
-      <item rowspan="1" row="4" column="0" colspan="3" >
-        <widget class="QLabel" name="MCFacteur" >
-          <property name="text" >
-            <string>&lt;p align="center">AFFE&lt;/p></string>
-          </property>
-          <property name="wordWrap" >
-            <bool>false</bool>
-          </property>
-        </widget>
-      </item>
-      <item row="5" column="1" >
-        <spacer name="spacer6" >
-          <property name="sizeHint" >
-            <size>
-              <width>21</width>
-              <height>31</height>
-            </size>
-          </property>
-          <property name="sizeType" >
-            <enum>QSizePolicy::Expanding</enum>
-          </property>
-          <property name="orientation" >
-            <enum>Qt::Vertical</enum>
-          </property>
-        </spacer>
-      </item>
-      <item row="3" column="1" >
-        <spacer name="spacer7" >
-          <property name="sizeHint" >
-            <size>
-              <width>21</width>
-              <height>51</height>
-            </size>
-          </property>
-          <property name="sizeType" >
-            <enum>QSizePolicy::Expanding</enum>
-          </property>
-          <property name="orientation" >
-            <enum>Qt::Vertical</enum>
-          </property>
-        </spacer>
-      </item>
-      <item row="0" column="1" >
-        <spacer name="spacer8" >
-          <property name="sizeHint" >
-            <size>
-              <width>41</width>
-              <height>51</height>
-            </size>
-          </property>
-          <property name="sizeType" >
-            <enum>QSizePolicy::Expanding</enum>
-          </property>
-          <property name="orientation" >
-            <enum>Qt::Vertical</enum>
-          </property>
-        </spacer>
-      </item>
-      <item row="10" column="0" >
-        <widget class="QPushButton" name="bSup" >
-          <property name="text" >
-            <string>&amp;Supprimer</string>
-          </property>
-          <property name="shortcut" >
-            <string>Alt+S</string>
-          </property>
-          <property name="autoDefault" >
-            <bool>true</bool>
-          </property>
-          <property name="toolTip" stdset="0" >
-            <string>suppression du mot clef</string>
-          </property>
-        </widget>
-      </item>
-      <item row="10" column="1" >
-        <widget class="QPushButton" name="bOk" >
-          <property name="text" >
-            <string>&amp;Valider</string>
-          </property>
-          <property name="shortcut" >
-            <string>Shift+A, Alt+A, Alt+A, Alt+A</string>
-          </property>
-          <property name="autoDefault" >
-            <bool>true</bool>
-          </property>
-          <property name="default" >
-            <bool>true</bool>
-          </property>
-          <property name="toolTip" stdset="0" >
-            <string>validation de la saisie</string>
-          </property>
-        </widget>
-      </item>
-      <item row="10" column="2" >
-        <widget class="QPushButton" name="bHelp" >
-          <property name="text" >
-            <string>&amp;Documentation</string>
-          </property>
-          <property name="shortcut" >
-            <string>Alt+D</string>
-          </property>
-          <property name="autoDefault" >
-            <bool>true</bool>
-          </property>
-          <property name="toolTip" stdset="0" >
-            <string>affichage documentation aster</string>
-          </property>
-        </widget>
-      </item>
-    </layout>
-  </widget>
-  <layoutdefault spacing="6" margin="11" />
-  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
+     </property>
+    </spacer>
+   </item>
+   <item row="6" column="0" colspan="3" >
+    <widget class="QLabel" name="textLabel1_2_2" >
+     <property name="text" >
+      <string>&lt;p align="center">&lt;font size="+1">cliquez ci-dessous&lt;/font> &lt;/p></string>
+     </property>
+     <property name="wordWrap" >
+      <bool>false</bool>
+     </property>
+    </widget>
+   </item>
+   <item row="7" column="1" >
+    <spacer name="spacer5" >
+     <property name="orientation" >
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeType" >
+      <enum>QSizePolicy::Expanding</enum>
+     </property>
+     <property name="sizeHint" stdset="0" >
+      <size>
+       <width>20</width>
+       <height>20</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="4" column="0" colspan="3" >
+    <widget class="QLabel" name="MCFacteur" >
+     <property name="text" >
+      <string>&lt;p align="center">AFFE&lt;/p></string>
+     </property>
+     <property name="wordWrap" >
+      <bool>false</bool>
+     </property>
+    </widget>
+   </item>
+   <item row="5" column="1" >
+    <spacer name="spacer6" >
+     <property name="orientation" >
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeType" >
+      <enum>QSizePolicy::Expanding</enum>
+     </property>
+     <property name="sizeHint" stdset="0" >
+      <size>
+       <width>21</width>
+       <height>31</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="3" column="1" >
+    <spacer name="spacer7" >
+     <property name="orientation" >
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeType" >
+      <enum>QSizePolicy::Expanding</enum>
+     </property>
+     <property name="sizeHint" stdset="0" >
+      <size>
+       <width>21</width>
+       <height>51</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="0" column="1" >
+    <spacer name="spacer8" >
+     <property name="orientation" >
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeType" >
+      <enum>QSizePolicy::Expanding</enum>
+     </property>
+     <property name="sizeHint" stdset="0" >
+      <size>
+       <width>41</width>
+       <height>51</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+  </layout>
+ </widget>
+ <layoutdefault spacing="6" margin="11" />
+ <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
+ <resources/>
+ <connections/>
 </ui>
index c9b3bf3b0b871b8cb4d6fd060320dccba8b2178f..6c9bb635083e1a741abbbd1905fd8900f3a1eb88 100644 (file)
@@ -2,8 +2,8 @@
 
 # Form implementation generated from reading ui file 'desParam.ui'
 #
-# Created: Tue Nov 18 17:37:24 2008
-#      by: PyQt4 UI code generator 4.4.2
+# Created: Fri Apr 24 10:10:36 2009
+#      by: PyQt4 UI code generator 4.4.3
 #
 # WARNING! All changes made in this file will be lost!
 
@@ -12,122 +12,127 @@ from PyQt4 import QtCore, QtGui
 class Ui_DParam(object):
     def setupUi(self, DParam):
         DParam.setObjectName("DParam")
-        DParam.resize(505,483)
-        DParam.setMinimumSize(QtCore.QSize(505,0))
-        self.gridlayout = QtGui.QGridLayout(DParam)
-        self.gridlayout.setObjectName("gridlayout")
-        self.Commentaire = QtGui.QLabel(DParam)
-        self.Commentaire.setFrameShape(QtGui.QFrame.NoFrame)
-        self.Commentaire.setFrameShadow(QtGui.QFrame.Plain)
-        self.Commentaire.setWordWrap(False)
-        self.Commentaire.setObjectName("Commentaire")
-        self.gridlayout.addWidget(self.Commentaire,1,0,1,3)
+        DParam.resize(682, 552)
+        DParam.setMinimumSize(QtCore.QSize(505, 0))
+        self.gridLayout_3 = QtGui.QGridLayout(DParam)
+        self.gridLayout_3.setObjectName("gridLayout_3")
         self.TWChoix = QtGui.QTabWidget(DParam)
         self.TWChoix.setObjectName("TWChoix")
         self.Valeur_Parametre = QtGui.QWidget()
-        self.Valeur_Parametre.setGeometry(QtCore.QRect(0,0,483,372))
         self.Valeur_Parametre.setObjectName("Valeur_Parametre")
-        self.gridLayout_3 = QtGui.QGridLayout(self.Valeur_Parametre)
-        self.gridLayout_3.setObjectName("gridLayout_3")
+        self.gridLayout_5 = QtGui.QGridLayout(self.Valeur_Parametre)
+        self.gridLayout_5.setObjectName("gridLayout_5")
         self.textLabel2_2_2 = QtGui.QLabel(self.Valeur_Parametre)
         self.textLabel2_2_2.setWordWrap(False)
         self.textLabel2_2_2.setObjectName("textLabel2_2_2")
-        self.gridLayout_3.addWidget(self.textLabel2_2_2,0,1,1,1)
+        self.gridLayout_5.addWidget(self.textLabel2_2_2, 0, 0, 1, 2)
         self.textLabel2_2 = QtGui.QLabel(self.Valeur_Parametre)
         self.textLabel2_2.setWordWrap(False)
         self.textLabel2_2.setObjectName("textLabel2_2")
-        self.gridLayout_3.addWidget(self.textLabel2_2,1,0,1,1)
+        self.gridLayout_5.addWidget(self.textLabel2_2, 1, 0, 1, 1)
         self.lineEditNom = QtGui.QLineEdit(self.Valeur_Parametre)
-        self.lineEditNom.setMinimumSize(QtCore.QSize(231,31))
+        self.lineEditNom.setMinimumSize(QtCore.QSize(231, 31))
         self.lineEditNom.setObjectName("lineEditNom")
-        self.gridLayout_3.addWidget(self.lineEditNom,1,1,1,1)
+        self.gridLayout_5.addWidget(self.lineEditNom, 1, 1, 1, 1)
         self.textLabel2 = QtGui.QLabel(self.Valeur_Parametre)
         self.textLabel2.setWordWrap(False)
         self.textLabel2.setObjectName("textLabel2")
-        self.gridLayout_3.addWidget(self.textLabel2,2,0,1,1)
+        self.gridLayout_5.addWidget(self.textLabel2, 2, 0, 1, 1)
         self.lineEditVal = QtGui.QLineEdit(self.Valeur_Parametre)
-        self.lineEditVal.setMinimumSize(QtCore.QSize(231,31))
+        self.lineEditVal.setMinimumSize(QtCore.QSize(231, 31))
         self.lineEditVal.setObjectName("lineEditVal")
-        self.gridLayout_3.addWidget(self.lineEditVal,2,1,1,1)
+        self.gridLayout_5.addWidget(self.lineEditVal, 2, 1, 1, 1)
         self.Commentaire2 = QtGui.QLabel(self.Valeur_Parametre)
         self.Commentaire2.setWordWrap(False)
         self.Commentaire2.setObjectName("Commentaire2")
-        self.gridLayout_3.addWidget(self.Commentaire2,3,0,1,2)
+        self.gridLayout_5.addWidget(self.Commentaire2, 3, 0, 1, 2)
+        spacerItem = QtGui.QSpacerItem(460, 139, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding)
+        self.gridLayout_5.addItem(spacerItem, 4, 0, 1, 2)
+        self.Commentaire = QtGui.QLabel(self.Valeur_Parametre)
+        self.Commentaire.setMinimumSize(QtCore.QSize(0, 20))
+        self.Commentaire.setMaximumSize(QtCore.QSize(465, 16777215))
+        self.Commentaire.setObjectName("Commentaire")
+        self.gridLayout_5.addWidget(self.Commentaire, 5, 0, 1, 2)
         self.Commentaire_2 = QtGui.QLabel(self.Valeur_Parametre)
         self.Commentaire_2.setWordWrap(False)
         self.Commentaire_2.setObjectName("Commentaire_2")
-        self.gridLayout_3.addWidget(self.Commentaire_2,4,0,1,2)
-        self.TWChoix.addTab(self.Valeur_Parametre,"")
+        self.gridLayout_5.addWidget(self.Commentaire_2, 6, 0, 1, 2)
+        self.TWChoix.addTab(self.Valeur_Parametre, "")
         self.Commande = QtGui.QWidget()
-        self.Commande.setGeometry(QtCore.QRect(0,0,483,372))
         self.Commande.setObjectName("Commande")
-        self.gridLayout_2 = QtGui.QGridLayout(self.Commande)
+        self.gridLayout_4 = QtGui.QGridLayout(self.Commande)
+        self.gridLayout_4.setObjectName("gridLayout_4")
+        self.gridLayout_2 = QtGui.QGridLayout()
         self.gridLayout_2.setObjectName("gridLayout_2")
         self.textLabel1_4 = QtGui.QLabel(self.Commande)
         self.textLabel1_4.setWordWrap(False)
         self.textLabel1_4.setObjectName("textLabel1_4")
-        self.gridLayout_2.addWidget(self.textLabel1_4,0,0,1,3)
+        self.gridLayout_2.addWidget(self.textLabel1_4, 0, 0, 1, 2)
         self.groupBox = QtGui.QGroupBox(self.Commande)
+        self.groupBox.setMinimumSize(QtCore.QSize(171, 71))
         self.groupBox.setObjectName("groupBox")
         self.gridLayout = QtGui.QGridLayout(self.groupBox)
         self.gridLayout.setObjectName("gridLayout")
-        self.RBGroupe = QtGui.QRadioButton(self.groupBox)
-        self.RBGroupe.setObjectName("RBGroupe")
-        self.gridLayout.addWidget(self.RBGroupe,1,0,1,1)
         self.RBalpha = QtGui.QRadioButton(self.groupBox)
+        self.RBalpha.setMinimumSize(QtCore.QSize(149, 16))
+        self.RBalpha.setMaximumSize(QtCore.QSize(149, 16))
         self.RBalpha.setChecked(True)
         self.RBalpha.setObjectName("RBalpha")
-        self.gridLayout.addWidget(self.RBalpha,0,0,1,1)
-        self.gridLayout_2.addWidget(self.groupBox,0,3,2,1)
+        self.gridLayout.addWidget(self.RBalpha, 0, 0, 1, 1)
+        self.RBGroupe = QtGui.QRadioButton(self.groupBox)
+        self.RBGroupe.setObjectName("RBGroupe")
+        self.gridLayout.addWidget(self.RBGroupe, 1, 0, 1, 1)
+        self.gridLayout_2.addWidget(self.groupBox, 0, 4, 2, 1)
         self.textLabel6 = QtGui.QLabel(self.Commande)
-        self.textLabel6.setMinimumSize(QtCore.QSize(50,30))
+        self.textLabel6.setMinimumSize(QtCore.QSize(91, 30))
         self.textLabel6.setWordWrap(False)
         self.textLabel6.setObjectName("textLabel6")
-        self.gridLayout_2.addWidget(self.textLabel6,1,0,1,1)
+        self.gridLayout_2.addWidget(self.textLabel6, 1, 0, 1, 1)
         self.LEFiltre = QtGui.QLineEdit(self.Commande)
-        self.LEFiltre.setMinimumSize(QtCore.QSize(160,30))
+        self.LEFiltre.setMinimumSize(QtCore.QSize(231, 30))
         self.LEFiltre.setObjectName("LEFiltre")
-        self.gridLayout_2.addWidget(self.LEFiltre,1,1,1,1)
+        self.gridLayout_2.addWidget(self.LEFiltre, 1, 1, 1, 1)
         self.BNext = QtGui.QPushButton(self.Commande)
+        self.BNext.setMinimumSize(QtCore.QSize(90, 30))
         self.BNext.setObjectName("BNext")
-        self.gridLayout_2.addWidget(self.BNext,1,2,1,1)
+        self.gridLayout_2.addWidget(self.BNext, 1, 2, 1, 1)
+        spacerItem1 = QtGui.QSpacerItem(108, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
+        self.gridLayout_2.addItem(spacerItem1, 1, 3, 1, 1)
+        self.gridLayout_4.addLayout(self.gridLayout_2, 0, 0, 1, 1)
         self.LBNouvCommande = QtGui.QListWidget(self.Commande)
         self.LBNouvCommande.setObjectName("LBNouvCommande")
-        self.gridLayout_2.addWidget(self.LBNouvCommande,2,0,1,4)
+        self.gridLayout_4.addWidget(self.LBNouvCommande, 1, 0, 1, 1)
         self.textLabel4 = QtGui.QLabel(self.Commande)
+        self.textLabel4.setMaximumSize(QtCore.QSize(721, 20))
         self.textLabel4.setWordWrap(False)
         self.textLabel4.setObjectName("textLabel4")
-        self.gridLayout_2.addWidget(self.textLabel4,3,0,1,4)
-        self.TWChoix.addTab(self.Commande,"")
-        self.gridlayout.addWidget(self.TWChoix,0,0,1,3)
+        self.gridLayout_4.addWidget(self.textLabel4, 2, 0, 1, 1)
+        self.TWChoix.addTab(self.Commande, "")
+        self.gridLayout_3.addWidget(self.TWChoix, 0, 0, 1, 1)
+        self.horizontalLayout = QtGui.QHBoxLayout()
+        self.horizontalLayout.setObjectName("horizontalLayout")
+        spacerItem2 = QtGui.QSpacerItem(158, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
+        self.horizontalLayout.addItem(spacerItem2)
         self.bOk = QtGui.QPushButton(DParam)
-        self.bOk.setMinimumSize(QtCore.QSize(0,30))
+        self.bOk.setMinimumSize(QtCore.QSize(160, 30))
+        self.bOk.setMaximumSize(QtCore.QSize(160, 30))
         self.bOk.setAutoDefault(True)
         self.bOk.setDefault(True)
         self.bOk.setObjectName("bOk")
-        self.gridlayout.addWidget(self.bOk,2,1,1,1)
-        self.bSup = QtGui.QPushButton(DParam)
-        self.bSup.setMinimumSize(QtCore.QSize(0,30))
-        self.bSup.setAutoDefault(True)
-        self.bSup.setObjectName("bSup")
-        self.gridlayout.addWidget(self.bSup,2,0,1,1)
-        self.bHelp = QtGui.QPushButton(DParam)
-        self.bHelp.setMinimumSize(QtCore.QSize(0,30))
-        self.bHelp.setAutoDefault(True)
-        self.bHelp.setObjectName("bHelp")
-        self.gridlayout.addWidget(self.bHelp,2,2,1,1)
+        self.horizontalLayout.addWidget(self.bOk)
+        spacerItem3 = QtGui.QSpacerItem(148, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
+        self.horizontalLayout.addItem(spacerItem3)
+        self.gridLayout_3.addLayout(self.horizontalLayout, 1, 0, 1, 1)
 
         self.retranslateUi(DParam)
         self.TWChoix.setCurrentIndex(0)
         QtCore.QMetaObject.connectSlotsByName(DParam)
-        DParam.setTabOrder(self.LEFiltre,self.TWChoix)
-        DParam.setTabOrder(self.TWChoix,self.lineEditNom)
-        DParam.setTabOrder(self.lineEditNom,self.lineEditVal)
-        DParam.setTabOrder(self.lineEditVal,self.LBNouvCommande)
-        DParam.setTabOrder(self.LBNouvCommande,self.RBalpha)
-        DParam.setTabOrder(self.RBalpha,self.bOk)
-        DParam.setTabOrder(self.bOk,self.bSup)
-        DParam.setTabOrder(self.bSup,self.bHelp)
+        DParam.setTabOrder(self.LEFiltre, self.TWChoix)
+        DParam.setTabOrder(self.TWChoix, self.lineEditNom)
+        DParam.setTabOrder(self.lineEditNom, self.lineEditVal)
+        DParam.setTabOrder(self.lineEditVal, self.LBNouvCommande)
+        DParam.setTabOrder(self.LBNouvCommande, self.RBalpha)
+        DParam.setTabOrder(self.RBalpha, self.bOk)
 
     def retranslateUi(self, DParam):
         DParam.setWindowTitle(QtGui.QApplication.translate("DParam", "DComm", None, QtGui.QApplication.UnicodeUTF8))
@@ -142,8 +147,8 @@ class Ui_DParam(object):
         self.TWChoix.setTabText(self.TWChoix.indexOf(self.Valeur_Parametre), QtGui.QApplication.translate("DParam", "Valeur Parametre", None, QtGui.QApplication.UnicodeUTF8))
         self.textLabel1_4.setText(QtGui.QApplication.translate("DParam", "<b><u>Commandes :</u></b>", None, QtGui.QApplication.UnicodeUTF8))
         self.groupBox.setTitle(QtGui.QApplication.translate("DParam", "Affichage", None, QtGui.QApplication.UnicodeUTF8))
-        self.RBGroupe.setText(QtGui.QApplication.translate("DParam", "par groupe", None, QtGui.QApplication.UnicodeUTF8))
         self.RBalpha.setText(QtGui.QApplication.translate("DParam", "alphabétique", None, QtGui.QApplication.UnicodeUTF8))
+        self.RBGroupe.setText(QtGui.QApplication.translate("DParam", "par groupe", None, QtGui.QApplication.UnicodeUTF8))
         self.textLabel6.setText(QtGui.QApplication.translate("DParam", "Filtre", None, QtGui.QApplication.UnicodeUTF8))
         self.BNext.setText(QtGui.QApplication.translate("DParam", "Suivant", None, QtGui.QApplication.UnicodeUTF8))
         self.textLabel4.setText(QtGui.QApplication.translate("DParam", "La commande choisie sera ajoutée APRES la commande courante", None, QtGui.QApplication.UnicodeUTF8))
@@ -151,12 +156,6 @@ class Ui_DParam(object):
         self.bOk.setToolTip(QtGui.QApplication.translate("DParam", "validation de la saisie", None, QtGui.QApplication.UnicodeUTF8))
         self.bOk.setText(QtGui.QApplication.translate("DParam", "&Valider", None, QtGui.QApplication.UnicodeUTF8))
         self.bOk.setShortcut(QtGui.QApplication.translate("DParam", "Shift+A, Alt+A, Alt+A, Alt+A", None, QtGui.QApplication.UnicodeUTF8))
-        self.bSup.setToolTip(QtGui.QApplication.translate("DParam", "suppression du mot clef", None, QtGui.QApplication.UnicodeUTF8))
-        self.bSup.setText(QtGui.QApplication.translate("DParam", "&Supprimer", None, QtGui.QApplication.UnicodeUTF8))
-        self.bSup.setShortcut(QtGui.QApplication.translate("DParam", "Alt+S", None, QtGui.QApplication.UnicodeUTF8))
-        self.bHelp.setToolTip(QtGui.QApplication.translate("DParam", "affichage documentation aster", None, QtGui.QApplication.UnicodeUTF8))
-        self.bHelp.setText(QtGui.QApplication.translate("DParam", "&Documentation", None, QtGui.QApplication.UnicodeUTF8))
-        self.bHelp.setShortcut(QtGui.QApplication.translate("DParam", "Alt+D", None, QtGui.QApplication.UnicodeUTF8))
 
 
 if __name__ == "__main__":
index faf4ef171641c7bb3f575ed1579f6c073bb49023..f418cc9bedfb2d89ebafa5a02d65a1e8e8e39031 100644 (file)
@@ -5,8 +5,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>505</width>
-    <height>483</height>
+    <width>682</width>
+    <height>552</height>
    </rect>
   </property>
   <property name="minimumSize" >
   <property name="windowTitle" >
    <string>DComm</string>
   </property>
-  <layout class="QGridLayout" >
-   <item row="1" column="0" colspan="3" >
-    <widget class="QLabel" name="Commentaire" >
-     <property name="frameShape" >
-      <enum>QFrame::NoFrame</enum>
-     </property>
-     <property name="frameShadow" >
-      <enum>QFrame::Plain</enum>
-     </property>
-     <property name="text" >
-      <string/>
-     </property>
-     <property name="wordWrap" >
-      <bool>false</bool>
-     </property>
-    </widget>
-   </item>
-   <item row="0" column="0" colspan="3" >
+  <layout class="QGridLayout" name="gridLayout_3" >
+   <item row="0" column="0" >
     <widget class="QTabWidget" name="TWChoix" >
      <property name="currentIndex" >
       <number>0</number>
      </property>
      <widget class="QWidget" name="Valeur_Parametre" >
-      <property name="geometry" >
-       <rect>
-        <x>0</x>
-        <y>0</y>
-        <width>483</width>
-        <height>372</height>
-       </rect>
-      </property>
       <attribute name="title" >
        <string>Valeur Parametre</string>
       </attribute>
-      <layout class="QGridLayout" name="gridLayout_3" >
-       <item row="0" column="1" >
+      <layout class="QGridLayout" name="gridLayout_5" >
+       <item row="0" column="0" colspan="2" >
         <widget class="QLabel" name="textLabel2_2_2" >
          <property name="text" >
           <string>&lt;u>&lt;b>&lt;p align="center">Parametre&lt;/p>&lt;/b>&lt;/u></string>
@@ -118,6 +94,38 @@ appuyé sur  le bouton Valider.</string>
         </widget>
        </item>
        <item row="4" column="0" colspan="2" >
+        <spacer name="verticalSpacer" >
+         <property name="orientation" >
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeHint" stdset="0" >
+          <size>
+           <width>460</width>
+           <height>139</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+       <item row="5" column="0" colspan="2" >
+        <widget class="QLabel" name="Commentaire" >
+         <property name="minimumSize" >
+          <size>
+           <width>0</width>
+           <height>20</height>
+          </size>
+         </property>
+         <property name="maximumSize" >
+          <size>
+           <width>465</width>
+           <height>16777215</height>
+          </size>
+         </property>
+         <property name="text" >
+          <string/>
+         </property>
+        </widget>
+       </item>
+       <item row="6" column="0" colspan="2" >
         <widget class="QLabel" name="Commentaire_2" >
          <property name="text" >
           <string/>
@@ -130,92 +138,131 @@ appuyé sur  le bouton Valider.</string>
       </layout>
      </widget>
      <widget class="QWidget" name="Commande" >
-      <property name="geometry" >
-       <rect>
-        <x>0</x>
-        <y>0</y>
-        <width>483</width>
-        <height>372</height>
-       </rect>
-      </property>
       <attribute name="title" >
        <string>Nouvelle Commande</string>
       </attribute>
-      <layout class="QGridLayout" name="gridLayout_2" >
-       <item row="0" column="0" colspan="3" >
-        <widget class="QLabel" name="textLabel1_4" >
-         <property name="text" >
-          <string>&lt;b>&lt;u>Commandes :&lt;/u>&lt;/b></string>
-         </property>
-         <property name="wordWrap" >
-          <bool>false</bool>
-         </property>
-        </widget>
-       </item>
-       <item rowspan="2" row="0" column="3" >
-        <widget class="QGroupBox" name="groupBox" >
-         <property name="title" >
-          <string>Affichage</string>
-         </property>
-         <layout class="QGridLayout" name="gridLayout" >
-          <item row="1" column="0" >
-           <widget class="QRadioButton" name="RBGroupe" >
-            <property name="text" >
-             <string>par groupe</string>
-            </property>
-           </widget>
-          </item>
-          <item row="0" column="0" >
-           <widget class="QRadioButton" name="RBalpha" >
-            <property name="text" >
-             <string>alphabétique</string>
-            </property>
-            <property name="checked" >
-             <bool>true</bool>
-            </property>
-           </widget>
-          </item>
-         </layout>
-        </widget>
+      <layout class="QGridLayout" name="gridLayout_4" >
+       <item row="0" column="0" >
+        <layout class="QGridLayout" name="gridLayout_2" >
+         <item row="0" column="0" colspan="2" >
+          <widget class="QLabel" name="textLabel1_4" >
+           <property name="text" >
+            <string>&lt;b>&lt;u>Commandes :&lt;/u>&lt;/b></string>
+           </property>
+           <property name="wordWrap" >
+            <bool>false</bool>
+           </property>
+          </widget>
+         </item>
+         <item rowspan="2" row="0" column="4" >
+          <widget class="QGroupBox" name="groupBox" >
+           <property name="minimumSize" >
+            <size>
+             <width>171</width>
+             <height>71</height>
+            </size>
+           </property>
+           <property name="title" >
+            <string>Affichage</string>
+           </property>
+           <layout class="QGridLayout" name="gridLayout" >
+            <item row="0" column="0" >
+             <widget class="QRadioButton" name="RBalpha" >
+              <property name="minimumSize" >
+               <size>
+                <width>149</width>
+                <height>16</height>
+               </size>
+              </property>
+              <property name="maximumSize" >
+               <size>
+                <width>149</width>
+                <height>16</height>
+               </size>
+              </property>
+              <property name="text" >
+               <string>alphabétique</string>
+              </property>
+              <property name="checked" >
+               <bool>true</bool>
+              </property>
+             </widget>
+            </item>
+            <item row="1" column="0" >
+             <widget class="QRadioButton" name="RBGroupe" >
+              <property name="text" >
+               <string>par groupe</string>
+              </property>
+             </widget>
+            </item>
+           </layout>
+          </widget>
+         </item>
+         <item row="1" column="0" >
+          <widget class="QLabel" name="textLabel6" >
+           <property name="minimumSize" >
+            <size>
+             <width>91</width>
+             <height>30</height>
+            </size>
+           </property>
+           <property name="text" >
+            <string>Filtre</string>
+           </property>
+           <property name="wordWrap" >
+            <bool>false</bool>
+           </property>
+          </widget>
+         </item>
+         <item row="1" column="1" >
+          <widget class="QLineEdit" name="LEFiltre" >
+           <property name="minimumSize" >
+            <size>
+             <width>231</width>
+             <height>30</height>
+            </size>
+           </property>
+          </widget>
+         </item>
+         <item row="1" column="2" >
+          <widget class="QPushButton" name="BNext" >
+           <property name="minimumSize" >
+            <size>
+             <width>90</width>
+             <height>30</height>
+            </size>
+           </property>
+           <property name="text" >
+            <string>Suivant</string>
+           </property>
+          </widget>
+         </item>
+         <item row="1" column="3" >
+          <spacer name="horizontalSpacer_4" >
+           <property name="orientation" >
+            <enum>Qt::Horizontal</enum>
+           </property>
+           <property name="sizeHint" stdset="0" >
+            <size>
+             <width>108</width>
+             <height>20</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
+        </layout>
        </item>
        <item row="1" column="0" >
-        <widget class="QLabel" name="textLabel6" >
-         <property name="minimumSize" >
-          <size>
-           <width>50</width>
-           <height>30</height>
-          </size>
-         </property>
-         <property name="text" >
-          <string>Filtre</string>
-         </property>
-         <property name="wordWrap" >
-          <bool>false</bool>
-         </property>
-        </widget>
+        <widget class="QListWidget" name="LBNouvCommande" />
        </item>
-       <item row="1" column="1" >
-        <widget class="QLineEdit" name="LEFiltre" >
-         <property name="minimumSize" >
+       <item row="2" column="0" >
+        <widget class="QLabel" name="textLabel4" >
+         <property name="maximumSize" >
           <size>
-           <width>160</width>
-           <height>30</height>
+           <width>721</width>
+           <height>20</height>
           </size>
          </property>
-        </widget>
-       </item>
-       <item row="1" column="2" >
-        <widget class="QPushButton" name="BNext" >
-         <property name="text" >
-          <string>Suivant</string>
-         </property>
-        </widget>
-       </item>
-       <item row="2" column="0" colspan="4" >
-        <widget class="QListWidget" name="LBNouvCommande" />
-       </item>
-       <item row="3" column="0" colspan="4" >
-        <widget class="QLabel" name="textLabel4" >
          <property name="text" >
           <string>La commande choisie sera ajoutée APRES la commande courante</string>
          </property>
@@ -228,74 +275,66 @@ appuyé sur  le bouton Valider.</string>
      </widget>
     </widget>
    </item>
-   <item row="2" column="1" >
-    <widget class="QPushButton" name="bOk" >
-     <property name="minimumSize" >
-      <size>
-       <width>0</width>
-       <height>30</height>
-      </size>
-     </property>
-     <property name="toolTip" >
-      <string>validation de la saisie</string>
-     </property>
-     <property name="text" >
-      <string>&amp;Valider</string>
-     </property>
-     <property name="shortcut" >
-      <string>Shift+A, Alt+A, Alt+A, Alt+A</string>
-     </property>
-     <property name="autoDefault" >
-      <bool>true</bool>
-     </property>
-     <property name="default" >
-      <bool>true</bool>
-     </property>
-    </widget>
-   </item>
-   <item row="2" column="0" >
-    <widget class="QPushButton" name="bSup" >
-     <property name="minimumSize" >
-      <size>
-       <width>0</width>
-       <height>30</height>
-      </size>
-     </property>
-     <property name="toolTip" >
-      <string>suppression du mot clef</string>
-     </property>
-     <property name="text" >
-      <string>&amp;Supprimer</string>
-     </property>
-     <property name="shortcut" >
-      <string>Alt+S</string>
-     </property>
-     <property name="autoDefault" >
-      <bool>true</bool>
-     </property>
-    </widget>
-   </item>
-   <item row="2" column="2" >
-    <widget class="QPushButton" name="bHelp" >
-     <property name="minimumSize" >
-      <size>
-       <width>0</width>
-       <height>30</height>
-      </size>
-     </property>
-     <property name="toolTip" >
-      <string>affichage documentation aster</string>
-     </property>
-     <property name="text" >
-      <string>&amp;Documentation</string>
-     </property>
-     <property name="shortcut" >
-      <string>Alt+D</string>
-     </property>
-     <property name="autoDefault" >
-      <bool>true</bool>
-     </property>
-    </widget>
+   <item row="1" column="0" >
+    <layout class="QHBoxLayout" name="horizontalLayout" >
+     <item>
+      <spacer name="horizontalSpacer" >
+       <property name="orientation" >
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0" >
+        <size>
+         <width>158</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QPushButton" name="bOk" >
+       <property name="minimumSize" >
+        <size>
+         <width>160</width>
+         <height>30</height>
+        </size>
+       </property>
+       <property name="maximumSize" >
+        <size>
+         <width>160</width>
+         <height>30</height>
+        </size>
+       </property>
+       <property name="toolTip" >
+        <string>validation de la saisie</string>
+       </property>
+       <property name="text" >
+        <string>&amp;Valider</string>
+       </property>
+       <property name="shortcut" >
+        <string>Shift+A, Alt+A, Alt+A, Alt+A</string>
+       </property>
+       <property name="autoDefault" >
+        <bool>true</bool>
+       </property>
+       <property name="default" >
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <spacer name="horizontalSpacer_2" >
+       <property name="orientation" >
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0" >
+        <size>
+         <width>148</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+    </layout>
    </item>
   </layout>
  </widget>
@@ -309,8 +348,6 @@ appuyé sur  le bouton Valider.</string>
   <tabstop>LBNouvCommande</tabstop>
   <tabstop>RBalpha</tabstop>
   <tabstop>bOk</tabstop>
-  <tabstop>bSup</tabstop>
-  <tabstop>bHelp</tabstop>
  </tabstops>
  <resources/>
  <connections/>
index a75ca407ce576e4f6fa6c9182a0f4cf0490d93c4..3c1d55d75975d2dbf7c7a292eacdaf65cf9eab32 100644 (file)
@@ -2,8 +2,8 @@
 
 # Form implementation generated from reading ui file 'desPlusieursBase.ui'
 #
-# Created: Tue Nov 18 17:37:25 2008
-#      by: PyQt4 UI code generator 4.4.2
+# Created: Fri Apr 24 15:50:34 2009
+#      by: PyQt4 UI code generator 4.4.3
 #
 # WARNING! All changes made in this file will be lost!
 
@@ -12,167 +12,169 @@ from PyQt4 import QtCore, QtGui
 class Ui_DPlusBase(object):
     def setupUi(self, DPlusBase):
         DPlusBase.setObjectName("DPlusBase")
-        DPlusBase.resize(552,480)
-        DPlusBase.setMinimumSize(QtCore.QSize(350,0))
-        self.gridlayout = QtGui.QGridLayout(DPlusBase)
-        self.gridlayout.setObjectName("gridlayout")
+        DPlusBase.resize(643, 728)
+        DPlusBase.setMinimumSize(QtCore.QSize(350, 0))
+        self.gridLayout_4 = QtGui.QGridLayout(DPlusBase)
+        self.gridLayout_4.setObjectName("gridLayout_4")
         self.tabuniqueinto = QtGui.QTabWidget(DPlusBase)
         self.tabuniqueinto.setObjectName("tabuniqueinto")
         self.Widget8 = QtGui.QWidget()
-        self.Widget8.setGeometry(QtCore.QRect(0,0,530,435))
         self.Widget8.setObjectName("Widget8")
-        self.gridlayout1 = QtGui.QGridLayout(self.Widget8)
-        self.gridlayout1.setObjectName("gridlayout1")
+        self.gridLayout_2 = QtGui.QGridLayout(self.Widget8)
+        self.gridLayout_2.setObjectName("gridLayout_2")
+        self.verticalLayout_2 = QtGui.QVBoxLayout()
+        self.verticalLayout_2.setObjectName("verticalLayout_2")
         self.textLabel1 = QtGui.QLabel(self.Widget8)
         self.textLabel1.setWordWrap(False)
         self.textLabel1.setObjectName("textLabel1")
-        self.gridlayout1.addWidget(self.textLabel1,0,0,1,1)
+        self.verticalLayout_2.addWidget(self.textLabel1)
         self.LBValeurs = QtGui.QListWidget(self.Widget8)
-        self.LBValeurs.setMinimumSize(QtCore.QSize(200,0))
+        self.LBValeurs.setMinimumSize(QtCore.QSize(200, 0))
         self.LBValeurs.setObjectName("LBValeurs")
-        self.gridlayout1.addWidget(self.LBValeurs,1,0,9,1)
-        spacerItem = QtGui.QSpacerItem(21,231,QtGui.QSizePolicy.Minimum,QtGui.QSizePolicy.Expanding)
-        self.gridlayout1.addItem(spacerItem,5,1,5,2)
-        spacerItem1 = QtGui.QSpacerItem(31,30,QtGui.QSizePolicy.Minimum,QtGui.QSizePolicy.Expanding)
-        self.gridlayout1.addItem(spacerItem1,0,1,1,2)
+        self.verticalLayout_2.addWidget(self.LBValeurs)
+        self.gridLayout_2.addLayout(self.verticalLayout_2, 0, 0, 1, 1)
+        self.verticalLayout_5 = QtGui.QVBoxLayout()
+        self.verticalLayout_5.setObjectName("verticalLayout_5")
+        self.gridLayout = QtGui.QGridLayout()
+        self.gridLayout.setObjectName("gridLayout")
+        self.horizontalLayout = QtGui.QHBoxLayout()
+        self.horizontalLayout.setObjectName("horizontalLayout")
+        self.textLabel1_2 = QtGui.QLabel(self.Widget8)
+        self.textLabel1_2.setMinimumSize(QtCore.QSize(61, 21))
+        self.textLabel1_2.setMaximumSize(QtCore.QSize(61, 21))
+        self.textLabel1_2.setWordWrap(False)
+        self.textLabel1_2.setObjectName("textLabel1_2")
+        self.horizontalLayout.addWidget(self.textLabel1_2)
+        spacerItem = QtGui.QSpacerItem(168, 18, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
+        self.horizontalLayout.addItem(spacerItem)
+        self.gridLayout.addLayout(self.horizontalLayout, 0, 0, 1, 3)
         self.BAjout1Val = QtGui.QToolButton(self.Widget8)
-        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed,QtGui.QSizePolicy.Fixed)
+        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.BAjout1Val.sizePolicy().hasHeightForWidth())
         self.BAjout1Val.setSizePolicy(sizePolicy)
-        self.BAjout1Val.setMinimumSize(QtCore.QSize(40,30))
+        self.BAjout1Val.setMinimumSize(QtCore.QSize(40, 30))
         icon = QtGui.QIcon()
-        icon.addPixmap(QtGui.QPixmap("../../EficasV1/Editeur/icons/arrow_left.gif"),QtGui.QIcon.Normal,QtGui.QIcon.Off)
+        icon.addPixmap(QtGui.QPixmap("../Editeur/icons/arrow_left.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
         self.BAjout1Val.setIcon(icon)
         self.BAjout1Val.setObjectName("BAjout1Val")
-        self.gridlayout1.addWidget(self.BAjout1Val,2,1,1,2)
-        spacerItem2 = QtGui.QSpacerItem(150,20,QtGui.QSizePolicy.Expanding,QtGui.QSizePolicy.Minimum)
-        self.gridlayout1.addItem(spacerItem2,8,2,1,3)
-        self.vboxlayout = QtGui.QVBoxLayout()
-        self.vboxlayout.setObjectName("vboxlayout")
-        self.bParam = QtGui.QPushButton(self.Widget8)
-        self.bParam.setMinimumSize(QtCore.QSize(0,30))
-        self.bParam.setAutoDefault(True)
-        self.bParam.setObjectName("bParam")
-        self.vboxlayout.addWidget(self.bParam)
-        self.bImport = QtGui.QPushButton(self.Widget8)
-        self.bImport.setMinimumSize(QtCore.QSize(0,30))
-        self.bImport.setAutoDefault(True)
-        self.bImport.setObjectName("bImport")
-        self.vboxlayout.addWidget(self.bImport)
-        self.gridlayout1.addLayout(self.vboxlayout,7,5,2,1)
-        spacerItem3 = QtGui.QSpacerItem(31,50,QtGui.QSizePolicy.Minimum,QtGui.QSizePolicy.Expanding)
-        self.gridlayout1.addItem(spacerItem3,6,5,1,1)
-        spacerItem4 = QtGui.QSpacerItem(31,50,QtGui.QSizePolicy.Minimum,QtGui.QSizePolicy.Expanding)
-        self.gridlayout1.addItem(spacerItem4,9,5,1,1)
-        self.BSalome = QtGui.QToolButton(self.Widget8)
-        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed,QtGui.QSizePolicy.Fixed)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.BSalome.sizePolicy().hasHeightForWidth())
-        self.BSalome.setSizePolicy(sizePolicy)
-        self.BSalome.setMinimumSize(QtCore.QSize(40,30))
-        icon = QtGui.QIcon()
-        icon.addPixmap(QtGui.QPixmap("image240.gif"),QtGui.QIcon.Normal,QtGui.QIcon.Off)
-        self.BSalome.setIcon(icon)
-        self.BSalome.setObjectName("BSalome")
-        self.gridlayout1.addWidget(self.BSalome,4,3,1,1)
-        self.BView2D = QtGui.QPushButton(self.Widget8)
-        self.BView2D.setMinimumSize(QtCore.QSize(120,30))
-        self.BView2D.setObjectName("BView2D")
-        self.gridlayout1.addWidget(self.BView2D,4,4,1,2)
-        self.hboxlayout = QtGui.QHBoxLayout()
-        self.hboxlayout.setObjectName("hboxlayout")
-        self.textLabel1_2 = QtGui.QLabel(self.Widget8)
-        self.textLabel1_2.setWordWrap(False)
-        self.textLabel1_2.setObjectName("textLabel1_2")
-        self.hboxlayout.addWidget(self.textLabel1_2)
-        spacerItem5 = QtGui.QSpacerItem(111,20,QtGui.QSizePolicy.Expanding,QtGui.QSizePolicy.Minimum)
-        self.hboxlayout.addItem(spacerItem5)
-        self.gridlayout1.addLayout(self.hboxlayout,0,3,2,3)
+        self.gridLayout.addWidget(self.BAjout1Val, 1, 0, 1, 1)
         self.LEValeur = QtGui.QLineEdit(self.Widget8)
-        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Minimum,QtGui.QSizePolicy.Minimum)
+        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Minimum)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.LEValeur.sizePolicy().hasHeightForWidth())
         self.LEValeur.setSizePolicy(sizePolicy)
-        self.LEValeur.setMinimumSize(QtCore.QSize(220,30))
+        self.LEValeur.setMinimumSize(QtCore.QSize(220, 30))
         self.LEValeur.setObjectName("LEValeur")
-        self.gridlayout1.addWidget(self.LEValeur,2,3,2,3)
+        self.gridLayout.addWidget(self.LEValeur, 1, 1, 1, 2)
         self.BSup1Val = QtGui.QToolButton(self.Widget8)
-        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed,QtGui.QSizePolicy.Fixed)
+        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.BSup1Val.sizePolicy().hasHeightForWidth())
         self.BSup1Val.setSizePolicy(sizePolicy)
-        self.BSup1Val.setMinimumSize(QtCore.QSize(40,30))
-        icon = QtGui.QIcon()
-        icon.addPixmap(QtGui.QPixmap("../../EficasV1/Editeur/icons/arrow_right.gif"),QtGui.QIcon.Normal,QtGui.QIcon.Off)
-        self.BSup1Val.setIcon(icon)
+        self.BSup1Val.setMinimumSize(QtCore.QSize(40, 30))
+        icon1 = QtGui.QIcon()
+        icon1.addPixmap(QtGui.QPixmap("../../EficasV1/Editeur/icons/arrow_right.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+        self.BSup1Val.setIcon(icon1)
         self.BSup1Val.setObjectName("BSup1Val")
-        self.gridlayout1.addWidget(self.BSup1Val,3,1,2,2)
+        self.gridLayout.addWidget(self.BSup1Val, 2, 0, 1, 1)
+        self.BSalome = QtGui.QToolButton(self.Widget8)
+        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.BSalome.sizePolicy().hasHeightForWidth())
+        self.BSalome.setSizePolicy(sizePolicy)
+        self.BSalome.setMinimumSize(QtCore.QSize(40, 30))
+        icon2 = QtGui.QIcon()
+        icon2.addPixmap(QtGui.QPixmap("image240.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+        self.BSalome.setIcon(icon2)
+        self.BSalome.setObjectName("BSalome")
+        self.gridLayout.addWidget(self.BSalome, 2, 1, 1, 1)
+        self.BView2D = QtGui.QPushButton(self.Widget8)
+        self.BView2D.setMinimumSize(QtCore.QSize(120, 30))
+        self.BView2D.setObjectName("BView2D")
+        self.gridLayout.addWidget(self.BView2D, 2, 2, 1, 1)
+        self.verticalLayout_5.addLayout(self.gridLayout)
+        spacerItem1 = QtGui.QSpacerItem(20, 158, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding)
+        self.verticalLayout_5.addItem(spacerItem1)
+        self.verticalLayout_4 = QtGui.QVBoxLayout()
+        self.verticalLayout_4.setObjectName("verticalLayout_4")
+        self.horizontalLayout_2 = QtGui.QHBoxLayout()
+        self.horizontalLayout_2.setObjectName("horizontalLayout_2")
+        spacerItem2 = QtGui.QSpacerItem(150, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
+        self.horizontalLayout_2.addItem(spacerItem2)
+        self.verticalLayout = QtGui.QVBoxLayout()
+        self.verticalLayout.setObjectName("verticalLayout")
+        self.bParam = QtGui.QPushButton(self.Widget8)
+        self.bParam.setMinimumSize(QtCore.QSize(100, 30))
+        self.bParam.setMaximumSize(QtCore.QSize(100, 30))
+        self.bParam.setAutoDefault(True)
+        self.bParam.setObjectName("bParam")
+        self.verticalLayout.addWidget(self.bParam)
+        self.bImport = QtGui.QPushButton(self.Widget8)
+        self.bImport.setMinimumSize(QtCore.QSize(100, 30))
+        self.bImport.setMaximumSize(QtCore.QSize(100, 30))
+        self.bImport.setAutoDefault(True)
+        self.bImport.setObjectName("bImport")
+        self.verticalLayout.addWidget(self.bImport)
+        self.horizontalLayout_2.addLayout(self.verticalLayout)
+        self.verticalLayout_4.addLayout(self.horizontalLayout_2)
+        self.verticalLayout_3 = QtGui.QVBoxLayout()
+        self.verticalLayout_3.setObjectName("verticalLayout_3")
+        spacerItem3 = QtGui.QSpacerItem(265, 48, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding)
+        self.verticalLayout_3.addItem(spacerItem3)
         self.Commentaire = QtGui.QLabel(self.Widget8)
-        self.Commentaire.setMinimumSize(QtCore.QSize(0,60))
-        self.Commentaire.setWordWrap(False)
+        self.Commentaire.setMinimumSize(QtCore.QSize(251, 21))
         self.Commentaire.setObjectName("Commentaire")
-        self.gridlayout1.addWidget(self.Commentaire,5,3,1,3)
-        self.hboxlayout1 = QtGui.QHBoxLayout()
-        self.hboxlayout1.setObjectName("hboxlayout1")
-        self.bSup = QtGui.QPushButton(self.Widget8)
-        self.bSup.setMinimumSize(QtCore.QSize(0,30))
-        self.bSup.setAutoDefault(True)
-        self.bSup.setObjectName("bSup")
-        self.hboxlayout1.addWidget(self.bSup)
+        self.verticalLayout_3.addWidget(self.Commentaire)
+        spacerItem4 = QtGui.QSpacerItem(265, 48, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding)
+        self.verticalLayout_3.addItem(spacerItem4)
+        self.verticalLayout_4.addLayout(self.verticalLayout_3)
+        self.horizontalLayout_3 = QtGui.QHBoxLayout()
+        self.horizontalLayout_3.setObjectName("horizontalLayout_3")
+        spacerItem5 = QtGui.QSpacerItem(118, 27, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
+        self.horizontalLayout_3.addItem(spacerItem5)
         self.bOk = QtGui.QPushButton(self.Widget8)
-        self.bOk.setMinimumSize(QtCore.QSize(0,30))
+        self.bOk.setMinimumSize(QtCore.QSize(160, 30))
+        self.bOk.setMaximumSize(QtCore.QSize(160, 30))
         self.bOk.setAutoDefault(True)
-        self.bOk.setDefault(True)
+        self.bOk.setDefault(False)
         self.bOk.setObjectName("bOk")
-        self.hboxlayout1.addWidget(self.bOk)
-        self.bHelp = QtGui.QPushButton(self.Widget8)
-        self.bHelp.setMinimumSize(QtCore.QSize(0,30))
-        self.bHelp.setAutoDefault(True)
-        self.bHelp.setObjectName("bHelp")
-        self.hboxlayout1.addWidget(self.bHelp)
-        self.gridlayout1.addLayout(self.hboxlayout1,10,0,1,6)
-        self.tabuniqueinto.addTab(self.Widget8,"")
-        self.gridlayout.addWidget(self.tabuniqueinto,0,0,1,1)
+        self.horizontalLayout_3.addWidget(self.bOk)
+        self.verticalLayout_4.addLayout(self.horizontalLayout_3)
+        self.verticalLayout_5.addLayout(self.verticalLayout_4)
+        self.gridLayout_2.addLayout(self.verticalLayout_5, 0, 1, 1, 1)
+        self.tabuniqueinto.addTab(self.Widget8, "")
+        self.gridLayout_4.addWidget(self.tabuniqueinto, 0, 0, 1, 1)
 
         self.retranslateUi(DPlusBase)
         QtCore.QMetaObject.connectSlotsByName(DPlusBase)
-        DPlusBase.setTabOrder(self.LEValeur,self.tabuniqueinto)
-        DPlusBase.setTabOrder(self.tabuniqueinto,self.bSup)
-        DPlusBase.setTabOrder(self.bSup,self.bOk)
-        DPlusBase.setTabOrder(self.bOk,self.bHelp)
-        DPlusBase.setTabOrder(self.bHelp,self.bParam)
-        DPlusBase.setTabOrder(self.bParam,self.bImport)
-        DPlusBase.setTabOrder(self.bImport,self.LBValeurs)
-        DPlusBase.setTabOrder(self.LBValeurs,self.BView2D)
+        DPlusBase.setTabOrder(self.LEValeur, self.tabuniqueinto)
+        DPlusBase.setTabOrder(self.tabuniqueinto, self.bOk)
+        DPlusBase.setTabOrder(self.bOk, self.bImport)
+        DPlusBase.setTabOrder(self.bImport, self.LBValeurs)
+        DPlusBase.setTabOrder(self.LBValeurs, self.BView2D)
 
     def retranslateUi(self, DPlusBase):
         DPlusBase.setWindowTitle(QtGui.QApplication.translate("DPlusBase", "DUnIn", None, QtGui.QApplication.UnicodeUTF8))
         self.textLabel1.setText(QtGui.QApplication.translate("DPlusBase", "<u><font size=\"+1\">Valeur(s) actuelle(s)</font></u>", None, QtGui.QApplication.UnicodeUTF8))
+        self.textLabel1_2.setText(QtGui.QApplication.translate("DPlusBase", "<font size=\"+1\">Valeur</font>", None, QtGui.QApplication.UnicodeUTF8))
         self.BAjout1Val.setToolTip(QtGui.QApplication.translate("DPlusBase", "ajoute la valeur saisie sous l occurence selectionnée (en fin de liste si il n y a pas de selection)", None, QtGui.QApplication.UnicodeUTF8))
+        self.BSup1Val.setToolTip(QtGui.QApplication.translate("DPlusBase", "enleve l occurence selectionnee", None, QtGui.QApplication.UnicodeUTF8))
+        self.BSalome.setToolTip(QtGui.QApplication.translate("DPlusBase", "ajoute la valeur saisie sous l occurence selectionnée (en fin de liste si il n y a pas de selection)", None, QtGui.QApplication.UnicodeUTF8))
+        self.BView2D.setText(QtGui.QApplication.translate("DPlusBase", "Visualiser", None, QtGui.QApplication.UnicodeUTF8))
         self.bParam.setToolTip(QtGui.QApplication.translate("DPlusBase", "suppression du mot clef", None, QtGui.QApplication.UnicodeUTF8))
         self.bParam.setText(QtGui.QApplication.translate("DPlusBase", "&Parametres", None, QtGui.QApplication.UnicodeUTF8))
         self.bParam.setShortcut(QtGui.QApplication.translate("DPlusBase", "Alt+P", None, QtGui.QApplication.UnicodeUTF8))
         self.bImport.setToolTip(QtGui.QApplication.translate("DPlusBase", "suppression du mot clef", None, QtGui.QApplication.UnicodeUTF8))
         self.bImport.setText(QtGui.QApplication.translate("DPlusBase", "&Importer", None, QtGui.QApplication.UnicodeUTF8))
         self.bImport.setShortcut(QtGui.QApplication.translate("DPlusBase", "Alt+I", None, QtGui.QApplication.UnicodeUTF8))
-        self.BSalome.setToolTip(QtGui.QApplication.translate("DPlusBase", "ajoute la valeur saisie sous l occurence selectionnée (en fin de liste si il n y a pas de selection)", None, QtGui.QApplication.UnicodeUTF8))
-        self.BView2D.setText(QtGui.QApplication.translate("DPlusBase", "Visualiser", None, QtGui.QApplication.UnicodeUTF8))
-        self.textLabel1_2.setText(QtGui.QApplication.translate("DPlusBase", "<font size=\"+1\">Valeur</font>", None, QtGui.QApplication.UnicodeUTF8))
-        self.BSup1Val.setToolTip(QtGui.QApplication.translate("DPlusBase", "enleve l occurence selectionnee", None, QtGui.QApplication.UnicodeUTF8))
-        self.bSup.setToolTip(QtGui.QApplication.translate("DPlusBase", "suppression du mot clef", None, QtGui.QApplication.UnicodeUTF8))
-        self.bSup.setText(QtGui.QApplication.translate("DPlusBase", "&Supprimer", None, QtGui.QApplication.UnicodeUTF8))
-        self.bSup.setShortcut(QtGui.QApplication.translate("DPlusBase", "Alt+S", None, QtGui.QApplication.UnicodeUTF8))
         self.bOk.setToolTip(QtGui.QApplication.translate("DPlusBase", "validation de la saisie", None, QtGui.QApplication.UnicodeUTF8))
         self.bOk.setText(QtGui.QApplication.translate("DPlusBase", "&Valider", None, QtGui.QApplication.UnicodeUTF8))
         self.bOk.setShortcut(QtGui.QApplication.translate("DPlusBase", "Shift+A, Alt+A, Alt+A, Alt+A", None, QtGui.QApplication.UnicodeUTF8))
-        self.bHelp.setToolTip(QtGui.QApplication.translate("DPlusBase", "affichage documentation aster", None, QtGui.QApplication.UnicodeUTF8))
-        self.bHelp.setText(QtGui.QApplication.translate("DPlusBase", "&Documentation", None, QtGui.QApplication.UnicodeUTF8))
-        self.bHelp.setShortcut(QtGui.QApplication.translate("DPlusBase", "Alt+D", None, QtGui.QApplication.UnicodeUTF8))
         self.tabuniqueinto.setTabText(self.tabuniqueinto.indexOf(self.Widget8), QtGui.QApplication.translate("DPlusBase", "Saisir Valeur", None, QtGui.QApplication.UnicodeUTF8))
 
 
index 6ad5312903f31d26a91ce7a4a267d3ad047c22d2..265ee2070c59eb0c2c6c1a75fed23fa2c84e2201 100644 (file)
@@ -5,8 +5,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>552</width>
-    <height>480</height>
+    <width>643</width>
+    <height>728</height>
    </rect>
   </property>
   <property name="minimumSize" >
   <property name="windowTitle" >
    <string>DUnIn</string>
   </property>
-  <layout class="QGridLayout" >
+  <layout class="QGridLayout" name="gridLayout_4" >
    <item row="0" column="0" >
     <widget class="QTabWidget" name="tabuniqueinto" >
      <widget class="QWidget" name="Widget8" >
-      <property name="geometry" >
-       <rect>
-        <x>0</x>
-        <y>0</y>
-        <width>530</width>
-        <height>435</height>
-       </rect>
-      </property>
       <attribute name="title" >
        <string>Saisir Valeur</string>
       </attribute>
-      <layout class="QGridLayout" >
+      <layout class="QGridLayout" name="gridLayout_2" >
        <item row="0" column="0" >
-        <widget class="QLabel" name="textLabel1" >
-         <property name="text" >
-          <string>&lt;u>&lt;font size="+1">Valeur(s) actuelle(s)&lt;/font>&lt;/u></string>
-         </property>
-         <property name="wordWrap" >
-          <bool>false</bool>
-         </property>
-        </widget>
-       </item>
-       <item rowspan="9" row="1" column="0" >
-        <widget class="QListWidget" name="LBValeurs" >
-         <property name="minimumSize" >
-          <size>
-           <width>200</width>
-           <height>0</height>
-          </size>
-         </property>
-        </widget>
-       </item>
-       <item rowspan="5" row="5" column="1" colspan="2" >
-        <spacer name="spacer4" >
-         <property name="orientation" >
-          <enum>Qt::Vertical</enum>
-         </property>
-         <property name="sizeType" >
-          <enum>QSizePolicy::Expanding</enum>
-         </property>
-         <property name="sizeHint" stdset="0" >
-          <size>
-           <width>21</width>
-           <height>231</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
-       <item row="0" column="1" colspan="2" >
-        <spacer name="spacer3_3" >
-         <property name="orientation" >
-          <enum>Qt::Vertical</enum>
-         </property>
-         <property name="sizeType" >
-          <enum>QSizePolicy::Expanding</enum>
-         </property>
-         <property name="sizeHint" stdset="0" >
-          <size>
-           <width>31</width>
-           <height>30</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
-       <item row="2" column="1" colspan="2" >
-        <widget class="QToolButton" name="BAjout1Val" >
-         <property name="sizePolicy" >
-          <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="minimumSize" >
-          <size>
-           <width>40</width>
-           <height>30</height>
-          </size>
-         </property>
-         <property name="toolTip" >
-          <string>ajoute la valeur saisie sous l occurence selectionnée (en fin de liste si il n y a pas de selection)</string>
-         </property>
-         <property name="text" >
-          <string/>
-         </property>
-         <property name="icon" >
-          <iconset>
-           <normaloff>../../EficasV1/Editeur/icons/arrow_left.gif</normaloff>../../EficasV1/Editeur/icons/arrow_left.gif</iconset>
-         </property>
-        </widget>
-       </item>
-       <item row="8" column="2" colspan="3" >
-        <spacer name="spacer5" >
-         <property name="orientation" >
-          <enum>Qt::Horizontal</enum>
-         </property>
-         <property name="sizeType" >
-          <enum>QSizePolicy::Expanding</enum>
-         </property>
-         <property name="sizeHint" stdset="0" >
-          <size>
-           <width>150</width>
-           <height>20</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
-       <item rowspan="2" row="7" column="5" >
-        <layout class="QVBoxLayout" >
+        <layout class="QVBoxLayout" name="verticalLayout_2" >
          <item>
-          <widget class="QPushButton" name="bParam" >
-           <property name="minimumSize" >
-            <size>
-             <width>0</width>
-             <height>30</height>
-            </size>
-           </property>
-           <property name="toolTip" >
-            <string>suppression du mot clef</string>
-           </property>
+          <widget class="QLabel" name="textLabel1" >
            <property name="text" >
-            <string>&amp;Parametres</string>
-           </property>
-           <property name="shortcut" >
-            <string>Alt+P</string>
+            <string>&lt;u>&lt;font size="+1">Valeur(s) actuelle(s)&lt;/font>&lt;/u></string>
            </property>
-           <property name="autoDefault" >
-            <bool>true</bool>
+           <property name="wordWrap" >
+            <bool>false</bool>
            </property>
           </widget>
          </item>
          <item>
-          <widget class="QPushButton" name="bImport" >
+          <widget class="QListWidget" name="LBValeurs" >
            <property name="minimumSize" >
             <size>
-             <width>0</width>
-             <height>30</height>
+             <width>200</width>
+             <height>0</height>
             </size>
            </property>
-           <property name="toolTip" >
-            <string>suppression du mot clef</string>
-           </property>
-           <property name="text" >
-            <string>&amp;Importer</string>
-           </property>
-           <property name="shortcut" >
-            <string>Alt+I</string>
-           </property>
-           <property name="autoDefault" >
-            <bool>true</bool>
-           </property>
           </widget>
          </item>
         </layout>
        </item>
-       <item row="6" column="5" >
-        <spacer name="spacer3" >
-         <property name="orientation" >
-          <enum>Qt::Vertical</enum>
-         </property>
-         <property name="sizeType" >
-          <enum>QSizePolicy::Expanding</enum>
-         </property>
-         <property name="sizeHint" stdset="0" >
-          <size>
-           <width>31</width>
-           <height>50</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
-       <item row="9" column="5" >
-        <spacer name="spacer3_2" >
-         <property name="orientation" >
-          <enum>Qt::Vertical</enum>
-         </property>
-         <property name="sizeType" >
-          <enum>QSizePolicy::Expanding</enum>
-         </property>
-         <property name="sizeHint" stdset="0" >
-          <size>
-           <width>31</width>
-           <height>50</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
-       <item row="4" column="3" >
-        <widget class="QToolButton" name="BSalome" >
-         <property name="sizePolicy" >
-          <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="minimumSize" >
-          <size>
-           <width>40</width>
-           <height>30</height>
-          </size>
-         </property>
-         <property name="toolTip" >
-          <string>ajoute la valeur saisie sous l occurence selectionnée (en fin de liste si il n y a pas de selection)</string>
-         </property>
-         <property name="text" >
-          <string/>
-         </property>
-         <property name="icon" >
-          <iconset>
-           <normaloff>image240.gif</normaloff>image240.gif</iconset>
-         </property>
-        </widget>
-       </item>
-       <item row="4" column="4" colspan="2" >
-        <widget class="QPushButton" name="BView2D" >
-         <property name="minimumSize" >
-          <size>
-           <width>120</width>
-           <height>30</height>
-          </size>
-         </property>
-         <property name="text" >
-          <string>Visualiser</string>
-         </property>
-        </widget>
-       </item>
-       <item rowspan="2" row="0" column="3" colspan="3" >
-        <layout class="QHBoxLayout" >
+       <item row="0" column="1" >
+        <layout class="QVBoxLayout" name="verticalLayout_5" >
          <item>
-          <widget class="QLabel" name="textLabel1_2" >
-           <property name="text" >
-            <string>&lt;font size="+1">Valeur&lt;/font></string>
-           </property>
-           <property name="wordWrap" >
-            <bool>false</bool>
-           </property>
-          </widget>
+          <layout class="QGridLayout" name="gridLayout" >
+           <item row="0" column="0" colspan="3" >
+            <layout class="QHBoxLayout" name="horizontalLayout" >
+             <item>
+              <widget class="QLabel" name="textLabel1_2" >
+               <property name="minimumSize" >
+                <size>
+                 <width>61</width>
+                 <height>21</height>
+                </size>
+               </property>
+               <property name="maximumSize" >
+                <size>
+                 <width>61</width>
+                 <height>21</height>
+                </size>
+               </property>
+               <property name="text" >
+                <string>&lt;font size="+1">Valeur&lt;/font></string>
+               </property>
+               <property name="wordWrap" >
+                <bool>false</bool>
+               </property>
+              </widget>
+             </item>
+             <item>
+              <spacer name="spacer6" >
+               <property name="orientation" >
+                <enum>Qt::Horizontal</enum>
+               </property>
+               <property name="sizeType" >
+                <enum>QSizePolicy::Expanding</enum>
+               </property>
+               <property name="sizeHint" stdset="0" >
+                <size>
+                 <width>168</width>
+                 <height>18</height>
+                </size>
+               </property>
+              </spacer>
+             </item>
+            </layout>
+           </item>
+           <item row="1" column="0" >
+            <widget class="QToolButton" name="BAjout1Val" >
+             <property name="sizePolicy" >
+              <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+               <horstretch>0</horstretch>
+               <verstretch>0</verstretch>
+              </sizepolicy>
+             </property>
+             <property name="minimumSize" >
+              <size>
+               <width>40</width>
+               <height>30</height>
+              </size>
+             </property>
+             <property name="toolTip" >
+              <string>ajoute la valeur saisie sous l occurence selectionnée (en fin de liste si il n y a pas de selection)</string>
+             </property>
+             <property name="text" >
+              <string/>
+             </property>
+             <property name="icon" >
+              <iconset>
+               <normaloff>../Editeur/icons/arrow_left.png</normaloff>../Editeur/icons/arrow_left.png</iconset>
+             </property>
+            </widget>
+           </item>
+           <item row="1" column="1" colspan="2" >
+            <widget class="QLineEdit" name="LEValeur" >
+             <property name="sizePolicy" >
+              <sizepolicy vsizetype="Minimum" hsizetype="Minimum" >
+               <horstretch>0</horstretch>
+               <verstretch>0</verstretch>
+              </sizepolicy>
+             </property>
+             <property name="minimumSize" >
+              <size>
+               <width>220</width>
+               <height>30</height>
+              </size>
+             </property>
+            </widget>
+           </item>
+           <item row="2" column="0" >
+            <widget class="QToolButton" name="BSup1Val" >
+             <property name="sizePolicy" >
+              <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+               <horstretch>0</horstretch>
+               <verstretch>0</verstretch>
+              </sizepolicy>
+             </property>
+             <property name="minimumSize" >
+              <size>
+               <width>40</width>
+               <height>30</height>
+              </size>
+             </property>
+             <property name="toolTip" >
+              <string>enleve l occurence selectionnee</string>
+             </property>
+             <property name="text" >
+              <string/>
+             </property>
+             <property name="icon" >
+              <iconset>
+               <normaloff>../../EficasV1/Editeur/icons/arrow_right.png</normaloff>../../EficasV1/Editeur/icons/arrow_right.png</iconset>
+             </property>
+            </widget>
+           </item>
+           <item row="2" column="1" >
+            <widget class="QToolButton" name="BSalome" >
+             <property name="sizePolicy" >
+              <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+               <horstretch>0</horstretch>
+               <verstretch>0</verstretch>
+              </sizepolicy>
+             </property>
+             <property name="minimumSize" >
+              <size>
+               <width>40</width>
+               <height>30</height>
+              </size>
+             </property>
+             <property name="toolTip" >
+              <string>ajoute la valeur saisie sous l occurence selectionnée (en fin de liste si il n y a pas de selection)</string>
+             </property>
+             <property name="text" >
+              <string/>
+             </property>
+             <property name="icon" >
+              <iconset>
+               <normaloff>image240.png</normaloff>image240.png</iconset>
+             </property>
+            </widget>
+           </item>
+           <item row="2" column="2" >
+            <widget class="QPushButton" name="BView2D" >
+             <property name="minimumSize" >
+              <size>
+               <width>120</width>
+               <height>30</height>
+              </size>
+             </property>
+             <property name="text" >
+              <string>Visualiser</string>
+             </property>
+            </widget>
+           </item>
+          </layout>
          </item>
          <item>
-          <spacer name="spacer6" >
+          <spacer name="verticalSpacer" >
            <property name="orientation" >
-            <enum>Qt::Horizontal</enum>
-           </property>
-           <property name="sizeType" >
-            <enum>QSizePolicy::Expanding</enum>
+            <enum>Qt::Vertical</enum>
            </property>
            <property name="sizeHint" stdset="0" >
             <size>
-             <width>111</width>
-             <height>20</height>
+             <width>20</width>
+             <height>158</height>
             </size>
            </property>
           </spacer>
          </item>
-        </layout>
-       </item>
-       <item rowspan="2" row="2" column="3" colspan="3" >
-        <widget class="QLineEdit" name="LEValeur" >
-         <property name="sizePolicy" >
-          <sizepolicy vsizetype="Minimum" hsizetype="Minimum" >
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="minimumSize" >
-          <size>
-           <width>220</width>
-           <height>30</height>
-          </size>
-         </property>
-        </widget>
-       </item>
-       <item rowspan="2" row="3" column="1" colspan="2" >
-        <widget class="QToolButton" name="BSup1Val" >
-         <property name="sizePolicy" >
-          <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="minimumSize" >
-          <size>
-           <width>40</width>
-           <height>30</height>
-          </size>
-         </property>
-         <property name="toolTip" >
-          <string>enleve l occurence selectionnee</string>
-         </property>
-         <property name="text" >
-          <string/>
-         </property>
-         <property name="icon" >
-          <iconset>
-           <normaloff>../../EficasV1/Editeur/icons/arrow_right.gif</normaloff>../../EficasV1/Editeur/icons/arrow_right.gif</iconset>
-         </property>
-        </widget>
-       </item>
-       <item row="5" column="3" colspan="3" >
-        <widget class="QLabel" name="Commentaire" >
-         <property name="minimumSize" >
-          <size>
-           <width>0</width>
-           <height>60</height>
-          </size>
-         </property>
-         <property name="text" >
-          <string/>
-         </property>
-         <property name="wordWrap" >
-          <bool>false</bool>
-         </property>
-        </widget>
-       </item>
-       <item row="10" column="0" colspan="6" >
-        <layout class="QHBoxLayout" >
-         <item>
-          <widget class="QPushButton" name="bSup" >
-           <property name="minimumSize" >
-            <size>
-             <width>0</width>
-             <height>30</height>
-            </size>
-           </property>
-           <property name="toolTip" >
-            <string>suppression du mot clef</string>
-           </property>
-           <property name="text" >
-            <string>&amp;Supprimer</string>
-           </property>
-           <property name="shortcut" >
-            <string>Alt+S</string>
-           </property>
-           <property name="autoDefault" >
-            <bool>true</bool>
-           </property>
-          </widget>
-         </item>
          <item>
-          <widget class="QPushButton" name="bOk" >
-           <property name="minimumSize" >
-            <size>
-             <width>0</width>
-             <height>30</height>
-            </size>
-           </property>
-           <property name="toolTip" >
-            <string>validation de la saisie</string>
-           </property>
-           <property name="text" >
-            <string>&amp;Valider</string>
-           </property>
-           <property name="shortcut" >
-            <string>Shift+A, Alt+A, Alt+A, Alt+A</string>
-           </property>
-           <property name="autoDefault" >
-            <bool>true</bool>
-           </property>
-           <property name="default" >
-            <bool>true</bool>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QPushButton" name="bHelp" >
-           <property name="minimumSize" >
-            <size>
-             <width>0</width>
-             <height>30</height>
-            </size>
-           </property>
-           <property name="toolTip" >
-            <string>affichage documentation aster</string>
-           </property>
-           <property name="text" >
-            <string>&amp;Documentation</string>
-           </property>
-           <property name="shortcut" >
-            <string>Alt+D</string>
-           </property>
-           <property name="autoDefault" >
-            <bool>true</bool>
-           </property>
-          </widget>
+          <layout class="QVBoxLayout" name="verticalLayout_4" >
+           <item>
+            <layout class="QHBoxLayout" name="horizontalLayout_2" >
+             <item>
+              <spacer name="spacer5" >
+               <property name="orientation" >
+                <enum>Qt::Horizontal</enum>
+               </property>
+               <property name="sizeType" >
+                <enum>QSizePolicy::Expanding</enum>
+               </property>
+               <property name="sizeHint" stdset="0" >
+                <size>
+                 <width>150</width>
+                 <height>20</height>
+                </size>
+               </property>
+              </spacer>
+             </item>
+             <item>
+              <layout class="QVBoxLayout" name="verticalLayout" >
+               <item>
+                <widget class="QPushButton" name="bParam" >
+                 <property name="minimumSize" >
+                  <size>
+                   <width>100</width>
+                   <height>30</height>
+                  </size>
+                 </property>
+                 <property name="maximumSize" >
+                  <size>
+                   <width>100</width>
+                   <height>30</height>
+                  </size>
+                 </property>
+                 <property name="toolTip" >
+                  <string>suppression du mot clef</string>
+                 </property>
+                 <property name="text" >
+                  <string>&amp;Parametres</string>
+                 </property>
+                 <property name="shortcut" >
+                  <string>Alt+P</string>
+                 </property>
+                 <property name="autoDefault" >
+                  <bool>true</bool>
+                 </property>
+                </widget>
+               </item>
+               <item>
+                <widget class="QPushButton" name="bImport" >
+                 <property name="minimumSize" >
+                  <size>
+                   <width>100</width>
+                   <height>30</height>
+                  </size>
+                 </property>
+                 <property name="maximumSize" >
+                  <size>
+                   <width>100</width>
+                   <height>30</height>
+                  </size>
+                 </property>
+                 <property name="toolTip" >
+                  <string>suppression du mot clef</string>
+                 </property>
+                 <property name="text" >
+                  <string>&amp;Importer</string>
+                 </property>
+                 <property name="shortcut" >
+                  <string>Alt+I</string>
+                 </property>
+                 <property name="autoDefault" >
+                  <bool>true</bool>
+                 </property>
+                </widget>
+               </item>
+              </layout>
+             </item>
+            </layout>
+           </item>
+           <item>
+            <layout class="QVBoxLayout" name="verticalLayout_3" >
+             <item>
+              <spacer name="spacer3_3" >
+               <property name="orientation" >
+                <enum>Qt::Vertical</enum>
+               </property>
+               <property name="sizeType" >
+                <enum>QSizePolicy::Expanding</enum>
+               </property>
+               <property name="sizeHint" stdset="0" >
+                <size>
+                 <width>265</width>
+                 <height>48</height>
+                </size>
+               </property>
+              </spacer>
+             </item>
+             <item>
+              <widget class="QLabel" name="Commentaire" >
+               <property name="minimumSize" >
+                <size>
+                 <width>251</width>
+                 <height>21</height>
+                </size>
+               </property>
+               <property name="text" >
+                <string/>
+               </property>
+              </widget>
+             </item>
+             <item>
+              <spacer name="spacer3_2" >
+               <property name="orientation" >
+                <enum>Qt::Vertical</enum>
+               </property>
+               <property name="sizeType" >
+                <enum>QSizePolicy::Expanding</enum>
+               </property>
+               <property name="sizeHint" stdset="0" >
+                <size>
+                 <width>265</width>
+                 <height>48</height>
+                </size>
+               </property>
+              </spacer>
+             </item>
+            </layout>
+           </item>
+           <item>
+            <layout class="QHBoxLayout" name="horizontalLayout_3" >
+             <item>
+              <spacer name="horizontalSpacer_2" >
+               <property name="orientation" >
+                <enum>Qt::Horizontal</enum>
+               </property>
+               <property name="sizeHint" stdset="0" >
+                <size>
+                 <width>118</width>
+                 <height>27</height>
+                </size>
+               </property>
+              </spacer>
+             </item>
+             <item>
+              <widget class="QPushButton" name="bOk" >
+               <property name="minimumSize" >
+                <size>
+                 <width>160</width>
+                 <height>30</height>
+                </size>
+               </property>
+               <property name="maximumSize" >
+                <size>
+                 <width>160</width>
+                 <height>30</height>
+                </size>
+               </property>
+               <property name="toolTip" >
+                <string>validation de la saisie</string>
+               </property>
+               <property name="text" >
+                <string>&amp;Valider</string>
+               </property>
+               <property name="shortcut" >
+                <string>Shift+A, Alt+A, Alt+A, Alt+A</string>
+               </property>
+               <property name="autoDefault" >
+                <bool>true</bool>
+               </property>
+               <property name="default" >
+                <bool>false</bool>
+               </property>
+              </widget>
+             </item>
+            </layout>
+           </item>
+          </layout>
          </item>
         </layout>
        </item>
  <tabstops>
   <tabstop>LEValeur</tabstop>
   <tabstop>tabuniqueinto</tabstop>
-  <tabstop>bSup</tabstop>
   <tabstop>bOk</tabstop>
-  <tabstop>bHelp</tabstop>
-  <tabstop>bParam</tabstop>
   <tabstop>bImport</tabstop>
   <tabstop>LBValeurs</tabstop>
   <tabstop>BView2D</tabstop>
index 5165f98eb78e8e6cbe32eaedee775eae5e959291..e26579cd33ba78f48bd626cef53e94e38d6f6946 100644 (file)
@@ -2,8 +2,8 @@
 
 # Form implementation generated from reading ui file 'desPlusieursInto.ui'
 #
-# Created: Tue Nov 18 17:37:25 2008
-#      by: PyQt4 UI code generator 4.4.2
+# Created: Fri Apr 24 15:53:20 2009
+#      by: PyQt4 UI code generator 4.4.3
 #
 # WARNING! All changes made in this file will be lost!
 
@@ -12,47 +12,24 @@ from PyQt4 import QtCore, QtGui
 class Ui_DPlusInto(object):
     def setupUi(self, DPlusInto):
         DPlusInto.setObjectName("DPlusInto")
-        DPlusInto.resize(482,480)
-        DPlusInto.setMinimumSize(QtCore.QSize(350,0))
+        DPlusInto.resize(482, 480)
+        DPlusInto.setMinimumSize(QtCore.QSize(350, 0))
         self.gridlayout = QtGui.QGridLayout(DPlusInto)
         self.gridlayout.setObjectName("gridlayout")
         self.tabuniqueinto = QtGui.QTabWidget(DPlusInto)
         self.tabuniqueinto.setObjectName("tabuniqueinto")
         self.Widget8 = QtGui.QWidget()
-        self.Widget8.setGeometry(QtCore.QRect(0,0,460,435))
         self.Widget8.setObjectName("Widget8")
-        self.gridlayout1 = QtGui.QGridLayout(self.Widget8)
-        self.gridlayout1.setObjectName("gridlayout1")
+        self.gridLayout = QtGui.QGridLayout(self.Widget8)
+        self.gridLayout.setObjectName("gridLayout")
         self.textLabel1 = QtGui.QLabel(self.Widget8)
         self.textLabel1.setWordWrap(False)
         self.textLabel1.setObjectName("textLabel1")
-        self.gridlayout1.addWidget(self.textLabel1,0,0,1,2)
-        self.bSup = QtGui.QPushButton(self.Widget8)
-        self.bSup.setMinimumSize(QtCore.QSize(130,30))
-        self.bSup.setAutoDefault(True)
-        self.bSup.setObjectName("bSup")
-        self.gridlayout1.addWidget(self.bSup,3,0,1,1)
-        self.bOk = QtGui.QPushButton(self.Widget8)
-        self.bOk.setMinimumSize(QtCore.QSize(130,30))
-        self.bOk.setAutoDefault(True)
-        self.bOk.setDefault(True)
-        self.bOk.setObjectName("bOk")
-        self.gridlayout1.addWidget(self.bOk,3,1,1,2)
-        self.bHelp = QtGui.QPushButton(self.Widget8)
-        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Minimum,QtGui.QSizePolicy.Fixed)
-        sizePolicy.setHorizontalStretch(150)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.bHelp.sizePolicy().hasHeightForWidth())
-        self.bHelp.setSizePolicy(sizePolicy)
-        self.bHelp.setMinimumSize(QtCore.QSize(130,30))
-        self.bHelp.setAutoDefault(True)
-        self.bHelp.setObjectName("bHelp")
-        self.gridlayout1.addWidget(self.bHelp,3,3,1,1)
-        self.Commentaire = QtGui.QLabel(self.Widget8)
-        self.Commentaire.setMinimumSize(QtCore.QSize(0,40))
-        self.Commentaire.setWordWrap(False)
-        self.Commentaire.setObjectName("Commentaire")
-        self.gridlayout1.addWidget(self.Commentaire,2,0,1,4)
+        self.gridLayout.addWidget(self.textLabel1, 0, 0, 1, 1)
+        self.textLabel1_2 = QtGui.QLabel(self.Widget8)
+        self.textLabel1_2.setWordWrap(False)
+        self.textLabel1_2.setObjectName("textLabel1_2")
+        self.gridLayout.addWidget(self.textLabel1_2, 0, 1, 1, 1)
         self.hboxlayout = QtGui.QHBoxLayout()
         self.hboxlayout.setObjectName("hboxlayout")
         self.LBValeurs = QtGui.QListWidget(self.Widget8)
@@ -60,64 +37,70 @@ class Ui_DPlusInto(object):
         self.hboxlayout.addWidget(self.LBValeurs)
         self.vboxlayout = QtGui.QVBoxLayout()
         self.vboxlayout.setObjectName("vboxlayout")
-        spacerItem = QtGui.QSpacerItem(21,44,QtGui.QSizePolicy.Minimum,QtGui.QSizePolicy.Expanding)
+        spacerItem = QtGui.QSpacerItem(21, 44, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding)
         self.vboxlayout.addItem(spacerItem)
         self.vboxlayout1 = QtGui.QVBoxLayout()
         self.vboxlayout1.setObjectName("vboxlayout1")
         self.BAjout1Val = QtGui.QToolButton(self.Widget8)
-        self.BAjout1Val.setMinimumSize(QtCore.QSize(40,31))
-        self.BAjout1Val.setMaximumSize(QtCore.QSize(40,31))
+        self.BAjout1Val.setMinimumSize(QtCore.QSize(40, 31))
+        self.BAjout1Val.setMaximumSize(QtCore.QSize(40, 31))
         icon = QtGui.QIcon()
-        icon.addPixmap(QtGui.QPixmap("../../EficasV1/Editeur/icons/arrow_left.gif"),QtGui.QIcon.Normal,QtGui.QIcon.Off)
+        icon.addPixmap(QtGui.QPixmap("../Editeur/icons/arrow_left.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
         self.BAjout1Val.setIcon(icon)
         self.BAjout1Val.setObjectName("BAjout1Val")
         self.vboxlayout1.addWidget(self.BAjout1Val)
         self.BSup1Val = QtGui.QToolButton(self.Widget8)
-        self.BSup1Val.setMinimumSize(QtCore.QSize(40,31))
-        self.BSup1Val.setMaximumSize(QtCore.QSize(40,31))
-        icon = QtGui.QIcon()
-        icon.addPixmap(QtGui.QPixmap("../Editeur/icons/arrow_right.gif"),QtGui.QIcon.Normal,QtGui.QIcon.Off)
-        self.BSup1Val.setIcon(icon)
+        self.BSup1Val.setMinimumSize(QtCore.QSize(40, 31))
+        self.BSup1Val.setMaximumSize(QtCore.QSize(40, 31))
+        icon1 = QtGui.QIcon()
+        icon1.addPixmap(QtGui.QPixmap("../Editeur/icons/arrow_right.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+        self.BSup1Val.setIcon(icon1)
         self.BSup1Val.setObjectName("BSup1Val")
         self.vboxlayout1.addWidget(self.BSup1Val)
-        spacerItem1 = QtGui.QSpacerItem(21,176,QtGui.QSizePolicy.Minimum,QtGui.QSizePolicy.Expanding)
+        spacerItem1 = QtGui.QSpacerItem(21, 176, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding)
         self.vboxlayout1.addItem(spacerItem1)
         self.vboxlayout.addLayout(self.vboxlayout1)
         self.hboxlayout.addLayout(self.vboxlayout)
         self.listBoxVal = QtGui.QListWidget(self.Widget8)
         self.listBoxVal.setObjectName("listBoxVal")
         self.hboxlayout.addWidget(self.listBoxVal)
-        self.gridlayout1.addLayout(self.hboxlayout,1,0,1,4)
-        self.textLabel1_2 = QtGui.QLabel(self.Widget8)
-        self.textLabel1_2.setWordWrap(False)
-        self.textLabel1_2.setObjectName("textLabel1_2")
-        self.gridlayout1.addWidget(self.textLabel1_2,0,2,1,2)
-        self.tabuniqueinto.addTab(self.Widget8,"")
-        self.gridlayout.addWidget(self.tabuniqueinto,0,0,1,1)
+        self.gridLayout.addLayout(self.hboxlayout, 1, 0, 1, 2)
+        self.Commentaire = QtGui.QLabel(self.Widget8)
+        self.Commentaire.setMinimumSize(QtCore.QSize(0, 20))
+        self.Commentaire.setWordWrap(False)
+        self.Commentaire.setObjectName("Commentaire")
+        self.gridLayout.addWidget(self.Commentaire, 2, 0, 1, 2)
+        self.horizontalLayout = QtGui.QHBoxLayout()
+        self.horizontalLayout.setObjectName("horizontalLayout")
+        spacerItem2 = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
+        self.horizontalLayout.addItem(spacerItem2)
+        self.bOk = QtGui.QPushButton(self.Widget8)
+        self.bOk.setMinimumSize(QtCore.QSize(130, 30))
+        self.bOk.setAutoDefault(True)
+        self.bOk.setDefault(True)
+        self.bOk.setObjectName("bOk")
+        self.horizontalLayout.addWidget(self.bOk)
+        spacerItem3 = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
+        self.horizontalLayout.addItem(spacerItem3)
+        self.gridLayout.addLayout(self.horizontalLayout, 3, 0, 1, 2)
+        self.tabuniqueinto.addTab(self.Widget8, "")
+        self.gridlayout.addWidget(self.tabuniqueinto, 0, 0, 1, 1)
 
         self.retranslateUi(DPlusInto)
         QtCore.QMetaObject.connectSlotsByName(DPlusInto)
-        DPlusInto.setTabOrder(self.listBoxVal,self.tabuniqueinto)
-        DPlusInto.setTabOrder(self.tabuniqueinto,self.bSup)
-        DPlusInto.setTabOrder(self.bSup,self.bOk)
-        DPlusInto.setTabOrder(self.bOk,self.bHelp)
-        DPlusInto.setTabOrder(self.bHelp,self.LBValeurs)
+        DPlusInto.setTabOrder(self.listBoxVal, self.tabuniqueinto)
+        DPlusInto.setTabOrder(self.tabuniqueinto, self.bOk)
+        DPlusInto.setTabOrder(self.bOk, self.LBValeurs)
 
     def retranslateUi(self, DPlusInto):
         DPlusInto.setWindowTitle(QtGui.QApplication.translate("DPlusInto", "DUnIn", None, QtGui.QApplication.UnicodeUTF8))
         self.textLabel1.setText(QtGui.QApplication.translate("DPlusInto", "<u><font size=\"+1\">Valeur(s) actuelle(s)</font></u>", None, QtGui.QApplication.UnicodeUTF8))
-        self.bSup.setToolTip(QtGui.QApplication.translate("DPlusInto", "suppression du mot clef", None, QtGui.QApplication.UnicodeUTF8))
-        self.bSup.setText(QtGui.QApplication.translate("DPlusInto", "&Supprimer", None, QtGui.QApplication.UnicodeUTF8))
-        self.bSup.setShortcut(QtGui.QApplication.translate("DPlusInto", "Alt+S", None, QtGui.QApplication.UnicodeUTF8))
+        self.textLabel1_2.setText(QtGui.QApplication.translate("DPlusInto", "<u><font size=\"+1\">Valeur(s) possibles(s)</font></u>", None, QtGui.QApplication.UnicodeUTF8))
+        self.BAjout1Val.setToolTip(QtGui.QApplication.translate("DPlusInto", "enleve l occurence selectionnee", None, QtGui.QApplication.UnicodeUTF8))
+        self.BSup1Val.setToolTip(QtGui.QApplication.translate("DPlusInto", "ajoute la valeur saisie sous l occurence selectionnée (en fin de liste si il n y a pas de selection)", None, QtGui.QApplication.UnicodeUTF8))
         self.bOk.setToolTip(QtGui.QApplication.translate("DPlusInto", "validation de la saisie", None, QtGui.QApplication.UnicodeUTF8))
         self.bOk.setText(QtGui.QApplication.translate("DPlusInto", "&Valider", None, QtGui.QApplication.UnicodeUTF8))
         self.bOk.setShortcut(QtGui.QApplication.translate("DPlusInto", "Shift+A, Alt+A, Alt+A, Alt+A", None, QtGui.QApplication.UnicodeUTF8))
-        self.bHelp.setToolTip(QtGui.QApplication.translate("DPlusInto", "affichage documentation aster", None, QtGui.QApplication.UnicodeUTF8))
-        self.bHelp.setText(QtGui.QApplication.translate("DPlusInto", "&Documentation", None, QtGui.QApplication.UnicodeUTF8))
-        self.bHelp.setShortcut(QtGui.QApplication.translate("DPlusInto", "Alt+D", None, QtGui.QApplication.UnicodeUTF8))
-        self.BAjout1Val.setToolTip(QtGui.QApplication.translate("DPlusInto", "enleve l occurence selectionnee", None, QtGui.QApplication.UnicodeUTF8))
-        self.BSup1Val.setToolTip(QtGui.QApplication.translate("DPlusInto", "ajoute la valeur saisie sous l occurence selectionnée (en fin de liste si il n y a pas de selection)", None, QtGui.QApplication.UnicodeUTF8))
-        self.textLabel1_2.setText(QtGui.QApplication.translate("DPlusInto", "<u><font size=\"+1\">Valeur(s) possibles(s)</font></u>", None, QtGui.QApplication.UnicodeUTF8))
         self.tabuniqueinto.setTabText(self.tabuniqueinto.indexOf(self.Widget8), QtGui.QApplication.translate("DPlusInto", "Saisir Valeur", None, QtGui.QApplication.UnicodeUTF8))
 
 
index 9fa87f7d8bcad2a1642b1198d0ce7372e8f503c9..a44f52e54922e087a97fa65e341e00ff7216bb17 100644 (file)
    <item row="0" column="0" >
     <widget class="QTabWidget" name="tabuniqueinto" >
      <widget class="QWidget" name="Widget8" >
-      <property name="geometry" >
-       <rect>
-        <x>0</x>
-        <y>0</y>
-        <width>460</width>
-        <height>435</height>
-       </rect>
-      </property>
       <attribute name="title" >
        <string>Saisir Valeur</string>
       </attribute>
-      <layout class="QGridLayout" >
-       <item row="0" column="0" colspan="2" >
+      <layout class="QGridLayout" name="gridLayout" >
+       <item row="0" column="0" >
         <widget class="QLabel" name="textLabel1" >
          <property name="text" >
           <string>&lt;u>&lt;font size="+1">Valeur(s) actuelle(s)&lt;/font>&lt;/u></string>
          </property>
         </widget>
        </item>
-       <item row="3" column="0" >
-        <widget class="QPushButton" name="bSup" >
-         <property name="minimumSize" >
-          <size>
-           <width>130</width>
-           <height>30</height>
-          </size>
-         </property>
-         <property name="toolTip" >
-          <string>suppression du mot clef</string>
-         </property>
-         <property name="text" >
-          <string>&amp;Supprimer</string>
-         </property>
-         <property name="shortcut" >
-          <string>Alt+S</string>
-         </property>
-         <property name="autoDefault" >
-          <bool>true</bool>
-         </property>
-        </widget>
-       </item>
-       <item row="3" column="1" colspan="2" >
-        <widget class="QPushButton" name="bOk" >
-         <property name="minimumSize" >
-          <size>
-           <width>130</width>
-           <height>30</height>
-          </size>
-         </property>
-         <property name="toolTip" >
-          <string>validation de la saisie</string>
-         </property>
-         <property name="text" >
-          <string>&amp;Valider</string>
-         </property>
-         <property name="shortcut" >
-          <string>Shift+A, Alt+A, Alt+A, Alt+A</string>
-         </property>
-         <property name="autoDefault" >
-          <bool>true</bool>
-         </property>
-         <property name="default" >
-          <bool>true</bool>
-         </property>
-        </widget>
-       </item>
-       <item row="3" column="3" >
-        <widget class="QPushButton" name="bHelp" >
-         <property name="sizePolicy" >
-          <sizepolicy vsizetype="Fixed" hsizetype="Minimum" >
-           <horstretch>150</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="minimumSize" >
-          <size>
-           <width>130</width>
-           <height>30</height>
-          </size>
-         </property>
-         <property name="toolTip" >
-          <string>affichage documentation aster</string>
-         </property>
-         <property name="text" >
-          <string>&amp;Documentation</string>
-         </property>
-         <property name="shortcut" >
-          <string>Alt+D</string>
-         </property>
-         <property name="autoDefault" >
-          <bool>true</bool>
-         </property>
-        </widget>
-       </item>
-       <item row="2" column="0" colspan="4" >
-        <widget class="QLabel" name="Commentaire" >
-         <property name="minimumSize" >
-          <size>
-           <width>0</width>
-           <height>40</height>
-          </size>
-         </property>
+       <item row="0" column="1" >
+        <widget class="QLabel" name="textLabel1_2" >
          <property name="text" >
-          <string/>
+          <string>&lt;u>&lt;font size="+1">Valeur(s) possibles(s)&lt;/font>&lt;/u></string>
          </property>
          <property name="wordWrap" >
           <bool>false</bool>
          </property>
         </widget>
        </item>
-       <item row="1" column="0" colspan="4" >
+       <item row="1" column="0" colspan="2" >
         <layout class="QHBoxLayout" >
          <item>
           <widget class="QListWidget" name="LBValeurs" />
                </property>
                <property name="icon" >
                 <iconset>
-                 <normaloff>../../EficasV1/Editeur/icons/arrow_left.gif</normaloff>../../EficasV1/Editeur/icons/arrow_left.gif</iconset>
+                 <normaloff>../Editeur/icons/arrow_left.png</normaloff>../Editeur/icons/arrow_left.png</iconset>
                </property>
               </widget>
              </item>
                </property>
                <property name="icon" >
                 <iconset>
-                 <normaloff>../Editeur/icons/arrow_right.gif</normaloff>../Editeur/icons/arrow_right.gif</iconset>
+                 <normaloff>../Editeur/icons/arrow_right.png</normaloff>../Editeur/icons/arrow_right.png</iconset>
                </property>
               </widget>
              </item>
          </item>
         </layout>
        </item>
-       <item row="0" column="2" colspan="2" >
-        <widget class="QLabel" name="textLabel1_2" >
+       <item row="2" column="0" colspan="2" >
+        <widget class="QLabel" name="Commentaire" >
+         <property name="minimumSize" >
+          <size>
+           <width>0</width>
+           <height>20</height>
+          </size>
+         </property>
          <property name="text" >
-          <string>&lt;u>&lt;font size="+1">Valeur(s) possibles(s)&lt;/font>&lt;/u></string>
+          <string/>
          </property>
          <property name="wordWrap" >
           <bool>false</bool>
          </property>
         </widget>
        </item>
+       <item row="3" column="0" colspan="2" >
+        <layout class="QHBoxLayout" name="horizontalLayout" >
+         <item>
+          <spacer name="horizontalSpacer" >
+           <property name="orientation" >
+            <enum>Qt::Horizontal</enum>
+           </property>
+           <property name="sizeHint" stdset="0" >
+            <size>
+             <width>40</width>
+             <height>20</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
+         <item>
+          <widget class="QPushButton" name="bOk" >
+           <property name="minimumSize" >
+            <size>
+             <width>130</width>
+             <height>30</height>
+            </size>
+           </property>
+           <property name="toolTip" >
+            <string>validation de la saisie</string>
+           </property>
+           <property name="text" >
+            <string>&amp;Valider</string>
+           </property>
+           <property name="shortcut" >
+            <string>Shift+A, Alt+A, Alt+A, Alt+A</string>
+           </property>
+           <property name="autoDefault" >
+            <bool>true</bool>
+           </property>
+           <property name="default" >
+            <bool>true</bool>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <spacer name="horizontalSpacer_3" >
+           <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>
     </widget>
  <tabstops>
   <tabstop>listBoxVal</tabstop>
   <tabstop>tabuniqueinto</tabstop>
-  <tabstop>bSup</tabstop>
   <tabstop>bOk</tabstop>
-  <tabstop>bHelp</tabstop>
   <tabstop>LBValeurs</tabstop>
  </tabstops>
  <resources/>
index d02e1fc30cd71d59b9d1f851b9134e881a693cd0..590b3058b9674ec665e7e1336fc3fd5fa0a4bb7d 100644 (file)
@@ -2,8 +2,8 @@
 
 # Form implementation generated from reading ui file 'desPoursuite.ui'
 #
-# Created: Tue Nov 18 17:37:25 2008
-#      by: PyQt4 UI code generator 4.4.2
+# Created: Thu Mar 12 10:42:31 2009
+#      by: PyQt4 UI code generator 4.4.3
 #
 # WARNING! All changes made in this file will be lost!
 
@@ -12,43 +12,41 @@ from PyQt4 import QtCore, QtGui
 class Ui_DPour(object):
     def setupUi(self, DPour):
         DPour.setObjectName("DPour")
-        DPour.resize(521,544)
-        DPour.setMinimumSize(QtCore.QSize(505,0))
+        DPour.resize(521, 544)
+        DPour.setMinimumSize(QtCore.QSize(505, 0))
         self.gridlayout = QtGui.QGridLayout(DPour)
         self.gridlayout.setObjectName("gridlayout")
         self.TWChoix = QtGui.QTabWidget(DPour)
         self.TWChoix.setObjectName("TWChoix")
         self.MotClef = QtGui.QWidget()
-        self.MotClef.setGeometry(QtCore.QRect(0,0,499,433))
         self.MotClef.setObjectName("MotClef")
         self.gridLayout_4 = QtGui.QGridLayout(self.MotClef)
         self.gridLayout_4.setObjectName("gridLayout_4")
         self.textLabel1 = QtGui.QLabel(self.MotClef)
-        self.textLabel1.setMinimumSize(QtCore.QSize(0,0))
+        self.textLabel1.setMinimumSize(QtCore.QSize(0, 0))
         self.textLabel1.setWordWrap(False)
         self.textLabel1.setObjectName("textLabel1")
-        self.gridLayout_4.addWidget(self.textLabel1,0,0,1,1)
+        self.gridLayout_4.addWidget(self.textLabel1, 0, 0, 1, 1)
         self.textLabel1_2 = QtGui.QLabel(self.MotClef)
         self.textLabel1_2.setWordWrap(False)
         self.textLabel1_2.setObjectName("textLabel1_2")
-        self.gridLayout_4.addWidget(self.textLabel1_2,0,1,1,1)
+        self.gridLayout_4.addWidget(self.textLabel1_2, 0, 1, 1, 1)
         self.LBMCPermis = QtGui.QListWidget(self.MotClef)
-        self.LBMCPermis.setMinimumSize(QtCore.QSize(0,0))
+        self.LBMCPermis.setMinimumSize(QtCore.QSize(0, 0))
         self.LBMCPermis.setObjectName("LBMCPermis")
-        self.gridLayout_4.addWidget(self.LBMCPermis,1,0,1,1)
+        self.gridLayout_4.addWidget(self.LBMCPermis, 1, 0, 1, 1)
         self.LBRegles = QtGui.QListWidget(self.MotClef)
         self.LBRegles.setObjectName("LBRegles")
-        self.gridLayout_4.addWidget(self.LBRegles,1,1,1,1)
-        self.TWChoix.addTab(self.MotClef,"")
+        self.gridLayout_4.addWidget(self.LBRegles, 1, 1, 1, 1)
+        self.TWChoix.addTab(self.MotClef, "")
         self.Commande = QtGui.QWidget()
-        self.Commande.setGeometry(QtCore.QRect(0,0,499,433))
         self.Commande.setObjectName("Commande")
         self.gridLayout_3 = QtGui.QGridLayout(self.Commande)
         self.gridLayout_3.setObjectName("gridLayout_3")
         self.textLabel1_4 = QtGui.QLabel(self.Commande)
         self.textLabel1_4.setWordWrap(False)
         self.textLabel1_4.setObjectName("textLabel1_4")
-        self.gridLayout_3.addWidget(self.textLabel1_4,0,0,1,3)
+        self.gridLayout_3.addWidget(self.textLabel1_4, 0, 0, 1, 3)
         self.groupBox = QtGui.QGroupBox(self.Commande)
         self.groupBox.setObjectName("groupBox")
         self.gridLayout = QtGui.QGridLayout(self.groupBox)
@@ -56,98 +54,82 @@ class Ui_DPour(object):
         self.RBalpha = QtGui.QRadioButton(self.groupBox)
         self.RBalpha.setChecked(True)
         self.RBalpha.setObjectName("RBalpha")
-        self.gridLayout.addWidget(self.RBalpha,0,0,1,1)
+        self.gridLayout.addWidget(self.RBalpha, 0, 0, 1, 1)
         self.RBGroupe = QtGui.QRadioButton(self.groupBox)
         self.RBGroupe.setObjectName("RBGroupe")
-        self.gridLayout.addWidget(self.RBGroupe,1,0,1,1)
-        self.gridLayout_3.addWidget(self.groupBox,0,3,2,1)
+        self.gridLayout.addWidget(self.RBGroupe, 1, 0, 1, 1)
+        self.gridLayout_3.addWidget(self.groupBox, 0, 3, 2, 1)
         self.textLabel6 = QtGui.QLabel(self.Commande)
-        self.textLabel6.setMinimumSize(QtCore.QSize(50,30))
+        self.textLabel6.setMinimumSize(QtCore.QSize(50, 30))
         self.textLabel6.setWordWrap(False)
         self.textLabel6.setObjectName("textLabel6")
-        self.gridLayout_3.addWidget(self.textLabel6,1,0,1,1)
+        self.gridLayout_3.addWidget(self.textLabel6, 1, 0, 1, 1)
         self.LEFiltre = QtGui.QLineEdit(self.Commande)
-        self.LEFiltre.setMinimumSize(QtCore.QSize(160,30))
+        self.LEFiltre.setMinimumSize(QtCore.QSize(160, 30))
         self.LEFiltre.setObjectName("LEFiltre")
-        self.gridLayout_3.addWidget(self.LEFiltre,1,1,1,1)
+        self.gridLayout_3.addWidget(self.LEFiltre, 1, 1, 1, 1)
         self.pushButton = QtGui.QPushButton(self.Commande)
         self.pushButton.setObjectName("pushButton")
-        self.gridLayout_3.addWidget(self.pushButton,1,2,1,1)
+        self.gridLayout_3.addWidget(self.pushButton, 1, 2, 1, 1)
         self.LBNouvCommande = QtGui.QListWidget(self.Commande)
         self.LBNouvCommande.setObjectName("LBNouvCommande")
-        self.gridLayout_3.addWidget(self.LBNouvCommande,2,0,1,4)
+        self.gridLayout_3.addWidget(self.LBNouvCommande, 2, 0, 1, 4)
         self.textLabel4 = QtGui.QLabel(self.Commande)
         self.textLabel4.setWordWrap(False)
         self.textLabel4.setObjectName("textLabel4")
-        self.gridLayout_3.addWidget(self.textLabel4,3,0,1,4)
-        self.TWChoix.addTab(self.Commande,"")
+        self.gridLayout_3.addWidget(self.textLabel4, 3, 0, 1, 4)
+        self.TWChoix.addTab(self.Commande, "")
         self.TabPage = QtGui.QWidget()
-        self.TabPage.setGeometry(QtCore.QRect(0,0,499,433))
         self.TabPage.setObjectName("TabPage")
-        self.gridLayout_2 = QtGui.QGridLayout(self.TabPage)
-        self.gridLayout_2.setObjectName("gridLayout_2")
         self.textLabel1_3 = QtGui.QLabel(self.TabPage)
+        self.textLabel1_3.setGeometry(QtCore.QRect(9, 9, 481, 19))
         self.textLabel1_3.setWordWrap(False)
         self.textLabel1_3.setObjectName("textLabel1_3")
-        self.gridLayout_2.addWidget(self.textLabel1_3,0,0,1,1)
         self.LENomFichier = QtGui.QLineEdit(self.TabPage)
-        self.LENomFichier.setMinimumSize(QtCore.QSize(470,40))
+        self.LENomFichier.setGeometry(QtCore.QRect(9, 33, 481, 40))
+        self.LENomFichier.setMinimumSize(QtCore.QSize(470, 40))
         self.LENomFichier.setObjectName("LENomFichier")
-        self.gridLayout_2.addWidget(self.LENomFichier,1,0,1,1)
-        spacerItem = QtGui.QSpacerItem(21,190,QtGui.QSizePolicy.Minimum,QtGui.QSizePolicy.Expanding)
-        self.gridLayout_2.addItem(spacerItem,2,0,1,1)
-        self.hboxlayout = QtGui.QHBoxLayout()
-        self.hboxlayout.setObjectName("hboxlayout")
-        spacerItem1 = QtGui.QSpacerItem(331,20,QtGui.QSizePolicy.Expanding,QtGui.QSizePolicy.Minimum)
-        self.hboxlayout.addItem(spacerItem1)
+        self.BFichier = QtGui.QPushButton(self.TabPage)
+        self.BFichier.setGeometry(QtCore.QRect(330, 170, 140, 50))
+        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.BFichier.sizePolicy().hasHeightForWidth())
+        self.BFichier.setSizePolicy(sizePolicy)
+        self.BFichier.setMinimumSize(QtCore.QSize(140, 50))
+        self.BFichier.setObjectName("BFichier")
         self.BBrowse = QtGui.QPushButton(self.TabPage)
-        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed,QtGui.QSizePolicy.Fixed)
+        self.BBrowse.setGeometry(QtCore.QRect(330, 110, 140, 50))
+        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.BBrowse.sizePolicy().hasHeightForWidth())
         self.BBrowse.setSizePolicy(sizePolicy)
-        self.BBrowse.setMinimumSize(QtCore.QSize(140,50))
+        self.BBrowse.setMinimumSize(QtCore.QSize(140, 50))
         self.BBrowse.setObjectName("BBrowse")
-        self.hboxlayout.addWidget(self.BBrowse)
-        self.gridLayout_2.addLayout(self.hboxlayout,3,0,1,1)
-        spacerItem2 = QtGui.QSpacerItem(21,87,QtGui.QSizePolicy.Minimum,QtGui.QSizePolicy.Expanding)
-        self.gridLayout_2.addItem(spacerItem2,4,0,1,1)
-        self.TWChoix.addTab(self.TabPage,"")
-        self.gridlayout.addWidget(self.TWChoix,0,0,1,3)
-        self.bSup = QtGui.QPushButton(DPour)
-        self.bSup.setMinimumSize(QtCore.QSize(0,30))
-        self.bSup.setAutoDefault(True)
-        self.bSup.setObjectName("bSup")
-        self.gridlayout.addWidget(self.bSup,2,0,1,1)
+        self.TWChoix.addTab(self.TabPage, "")
+        self.gridlayout.addWidget(self.TWChoix, 0, 0, 1, 3)
         self.bOk = QtGui.QPushButton(DPour)
-        self.bOk.setMinimumSize(QtCore.QSize(0,30))
+        self.bOk.setMinimumSize(QtCore.QSize(0, 30))
         self.bOk.setAutoDefault(True)
         self.bOk.setDefault(True)
         self.bOk.setObjectName("bOk")
-        self.gridlayout.addWidget(self.bOk,2,1,1,1)
-        self.bHelp = QtGui.QPushButton(DPour)
-        self.bHelp.setMinimumSize(QtCore.QSize(0,30))
-        self.bHelp.setAutoDefault(True)
-        self.bHelp.setObjectName("bHelp")
-        self.gridlayout.addWidget(self.bHelp,2,2,1,1)
+        self.gridlayout.addWidget(self.bOk, 2, 1, 1, 1)
         self.Commentaire = QtGui.QLabel(DPour)
         self.Commentaire.setWordWrap(False)
         self.Commentaire.setObjectName("Commentaire")
-        self.gridlayout.addWidget(self.Commentaire,1,0,1,3)
+        self.gridlayout.addWidget(self.Commentaire, 1, 0, 1, 3)
 
         self.retranslateUi(DPour)
-        self.TWChoix.setCurrentIndex(0)
+        self.TWChoix.setCurrentIndex(2)
         QtCore.QMetaObject.connectSlotsByName(DPour)
-        DPour.setTabOrder(self.LEFiltre,self.LENomFichier)
-        DPour.setTabOrder(self.LENomFichier,self.TWChoix)
-        DPour.setTabOrder(self.TWChoix,self.LBMCPermis)
-        DPour.setTabOrder(self.LBMCPermis,self.LBRegles)
-        DPour.setTabOrder(self.LBRegles,self.LBNouvCommande)
-        DPour.setTabOrder(self.LBNouvCommande,self.RBalpha)
-        DPour.setTabOrder(self.RBalpha,self.BBrowse)
-        DPour.setTabOrder(self.BBrowse,self.bSup)
-        DPour.setTabOrder(self.bSup,self.bOk)
-        DPour.setTabOrder(self.bOk,self.bHelp)
+        DPour.setTabOrder(self.LEFiltre, self.LENomFichier)
+        DPour.setTabOrder(self.LENomFichier, self.TWChoix)
+        DPour.setTabOrder(self.TWChoix, self.LBMCPermis)
+        DPour.setTabOrder(self.LBMCPermis, self.LBRegles)
+        DPour.setTabOrder(self.LBRegles, self.LBNouvCommande)
+        DPour.setTabOrder(self.LBNouvCommande, self.RBalpha)
+        DPour.setTabOrder(self.RBalpha, self.bOk)
 
     def retranslateUi(self, DPour):
         DPour.setWindowTitle(QtGui.QApplication.translate("DPour", "DMacro", None, QtGui.QApplication.UnicodeUTF8))
@@ -163,17 +145,12 @@ class Ui_DPour(object):
         self.textLabel4.setText(QtGui.QApplication.translate("DPour", "La commande choisie sera ajoutée APRES la commande courante", None, QtGui.QApplication.UnicodeUTF8))
         self.TWChoix.setTabText(self.TWChoix.indexOf(self.Commande), QtGui.QApplication.translate("DPour", "Nouvelle Commande", None, QtGui.QApplication.UnicodeUTF8))
         self.textLabel1_3.setText(QtGui.QApplication.translate("DPour", "<font size=\"+1\">La commande POURSUITE requiert un nom de Fichier :</font>", None, QtGui.QApplication.UnicodeUTF8))
+        self.BFichier.setText(QtGui.QApplication.translate("DPour", "Autre Fichier", None, QtGui.QApplication.UnicodeUTF8))
         self.BBrowse.setText(QtGui.QApplication.translate("DPour", "Edit", None, QtGui.QApplication.UnicodeUTF8))
         self.TWChoix.setTabText(self.TWChoix.indexOf(self.TabPage), QtGui.QApplication.translate("DPour", "Fichier Poursuite", None, QtGui.QApplication.UnicodeUTF8))
-        self.bSup.setToolTip(QtGui.QApplication.translate("DPour", "suppression du mot clef", None, QtGui.QApplication.UnicodeUTF8))
-        self.bSup.setText(QtGui.QApplication.translate("DPour", "&Supprimer", None, QtGui.QApplication.UnicodeUTF8))
-        self.bSup.setShortcut(QtGui.QApplication.translate("DPour", "Alt+S", None, QtGui.QApplication.UnicodeUTF8))
         self.bOk.setToolTip(QtGui.QApplication.translate("DPour", "validation de la saisie", None, QtGui.QApplication.UnicodeUTF8))
         self.bOk.setText(QtGui.QApplication.translate("DPour", "&Valider", None, QtGui.QApplication.UnicodeUTF8))
         self.bOk.setShortcut(QtGui.QApplication.translate("DPour", "Shift+A, Alt+A, Alt+A, Alt+A", None, QtGui.QApplication.UnicodeUTF8))
-        self.bHelp.setToolTip(QtGui.QApplication.translate("DPour", "affichage documentation aster", None, QtGui.QApplication.UnicodeUTF8))
-        self.bHelp.setText(QtGui.QApplication.translate("DPour", "&Documentation", None, QtGui.QApplication.UnicodeUTF8))
-        self.bHelp.setShortcut(QtGui.QApplication.translate("DPour", "Alt+D", None, QtGui.QApplication.UnicodeUTF8))
 
 
 if __name__ == "__main__":
index 71a35017a177ed4daa05501b576647b7ba8528d0..7fc41bf7db5fae0efbb982dfbbf650bce02d598c 100644 (file)
    <item row="0" column="0" colspan="3" >
     <widget class="QTabWidget" name="TWChoix" >
      <property name="currentIndex" >
-      <number>0</number>
+      <number>2</number>
      </property>
      <widget class="QWidget" name="MotClef" >
-      <property name="geometry" >
-       <rect>
-        <x>0</x>
-        <y>0</y>
-        <width>499</width>
-        <height>433</height>
-       </rect>
-      </property>
       <attribute name="title" >
        <string>Ajouter Mot-Clef</string>
       </attribute>
       </layout>
      </widget>
      <widget class="QWidget" name="Commande" >
-      <property name="geometry" >
-       <rect>
-        <x>0</x>
-        <y>0</y>
-        <width>499</width>
-        <height>433</height>
-       </rect>
-      </property>
       <attribute name="title" >
        <string>Nouvelle Commande</string>
       </attribute>
       </layout>
      </widget>
      <widget class="QWidget" name="TabPage" >
-      <property name="geometry" >
-       <rect>
-        <x>0</x>
-        <y>0</y>
-        <width>499</width>
-        <height>433</height>
-       </rect>
-      </property>
       <attribute name="title" >
        <string>Fichier Poursuite</string>
       </attribute>
-      <layout class="QGridLayout" name="gridLayout_2" >
-       <item row="0" column="0" >
-        <widget class="QLabel" name="textLabel1_3" >
-         <property name="text" >
-          <string>&lt;font size="+1">La commande POURSUITE requiert un nom de Fichier :&lt;/font></string>
-         </property>
-         <property name="wordWrap" >
-          <bool>false</bool>
-         </property>
-        </widget>
-       </item>
-       <item row="1" column="0" >
-        <widget class="QLineEdit" name="LENomFichier" >
-         <property name="minimumSize" >
-          <size>
-           <width>470</width>
-           <height>40</height>
-          </size>
-         </property>
-        </widget>
-       </item>
-       <item row="2" column="0" >
-        <spacer name="spacer1" >
-         <property name="orientation" >
-          <enum>Qt::Vertical</enum>
-         </property>
-         <property name="sizeType" >
-          <enum>QSizePolicy::Expanding</enum>
-         </property>
-         <property name="sizeHint" stdset="0" >
-          <size>
-           <width>21</width>
-           <height>190</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
-       <item row="3" column="0" >
-        <layout class="QHBoxLayout" >
-         <item>
-          <spacer name="spacer3" >
-           <property name="orientation" >
-            <enum>Qt::Horizontal</enum>
-           </property>
-           <property name="sizeType" >
-            <enum>QSizePolicy::Expanding</enum>
-           </property>
-           <property name="sizeHint" stdset="0" >
-            <size>
-             <width>331</width>
-             <height>20</height>
-            </size>
-           </property>
-          </spacer>
-         </item>
-         <item>
-          <widget class="QPushButton" name="BBrowse" >
-           <property name="sizePolicy" >
-            <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-           <property name="minimumSize" >
-            <size>
-             <width>140</width>
-             <height>50</height>
-            </size>
-           </property>
-           <property name="text" >
-            <string>Edit</string>
-           </property>
-          </widget>
-         </item>
-        </layout>
-       </item>
-       <item row="4" column="0" >
-        <spacer name="spacer1_2" >
-         <property name="orientation" >
-          <enum>Qt::Vertical</enum>
-         </property>
-         <property name="sizeType" >
-          <enum>QSizePolicy::Expanding</enum>
-         </property>
-         <property name="sizeHint" stdset="0" >
-          <size>
-           <width>21</width>
-           <height>87</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
-      </layout>
+      <widget class="QLabel" name="textLabel1_3" >
+       <property name="geometry" >
+        <rect>
+         <x>9</x>
+         <y>9</y>
+         <width>481</width>
+         <height>19</height>
+        </rect>
+       </property>
+       <property name="text" >
+        <string>&lt;font size="+1">La commande POURSUITE requiert un nom de Fichier :&lt;/font></string>
+       </property>
+       <property name="wordWrap" >
+        <bool>false</bool>
+       </property>
+      </widget>
+      <widget class="QLineEdit" name="LENomFichier" >
+       <property name="geometry" >
+        <rect>
+         <x>9</x>
+         <y>33</y>
+         <width>481</width>
+         <height>40</height>
+        </rect>
+       </property>
+       <property name="minimumSize" >
+        <size>
+         <width>470</width>
+         <height>40</height>
+        </size>
+       </property>
+      </widget>
+      <widget class="QPushButton" name="BFichier" >
+       <property name="geometry" >
+        <rect>
+         <x>330</x>
+         <y>170</y>
+         <width>140</width>
+         <height>50</height>
+        </rect>
+       </property>
+       <property name="sizePolicy" >
+        <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="minimumSize" >
+        <size>
+         <width>140</width>
+         <height>50</height>
+        </size>
+       </property>
+       <property name="text" >
+        <string>Autre Fichier</string>
+       </property>
+      </widget>
+      <widget class="QPushButton" name="BBrowse" >
+       <property name="geometry" >
+        <rect>
+         <x>330</x>
+         <y>110</y>
+         <width>140</width>
+         <height>50</height>
+        </rect>
+       </property>
+       <property name="sizePolicy" >
+        <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="minimumSize" >
+        <size>
+         <width>140</width>
+         <height>50</height>
+        </size>
+       </property>
+       <property name="text" >
+        <string>Edit</string>
+       </property>
+      </widget>
      </widget>
     </widget>
    </item>
-   <item row="2" column="0" >
-    <widget class="QPushButton" name="bSup" >
-     <property name="minimumSize" >
-      <size>
-       <width>0</width>
-       <height>30</height>
-      </size>
-     </property>
-     <property name="toolTip" >
-      <string>suppression du mot clef</string>
-     </property>
-     <property name="text" >
-      <string>&amp;Supprimer</string>
-     </property>
-     <property name="shortcut" >
-      <string>Alt+S</string>
-     </property>
-     <property name="autoDefault" >
-      <bool>true</bool>
-     </property>
-    </widget>
-   </item>
    <item row="2" column="1" >
     <widget class="QPushButton" name="bOk" >
      <property name="minimumSize" >
      </property>
     </widget>
    </item>
-   <item row="2" column="2" >
-    <widget class="QPushButton" name="bHelp" >
-     <property name="minimumSize" >
-      <size>
-       <width>0</width>
-       <height>30</height>
-      </size>
-     </property>
-     <property name="toolTip" >
-      <string>affichage documentation aster</string>
-     </property>
-     <property name="text" >
-      <string>&amp;Documentation</string>
-     </property>
-     <property name="shortcut" >
-      <string>Alt+D</string>
-     </property>
-     <property name="autoDefault" >
-      <bool>true</bool>
-     </property>
-    </widget>
-   </item>
    <item row="1" column="0" colspan="3" >
     <widget class="QLabel" name="Commentaire" >
      <property name="text" >
   <tabstop>LBRegles</tabstop>
   <tabstop>LBNouvCommande</tabstop>
   <tabstop>RBalpha</tabstop>
-  <tabstop>BBrowse</tabstop>
-  <tabstop>bSup</tabstop>
   <tabstop>bOk</tabstop>
-  <tabstop>bHelp</tabstop>
  </tabstops>
  <resources/>
  <connections/>
index 297b9adf9166112aa6d08d21891640f797a8d3e4..d0c26ca37bf9303e7e84d500c8c60999c770ffb9 100644 (file)
@@ -2,8 +2,8 @@
 
 # Form implementation generated from reading ui file 'desRacine.ui'
 #
-# Created: Tue Nov 18 17:37:25 2008
-#      by: PyQt4 UI code generator 4.4.2
+# Created: Thu Apr 23 16:04:23 2009
+#      by: PyQt4 UI code generator 4.4.3
 #
 # WARNING! All changes made in this file will be lost!
 
@@ -12,69 +12,108 @@ from PyQt4 import QtCore, QtGui
 class Ui_DRac(object):
     def setupUi(self, DRac):
         DRac.setObjectName("DRac")
-        DRac.resize(554,540)
-        DRac.setMinimumSize(QtCore.QSize(505,0))
-        self.gridLayout = QtGui.QGridLayout(DRac)
-        self.gridLayout.setObjectName("gridLayout")
+        DRac.resize(582, 540)
+        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Expanding)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(DRac.sizePolicy().hasHeightForWidth())
+        DRac.setSizePolicy(sizePolicy)
+        DRac.setMinimumSize(QtCore.QSize(505, 0))
+        self.gridLayout_2 = QtGui.QGridLayout(DRac)
+        self.gridLayout_2.setObjectName("gridLayout_2")
+        self.verticalLayout = QtGui.QVBoxLayout()
+        self.verticalLayout.setObjectName("verticalLayout")
+        self.horizontalLayout = QtGui.QHBoxLayout()
+        self.horizontalLayout.setObjectName("horizontalLayout")
         self.textLabel1_4 = QtGui.QLabel(DRac)
-        self.textLabel1_4.setMinimumSize(QtCore.QSize(291,21))
+        self.textLabel1_4.setMinimumSize(QtCore.QSize(0, 20))
         self.textLabel1_4.setWordWrap(False)
         self.textLabel1_4.setObjectName("textLabel1_4")
-        self.gridLayout.addWidget(self.textLabel1_4,0,0,2,5)
+        self.horizontalLayout.addWidget(self.textLabel1_4)
         self.textLabel1_4_2 = QtGui.QLabel(DRac)
         self.textLabel1_4_2.setWordWrap(False)
         self.textLabel1_4_2.setObjectName("textLabel1_4_2")
-        self.gridLayout.addWidget(self.textLabel1_4_2,1,4,1,2)
+        self.horizontalLayout.addWidget(self.textLabel1_4_2)
+        self.verticalLayout.addLayout(self.horizontalLayout)
+        self.horizontalLayout_2 = QtGui.QHBoxLayout()
+        self.horizontalLayout_2.setObjectName("horizontalLayout_2")
         self.RBalpha = QtGui.QRadioButton(DRac)
         self.RBalpha.setChecked(True)
         self.RBalpha.setObjectName("RBalpha")
-        self.gridLayout.addWidget(self.RBalpha,2,0,1,2)
+        self.horizontalLayout_2.addWidget(self.RBalpha)
         self.RBGroupe = QtGui.QRadioButton(DRac)
         self.RBGroupe.setObjectName("RBGroupe")
-        self.gridLayout.addWidget(self.RBGroupe,2,2,1,3)
+        self.horizontalLayout_2.addWidget(self.RBGroupe)
+        spacerItem = QtGui.QSpacerItem(228, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
+        self.horizontalLayout_2.addItem(spacerItem)
+        self.verticalLayout.addLayout(self.horizontalLayout_2)
+        self.horizontalLayout_3 = QtGui.QHBoxLayout()
+        self.horizontalLayout_3.setObjectName("horizontalLayout_3")
         self.textLabel6 = QtGui.QLabel(DRac)
-        self.textLabel6.setMinimumSize(QtCore.QSize(40,0))
+        self.textLabel6.setMinimumSize(QtCore.QSize(40, 0))
         self.textLabel6.setWordWrap(False)
         self.textLabel6.setObjectName("textLabel6")
-        self.gridLayout.addWidget(self.textLabel6,3,0,1,1)
+        self.horizontalLayout_3.addWidget(self.textLabel6)
         self.LEFiltre = QtGui.QLineEdit(DRac)
-        self.LEFiltre.setMinimumSize(QtCore.QSize(0,30))
+        self.LEFiltre.setMinimumSize(QtCore.QSize(0, 30))
         self.LEFiltre.setObjectName("LEFiltre")
-        self.gridLayout.addWidget(self.LEFiltre,3,1,1,1)
+        self.horizontalLayout_3.addWidget(self.LEFiltre)
         self.BNext = QtGui.QPushButton(DRac)
+        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Preferred)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.BNext.sizePolicy().hasHeightForWidth())
+        self.BNext.setSizePolicy(sizePolicy)
         self.BNext.setObjectName("BNext")
-        self.gridLayout.addWidget(self.BNext,3,2,1,1)
-        self.LBRegles = QtGui.QListWidget(DRac)
-        self.LBRegles.setMinimumSize(QtCore.QSize(0,0))
-        self.LBRegles.setObjectName("LBRegles")
-        self.gridLayout.addWidget(self.LBRegles,3,3,2,3)
+        self.horizontalLayout_3.addWidget(self.BNext)
+        spacerItem1 = QtGui.QSpacerItem(268, 27, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
+        self.horizontalLayout_3.addItem(spacerItem1)
+        self.verticalLayout.addLayout(self.horizontalLayout_3)
+        self.gridLayout_2.addLayout(self.verticalLayout, 0, 0, 1, 1)
+        self.gridLayout = QtGui.QGridLayout()
+        self.gridLayout.setObjectName("gridLayout")
         self.LBNouvCommande = QtGui.QListWidget(DRac)
+        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.MinimumExpanding)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.LBNouvCommande.sizePolicy().hasHeightForWidth())
+        self.LBNouvCommande.setSizePolicy(sizePolicy)
         self.LBNouvCommande.setObjectName("LBNouvCommande")
-        self.gridLayout.addWidget(self.LBNouvCommande,4,0,1,3)
-        self.bSup = QtGui.QPushButton(DRac)
-        self.bSup.setMinimumSize(QtCore.QSize(160,30))
-        self.bSup.setAutoDefault(True)
-        self.bSup.setObjectName("bSup")
-        self.gridLayout.addWidget(self.bSup,5,0,1,2)
+        self.gridLayout.addWidget(self.LBNouvCommande, 0, 0, 1, 1)
+        self.LBRegles = QtGui.QListWidget(DRac)
+        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.MinimumExpanding)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.LBRegles.sizePolicy().hasHeightForWidth())
+        self.LBRegles.setSizePolicy(sizePolicy)
+        self.LBRegles.setMinimumSize(QtCore.QSize(0, 0))
+        self.LBRegles.setObjectName("LBRegles")
+        self.gridLayout.addWidget(self.LBRegles, 0, 1, 1, 1)
+        self.gridLayout_2.addLayout(self.gridLayout, 1, 0, 1, 1)
+        self.horizontalLayout_4 = QtGui.QHBoxLayout()
+        self.horizontalLayout_4.setObjectName("horizontalLayout_4")
+        spacerItem2 = QtGui.QSpacerItem(148, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
+        self.horizontalLayout_4.addItem(spacerItem2)
         self.bOk = QtGui.QPushButton(DRac)
-        self.bOk.setMinimumSize(QtCore.QSize(160,30))
+        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.bOk.sizePolicy().hasHeightForWidth())
+        self.bOk.setSizePolicy(sizePolicy)
+        self.bOk.setMinimumSize(QtCore.QSize(160, 30))
         self.bOk.setAutoDefault(True)
         self.bOk.setDefault(True)
         self.bOk.setObjectName("bOk")
-        self.gridLayout.addWidget(self.bOk,5,2,1,3)
-        self.bHelp = QtGui.QPushButton(DRac)
-        self.bHelp.setMinimumSize(QtCore.QSize(160,30))
-        self.bHelp.setAutoDefault(True)
-        self.bHelp.setObjectName("bHelp")
-        self.gridLayout.addWidget(self.bHelp,5,5,1,1)
+        self.horizontalLayout_4.addWidget(self.bOk)
+        spacerItem3 = QtGui.QSpacerItem(148, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
+        self.horizontalLayout_4.addItem(spacerItem3)
+        self.gridLayout_2.addLayout(self.horizontalLayout_4, 2, 0, 1, 1)
 
         self.retranslateUi(DRac)
         QtCore.QMetaObject.connectSlotsByName(DRac)
-        DRac.setTabOrder(self.LEFiltre,self.LBNouvCommande)
-        DRac.setTabOrder(self.LBNouvCommande,self.bSup)
-        DRac.setTabOrder(self.bSup,self.bOk)
-        DRac.setTabOrder(self.bOk,self.bHelp)
-        DRac.setTabOrder(self.bHelp,self.LBRegles)
+        DRac.setTabOrder(self.LEFiltre, self.LBNouvCommande)
+        DRac.setTabOrder(self.LBNouvCommande, self.bOk)
+        DRac.setTabOrder(self.bOk, self.LBRegles)
 
     def retranslateUi(self, DRac):
         DRac.setWindowTitle(QtGui.QApplication.translate("DRac", "DMacro", None, QtGui.QApplication.UnicodeUTF8))
@@ -84,15 +123,9 @@ class Ui_DRac(object):
         self.RBGroupe.setText(QtGui.QApplication.translate("DRac", "par groupe", None, QtGui.QApplication.UnicodeUTF8))
         self.textLabel6.setText(QtGui.QApplication.translate("DRac", "Filtre", None, QtGui.QApplication.UnicodeUTF8))
         self.BNext.setText(QtGui.QApplication.translate("DRac", "Suivant", None, QtGui.QApplication.UnicodeUTF8))
-        self.bSup.setToolTip(QtGui.QApplication.translate("DRac", "suppression du mot clef", None, QtGui.QApplication.UnicodeUTF8))
-        self.bSup.setText(QtGui.QApplication.translate("DRac", "&Supprimer", None, QtGui.QApplication.UnicodeUTF8))
-        self.bSup.setShortcut(QtGui.QApplication.translate("DRac", "Alt+S", None, QtGui.QApplication.UnicodeUTF8))
         self.bOk.setToolTip(QtGui.QApplication.translate("DRac", "validation de la saisie", None, QtGui.QApplication.UnicodeUTF8))
         self.bOk.setText(QtGui.QApplication.translate("DRac", "&Valider", None, QtGui.QApplication.UnicodeUTF8))
         self.bOk.setShortcut(QtGui.QApplication.translate("DRac", "Shift+A, Alt+A, Alt+A, Alt+A", None, QtGui.QApplication.UnicodeUTF8))
-        self.bHelp.setToolTip(QtGui.QApplication.translate("DRac", "affichage documentation aster", None, QtGui.QApplication.UnicodeUTF8))
-        self.bHelp.setText(QtGui.QApplication.translate("DRac", "&Documentation", None, QtGui.QApplication.UnicodeUTF8))
-        self.bHelp.setShortcut(QtGui.QApplication.translate("DRac", "Alt+D", None, QtGui.QApplication.UnicodeUTF8))
 
 
 if __name__ == "__main__":
index d21e3ce378c587a12d258258f23cdcde1803d693..19b1a4069a3bff8d071051fab7d0e3402741181b 100644 (file)
@@ -5,10 +5,16 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>554</width>
+    <width>582</width>
     <height>540</height>
    </rect>
   </property>
+  <property name="sizePolicy" >
+   <sizepolicy vsizetype="Expanding" hsizetype="Expanding" >
+    <horstretch>0</horstretch>
+    <verstretch>0</verstretch>
+   </sizepolicy>
+  </property>
   <property name="minimumSize" >
    <size>
     <width>505</width>
   <property name="windowTitle" >
    <string>DMacro</string>
   </property>
-  <layout class="QGridLayout" name="gridLayout" >
-   <item rowspan="2" row="0" column="0" colspan="5" >
-    <widget class="QLabel" name="textLabel1_4" >
-     <property name="minimumSize" >
-      <size>
-       <width>291</width>
-       <height>21</height>
-      </size>
-     </property>
-     <property name="text" >
-      <string>&lt;b>&lt;u>Commandes :&lt;/u>&lt;/b></string>
-     </property>
-     <property name="wordWrap" >
-      <bool>false</bool>
-     </property>
-    </widget>
-   </item>
-   <item row="1" column="4" colspan="2" >
-    <widget class="QLabel" name="textLabel1_4_2" >
-     <property name="text" >
-      <string>&lt;p align="center">&lt;b>&lt;u>Régles :&lt;/u>&lt;/b>&lt;/p></string>
-     </property>
-     <property name="wordWrap" >
-      <bool>false</bool>
-     </property>
-    </widget>
-   </item>
-   <item row="2" column="0" colspan="2" >
-    <widget class="QRadioButton" name="RBalpha" >
-     <property name="text" >
-      <string>alphabétique</string>
-     </property>
-     <property name="checked" >
-      <bool>true</bool>
-     </property>
-    </widget>
-   </item>
-   <item row="2" column="2" colspan="3" >
-    <widget class="QRadioButton" name="RBGroupe" >
-     <property name="text" >
-      <string>par groupe</string>
-     </property>
-    </widget>
-   </item>
-   <item row="3" column="0" >
-    <widget class="QLabel" name="textLabel6" >
-     <property name="minimumSize" >
-      <size>
-       <width>40</width>
-       <height>0</height>
-      </size>
-     </property>
-     <property name="text" >
-      <string>Filtre</string>
-     </property>
-     <property name="wordWrap" >
-      <bool>false</bool>
-     </property>
-    </widget>
-   </item>
-   <item row="3" column="1" >
-    <widget class="QLineEdit" name="LEFiltre" >
-     <property name="minimumSize" >
-      <size>
-       <width>0</width>
-       <height>30</height>
-      </size>
-     </property>
-    </widget>
-   </item>
-   <item row="3" column="2" >
-    <widget class="QPushButton" name="BNext" >
-     <property name="text" >
-      <string>Suivant</string>
-     </property>
-    </widget>
-   </item>
-   <item rowspan="2" row="3" column="3" colspan="3" >
-    <widget class="QListWidget" name="LBRegles" >
-     <property name="minimumSize" >
-      <size>
-       <width>0</width>
-       <height>0</height>
-      </size>
-     </property>
-    </widget>
-   </item>
-   <item row="4" column="0" colspan="3" >
-    <widget class="QListWidget" name="LBNouvCommande" />
-   </item>
-   <item row="5" column="0" colspan="2" >
-    <widget class="QPushButton" name="bSup" >
-     <property name="minimumSize" >
-      <size>
-       <width>160</width>
-       <height>30</height>
-      </size>
-     </property>
-     <property name="toolTip" >
-      <string>suppression du mot clef</string>
-     </property>
-     <property name="text" >
-      <string>&amp;Supprimer</string>
-     </property>
-     <property name="shortcut" >
-      <string>Alt+S</string>
-     </property>
-     <property name="autoDefault" >
-      <bool>true</bool>
-     </property>
-    </widget>
+  <layout class="QGridLayout" name="gridLayout_2" >
+   <item row="0" column="0" >
+    <layout class="QVBoxLayout" name="verticalLayout" >
+     <item>
+      <layout class="QHBoxLayout" name="horizontalLayout" >
+       <item>
+        <widget class="QLabel" name="textLabel1_4" >
+         <property name="minimumSize" >
+          <size>
+           <width>0</width>
+           <height>20</height>
+          </size>
+         </property>
+         <property name="text" >
+          <string>&lt;b>&lt;u>Commandes :&lt;/u>&lt;/b></string>
+         </property>
+         <property name="wordWrap" >
+          <bool>false</bool>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QLabel" name="textLabel1_4_2" >
+         <property name="text" >
+          <string>&lt;p align="center">&lt;b>&lt;u>Régles :&lt;/u>&lt;/b>&lt;/p></string>
+         </property>
+         <property name="wordWrap" >
+          <bool>false</bool>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </item>
+     <item>
+      <layout class="QHBoxLayout" name="horizontalLayout_2" >
+       <item>
+        <widget class="QRadioButton" name="RBalpha" >
+         <property name="text" >
+          <string>alphabétique</string>
+         </property>
+         <property name="checked" >
+          <bool>true</bool>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QRadioButton" name="RBGroupe" >
+         <property name="text" >
+          <string>par groupe</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <spacer name="horizontalSpacer" >
+         <property name="orientation" >
+          <enum>Qt::Horizontal</enum>
+         </property>
+         <property name="sizeHint" stdset="0" >
+          <size>
+           <width>228</width>
+           <height>20</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+      </layout>
+     </item>
+     <item>
+      <layout class="QHBoxLayout" name="horizontalLayout_3" >
+       <item>
+        <widget class="QLabel" name="textLabel6" >
+         <property name="minimumSize" >
+          <size>
+           <width>40</width>
+           <height>0</height>
+          </size>
+         </property>
+         <property name="text" >
+          <string>Filtre</string>
+         </property>
+         <property name="wordWrap" >
+          <bool>false</bool>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QLineEdit" name="LEFiltre" >
+         <property name="minimumSize" >
+          <size>
+           <width>0</width>
+           <height>30</height>
+          </size>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QPushButton" name="BNext" >
+         <property name="sizePolicy" >
+          <sizepolicy vsizetype="Preferred" hsizetype="Preferred" >
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="text" >
+          <string>Suivant</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <spacer name="horizontalSpacer_2" >
+         <property name="orientation" >
+          <enum>Qt::Horizontal</enum>
+         </property>
+         <property name="sizeHint" stdset="0" >
+          <size>
+           <width>268</width>
+           <height>27</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+      </layout>
+     </item>
+    </layout>
    </item>
-   <item row="5" column="2" colspan="3" >
-    <widget class="QPushButton" name="bOk" >
-     <property name="minimumSize" >
-      <size>
-       <width>160</width>
-       <height>30</height>
-      </size>
-     </property>
-     <property name="toolTip" >
-      <string>validation de la saisie</string>
-     </property>
-     <property name="text" >
-      <string>&amp;Valider</string>
-     </property>
-     <property name="shortcut" >
-      <string>Shift+A, Alt+A, Alt+A, Alt+A</string>
-     </property>
-     <property name="autoDefault" >
-      <bool>true</bool>
-     </property>
-     <property name="default" >
-      <bool>true</bool>
-     </property>
-    </widget>
+   <item row="1" column="0" >
+    <layout class="QGridLayout" name="gridLayout" >
+     <item row="0" column="0" >
+      <widget class="QListWidget" name="LBNouvCommande" >
+       <property name="sizePolicy" >
+        <sizepolicy vsizetype="MinimumExpanding" hsizetype="Expanding" >
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="1" >
+      <widget class="QListWidget" name="LBRegles" >
+       <property name="sizePolicy" >
+        <sizepolicy vsizetype="MinimumExpanding" hsizetype="Expanding" >
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="minimumSize" >
+        <size>
+         <width>0</width>
+         <height>0</height>
+        </size>
+       </property>
+      </widget>
+     </item>
+    </layout>
    </item>
-   <item row="5" column="5" >
-    <widget class="QPushButton" name="bHelp" >
-     <property name="minimumSize" >
-      <size>
-       <width>160</width>
-       <height>30</height>
-      </size>
-     </property>
-     <property name="toolTip" >
-      <string>affichage documentation aster</string>
-     </property>
-     <property name="text" >
-      <string>&amp;Documentation</string>
-     </property>
-     <property name="shortcut" >
-      <string>Alt+D</string>
-     </property>
-     <property name="autoDefault" >
-      <bool>true</bool>
-     </property>
-    </widget>
+   <item row="2" column="0" >
+    <layout class="QHBoxLayout" name="horizontalLayout_4" >
+     <item>
+      <spacer name="horizontalSpacer_3" >
+       <property name="orientation" >
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0" >
+        <size>
+         <width>148</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QPushButton" name="bOk" >
+       <property name="sizePolicy" >
+        <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="minimumSize" >
+        <size>
+         <width>160</width>
+         <height>30</height>
+        </size>
+       </property>
+       <property name="toolTip" >
+        <string>validation de la saisie</string>
+       </property>
+       <property name="text" >
+        <string>&amp;Valider</string>
+       </property>
+       <property name="shortcut" >
+        <string>Shift+A, Alt+A, Alt+A, Alt+A</string>
+       </property>
+       <property name="autoDefault" >
+        <bool>true</bool>
+       </property>
+       <property name="default" >
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <spacer name="horizontalSpacer_4" >
+       <property name="orientation" >
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0" >
+        <size>
+         <width>148</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+    </layout>
    </item>
   </layout>
  </widget>
  <tabstops>
   <tabstop>LEFiltre</tabstop>
   <tabstop>LBNouvCommande</tabstop>
-  <tabstop>bSup</tabstop>
   <tabstop>bOk</tabstop>
-  <tabstop>bHelp</tabstop>
   <tabstop>LBRegles</tabstop>
  </tabstops>
  <resources/>
index c42291946750ab6a39666611e129c98f535c44d8..29a89853838bcab56761b4f9da8e2c7e55454065 100644 (file)
@@ -2,8 +2,8 @@
 
 # Form implementation generated from reading ui file 'desSelectVal.ui'
 #
-# Created: Tue Nov 18 17:37:25 2008
-#      by: PyQt4 UI code generator 4.4.2
+# Created: Tue Jan 27 12:25:37 2009
+#      by: PyQt4 UI code generator 4.4.3
 #
 # WARNING! All changes made in this file will be lost!
 
@@ -12,28 +12,28 @@ from PyQt4 import QtCore, QtGui
 class Ui_DSelVal(object):
     def setupUi(self, DSelVal):
         DSelVal.setObjectName("DSelVal")
-        DSelVal.resize(469,624)
+        DSelVal.resize(469, 624)
         self.TBtext = QtGui.QTextEdit(DSelVal)
-        self.TBtext.setGeometry(QtCore.QRect(9,9,451,476))
+        self.TBtext.setGeometry(QtCore.QRect(9, 9, 451, 476))
         self.TBtext.setObjectName("TBtext")
         self.BImportSel = QtGui.QPushButton(DSelVal)
-        self.BImportSel.setGeometry(QtCore.QRect(220,520,208,27))
+        self.BImportSel.setGeometry(QtCore.QRect(220, 520, 208, 27))
         self.BImportSel.setObjectName("BImportSel")
         self.BImportTout = QtGui.QPushButton(DSelVal)
-        self.BImportTout.setGeometry(QtCore.QRect(220,560,208,27))
+        self.BImportTout.setGeometry(QtCore.QRect(220, 560, 208, 27))
         self.BImportTout.setObjectName("BImportTout")
         self.BGSeparateur = QtGui.QGroupBox(DSelVal)
-        self.BGSeparateur.setGeometry(QtCore.QRect(20,500,188,103))
+        self.BGSeparateur.setGeometry(QtCore.QRect(20, 500, 188, 103))
         self.BGSeparateur.setObjectName("BGSeparateur")
         self.Bespace = QtGui.QRadioButton(self.BGSeparateur)
-        self.Bespace.setGeometry(QtCore.QRect(20,20,148,23))
+        self.Bespace.setGeometry(QtCore.QRect(20, 20, 148, 23))
         self.Bespace.setChecked(True)
         self.Bespace.setObjectName("Bespace")
         self.Bvirgule = QtGui.QRadioButton(self.BGSeparateur)
-        self.Bvirgule.setGeometry(QtCore.QRect(20,40,148,23))
+        self.Bvirgule.setGeometry(QtCore.QRect(20, 40, 148, 23))
         self.Bvirgule.setObjectName("Bvirgule")
         self.BpointVirgule = QtGui.QRadioButton(self.BGSeparateur)
-        self.BpointVirgule.setGeometry(QtCore.QRect(20,60,148,23))
+        self.BpointVirgule.setGeometry(QtCore.QRect(20, 60, 148, 23))
         self.BpointVirgule.setObjectName("BpointVirgule")
 
         self.retranslateUi(DSelVal)
index 11130db36a443f312b1c559e5c6c0b44e02b8ad3..e7da3d8b27a52065ab1d953d0b13adb613d06bd4 100644 (file)
@@ -2,8 +2,8 @@
 
 # Form implementation generated from reading ui file 'desUniqueASSD.ui'
 #
-# Created: Tue Nov 18 17:37:25 2008
-#      by: PyQt4 UI code generator 4.4.2
+# Created: Fri Apr 24 14:45:17 2009
+#      by: PyQt4 UI code generator 4.4.3
 #
 # WARNING! All changes made in this file will be lost!
 
@@ -12,66 +12,55 @@ from PyQt4 import QtCore, QtGui
 class Ui_DUnASSD(object):
     def setupUi(self, DUnASSD):
         DUnASSD.setObjectName("DUnASSD")
-        DUnASSD.resize(482,480)
-        DUnASSD.setMinimumSize(QtCore.QSize(350,0))
+        DUnASSD.resize(482, 480)
+        DUnASSD.setMinimumSize(QtCore.QSize(350, 0))
         self.gridlayout = QtGui.QGridLayout(DUnASSD)
         self.gridlayout.setObjectName("gridlayout")
         self.tabuniqueinto = QtGui.QTabWidget(DUnASSD)
         self.tabuniqueinto.setObjectName("tabuniqueinto")
         self.Widget8 = QtGui.QWidget()
         self.Widget8.setObjectName("Widget8")
-        self.gridlayout1 = QtGui.QGridLayout(self.Widget8)
-        self.gridlayout1.setObjectName("gridlayout1")
+        self.gridLayout = QtGui.QGridLayout(self.Widget8)
+        self.gridLayout.setObjectName("gridLayout")
         self.textLabel2 = QtGui.QLabel(self.Widget8)
-        self.textLabel2.setMinimumSize(QtCore.QSize(436,50))
+        self.textLabel2.setMinimumSize(QtCore.QSize(436, 50))
         self.textLabel2.setWordWrap(False)
         self.textLabel2.setObjectName("textLabel2")
-        self.gridlayout1.addWidget(self.textLabel2,0,0,1,1)
+        self.gridLayout.addWidget(self.textLabel2, 0, 0, 1, 1)
         self.listBoxASSD = QtGui.QListWidget(self.Widget8)
         self.listBoxASSD.setObjectName("listBoxASSD")
-        self.gridlayout1.addWidget(self.listBoxASSD,1,0,1,1)
+        self.gridLayout.addWidget(self.listBoxASSD, 1, 0, 1, 1)
         self.Commentaire = QtGui.QLabel(self.Widget8)
-        self.Commentaire.setMinimumSize(QtCore.QSize(380,30))
+        self.Commentaire.setMinimumSize(QtCore.QSize(380, 30))
         self.Commentaire.setWordWrap(False)
         self.Commentaire.setObjectName("Commentaire")
-        self.gridlayout1.addWidget(self.Commentaire,2,0,1,1)
-        self.hboxlayout = QtGui.QHBoxLayout()
-        self.hboxlayout.setObjectName("hboxlayout")
-        self.bSup = QtGui.QPushButton(self.Widget8)
-        self.bSup.setMinimumSize(QtCore.QSize(0,30))
-        self.bSup.setAutoDefault(True)
-        self.bSup.setProperty("toolTip",QtCore.QVariant(QtGui.QApplication.translate("DUnASSD", "suppression du mot clef", None, QtGui.QApplication.UnicodeUTF8)))
-        self.bSup.setObjectName("bSup")
-        self.hboxlayout.addWidget(self.bSup)
+        self.gridLayout.addWidget(self.Commentaire, 2, 0, 1, 1)
+        self.horizontalLayout = QtGui.QHBoxLayout()
+        self.horizontalLayout.setObjectName("horizontalLayout")
+        spacerItem = QtGui.QSpacerItem(138, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
+        self.horizontalLayout.addItem(spacerItem)
         self.bOk = QtGui.QPushButton(self.Widget8)
-        self.bOk.setMinimumSize(QtCore.QSize(0,30))
+        self.bOk.setMinimumSize(QtCore.QSize(160, 30))
         self.bOk.setAutoDefault(True)
         self.bOk.setDefault(True)
-        self.bOk.setProperty("toolTip",QtCore.QVariant(QtGui.QApplication.translate("DUnASSD", "validation de la saisie", None, QtGui.QApplication.UnicodeUTF8)))
         self.bOk.setObjectName("bOk")
-        self.hboxlayout.addWidget(self.bOk)
-        self.bHelp = QtGui.QPushButton(self.Widget8)
-        self.bHelp.setMinimumSize(QtCore.QSize(0,30))
-        self.bHelp.setAutoDefault(True)
-        self.bHelp.setProperty("toolTip",QtCore.QVariant(QtGui.QApplication.translate("DUnASSD", "affichage documentation aster", None, QtGui.QApplication.UnicodeUTF8)))
-        self.bHelp.setObjectName("bHelp")
-        self.hboxlayout.addWidget(self.bHelp)
-        self.gridlayout1.addLayout(self.hboxlayout,3,0,1,1)
-        self.tabuniqueinto.addTab(self.Widget8,"")
-        self.gridlayout.addWidget(self.tabuniqueinto,0,0,1,1)
+        self.horizontalLayout.addWidget(self.bOk)
+        spacerItem1 = QtGui.QSpacerItem(138, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
+        self.horizontalLayout.addItem(spacerItem1)
+        self.gridLayout.addLayout(self.horizontalLayout, 3, 0, 1, 1)
+        self.tabuniqueinto.addTab(self.Widget8, "")
+        self.gridlayout.addWidget(self.tabuniqueinto, 0, 0, 1, 1)
 
         self.retranslateUi(DUnASSD)
+        QtCore.QMetaObject.connectSlotsByName(DUnASSD)
 
     def retranslateUi(self, DUnASSD):
         DUnASSD.setWindowTitle(QtGui.QApplication.translate("DUnASSD", "DUnIn", None, QtGui.QApplication.UnicodeUTF8))
         self.textLabel2.setText(QtGui.QApplication.translate("DUnASSD", "<font size=\"+1\"><p align=\"center\">Structures de données du type\n"
 "requis par l\'objet courant :</p></font>", None, QtGui.QApplication.UnicodeUTF8))
-        self.bSup.setText(QtGui.QApplication.translate("DUnASSD", "&Supprimer", None, QtGui.QApplication.UnicodeUTF8))
-        self.bSup.setShortcut(QtGui.QApplication.translate("DUnASSD", "Alt+S", None, QtGui.QApplication.UnicodeUTF8))
+        self.bOk.setToolTip(QtGui.QApplication.translate("DUnASSD", "validation de la saisie", None, QtGui.QApplication.UnicodeUTF8))
         self.bOk.setText(QtGui.QApplication.translate("DUnASSD", "&Valider", None, QtGui.QApplication.UnicodeUTF8))
         self.bOk.setShortcut(QtGui.QApplication.translate("DUnASSD", "Shift+A, Alt+A, Alt+A, Alt+A", None, QtGui.QApplication.UnicodeUTF8))
-        self.bHelp.setText(QtGui.QApplication.translate("DUnASSD", "&Documentation", None, QtGui.QApplication.UnicodeUTF8))
-        self.bHelp.setShortcut(QtGui.QApplication.translate("DUnASSD", "Alt+D", None, QtGui.QApplication.UnicodeUTF8))
         self.tabuniqueinto.setTabText(self.tabuniqueinto.indexOf(self.Widget8), QtGui.QApplication.translate("DUnASSD", "Saisir Valeur", None, QtGui.QApplication.UnicodeUTF8))
 
 
index fd6ee2ab9f90520df18b95496680ae6810ebbefb..5f205a7e789488775942daa5f3e3fd946c7379fb 100644 (file)
-<ui version="4.0" stdsetdef="1" >
-  <author></author>
-  <comment></comment>
-  <exportmacro></exportmacro>
-  <class>DUnASSD</class>
-  <widget class="QWidget" name="DUnASSD" >
-    <property name="geometry" >
-      <rect>
-        <x>0</x>
-        <y>0</y>
-        <width>482</width>
-        <height>480</height>
-      </rect>
-    </property>
-    <property name="minimumSize" >
-      <size>
-        <width>350</width>
-        <height>0</height>
-      </size>
-    </property>
-    <property name="windowTitle" >
-      <string>DUnIn</string>
-    </property>
-    <layout class="QGridLayout" >
-      <item row="0" column="0" >
-        <widget class="QTabWidget" name="tabuniqueinto" >
-          <widget class="QWidget" name="Widget8" >
-            <attribute name="title" >
-              <string>Saisir Valeur</string>
-            </attribute>
-            <layout class="QGridLayout" >
-              <item row="0" column="0" >
-                <widget class="QLabel" name="textLabel2" >
-                  <property name="minimumSize" >
-                    <size>
-                      <width>436</width>
-                      <height>50</height>
-                    </size>
-                  </property>
-                  <property name="text" >
-                    <string>&lt;font size="+1">&lt;p align="center">Structures de données du type
+<ui version="4.0" >
+ <class>DUnASSD</class>
+ <widget class="QWidget" name="DUnASSD" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>482</width>
+    <height>480</height>
+   </rect>
+  </property>
+  <property name="minimumSize" >
+   <size>
+    <width>350</width>
+    <height>0</height>
+   </size>
+  </property>
+  <property name="windowTitle" >
+   <string>DUnIn</string>
+  </property>
+  <layout class="QGridLayout" >
+   <item row="0" column="0" >
+    <widget class="QTabWidget" name="tabuniqueinto" >
+     <widget class="QWidget" name="Widget8" >
+      <attribute name="title" >
+       <string>Saisir Valeur</string>
+      </attribute>
+      <layout class="QGridLayout" name="gridLayout" >
+       <item row="0" column="0" >
+        <widget class="QLabel" name="textLabel2" >
+         <property name="minimumSize" >
+          <size>
+           <width>436</width>
+           <height>50</height>
+          </size>
+         </property>
+         <property name="text" >
+          <string>&lt;font size="+1">&lt;p align="center">Structures de données du type
 requis par l'objet courant :&lt;/p>&lt;/font></string>
-                  </property>
-                  <property name="wordWrap" >
-                    <bool>false</bool>
-                  </property>
-                </widget>
-              </item>
-              <item row="1" column="0" >
-                <widget class="QListWidget" name="listBoxASSD" />
-              </item>
-              <item row="2" column="0" >
-                <widget class="QLabel" name="Commentaire" >
-                  <property name="minimumSize" >
-                    <size>
-                      <width>380</width>
-                      <height>30</height>
-                    </size>
-                  </property>
-                  <property name="text" >
-                    <string/>
-                  </property>
-                  <property name="wordWrap" >
-                    <bool>false</bool>
-                  </property>
-                </widget>
-              </item>
-              <item row="3" column="0" >
-                <layout class="QHBoxLayout" >
-                  <item>
-                    <widget class="QPushButton" name="bSup" >
-                      <property name="minimumSize" >
-                        <size>
-                          <width>0</width>
-                          <height>30</height>
-                        </size>
-                      </property>
-                      <property name="text" >
-                        <string>&amp;Supprimer</string>
-                      </property>
-                      <property name="shortcut" >
-                        <string>Alt+S</string>
-                      </property>
-                      <property name="autoDefault" >
-                        <bool>true</bool>
-                      </property>
-                      <property name="toolTip" stdset="0" >
-                        <string>suppression du mot clef</string>
-                      </property>
-                    </widget>
-                  </item>
-                  <item>
-                    <widget class="QPushButton" name="bOk" >
-                      <property name="minimumSize" >
-                        <size>
-                          <width>0</width>
-                          <height>30</height>
-                        </size>
-                      </property>
-                      <property name="text" >
-                        <string>&amp;Valider</string>
-                      </property>
-                      <property name="shortcut" >
-                        <string>Shift+A, Alt+A, Alt+A, Alt+A</string>
-                      </property>
-                      <property name="autoDefault" >
-                        <bool>true</bool>
-                      </property>
-                      <property name="default" >
-                        <bool>true</bool>
-                      </property>
-                      <property name="toolTip" stdset="0" >
-                        <string>validation de la saisie</string>
-                      </property>
-                    </widget>
-                  </item>
-                  <item>
-                    <widget class="QPushButton" name="bHelp" >
-                      <property name="minimumSize" >
-                        <size>
-                          <width>0</width>
-                          <height>30</height>
-                        </size>
-                      </property>
-                      <property name="text" >
-                        <string>&amp;Documentation</string>
-                      </property>
-                      <property name="shortcut" >
-                        <string>Alt+D</string>
-                      </property>
-                      <property name="autoDefault" >
-                        <bool>true</bool>
-                      </property>
-                      <property name="toolTip" stdset="0" >
-                        <string>affichage documentation aster</string>
-                      </property>
-                    </widget>
-                  </item>
-                </layout>
-              </item>
-            </layout>
-          </widget>
+         </property>
+         <property name="wordWrap" >
+          <bool>false</bool>
+         </property>
+        </widget>
+       </item>
+       <item row="1" column="0" >
+        <widget class="QListWidget" name="listBoxASSD" />
+       </item>
+       <item row="2" column="0" >
+        <widget class="QLabel" name="Commentaire" >
+         <property name="minimumSize" >
+          <size>
+           <width>380</width>
+           <height>30</height>
+          </size>
+         </property>
+         <property name="text" >
+          <string/>
+         </property>
+         <property name="wordWrap" >
+          <bool>false</bool>
+         </property>
         </widget>
-      </item>
-    </layout>
-  </widget>
-  <layoutdefault spacing="6" margin="11" />
-  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
+       </item>
+       <item row="3" column="0" >
+        <layout class="QHBoxLayout" name="horizontalLayout" >
+         <item>
+          <spacer name="horizontalSpacer" >
+           <property name="orientation" >
+            <enum>Qt::Horizontal</enum>
+           </property>
+           <property name="sizeHint" stdset="0" >
+            <size>
+             <width>138</width>
+             <height>20</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
+         <item>
+          <widget class="QPushButton" name="bOk" >
+           <property name="minimumSize" >
+            <size>
+             <width>160</width>
+             <height>30</height>
+            </size>
+           </property>
+           <property name="toolTip" >
+            <string>validation de la saisie</string>
+           </property>
+           <property name="text" >
+            <string>&amp;Valider</string>
+           </property>
+           <property name="shortcut" >
+            <string>Shift+A, Alt+A, Alt+A, Alt+A</string>
+           </property>
+           <property name="autoDefault" >
+            <bool>true</bool>
+           </property>
+           <property name="default" >
+            <bool>true</bool>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <spacer name="horizontalSpacer_2" >
+           <property name="orientation" >
+            <enum>Qt::Horizontal</enum>
+           </property>
+           <property name="sizeHint" stdset="0" >
+            <size>
+             <width>138</width>
+             <height>20</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
+        </layout>
+       </item>
+      </layout>
+     </widget>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <layoutdefault spacing="6" margin="11" />
+ <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
+ <resources/>
+ <connections/>
 </ui>
index 6d2c6b3301472f297f6f1cc6a17ef30c872c3731..d88cadb8f92654260d5f67192e862f433017f319 100644 (file)
@@ -2,8 +2,8 @@
 
 # Form implementation generated from reading ui file 'desUniqueBase.ui'
 #
-# Created: Tue Nov 18 17:37:25 2008
-#      by: PyQt4 UI code generator 4.4.2
+# Created: Fri Apr 24 14:36:52 2009
+#      by: PyQt4 UI code generator 4.4.3
 #
 # WARNING! All changes made in this file will be lost!
 
@@ -12,102 +12,119 @@ from PyQt4 import QtCore, QtGui
 class Ui_DUnBase(object):
     def setupUi(self, DUnBase):
         DUnBase.setObjectName("DUnBase")
-        DUnBase.resize(482,480)
-        DUnBase.setMinimumSize(QtCore.QSize(350,0))
+        DUnBase.resize(482, 480)
+        DUnBase.setMinimumSize(QtCore.QSize(350, 0))
         self.gridlayout = QtGui.QGridLayout(DUnBase)
         self.gridlayout.setObjectName("gridlayout")
         self.tabuniqueinto = QtGui.QTabWidget(DUnBase)
         self.tabuniqueinto.setObjectName("tabuniqueinto")
         self.Widget8 = QtGui.QWidget()
-        self.Widget8.setGeometry(QtCore.QRect(0,0,460,435))
         self.Widget8.setObjectName("Widget8")
-        self.gridlayout1 = QtGui.QGridLayout(self.Widget8)
-        self.gridlayout1.setObjectName("gridlayout1")
-        self.hboxlayout = QtGui.QHBoxLayout()
-        self.hboxlayout.setObjectName("hboxlayout")
+        self.gridLayout = QtGui.QGridLayout(self.Widget8)
+        self.gridLayout.setObjectName("gridLayout")
+        self.horizontalLayout = QtGui.QHBoxLayout()
+        self.horizontalLayout.setObjectName("horizontalLayout")
         self.textLabel2 = QtGui.QLabel(self.Widget8)
         self.textLabel2.setWordWrap(False)
         self.textLabel2.setObjectName("textLabel2")
-        self.hboxlayout.addWidget(self.textLabel2)
+        self.horizontalLayout.addWidget(self.textLabel2)
         self.lineEditVal = QtGui.QLineEdit(self.Widget8)
-        self.lineEditVal.setMinimumSize(QtCore.QSize(290,50))
+        self.lineEditVal.setMinimumSize(QtCore.QSize(290, 50))
         self.lineEditVal.setObjectName("lineEditVal")
-        self.hboxlayout.addWidget(self.lineEditVal)
-        self.gridlayout1.addLayout(self.hboxlayout,1,0,1,3)
-        spacerItem = QtGui.QSpacerItem(288,21,QtGui.QSizePolicy.Expanding,QtGui.QSizePolicy.Minimum)
-        self.gridlayout1.addItem(spacerItem,0,0,1,2)
+        self.horizontalLayout.addWidget(self.lineEditVal)
+        self.gridLayout.addLayout(self.horizontalLayout, 0, 0, 1, 4)
+        spacerItem = QtGui.QSpacerItem(137, 43, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding)
+        self.gridLayout.addItem(spacerItem, 1, 2, 1, 1)
         self.bParametres = QtGui.QPushButton(self.Widget8)
-        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed,QtGui.QSizePolicy.Fixed)
+        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.bParametres.sizePolicy().hasHeightForWidth())
         self.bParametres.setSizePolicy(sizePolicy)
-        self.bParametres.setMinimumSize(QtCore.QSize(140,30))
+        self.bParametres.setMinimumSize(QtCore.QSize(140, 45))
         self.bParametres.setObjectName("bParametres")
-        self.gridlayout1.addWidget(self.bParametres,0,2,1,1)
-        self.bSup = QtGui.QPushButton(self.Widget8)
-        self.bSup.setMinimumSize(QtCore.QSize(0,30))
-        self.bSup.setAutoDefault(True)
-        self.bSup.setObjectName("bSup")
-        self.gridlayout1.addWidget(self.bSup,5,0,1,1)
-        self.bOk = QtGui.QPushButton(self.Widget8)
-        self.bOk.setMinimumSize(QtCore.QSize(0,30))
-        self.bOk.setAutoDefault(True)
-        self.bOk.setDefault(True)
-        self.bOk.setObjectName("bOk")
-        self.gridlayout1.addWidget(self.bOk,5,1,1,1)
-        self.bHelp = QtGui.QPushButton(self.Widget8)
-        self.bHelp.setMinimumSize(QtCore.QSize(0,30))
-        self.bHelp.setAutoDefault(True)
-        self.bHelp.setObjectName("bHelp")
-        self.gridlayout1.addWidget(self.bHelp,5,2,1,1)
-        spacerItem1 = QtGui.QSpacerItem(41,112,QtGui.QSizePolicy.Minimum,QtGui.QSizePolicy.Expanding)
-        self.gridlayout1.addItem(spacerItem1,2,1,1,1)
-        spacerItem2 = QtGui.QSpacerItem(21,112,QtGui.QSizePolicy.Minimum,QtGui.QSizePolicy.Expanding)
-        self.gridlayout1.addItem(spacerItem2,4,1,1,1)
-        self.Commentaire = QtGui.QLabel(self.Widget8)
-        self.Commentaire.setMinimumSize(QtCore.QSize(430,40))
-        self.Commentaire.setWordWrap(False)
-        self.Commentaire.setObjectName("Commentaire")
-        self.gridlayout1.addWidget(self.Commentaire,3,0,1,3)
-        self.BView2D = QtGui.QPushButton(self.Widget8)
-        self.BView2D.setMinimumSize(QtCore.QSize(110,40))
-        self.BView2D.setObjectName("BView2D")
-        self.gridlayout1.addWidget(self.BView2D,2,2,1,1)
+        self.gridLayout.addWidget(self.bParametres, 1, 3, 2, 1)
+        spacerItem1 = QtGui.QSpacerItem(293, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
+        self.gridLayout.addItem(spacerItem1, 2, 0, 1, 3)
         self.BSalome = QtGui.QPushButton(self.Widget8)
-        self.BSalome.setMinimumSize(QtCore.QSize(50,40))
+        self.BSalome.setMinimumSize(QtCore.QSize(142, 40))
         icon = QtGui.QIcon()
-        icon.addPixmap(QtGui.QPixmap("image240.gif"),QtGui.QIcon.Normal,QtGui.QIcon.Off)
+        icon.addPixmap(QtGui.QPixmap("image240.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
         self.BSalome.setIcon(icon)
         self.BSalome.setObjectName("BSalome")
-        self.gridlayout1.addWidget(self.BSalome,2,0,1,1)
-        self.tabuniqueinto.addTab(self.Widget8,"")
-        self.gridlayout.addWidget(self.tabuniqueinto,0,0,1,1)
+        self.gridLayout.addWidget(self.BSalome, 3, 0, 1, 1)
+        spacerItem2 = QtGui.QSpacerItem(138, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
+        self.gridLayout.addItem(spacerItem2, 3, 1, 1, 1)
+        spacerItem3 = QtGui.QSpacerItem(137, 77, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding)
+        self.gridLayout.addItem(spacerItem3, 3, 2, 2, 1)
+        self.BView2D = QtGui.QPushButton(self.Widget8)
+        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.BView2D.sizePolicy().hasHeightForWidth())
+        self.BView2D.setSizePolicy(sizePolicy)
+        self.BView2D.setMinimumSize(QtCore.QSize(140, 40))
+        self.BView2D.setObjectName("BView2D")
+        self.gridLayout.addWidget(self.BView2D, 3, 3, 1, 1)
+        self.BFichier = QtGui.QPushButton(self.Widget8)
+        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.BFichier.sizePolicy().hasHeightForWidth())
+        self.BFichier.setSizePolicy(sizePolicy)
+        self.BFichier.setMinimumSize(QtCore.QSize(140, 40))
+        self.BFichier.setIcon(icon)
+        self.BFichier.setObjectName("BFichier")
+        self.gridLayout.addWidget(self.BFichier, 4, 3, 2, 1)
+        spacerItem4 = QtGui.QSpacerItem(293, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
+        self.gridLayout.addItem(spacerItem4, 5, 0, 1, 3)
+        self.verticalLayout = QtGui.QVBoxLayout()
+        self.verticalLayout.setObjectName("verticalLayout")
+        spacerItem5 = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding)
+        self.verticalLayout.addItem(spacerItem5)
+        self.Commentaire = QtGui.QLabel(self.Widget8)
+        self.Commentaire.setObjectName("Commentaire")
+        self.verticalLayout.addWidget(self.Commentaire)
+        spacerItem6 = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding)
+        self.verticalLayout.addItem(spacerItem6)
+        self.gridLayout.addLayout(self.verticalLayout, 6, 0, 1, 4)
+        self.horizontalLayout_2 = QtGui.QHBoxLayout()
+        self.horizontalLayout_2.setObjectName("horizontalLayout_2")
+        spacerItem7 = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
+        self.horizontalLayout_2.addItem(spacerItem7)
+        self.bOk = QtGui.QPushButton(self.Widget8)
+        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.bOk.sizePolicy().hasHeightForWidth())
+        self.bOk.setSizePolicy(sizePolicy)
+        self.bOk.setMinimumSize(QtCore.QSize(140, 40))
+        self.bOk.setAutoDefault(True)
+        self.bOk.setDefault(True)
+        self.bOk.setObjectName("bOk")
+        self.horizontalLayout_2.addWidget(self.bOk)
+        spacerItem8 = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
+        self.horizontalLayout_2.addItem(spacerItem8)
+        self.gridLayout.addLayout(self.horizontalLayout_2, 7, 0, 1, 4)
+        self.tabuniqueinto.addTab(self.Widget8, "")
+        self.gridlayout.addWidget(self.tabuniqueinto, 0, 0, 1, 1)
 
         self.retranslateUi(DUnBase)
         QtCore.QMetaObject.connectSlotsByName(DUnBase)
-        DUnBase.setTabOrder(self.lineEditVal,self.bOk)
-        DUnBase.setTabOrder(self.bOk,self.bSup)
-        DUnBase.setTabOrder(self.bSup,self.BSalome)
-        DUnBase.setTabOrder(self.BSalome,self.bHelp)
-        DUnBase.setTabOrder(self.bHelp,self.BView2D)
-        DUnBase.setTabOrder(self.BView2D,self.bParametres)
-        DUnBase.setTabOrder(self.bParametres,self.tabuniqueinto)
+        DUnBase.setTabOrder(self.lineEditVal, self.bOk)
+        DUnBase.setTabOrder(self.bOk, self.BSalome)
+        DUnBase.setTabOrder(self.BSalome, self.BView2D)
 
     def retranslateUi(self, DUnBase):
         DUnBase.setWindowTitle(QtGui.QApplication.translate("DUnBase", "DUnIn", None, QtGui.QApplication.UnicodeUTF8))
         self.textLabel2.setText(QtGui.QApplication.translate("DUnBase", "<b><u><p align=\"center\">Valeur: </p></u></b>", None, QtGui.QApplication.UnicodeUTF8))
         self.bParametres.setText(QtGui.QApplication.translate("DUnBase", "Parametres", None, QtGui.QApplication.UnicodeUTF8))
-        self.bSup.setToolTip(QtGui.QApplication.translate("DUnBase", "suppression du mot clef", None, QtGui.QApplication.UnicodeUTF8))
-        self.bSup.setText(QtGui.QApplication.translate("DUnBase", "&Supprimer", None, QtGui.QApplication.UnicodeUTF8))
-        self.bSup.setShortcut(QtGui.QApplication.translate("DUnBase", "Alt+S", None, QtGui.QApplication.UnicodeUTF8))
+        self.BView2D.setText(QtGui.QApplication.translate("DUnBase", "Visualiser", None, QtGui.QApplication.UnicodeUTF8))
+        self.BFichier.setText(QtGui.QApplication.translate("DUnBase", "Fichier", None, QtGui.QApplication.UnicodeUTF8))
+        self.Commentaire.setText(QtGui.QApplication.translate("DUnBase", "TextLabel", None, QtGui.QApplication.UnicodeUTF8))
         self.bOk.setToolTip(QtGui.QApplication.translate("DUnBase", "validation de la saisie", None, QtGui.QApplication.UnicodeUTF8))
         self.bOk.setText(QtGui.QApplication.translate("DUnBase", "&Valider", None, QtGui.QApplication.UnicodeUTF8))
         self.bOk.setShortcut(QtGui.QApplication.translate("DUnBase", "Shift+A, Alt+A, Alt+A, Alt+A", None, QtGui.QApplication.UnicodeUTF8))
-        self.bHelp.setToolTip(QtGui.QApplication.translate("DUnBase", "affichage documentation aster", None, QtGui.QApplication.UnicodeUTF8))
-        self.bHelp.setText(QtGui.QApplication.translate("DUnBase", "&Documentation", None, QtGui.QApplication.UnicodeUTF8))
-        self.bHelp.setShortcut(QtGui.QApplication.translate("DUnBase", "Alt+D", None, QtGui.QApplication.UnicodeUTF8))
-        self.BView2D.setText(QtGui.QApplication.translate("DUnBase", "Visualiser", None, QtGui.QApplication.UnicodeUTF8))
         self.tabuniqueinto.setTabText(self.tabuniqueinto.indexOf(self.Widget8), QtGui.QApplication.translate("DUnBase", "Saisir Valeur", None, QtGui.QApplication.UnicodeUTF8))
 
 
index c089a5ff821c1dd4c4c683263f4b316518e28f95..ad9c6a75249ce3849fc7c42a5b7dca15c8b5eca6 100644 (file)
    <item row="0" column="0" >
     <widget class="QTabWidget" name="tabuniqueinto" >
      <widget class="QWidget" name="Widget8" >
-      <property name="geometry" >
-       <rect>
-        <x>0</x>
-        <y>0</y>
-        <width>460</width>
-        <height>435</height>
-       </rect>
-      </property>
       <attribute name="title" >
        <string>Saisir Valeur</string>
       </attribute>
-      <layout class="QGridLayout" >
-       <item row="1" column="0" colspan="3" >
-        <layout class="QHBoxLayout" >
+      <layout class="QGridLayout" name="gridLayout" >
+       <item row="0" column="0" colspan="4" >
+        <layout class="QHBoxLayout" name="horizontalLayout" >
          <item>
           <widget class="QLabel" name="textLabel2" >
            <property name="text" >
          </item>
         </layout>
        </item>
-       <item row="0" column="0" colspan="2" >
-        <spacer name="spacer1" >
+       <item row="1" column="2" >
+        <spacer name="verticalSpacer" >
          <property name="orientation" >
-          <enum>Qt::Horizontal</enum>
-         </property>
-         <property name="sizeType" >
-          <enum>QSizePolicy::Expanding</enum>
+          <enum>Qt::Vertical</enum>
          </property>
          <property name="sizeHint" stdset="0" >
           <size>
-           <width>288</width>
-           <height>21</height>
+           <width>137</width>
+           <height>43</height>
           </size>
          </property>
         </spacer>
        </item>
-       <item row="0" column="2" >
+       <item rowspan="2" row="1" column="3" >
         <widget class="QPushButton" name="bParametres" >
          <property name="sizePolicy" >
           <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
@@ -85,7 +74,7 @@
          <property name="minimumSize" >
           <size>
            <width>140</width>
-           <height>30</height>
+           <height>45</height>
           </size>
          </property>
          <property name="text" >
          </property>
         </widget>
        </item>
-       <item row="5" column="0" >
-        <widget class="QPushButton" name="bSup" >
-         <property name="minimumSize" >
-          <size>
-           <width>0</width>
-           <height>30</height>
-          </size>
-         </property>
-         <property name="toolTip" >
-          <string>suppression du mot clef</string>
-         </property>
-         <property name="text" >
-          <string>&amp;Supprimer</string>
-         </property>
-         <property name="shortcut" >
-          <string>Alt+S</string>
-         </property>
-         <property name="autoDefault" >
-          <bool>true</bool>
+       <item row="2" column="0" colspan="3" >
+        <spacer name="horizontalSpacer_3" >
+         <property name="orientation" >
+          <enum>Qt::Horizontal</enum>
          </property>
-        </widget>
-       </item>
-       <item row="5" column="1" >
-        <widget class="QPushButton" name="bOk" >
-         <property name="minimumSize" >
+         <property name="sizeHint" stdset="0" >
           <size>
-           <width>0</width>
-           <height>30</height>
+           <width>293</width>
+           <height>20</height>
           </size>
          </property>
-         <property name="toolTip" >
-          <string>validation de la saisie</string>
-         </property>
-         <property name="text" >
-          <string>&amp;Valider</string>
-         </property>
-         <property name="shortcut" >
-          <string>Shift+A, Alt+A, Alt+A, Alt+A</string>
-         </property>
-         <property name="autoDefault" >
-          <bool>true</bool>
-         </property>
-         <property name="default" >
-          <bool>true</bool>
-         </property>
-        </widget>
+        </spacer>
        </item>
-       <item row="5" column="2" >
-        <widget class="QPushButton" name="bHelp" >
+       <item row="3" column="0" >
+        <widget class="QPushButton" name="BSalome" >
          <property name="minimumSize" >
           <size>
-           <width>0</width>
-           <height>30</height>
+           <width>142</width>
+           <height>40</height>
           </size>
          </property>
-         <property name="toolTip" >
-          <string>affichage documentation aster</string>
-         </property>
          <property name="text" >
-          <string>&amp;Documentation</string>
-         </property>
-         <property name="shortcut" >
-          <string>Alt+D</string>
+          <string/>
          </property>
-         <property name="autoDefault" >
-          <bool>true</bool>
+         <property name="icon" >
+          <iconset>
+           <normaloff>image240.png</normaloff>image240.png</iconset>
          </property>
         </widget>
        </item>
-       <item row="2" column="1" >
-        <spacer name="spacer4" >
+       <item row="3" column="1" >
+        <spacer name="horizontalSpacer_5" >
          <property name="orientation" >
-          <enum>Qt::Vertical</enum>
-         </property>
-         <property name="sizeType" >
-          <enum>QSizePolicy::Expanding</enum>
+          <enum>Qt::Horizontal</enum>
          </property>
          <property name="sizeHint" stdset="0" >
           <size>
-           <width>41</width>
-           <height>112</height>
+           <width>138</width>
+           <height>20</height>
           </size>
          </property>
         </spacer>
        </item>
-       <item row="4" column="1" >
-        <spacer name="spacer3" >
+       <item rowspan="2" row="3" column="2" >
+        <spacer name="spacer4" >
          <property name="orientation" >
           <enum>Qt::Vertical</enum>
          </property>
          </property>
          <property name="sizeHint" stdset="0" >
           <size>
-           <width>21</width>
-           <height>112</height>
+           <width>137</width>
+           <height>77</height>
           </size>
          </property>
         </spacer>
        </item>
-       <item row="3" column="0" colspan="3" >
-        <widget class="QLabel" name="Commentaire" >
-         <property name="minimumSize" >
-          <size>
-           <width>430</width>
-           <height>40</height>
-          </size>
-         </property>
-         <property name="text" >
-          <string/>
-         </property>
-         <property name="wordWrap" >
-          <bool>false</bool>
-         </property>
-        </widget>
-       </item>
-       <item row="2" column="2" >
+       <item row="3" column="3" >
         <widget class="QPushButton" name="BView2D" >
+         <property name="sizePolicy" >
+          <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
          <property name="minimumSize" >
           <size>
-           <width>110</width>
+           <width>140</width>
            <height>40</height>
           </size>
          </property>
          </property>
         </widget>
        </item>
-       <item row="2" column="0" >
-        <widget class="QPushButton" name="BSalome" >
+       <item rowspan="2" row="4" column="3" >
+        <widget class="QPushButton" name="BFichier" >
+         <property name="sizePolicy" >
+          <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
          <property name="minimumSize" >
           <size>
-           <width>50</width>
+           <width>140</width>
            <height>40</height>
           </size>
          </property>
          <property name="text" >
-          <string/>
+          <string>Fichier</string>
          </property>
          <property name="icon" >
           <iconset>
-           <normaloff>image240.gif</normaloff>image240.gif</iconset>
+           <normaloff>image240.png</normaloff>image240.png</iconset>
          </property>
         </widget>
        </item>
+       <item row="5" column="0" colspan="3" >
+        <spacer name="horizontalSpacer_4" >
+         <property name="orientation" >
+          <enum>Qt::Horizontal</enum>
+         </property>
+         <property name="sizeHint" stdset="0" >
+          <size>
+           <width>293</width>
+           <height>20</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+       <item row="6" column="0" colspan="4" >
+        <layout class="QVBoxLayout" name="verticalLayout" >
+         <item>
+          <spacer name="verticalSpacer_2" >
+           <property name="orientation" >
+            <enum>Qt::Vertical</enum>
+           </property>
+           <property name="sizeHint" stdset="0" >
+            <size>
+             <width>20</width>
+             <height>40</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
+         <item>
+          <widget class="QLabel" name="Commentaire" >
+           <property name="text" >
+            <string>TextLabel</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <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>
+       </item>
+       <item row="7" column="0" colspan="4" >
+        <layout class="QHBoxLayout" name="horizontalLayout_2" >
+         <item>
+          <spacer name="horizontalSpacer" >
+           <property name="orientation" >
+            <enum>Qt::Horizontal</enum>
+           </property>
+           <property name="sizeHint" stdset="0" >
+            <size>
+             <width>40</width>
+             <height>20</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
+         <item>
+          <widget class="QPushButton" name="bOk" >
+           <property name="sizePolicy" >
+            <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <property name="minimumSize" >
+            <size>
+             <width>140</width>
+             <height>40</height>
+            </size>
+           </property>
+           <property name="toolTip" >
+            <string>validation de la saisie</string>
+           </property>
+           <property name="text" >
+            <string>&amp;Valider</string>
+           </property>
+           <property name="shortcut" >
+            <string>Shift+A, Alt+A, Alt+A, Alt+A</string>
+           </property>
+           <property name="autoDefault" >
+            <bool>true</bool>
+           </property>
+           <property name="default" >
+            <bool>true</bool>
+           </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>
       </layout>
      </widget>
     </widget>
  <tabstops>
   <tabstop>lineEditVal</tabstop>
   <tabstop>bOk</tabstop>
-  <tabstop>bSup</tabstop>
   <tabstop>BSalome</tabstop>
-  <tabstop>bHelp</tabstop>
   <tabstop>BView2D</tabstop>
-  <tabstop>bParametres</tabstop>
-  <tabstop>tabuniqueinto</tabstop>
  </tabstops>
  <resources/>
  <connections/>
index 77b18a589093231dfcc4cf26696cb9c5539aed33..e3810b31fcc89678a221f5008781db7a1c06adef 100644 (file)
@@ -2,8 +2,8 @@
 
 # Form implementation generated from reading ui file 'desUniqueComp.ui'
 #
-# Created: Tue Nov 18 17:37:25 2008
-#      by: PyQt4 UI code generator 4.4.2
+# Created: Fri Apr 24 16:01:08 2009
+#      by: PyQt4 UI code generator 4.4.3
 #
 # WARNING! All changes made in this file will be lost!
 
@@ -12,64 +12,79 @@ from PyQt4 import QtCore, QtGui
 class Ui_DUnComp(object):
     def setupUi(self, DUnComp):
         DUnComp.setObjectName("DUnComp")
-        DUnComp.resize(484,529)
-        DUnComp.setMinimumSize(QtCore.QSize(350,0))
+        DUnComp.resize(484, 529)
+        DUnComp.setMinimumSize(QtCore.QSize(350, 0))
         self.gridlayout = QtGui.QGridLayout(DUnComp)
         self.gridlayout.setObjectName("gridlayout")
         self.tabuniqueinto = QtGui.QTabWidget(DUnComp)
         self.tabuniqueinto.setObjectName("tabuniqueinto")
         self.Widget8 = QtGui.QWidget()
-        self.Widget8.setGeometry(QtCore.QRect(0,0,462,484))
         self.Widget8.setObjectName("Widget8")
-        self.gridLayout = QtGui.QGridLayout(self.Widget8)
-        self.gridLayout.setObjectName("gridLayout")
+        self.gridLayout_2 = QtGui.QGridLayout(self.Widget8)
+        self.gridLayout_2.setObjectName("gridLayout_2")
+        self.verticalLayout_2 = QtGui.QVBoxLayout()
+        self.verticalLayout_2.setObjectName("verticalLayout_2")
         self.textLabel1 = QtGui.QLabel(self.Widget8)
         self.textLabel1.setWordWrap(False)
         self.textLabel1.setObjectName("textLabel1")
-        self.gridLayout.addWidget(self.textLabel1,0,0,1,2)
+        self.verticalLayout_2.addWidget(self.textLabel1)
         self.LEcomp = QtGui.QLineEdit(self.Widget8)
-        self.LEcomp.setMinimumSize(QtCore.QSize(390,40))
+        self.LEcomp.setMinimumSize(QtCore.QSize(390, 40))
         self.LEcomp.setObjectName("LEcomp")
-        self.gridLayout.addWidget(self.LEcomp,1,0,1,2)
+        self.verticalLayout_2.addWidget(self.LEcomp)
+        self.gridLayout_2.addLayout(self.verticalLayout_2, 0, 0, 1, 1)
+        self.verticalLayout_3 = QtGui.QVBoxLayout()
+        self.verticalLayout_3.setObjectName("verticalLayout_3")
+        spacerItem = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding)
+        self.verticalLayout_3.addItem(spacerItem)
         self.groupBox = QtGui.QGroupBox(self.Widget8)
         self.groupBox.setObjectName("groupBox")
+        self.gridLayout = QtGui.QGridLayout(self.groupBox)
+        self.gridLayout.setObjectName("gridLayout")
         self.RBRI = QtGui.QRadioButton(self.groupBox)
-        self.RBRI.setGeometry(QtCore.QRect(10,30,444,23))
         self.RBRI.setObjectName("RBRI")
+        self.gridLayout.addWidget(self.RBRI, 0, 0, 1, 1)
         self.RBMP = QtGui.QRadioButton(self.groupBox)
-        self.RBMP.setGeometry(QtCore.QRect(10,50,444,23))
         self.RBMP.setObjectName("RBMP")
-        self.gridLayout.addWidget(self.groupBox,2,0,1,2)
+        self.gridLayout.addWidget(self.RBMP, 1, 0, 1, 1)
+        self.verticalLayout_3.addWidget(self.groupBox)
+        self.gridLayout_2.addLayout(self.verticalLayout_3, 1, 0, 1, 1)
+        self.horizontalLayout_2 = QtGui.QHBoxLayout()
+        self.horizontalLayout_2.setObjectName("horizontalLayout_2")
         self.LEReel = QtGui.QLineEdit(self.Widget8)
-        self.LEReel.setMinimumSize(QtCore.QSize(190,40))
+        self.LEReel.setMinimumSize(QtCore.QSize(190, 40))
         self.LEReel.setObjectName("LEReel")
-        self.gridLayout.addWidget(self.LEReel,3,0,1,1)
+        self.horizontalLayout_2.addWidget(self.LEReel)
         self.LEImag = QtGui.QLineEdit(self.Widget8)
-        self.LEImag.setMinimumSize(QtCore.QSize(190,40))
+        self.LEImag.setMinimumSize(QtCore.QSize(190, 40))
         self.LEImag.setObjectName("LEImag")
-        self.gridLayout.addWidget(self.LEImag,3,1,1,1)
+        self.horizontalLayout_2.addWidget(self.LEImag)
+        self.gridLayout_2.addLayout(self.horizontalLayout_2, 2, 0, 1, 1)
+        self.verticalLayout = QtGui.QVBoxLayout()
+        self.verticalLayout.setObjectName("verticalLayout")
         self.Commentaire = QtGui.QLabel(self.Widget8)
         self.Commentaire.setWordWrap(False)
         self.Commentaire.setObjectName("Commentaire")
-        self.gridLayout.addWidget(self.Commentaire,4,0,1,2)
+        self.verticalLayout.addWidget(self.Commentaire)
+        spacerItem1 = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding)
+        self.verticalLayout.addItem(spacerItem1)
         self.horizontalLayout = QtGui.QHBoxLayout()
         self.horizontalLayout.setObjectName("horizontalLayout")
-        self.bSup = QtGui.QPushButton(self.Widget8)
-        self.bSup.setAutoDefault(True)
-        self.bSup.setObjectName("bSup")
-        self.horizontalLayout.addWidget(self.bSup)
+        spacerItem2 = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
+        self.horizontalLayout.addItem(spacerItem2)
         self.bOk = QtGui.QPushButton(self.Widget8)
+        self.bOk.setMinimumSize(QtCore.QSize(160, 30))
+        self.bOk.setMaximumSize(QtCore.QSize(160, 30))
         self.bOk.setAutoDefault(True)
         self.bOk.setDefault(True)
         self.bOk.setObjectName("bOk")
         self.horizontalLayout.addWidget(self.bOk)
-        self.bHelp = QtGui.QPushButton(self.Widget8)
-        self.bHelp.setAutoDefault(True)
-        self.bHelp.setObjectName("bHelp")
-        self.horizontalLayout.addWidget(self.bHelp)
-        self.gridLayout.addLayout(self.horizontalLayout,5,0,1,2)
-        self.tabuniqueinto.addTab(self.Widget8,"")
-        self.gridlayout.addWidget(self.tabuniqueinto,0,0,1,1)
+        spacerItem3 = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
+        self.horizontalLayout.addItem(spacerItem3)
+        self.verticalLayout.addLayout(self.horizontalLayout)
+        self.gridLayout_2.addLayout(self.verticalLayout, 3, 0, 1, 1)
+        self.tabuniqueinto.addTab(self.Widget8, "")
+        self.gridlayout.addWidget(self.tabuniqueinto, 0, 0, 1, 1)
 
         self.retranslateUi(DUnComp)
         QtCore.QMetaObject.connectSlotsByName(DUnComp)
@@ -81,15 +96,9 @@ class Ui_DUnComp(object):
         self.RBRI.setText(QtGui.QApplication.translate("DUnComp", "RI   : Réel                                                 Imaginaire", None, QtGui.QApplication.UnicodeUTF8))
         self.RBMP.setText(QtGui.QApplication.translate("DUnComp", "MP    : Module                                             Phase", None, QtGui.QApplication.UnicodeUTF8))
         self.Commentaire.setText(QtGui.QApplication.translate("DUnComp", "<font size=\"+2\">Un complexe est attendu</font>", None, QtGui.QApplication.UnicodeUTF8))
-        self.bSup.setToolTip(QtGui.QApplication.translate("DUnComp", "suppression du mot clef", None, QtGui.QApplication.UnicodeUTF8))
-        self.bSup.setText(QtGui.QApplication.translate("DUnComp", "&Supprimer", None, QtGui.QApplication.UnicodeUTF8))
-        self.bSup.setShortcut(QtGui.QApplication.translate("DUnComp", "Alt+S", None, QtGui.QApplication.UnicodeUTF8))
         self.bOk.setToolTip(QtGui.QApplication.translate("DUnComp", "validation de la saisie", None, QtGui.QApplication.UnicodeUTF8))
         self.bOk.setText(QtGui.QApplication.translate("DUnComp", "&Valider", None, QtGui.QApplication.UnicodeUTF8))
         self.bOk.setShortcut(QtGui.QApplication.translate("DUnComp", "Shift+A, Alt+A, Alt+A, Alt+A", None, QtGui.QApplication.UnicodeUTF8))
-        self.bHelp.setToolTip(QtGui.QApplication.translate("DUnComp", "affichage documentation aster", None, QtGui.QApplication.UnicodeUTF8))
-        self.bHelp.setText(QtGui.QApplication.translate("DUnComp", "&Documentation", None, QtGui.QApplication.UnicodeUTF8))
-        self.bHelp.setShortcut(QtGui.QApplication.translate("DUnComp", "Alt+D", None, QtGui.QApplication.UnicodeUTF8))
         self.tabuniqueinto.setTabText(self.tabuniqueinto.indexOf(self.Widget8), QtGui.QApplication.translate("DUnComp", "Saisir Valeur", None, QtGui.QApplication.UnicodeUTF8))
 
 
index dcf31b2240dbf2e83bee5fb3115a011009ea00de..f7a21519a6e8db5a19ac9c9dbe4792b4cae0133d 100644 (file)
    <item row="0" column="0" >
     <widget class="QTabWidget" name="tabuniqueinto" >
      <widget class="QWidget" name="Widget8" >
-      <property name="geometry" >
-       <rect>
-        <x>0</x>
-        <y>0</y>
-        <width>462</width>
-        <height>484</height>
-       </rect>
-      </property>
       <attribute name="title" >
        <string>Saisir Valeur</string>
       </attribute>
-      <layout class="QGridLayout" name="gridLayout" >
-       <item row="0" column="0" colspan="2" >
-        <widget class="QLabel" name="textLabel1" >
-         <property name="text" >
-          <string>&lt;font size="+2">Complexe de la forme : a+bj&lt;/font></string>
-         </property>
-         <property name="wordWrap" >
-          <bool>false</bool>
-         </property>
-        </widget>
-       </item>
-       <item row="1" column="0" colspan="2" >
-        <widget class="QLineEdit" name="LEcomp" >
-         <property name="minimumSize" >
-          <size>
-           <width>390</width>
-           <height>40</height>
-          </size>
-         </property>
-        </widget>
-       </item>
-       <item row="2" column="0" colspan="2" >
-        <widget class="QGroupBox" name="groupBox" >
-         <property name="title" >
-          <string>Ou</string>
-         </property>
-         <widget class="QRadioButton" name="RBRI" >
-          <property name="geometry" >
-           <rect>
-            <x>10</x>
-            <y>30</y>
-            <width>444</width>
-            <height>23</height>
-           </rect>
-          </property>
-          <property name="text" >
-           <string>RI   : Réel                                                     Imaginaire</string>
-          </property>
-         </widget>
-         <widget class="QRadioButton" name="RBMP" >
-          <property name="geometry" >
-           <rect>
-            <x>10</x>
-            <y>50</y>
-            <width>444</width>
-            <height>23</height>
-           </rect>
-          </property>
-          <property name="text" >
-           <string>MP  : Module                                                 Phase</string>
-          </property>
-         </widget>
-        </widget>
-       </item>
-       <item row="3" column="0" >
-        <widget class="QLineEdit" name="LEReel" >
-         <property name="minimumSize" >
-          <size>
-           <width>190</width>
-           <height>40</height>
-          </size>
-         </property>
-        </widget>
-       </item>
-       <item row="3" column="1" >
-        <widget class="QLineEdit" name="LEImag" >
-         <property name="minimumSize" >
-          <size>
-           <width>190</width>
-           <height>40</height>
-          </size>
-         </property>
-        </widget>
-       </item>
-       <item row="4" column="0" colspan="2" >
-        <widget class="QLabel" name="Commentaire" >
-         <property name="text" >
-          <string>&lt;font size="+2">Un complexe est attendu&lt;/font></string>
-         </property>
-         <property name="wordWrap" >
-          <bool>false</bool>
-         </property>
-        </widget>
-       </item>
-       <item row="5" column="0" colspan="2" >
-        <layout class="QHBoxLayout" name="horizontalLayout" >
+      <layout class="QGridLayout" name="gridLayout_2" >
+       <item row="0" column="0" >
+        <layout class="QVBoxLayout" name="verticalLayout_2" >
          <item>
-          <widget class="QPushButton" name="bSup" >
-           <property name="toolTip" >
-            <string>suppression du mot clef</string>
-           </property>
+          <widget class="QLabel" name="textLabel1" >
            <property name="text" >
-            <string>&amp;Supprimer</string>
-           </property>
-           <property name="shortcut" >
-            <string>Alt+S</string>
+            <string>&lt;font size="+2">Complexe de la forme : a+bj&lt;/font></string>
            </property>
-           <property name="autoDefault" >
-            <bool>true</bool>
+           <property name="wordWrap" >
+            <bool>false</bool>
            </property>
           </widget>
          </item>
          <item>
-          <widget class="QPushButton" name="bOk" >
-           <property name="toolTip" >
-            <string>validation de la saisie</string>
+          <widget class="QLineEdit" name="LEcomp" >
+           <property name="minimumSize" >
+            <size>
+             <width>390</width>
+             <height>40</height>
+            </size>
            </property>
-           <property name="text" >
-            <string>&amp;Valider</string>
+          </widget>
+         </item>
+        </layout>
+       </item>
+       <item row="1" column="0" >
+        <layout class="QVBoxLayout" name="verticalLayout_3" >
+         <item>
+          <spacer name="verticalSpacer_2" >
+           <property name="orientation" >
+            <enum>Qt::Vertical</enum>
            </property>
-           <property name="shortcut" >
-            <string>Shift+A, Alt+A, Alt+A, Alt+A</string>
+           <property name="sizeHint" stdset="0" >
+            <size>
+             <width>20</width>
+             <height>40</height>
+            </size>
            </property>
-           <property name="autoDefault" >
-            <bool>true</bool>
+          </spacer>
+         </item>
+         <item>
+          <widget class="QGroupBox" name="groupBox" >
+           <property name="title" >
+            <string>Ou</string>
            </property>
-           <property name="default" >
-            <bool>true</bool>
+           <layout class="QGridLayout" name="gridLayout" >
+            <item row="0" column="0" >
+             <widget class="QRadioButton" name="RBRI" >
+              <property name="text" >
+               <string>RI   : Réel                                                 Imaginaire</string>
+              </property>
+             </widget>
+            </item>
+            <item row="1" column="0" >
+             <widget class="QRadioButton" name="RBMP" >
+              <property name="text" >
+               <string>MP      : Module                                                 Phase</string>
+              </property>
+             </widget>
+            </item>
+           </layout>
+          </widget>
+         </item>
+        </layout>
+       </item>
+       <item row="2" column="0" >
+        <layout class="QHBoxLayout" name="horizontalLayout_2" >
+         <item>
+          <widget class="QLineEdit" name="LEReel" >
+           <property name="minimumSize" >
+            <size>
+             <width>190</width>
+             <height>40</height>
+            </size>
            </property>
           </widget>
          </item>
          <item>
-          <widget class="QPushButton" name="bHelp" >
-           <property name="toolTip" >
-            <string>affichage documentation aster</string>
+          <widget class="QLineEdit" name="LEImag" >
+           <property name="minimumSize" >
+            <size>
+             <width>190</width>
+             <height>40</height>
+            </size>
            </property>
+          </widget>
+         </item>
+        </layout>
+       </item>
+       <item row="3" column="0" >
+        <layout class="QVBoxLayout" name="verticalLayout" >
+         <item>
+          <widget class="QLabel" name="Commentaire" >
            <property name="text" >
-            <string>&amp;Documentation</string>
-           </property>
-           <property name="shortcut" >
-            <string>Alt+D</string>
+            <string>&lt;font size="+2">Un complexe est attendu&lt;/font></string>
            </property>
-           <property name="autoDefault" >
-            <bool>true</bool>
+           <property name="wordWrap" >
+            <bool>false</bool>
            </property>
           </widget>
          </item>
+         <item>
+          <spacer name="verticalSpacer" >
+           <property name="orientation" >
+            <enum>Qt::Vertical</enum>
+           </property>
+           <property name="sizeHint" stdset="0" >
+            <size>
+             <width>20</width>
+             <height>40</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
+         <item>
+          <layout class="QHBoxLayout" name="horizontalLayout" >
+           <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>
+           <item>
+            <widget class="QPushButton" name="bOk" >
+             <property name="minimumSize" >
+              <size>
+               <width>160</width>
+               <height>30</height>
+              </size>
+             </property>
+             <property name="maximumSize" >
+              <size>
+               <width>160</width>
+               <height>30</height>
+              </size>
+             </property>
+             <property name="toolTip" >
+              <string>validation de la saisie</string>
+             </property>
+             <property name="text" >
+              <string>&amp;Valider</string>
+             </property>
+             <property name="shortcut" >
+              <string>Shift+A, Alt+A, Alt+A, Alt+A</string>
+             </property>
+             <property name="autoDefault" >
+              <bool>true</bool>
+             </property>
+             <property name="default" >
+              <bool>true</bool>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <spacer name="horizontalSpacer" >
+             <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>
        </item>
       </layout>
index 9c2785c7865002e9a15ffcdaf60d0cb7e9359892..d3d887dcc605be807cd810085922a08025c989eb 100644 (file)
@@ -2,8 +2,8 @@
 
 # Form implementation generated from reading ui file 'desUniqueInto.ui'
 #
-# Created: Tue Nov 18 17:37:25 2008
-#      by: PyQt4 UI code generator 4.4.2
+# Created: Fri Apr 24 14:21:54 2009
+#      by: PyQt4 UI code generator 4.4.3
 #
 # WARNING! All changes made in this file will be lost!
 
@@ -12,64 +12,54 @@ from PyQt4 import QtCore, QtGui
 class Ui_DUnIn(object):
     def setupUi(self, DUnIn):
         DUnIn.setObjectName("DUnIn")
-        DUnIn.resize(482,480)
-        DUnIn.setMinimumSize(QtCore.QSize(350,0))
-        self.gridlayout = QtGui.QGridLayout(DUnIn)
-        self.gridlayout.setObjectName("gridlayout")
+        DUnIn.resize(482, 480)
+        DUnIn.setMinimumSize(QtCore.QSize(350, 0))
+        self.gridLayout_2 = QtGui.QGridLayout(DUnIn)
+        self.gridLayout_2.setObjectName("gridLayout_2")
         self.tabuniqueinto = QtGui.QTabWidget(DUnIn)
         self.tabuniqueinto.setObjectName("tabuniqueinto")
         self.Widget8 = QtGui.QWidget()
         self.Widget8.setObjectName("Widget8")
-        self.gridlayout1 = QtGui.QGridLayout(self.Widget8)
-        self.gridlayout1.setObjectName("gridlayout1")
+        self.gridLayout = QtGui.QGridLayout(self.Widget8)
+        self.gridLayout.setObjectName("gridLayout")
+        self.textLabel2 = QtGui.QLabel(self.Widget8)
+        self.textLabel2.setWordWrap(False)
+        self.textLabel2.setObjectName("textLabel2")
+        self.gridLayout.addWidget(self.textLabel2, 0, 0, 1, 1)
+        self.listBoxVal = QtGui.QListWidget(self.Widget8)
+        self.listBoxVal.setObjectName("listBoxVal")
+        self.gridLayout.addWidget(self.listBoxVal, 1, 0, 1, 1)
         self.Commentaire = QtGui.QLabel(self.Widget8)
-        self.Commentaire.setMinimumSize(QtCore.QSize(420,30))
+        self.Commentaire.setMinimumSize(QtCore.QSize(420, 30))
         self.Commentaire.setWordWrap(False)
         self.Commentaire.setObjectName("Commentaire")
-        self.gridlayout1.addWidget(self.Commentaire,2,0,1,1)
-        self.hboxlayout = QtGui.QHBoxLayout()
-        self.hboxlayout.setObjectName("hboxlayout")
-        self.bSup = QtGui.QPushButton(self.Widget8)
-        self.bSup.setMinimumSize(QtCore.QSize(0,30))
-        self.bSup.setAutoDefault(True)
-        self.bSup.setProperty("toolTip",QtCore.QVariant(QtGui.QApplication.translate("DUnIn", "suppression du mot clef", None, QtGui.QApplication.UnicodeUTF8)))
-        self.bSup.setObjectName("bSup")
-        self.hboxlayout.addWidget(self.bSup)
+        self.gridLayout.addWidget(self.Commentaire, 2, 0, 1, 1)
+        self.horizontalLayout = QtGui.QHBoxLayout()
+        self.horizontalLayout.setObjectName("horizontalLayout")
+        spacerItem = QtGui.QSpacerItem(138, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
+        self.horizontalLayout.addItem(spacerItem)
         self.bOk = QtGui.QPushButton(self.Widget8)
-        self.bOk.setMinimumSize(QtCore.QSize(0,30))
+        self.bOk.setMinimumSize(QtCore.QSize(160, 30))
+        self.bOk.setMaximumSize(QtCore.QSize(160, 30))
         self.bOk.setAutoDefault(True)
         self.bOk.setDefault(True)
-        self.bOk.setProperty("toolTip",QtCore.QVariant(QtGui.QApplication.translate("DUnIn", "validation de la saisie", None, QtGui.QApplication.UnicodeUTF8)))
         self.bOk.setObjectName("bOk")
-        self.hboxlayout.addWidget(self.bOk)
-        self.bHelp = QtGui.QPushButton(self.Widget8)
-        self.bHelp.setMinimumSize(QtCore.QSize(0,30))
-        self.bHelp.setAutoDefault(True)
-        self.bHelp.setProperty("toolTip",QtCore.QVariant(QtGui.QApplication.translate("DUnIn", "affichage documentation aster", None, QtGui.QApplication.UnicodeUTF8)))
-        self.bHelp.setObjectName("bHelp")
-        self.hboxlayout.addWidget(self.bHelp)
-        self.gridlayout1.addLayout(self.hboxlayout,3,0,1,1)
-        self.listBoxVal = QtGui.QListWidget(self.Widget8)
-        self.listBoxVal.setObjectName("listBoxVal")
-        self.gridlayout1.addWidget(self.listBoxVal,1,0,1,1)
-        self.textLabel2 = QtGui.QLabel(self.Widget8)
-        self.textLabel2.setWordWrap(False)
-        self.textLabel2.setObjectName("textLabel2")
-        self.gridlayout1.addWidget(self.textLabel2,0,0,1,1)
-        self.tabuniqueinto.addTab(self.Widget8,"")
-        self.gridlayout.addWidget(self.tabuniqueinto,0,0,1,1)
+        self.horizontalLayout.addWidget(self.bOk)
+        spacerItem1 = QtGui.QSpacerItem(118, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
+        self.horizontalLayout.addItem(spacerItem1)
+        self.gridLayout.addLayout(self.horizontalLayout, 3, 0, 1, 1)
+        self.tabuniqueinto.addTab(self.Widget8, "")
+        self.gridLayout_2.addWidget(self.tabuniqueinto, 0, 0, 1, 1)
 
         self.retranslateUi(DUnIn)
+        QtCore.QMetaObject.connectSlotsByName(DUnIn)
 
     def retranslateUi(self, DUnIn):
         DUnIn.setWindowTitle(QtGui.QApplication.translate("DUnIn", "DUnIn", None, QtGui.QApplication.UnicodeUTF8))
-        self.bSup.setText(QtGui.QApplication.translate("DUnIn", "&Supprimer", None, QtGui.QApplication.UnicodeUTF8))
-        self.bSup.setShortcut(QtGui.QApplication.translate("DUnIn", "Alt+S", None, QtGui.QApplication.UnicodeUTF8))
+        self.textLabel2.setText(QtGui.QApplication.translate("DUnIn", "<b><u><p align=\"center\">Valeurs possibles</p></u></b>", None, QtGui.QApplication.UnicodeUTF8))
+        self.bOk.setToolTip(QtGui.QApplication.translate("DUnIn", "validation de la saisie", None, QtGui.QApplication.UnicodeUTF8))
         self.bOk.setText(QtGui.QApplication.translate("DUnIn", "&Valider", None, QtGui.QApplication.UnicodeUTF8))
         self.bOk.setShortcut(QtGui.QApplication.translate("DUnIn", "Shift+A, Alt+A, Alt+A, Alt+A", None, QtGui.QApplication.UnicodeUTF8))
-        self.bHelp.setText(QtGui.QApplication.translate("DUnIn", "&Documentation", None, QtGui.QApplication.UnicodeUTF8))
-        self.bHelp.setShortcut(QtGui.QApplication.translate("DUnIn", "Alt+D", None, QtGui.QApplication.UnicodeUTF8))
-        self.textLabel2.setText(QtGui.QApplication.translate("DUnIn", "<b><u><p align=\"center\">Valeurs possibles</p></u></b>", None, QtGui.QApplication.UnicodeUTF8))
         self.tabuniqueinto.setTabText(self.tabuniqueinto.indexOf(self.Widget8), QtGui.QApplication.translate("DUnIn", "Saisir Valeur", None, QtGui.QApplication.UnicodeUTF8))
 
 
index 7ab92b499665bcf03ed2247721695b9bcd79d4e8..0023c02276b8bce1cf143b3ecb0b7b097453ac30 100644 (file)
-<ui version="4.0" stdsetdef="1" >
-  <author></author>
-  <comment></comment>
-  <exportmacro></exportmacro>
-  <class>DUnIn</class>
-  <widget class="QWidget" name="DUnIn" >
-    <property name="geometry" >
-      <rect>
-        <x>0</x>
-        <y>0</y>
-        <width>482</width>
-        <height>480</height>
-      </rect>
-    </property>
-    <property name="minimumSize" >
-      <size>
-        <width>350</width>
-        <height>0</height>
-      </size>
-    </property>
-    <property name="windowTitle" >
-      <string>DUnIn</string>
-    </property>
-    <layout class="QGridLayout" >
-      <item row="0" column="0" >
-        <widget class="QTabWidget" name="tabuniqueinto" >
-          <widget class="QWidget" name="Widget8" >
-            <attribute name="title" >
-              <string>Saisir Valeur</string>
-            </attribute>
-            <layout class="QGridLayout" >
-              <item row="2" column="0" >
-                <widget class="QLabel" name="Commentaire" >
-                  <property name="minimumSize" >
-                    <size>
-                      <width>420</width>
-                      <height>30</height>
-                    </size>
-                  </property>
-                  <property name="text" >
-                    <string/>
-                  </property>
-                  <property name="wordWrap" >
-                    <bool>false</bool>
-                  </property>
-                </widget>
-              </item>
-              <item row="3" column="0" >
-                <layout class="QHBoxLayout" >
-                  <item>
-                    <widget class="QPushButton" name="bSup" >
-                      <property name="minimumSize" >
-                        <size>
-                          <width>0</width>
-                          <height>30</height>
-                        </size>
-                      </property>
-                      <property name="text" >
-                        <string>&amp;Supprimer</string>
-                      </property>
-                      <property name="shortcut" >
-                        <string>Alt+S</string>
-                      </property>
-                      <property name="autoDefault" >
-                        <bool>true</bool>
-                      </property>
-                      <property name="toolTip" stdset="0" >
-                        <string>suppression du mot clef</string>
-                      </property>
-                    </widget>
-                  </item>
-                  <item>
-                    <widget class="QPushButton" name="bOk" >
-                      <property name="minimumSize" >
-                        <size>
-                          <width>0</width>
-                          <height>30</height>
-                        </size>
-                      </property>
-                      <property name="text" >
-                        <string>&amp;Valider</string>
-                      </property>
-                      <property name="shortcut" >
-                        <string>Shift+A, Alt+A, Alt+A, Alt+A</string>
-                      </property>
-                      <property name="autoDefault" >
-                        <bool>true</bool>
-                      </property>
-                      <property name="default" >
-                        <bool>true</bool>
-                      </property>
-                      <property name="toolTip" stdset="0" >
-                        <string>validation de la saisie</string>
-                      </property>
-                    </widget>
-                  </item>
-                  <item>
-                    <widget class="QPushButton" name="bHelp" >
-                      <property name="minimumSize" >
-                        <size>
-                          <width>0</width>
-                          <height>30</height>
-                        </size>
-                      </property>
-                      <property name="text" >
-                        <string>&amp;Documentation</string>
-                      </property>
-                      <property name="shortcut" >
-                        <string>Alt+D</string>
-                      </property>
-                      <property name="autoDefault" >
-                        <bool>true</bool>
-                      </property>
-                      <property name="toolTip" stdset="0" >
-                        <string>affichage documentation aster</string>
-                      </property>
-                    </widget>
-                  </item>
-                </layout>
-              </item>
-              <item row="1" column="0" >
-                <widget class="QListWidget" name="listBoxVal" />
-              </item>
-              <item row="0" column="0" >
-                <widget class="QLabel" name="textLabel2" >
-                  <property name="text" >
-                    <string>&lt;b>&lt;u>&lt;p align="center">Valeurs possibles&lt;/p>&lt;/u>&lt;/b></string>
-                  </property>
-                  <property name="wordWrap" >
-                    <bool>false</bool>
-                  </property>
-                </widget>
-              </item>
-            </layout>
-          </widget>
+<ui version="4.0" >
+ <class>DUnIn</class>
+ <widget class="QWidget" name="DUnIn" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>482</width>
+    <height>480</height>
+   </rect>
+  </property>
+  <property name="minimumSize" >
+   <size>
+    <width>350</width>
+    <height>0</height>
+   </size>
+  </property>
+  <property name="windowTitle" >
+   <string>DUnIn</string>
+  </property>
+  <layout class="QGridLayout" name="gridLayout_2" >
+   <item row="0" column="0" >
+    <widget class="QTabWidget" name="tabuniqueinto" >
+     <widget class="QWidget" name="Widget8" >
+      <attribute name="title" >
+       <string>Saisir Valeur</string>
+      </attribute>
+      <layout class="QGridLayout" name="gridLayout" >
+       <item row="0" column="0" >
+        <widget class="QLabel" name="textLabel2" >
+         <property name="text" >
+          <string>&lt;b>&lt;u>&lt;p align="center">Valeurs possibles&lt;/p>&lt;/u>&lt;/b></string>
+         </property>
+         <property name="wordWrap" >
+          <bool>false</bool>
+         </property>
+        </widget>
+       </item>
+       <item row="1" column="0" >
+        <widget class="QListWidget" name="listBoxVal" />
+       </item>
+       <item row="2" column="0" >
+        <widget class="QLabel" name="Commentaire" >
+         <property name="minimumSize" >
+          <size>
+           <width>420</width>
+           <height>30</height>
+          </size>
+         </property>
+         <property name="text" >
+          <string/>
+         </property>
+         <property name="wordWrap" >
+          <bool>false</bool>
+         </property>
         </widget>
-      </item>
-    </layout>
-  </widget>
-  <layoutdefault spacing="6" margin="11" />
-  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
+       </item>
+       <item row="3" column="0" >
+        <layout class="QHBoxLayout" name="horizontalLayout" >
+         <item>
+          <spacer name="horizontalSpacer" >
+           <property name="orientation" >
+            <enum>Qt::Horizontal</enum>
+           </property>
+           <property name="sizeHint" stdset="0" >
+            <size>
+             <width>138</width>
+             <height>20</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
+         <item>
+          <widget class="QPushButton" name="bOk" >
+           <property name="minimumSize" >
+            <size>
+             <width>160</width>
+             <height>30</height>
+            </size>
+           </property>
+           <property name="maximumSize" >
+            <size>
+             <width>160</width>
+             <height>30</height>
+            </size>
+           </property>
+           <property name="toolTip" >
+            <string>validation de la saisie</string>
+           </property>
+           <property name="text" >
+            <string>&amp;Valider</string>
+           </property>
+           <property name="shortcut" >
+            <string>Shift+A, Alt+A, Alt+A, Alt+A</string>
+           </property>
+           <property name="autoDefault" >
+            <bool>true</bool>
+           </property>
+           <property name="default" >
+            <bool>true</bool>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <spacer name="horizontalSpacer_2" >
+           <property name="orientation" >
+            <enum>Qt::Horizontal</enum>
+           </property>
+           <property name="sizeHint" stdset="0" >
+            <size>
+             <width>118</width>
+             <height>20</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
+        </layout>
+       </item>
+      </layout>
+     </widget>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <layoutdefault spacing="6" margin="11" />
+ <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
+ <resources/>
+ <connections/>
 </ui>
index a65143e445b9bfeed3d3197748696656b86e011c..5bbfa88e29509d158466c81d7f728438ef5e347c 100644 (file)
@@ -2,8 +2,8 @@
 
 # Form implementation generated from reading ui file 'desUniqueSDCO.ui'
 #
-# Created: Tue Nov 18 17:37:26 2008
-#      by: PyQt4 UI code generator 4.4.2
+# Created: Thu Mar 12 10:42:32 2009
+#      by: PyQt4 UI code generator 4.4.3
 #
 # WARNING! All changes made in this file will be lost!
 
@@ -12,8 +12,8 @@ from PyQt4 import QtCore, QtGui
 class Ui_DUnSDCO(object):
     def setupUi(self, DUnSDCO):
         DUnSDCO.setObjectName("DUnSDCO")
-        DUnSDCO.resize(461,480)
-        DUnSDCO.setMinimumSize(QtCore.QSize(350,0))
+        DUnSDCO.resize(461, 480)
+        DUnSDCO.setMinimumSize(QtCore.QSize(350, 0))
         self.gridlayout = QtGui.QGridLayout(DUnSDCO)
         self.gridlayout.setObjectName("gridlayout")
         self.tabuniqueinto = QtGui.QTabWidget(DUnSDCO)
@@ -22,59 +22,42 @@ class Ui_DUnSDCO(object):
         self.Widget8.setObjectName("Widget8")
         self.gridlayout1 = QtGui.QGridLayout(self.Widget8)
         self.gridlayout1.setObjectName("gridlayout1")
-        self.bSup = QtGui.QPushButton(self.Widget8)
-        self.bSup.setMinimumSize(QtCore.QSize(0,30))
-        self.bSup.setAutoDefault(True)
-        self.bSup.setProperty("toolTip",QtCore.QVariant(QtGui.QApplication.translate("DUnSDCO", "suppression du mot clef", None, QtGui.QApplication.UnicodeUTF8)))
-        self.bSup.setObjectName("bSup")
-        self.gridlayout1.addWidget(self.bSup,4,0,1,1)
         self.bOk = QtGui.QPushButton(self.Widget8)
-        self.bOk.setMinimumSize(QtCore.QSize(0,30))
+        self.bOk.setMinimumSize(QtCore.QSize(0, 30))
         self.bOk.setAutoDefault(True)
         self.bOk.setDefault(True)
-        self.bOk.setProperty("toolTip",QtCore.QVariant(QtGui.QApplication.translate("DUnSDCO", "validation de la saisie", None, QtGui.QApplication.UnicodeUTF8)))
         self.bOk.setObjectName("bOk")
-        self.gridlayout1.addWidget(self.bOk,4,1,1,1)
-        self.bHelp = QtGui.QPushButton(self.Widget8)
-        self.bHelp.setMinimumSize(QtCore.QSize(0,30))
-        self.bHelp.setAutoDefault(True)
-        self.bHelp.setProperty("toolTip",QtCore.QVariant(QtGui.QApplication.translate("DUnSDCO", "affichage documentation aster", None, QtGui.QApplication.UnicodeUTF8)))
-        self.bHelp.setObjectName("bHelp")
-        self.gridlayout1.addWidget(self.bHelp,4,2,1,1)
+        self.gridlayout1.addWidget(self.bOk, 4, 1, 1, 1)
         self.Commentaire = QtGui.QLabel(self.Widget8)
-        self.Commentaire.setMinimumSize(QtCore.QSize(311,30))
+        self.Commentaire.setMinimumSize(QtCore.QSize(311, 30))
         self.Commentaire.setWordWrap(False)
         self.Commentaire.setObjectName("Commentaire")
-        self.gridlayout1.addWidget(self.Commentaire,3,0,1,3)
+        self.gridlayout1.addWidget(self.Commentaire, 3, 0, 1, 3)
         self.textLabel2_2 = QtGui.QLabel(self.Widget8)
         self.textLabel2_2.setWordWrap(False)
         self.textLabel2_2.setObjectName("textLabel2_2")
-        self.gridlayout1.addWidget(self.textLabel2_2,0,0,1,3)
+        self.gridlayout1.addWidget(self.textLabel2_2, 0, 0, 1, 3)
         self.LESDCO = QtGui.QLineEdit(self.Widget8)
-        self.LESDCO.setMinimumSize(QtCore.QSize(300,40))
+        self.LESDCO.setMinimumSize(QtCore.QSize(300, 40))
         self.LESDCO.setObjectName("LESDCO")
-        self.gridlayout1.addWidget(self.LESDCO,1,0,1,3)
+        self.gridlayout1.addWidget(self.LESDCO, 1, 0, 1, 3)
         self.textLabel2 = QtGui.QLabel(self.Widget8)
         self.textLabel2.setWordWrap(False)
         self.textLabel2.setObjectName("textLabel2")
-        self.gridlayout1.addWidget(self.textLabel2,2,0,1,3)
-        self.tabuniqueinto.addTab(self.Widget8,"")
-        self.gridlayout.addWidget(self.tabuniqueinto,0,0,1,1)
+        self.gridlayout1.addWidget(self.textLabel2, 2, 0, 1, 3)
+        self.tabuniqueinto.addTab(self.Widget8, "")
+        self.gridlayout.addWidget(self.tabuniqueinto, 0, 0, 1, 1)
 
         self.retranslateUi(DUnSDCO)
-        DUnSDCO.setTabOrder(self.LESDCO,self.tabuniqueinto)
-        DUnSDCO.setTabOrder(self.tabuniqueinto,self.bSup)
-        DUnSDCO.setTabOrder(self.bSup,self.bOk)
-        DUnSDCO.setTabOrder(self.bOk,self.bHelp)
+        QtCore.QMetaObject.connectSlotsByName(DUnSDCO)
+        DUnSDCO.setTabOrder(self.LESDCO, self.tabuniqueinto)
+        DUnSDCO.setTabOrder(self.tabuniqueinto, self.bOk)
 
     def retranslateUi(self, DUnSDCO):
         DUnSDCO.setWindowTitle(QtGui.QApplication.translate("DUnSDCO", "DUnIn", None, QtGui.QApplication.UnicodeUTF8))
-        self.bSup.setText(QtGui.QApplication.translate("DUnSDCO", "&Supprimer", None, QtGui.QApplication.UnicodeUTF8))
-        self.bSup.setShortcut(QtGui.QApplication.translate("DUnSDCO", "Alt+S", None, QtGui.QApplication.UnicodeUTF8))
+        self.bOk.setToolTip(QtGui.QApplication.translate("DUnSDCO", "validation de la saisie", None, QtGui.QApplication.UnicodeUTF8))
         self.bOk.setText(QtGui.QApplication.translate("DUnSDCO", "&Valider", None, QtGui.QApplication.UnicodeUTF8))
         self.bOk.setShortcut(QtGui.QApplication.translate("DUnSDCO", "Shift+A, Alt+A, Alt+A, Alt+A", None, QtGui.QApplication.UnicodeUTF8))
-        self.bHelp.setText(QtGui.QApplication.translate("DUnSDCO", "&Documentation", None, QtGui.QApplication.UnicodeUTF8))
-        self.bHelp.setShortcut(QtGui.QApplication.translate("DUnSDCO", "Alt+D", None, QtGui.QApplication.UnicodeUTF8))
         self.textLabel2_2.setText(QtGui.QApplication.translate("DUnSDCO", "<h1><font size=\"+2\">Nom du nouveau concept : </font></h1>", None, QtGui.QApplication.UnicodeUTF8))
         self.textLabel2.setText(QtGui.QApplication.translate("DUnSDCO", "<font size=\"+1\">Un objet de type CO est attendu</font>", None, QtGui.QApplication.UnicodeUTF8))
         self.tabuniqueinto.setTabText(self.tabuniqueinto.indexOf(self.Widget8), QtGui.QApplication.translate("DUnSDCO", "Saisir Valeur", None, QtGui.QApplication.UnicodeUTF8))
index 46a472ca5cad4e65ff8474ba96c89d2958eb1c74..7e4739f268405e69caac42fecd235f6d0680466f 100644 (file)
-<ui version="4.0" stdsetdef="1" >
-  <author></author>
-  <comment></comment>
-  <exportmacro></exportmacro>
-  <class>DUnSDCO</class>
-  <widget class="QWidget" name="DUnSDCO" >
-    <property name="geometry" >
-      <rect>
-        <x>0</x>
-        <y>0</y>
-        <width>461</width>
-        <height>480</height>
-      </rect>
-    </property>
-    <property name="minimumSize" >
-      <size>
-        <width>350</width>
-        <height>0</height>
-      </size>
-    </property>
-    <property name="windowTitle" >
-      <string>DUnIn</string>
-    </property>
-    <layout class="QGridLayout" >
-      <item row="0" column="0" >
-        <widget class="QTabWidget" name="tabuniqueinto" >
-          <widget class="QWidget" name="Widget8" >
-            <attribute name="title" >
-              <string>Saisir Valeur</string>
-            </attribute>
-            <layout class="QGridLayout" >
-              <item row="4" column="0" >
-                <widget class="QPushButton" name="bSup" >
-                  <property name="minimumSize" >
-                    <size>
-                      <width>0</width>
-                      <height>30</height>
-                    </size>
-                  </property>
-                  <property name="text" >
-                    <string>&amp;Supprimer</string>
-                  </property>
-                  <property name="shortcut" >
-                    <string>Alt+S</string>
-                  </property>
-                  <property name="autoDefault" >
-                    <bool>true</bool>
-                  </property>
-                  <property name="toolTip" stdset="0" >
-                    <string>suppression du mot clef</string>
-                  </property>
-                </widget>
-              </item>
-              <item row="4" column="1" >
-                <widget class="QPushButton" name="bOk" >
-                  <property name="minimumSize" >
-                    <size>
-                      <width>0</width>
-                      <height>30</height>
-                    </size>
-                  </property>
-                  <property name="text" >
-                    <string>&amp;Valider</string>
-                  </property>
-                  <property name="shortcut" >
-                    <string>Shift+A, Alt+A, Alt+A, Alt+A</string>
-                  </property>
-                  <property name="autoDefault" >
-                    <bool>true</bool>
-                  </property>
-                  <property name="default" >
-                    <bool>true</bool>
-                  </property>
-                  <property name="toolTip" stdset="0" >
-                    <string>validation de la saisie</string>
-                  </property>
-                </widget>
-              </item>
-              <item row="4" column="2" >
-                <widget class="QPushButton" name="bHelp" >
-                  <property name="minimumSize" >
-                    <size>
-                      <width>0</width>
-                      <height>30</height>
-                    </size>
-                  </property>
-                  <property name="text" >
-                    <string>&amp;Documentation</string>
-                  </property>
-                  <property name="shortcut" >
-                    <string>Alt+D</string>
-                  </property>
-                  <property name="autoDefault" >
-                    <bool>true</bool>
-                  </property>
-                  <property name="toolTip" stdset="0" >
-                    <string>affichage documentation aster</string>
-                  </property>
-                </widget>
-              </item>
-              <item rowspan="1" row="3" column="0" colspan="3" >
-                <widget class="QLabel" name="Commentaire" >
-                  <property name="minimumSize" >
-                    <size>
-                      <width>311</width>
-                      <height>30</height>
-                    </size>
-                  </property>
-                  <property name="text" >
-                    <string/>
-                  </property>
-                  <property name="wordWrap" >
-                    <bool>false</bool>
-                  </property>
-                </widget>
-              </item>
-              <item rowspan="1" row="0" column="0" colspan="3" >
-                <widget class="QLabel" name="textLabel2_2" >
-                  <property name="text" >
-                    <string>&lt;h1>&lt;font size="+2">Nom du nouveau concept : &lt;/font>&lt;/h1></string>
-                  </property>
-                  <property name="wordWrap" >
-                    <bool>false</bool>
-                  </property>
-                </widget>
-              </item>
-              <item rowspan="1" row="1" column="0" colspan="3" >
-                <widget class="QLineEdit" name="LESDCO" >
-                  <property name="minimumSize" >
-                    <size>
-                      <width>300</width>
-                      <height>40</height>
-                    </size>
-                  </property>
-                </widget>
-              </item>
-              <item rowspan="1" row="2" column="0" colspan="3" >
-                <widget class="QLabel" name="textLabel2" >
-                  <property name="text" >
-                    <string>&lt;font size="+1">Un objet de type CO est attendu&lt;/font></string>
-                  </property>
-                  <property name="wordWrap" >
-                    <bool>false</bool>
-                  </property>
-                </widget>
-              </item>
-            </layout>
-          </widget>
+<ui version="4.0" >
+ <class>DUnSDCO</class>
+ <widget class="QWidget" name="DUnSDCO" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>461</width>
+    <height>480</height>
+   </rect>
+  </property>
+  <property name="minimumSize" >
+   <size>
+    <width>350</width>
+    <height>0</height>
+   </size>
+  </property>
+  <property name="windowTitle" >
+   <string>DUnIn</string>
+  </property>
+  <layout class="QGridLayout" >
+   <item row="0" column="0" >
+    <widget class="QTabWidget" name="tabuniqueinto" >
+     <widget class="QWidget" name="Widget8" >
+      <attribute name="title" >
+       <string>Saisir Valeur</string>
+      </attribute>
+      <layout class="QGridLayout" >
+       <item row="4" column="1" >
+        <widget class="QPushButton" name="bOk" >
+         <property name="minimumSize" >
+          <size>
+           <width>0</width>
+           <height>30</height>
+          </size>
+         </property>
+         <property name="toolTip" >
+          <string>validation de la saisie</string>
+         </property>
+         <property name="text" >
+          <string>&amp;Valider</string>
+         </property>
+         <property name="shortcut" >
+          <string>Shift+A, Alt+A, Alt+A, Alt+A</string>
+         </property>
+         <property name="autoDefault" >
+          <bool>true</bool>
+         </property>
+         <property name="default" >
+          <bool>true</bool>
+         </property>
         </widget>
-      </item>
-    </layout>
-  </widget>
-  <layoutdefault spacing="6" margin="11" />
-  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
-  <tabstops>
-    <tabstop>LESDCO</tabstop>
-    <tabstop>tabuniqueinto</tabstop>
-    <tabstop>bSup</tabstop>
-    <tabstop>bOk</tabstop>
-    <tabstop>bHelp</tabstop>
-  </tabstops>
+       </item>
+       <item row="3" column="0" colspan="3" >
+        <widget class="QLabel" name="Commentaire" >
+         <property name="minimumSize" >
+          <size>
+           <width>311</width>
+           <height>30</height>
+          </size>
+         </property>
+         <property name="text" >
+          <string/>
+         </property>
+         <property name="wordWrap" >
+          <bool>false</bool>
+         </property>
+        </widget>
+       </item>
+       <item row="0" column="0" colspan="3" >
+        <widget class="QLabel" name="textLabel2_2" >
+         <property name="text" >
+          <string>&lt;h1>&lt;font size="+2">Nom du nouveau concept : &lt;/font>&lt;/h1></string>
+         </property>
+         <property name="wordWrap" >
+          <bool>false</bool>
+         </property>
+        </widget>
+       </item>
+       <item row="1" column="0" colspan="3" >
+        <widget class="QLineEdit" name="LESDCO" >
+         <property name="minimumSize" >
+          <size>
+           <width>300</width>
+           <height>40</height>
+          </size>
+         </property>
+        </widget>
+       </item>
+       <item row="2" column="0" colspan="3" >
+        <widget class="QLabel" name="textLabel2" >
+         <property name="text" >
+          <string>&lt;font size="+1">Un objet de type CO est attendu&lt;/font></string>
+         </property>
+         <property name="wordWrap" >
+          <bool>false</bool>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </widget>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <layoutdefault spacing="6" margin="11" />
+ <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
+ <tabstops>
+  <tabstop>LESDCO</tabstop>
+  <tabstop>tabuniqueinto</tabstop>
+  <tabstop>bOk</tabstop>
+ </tabstops>
+ <resources/>
+ <connections/>
 </ui>
index 65367aaab80c1f2803d86fec992e4c3694562ba4..50d64c1f6954505d41dddac24ad561f016e72427 100644 (file)
@@ -2,8 +2,8 @@
 
 # Form implementation generated from reading ui file 'desUniqueSDCOInto.ui'
 #
-# Created: Tue Nov 18 17:37:25 2008
-#      by: PyQt4 UI code generator 4.4.2
+# Created: Thu Mar 12 10:42:31 2009
+#      by: PyQt4 UI code generator 4.4.3
 #
 # WARNING! All changes made in this file will be lost!
 
@@ -12,8 +12,8 @@ from PyQt4 import QtCore, QtGui
 class Ui_DUnSDCOInto(object):
     def setupUi(self, DUnSDCOInto):
         DUnSDCOInto.setObjectName("DUnSDCOInto")
-        DUnSDCOInto.resize(482,480)
-        DUnSDCOInto.setMinimumSize(QtCore.QSize(350,0))
+        DUnSDCOInto.resize(482, 480)
+        DUnSDCOInto.setMinimumSize(QtCore.QSize(350, 0))
         self.gridlayout = QtGui.QGridLayout(DUnSDCOInto)
         self.gridlayout.setObjectName("gridlayout")
         self.tabuniqueinto = QtGui.QTabWidget(DUnSDCOInto)
@@ -25,79 +25,62 @@ class Ui_DUnSDCOInto(object):
         self.textLabel2 = QtGui.QLabel(self.Widget8)
         self.textLabel2.setWordWrap(False)
         self.textLabel2.setObjectName("textLabel2")
-        self.gridlayout1.addWidget(self.textLabel2,0,0,1,3)
+        self.gridlayout1.addWidget(self.textLabel2, 0, 0, 1, 3)
         self.LBSDCO = QtGui.QListWidget(self.Widget8)
         self.LBSDCO.setObjectName("LBSDCO")
-        self.gridlayout1.addWidget(self.LBSDCO,1,0,1,3)
+        self.gridlayout1.addWidget(self.LBSDCO, 1, 0, 1, 3)
         self.textLabel2_3 = QtGui.QLabel(self.Widget8)
         self.textLabel2_3.setWordWrap(False)
         self.textLabel2_3.setObjectName("textLabel2_3")
-        self.gridlayout1.addWidget(self.textLabel2_3,5,0,1,3)
+        self.gridlayout1.addWidget(self.textLabel2_3, 5, 0, 1, 3)
         self.Commentaire = QtGui.QLabel(self.Widget8)
-        self.Commentaire.setMinimumSize(QtCore.QSize(420,30))
+        self.Commentaire.setMinimumSize(QtCore.QSize(420, 30))
         self.Commentaire.setWordWrap(False)
         self.Commentaire.setObjectName("Commentaire")
-        self.gridlayout1.addWidget(self.Commentaire,4,0,1,3)
+        self.gridlayout1.addWidget(self.Commentaire, 4, 0, 1, 3)
         self.gridlayout2 = QtGui.QGridLayout()
         self.gridlayout2.setObjectName("gridlayout2")
-        self.gridlayout1.addLayout(self.gridlayout2,2,0,1,3)
+        self.gridlayout1.addLayout(self.gridlayout2, 2, 0, 1, 3)
         self.hboxlayout = QtGui.QHBoxLayout()
         self.hboxlayout.setObjectName("hboxlayout")
         self.frame3 = QtGui.QFrame(self.Widget8)
-        self.frame3.setMinimumSize(QtCore.QSize(190,50))
+        self.frame3.setMinimumSize(QtCore.QSize(190, 50))
         self.frame3.setFrameShape(QtGui.QFrame.StyledPanel)
         self.frame3.setFrameShadow(QtGui.QFrame.Raised)
         self.frame3.setObjectName("frame3")
         self.textLabel2_2 = QtGui.QLabel(self.frame3)
-        self.textLabel2_2.setGeometry(QtCore.QRect(20,10,150,30))
+        self.textLabel2_2.setGeometry(QtCore.QRect(20, 10, 150, 30))
         self.textLabel2_2.setWordWrap(False)
         self.textLabel2_2.setObjectName("textLabel2_2")
         self.hboxlayout.addWidget(self.frame3)
         self.LESDCO = QtGui.QLineEdit(self.Widget8)
-        self.LESDCO.setMinimumSize(QtCore.QSize(220,40))
+        self.LESDCO.setMinimumSize(QtCore.QSize(220, 40))
         self.LESDCO.setObjectName("LESDCO")
         self.hboxlayout.addWidget(self.LESDCO)
-        self.gridlayout1.addLayout(self.hboxlayout,3,0,1,3)
-        self.bSup = QtGui.QPushButton(self.Widget8)
-        self.bSup.setMinimumSize(QtCore.QSize(0,30))
-        self.bSup.setAutoDefault(True)
-        self.bSup.setProperty("toolTip",QtCore.QVariant(QtGui.QApplication.translate("DUnSDCOInto", "suppression du mot clef", None, QtGui.QApplication.UnicodeUTF8)))
-        self.bSup.setObjectName("bSup")
-        self.gridlayout1.addWidget(self.bSup,6,0,1,1)
+        self.gridlayout1.addLayout(self.hboxlayout, 3, 0, 1, 3)
         self.bOk = QtGui.QPushButton(self.Widget8)
-        self.bOk.setMinimumSize(QtCore.QSize(0,30))
+        self.bOk.setMinimumSize(QtCore.QSize(0, 30))
         self.bOk.setAutoDefault(True)
         self.bOk.setDefault(True)
-        self.bOk.setProperty("toolTip",QtCore.QVariant(QtGui.QApplication.translate("DUnSDCOInto", "validation de la saisie", None, QtGui.QApplication.UnicodeUTF8)))
         self.bOk.setObjectName("bOk")
-        self.gridlayout1.addWidget(self.bOk,6,1,1,1)
-        self.bHelp = QtGui.QPushButton(self.Widget8)
-        self.bHelp.setMinimumSize(QtCore.QSize(0,30))
-        self.bHelp.setAutoDefault(True)
-        self.bHelp.setProperty("toolTip",QtCore.QVariant(QtGui.QApplication.translate("DUnSDCOInto", "affichage documentation aster", None, QtGui.QApplication.UnicodeUTF8)))
-        self.bHelp.setObjectName("bHelp")
-        self.gridlayout1.addWidget(self.bHelp,6,2,1,1)
-        self.tabuniqueinto.addTab(self.Widget8,"")
-        self.gridlayout.addWidget(self.tabuniqueinto,0,0,1,1)
+        self.gridlayout1.addWidget(self.bOk, 6, 1, 1, 1)
+        self.tabuniqueinto.addTab(self.Widget8, "")
+        self.gridlayout.addWidget(self.tabuniqueinto, 0, 0, 1, 1)
 
         self.retranslateUi(DUnSDCOInto)
-        DUnSDCOInto.setTabOrder(self.LESDCO,self.LBSDCO)
-        DUnSDCOInto.setTabOrder(self.LBSDCO,self.tabuniqueinto)
-        DUnSDCOInto.setTabOrder(self.tabuniqueinto,self.bSup)
-        DUnSDCOInto.setTabOrder(self.bSup,self.bOk)
-        DUnSDCOInto.setTabOrder(self.bOk,self.bHelp)
+        QtCore.QMetaObject.connectSlotsByName(DUnSDCOInto)
+        DUnSDCOInto.setTabOrder(self.LESDCO, self.LBSDCO)
+        DUnSDCOInto.setTabOrder(self.LBSDCO, self.tabuniqueinto)
+        DUnSDCOInto.setTabOrder(self.tabuniqueinto, self.bOk)
 
     def retranslateUi(self, DUnSDCOInto):
         DUnSDCOInto.setWindowTitle(QtGui.QApplication.translate("DUnSDCOInto", "DUnIn", None, QtGui.QApplication.UnicodeUTF8))
         self.textLabel2.setText(QtGui.QApplication.translate("DUnSDCOInto", "<font size=\"+1\"><u>Structures de données du type requis par l\'objet courant </u></font>", None, QtGui.QApplication.UnicodeUTF8))
         self.textLabel2_3.setText(QtGui.QApplication.translate("DUnSDCOInto", "<font size=\"+1\">Un objet de type CO est attendu</font>", None, QtGui.QApplication.UnicodeUTF8))
         self.textLabel2_2.setText(QtGui.QApplication.translate("DUnSDCOInto", "<font size=\"+1\"> Nom concept : </font>", None, QtGui.QApplication.UnicodeUTF8))
-        self.bSup.setText(QtGui.QApplication.translate("DUnSDCOInto", "&Supprimer", None, QtGui.QApplication.UnicodeUTF8))
-        self.bSup.setShortcut(QtGui.QApplication.translate("DUnSDCOInto", "Alt+S", None, QtGui.QApplication.UnicodeUTF8))
+        self.bOk.setToolTip(QtGui.QApplication.translate("DUnSDCOInto", "validation de la saisie", None, QtGui.QApplication.UnicodeUTF8))
         self.bOk.setText(QtGui.QApplication.translate("DUnSDCOInto", "&Valider", None, QtGui.QApplication.UnicodeUTF8))
         self.bOk.setShortcut(QtGui.QApplication.translate("DUnSDCOInto", "Shift+A, Alt+A, Alt+A, Alt+A", None, QtGui.QApplication.UnicodeUTF8))
-        self.bHelp.setText(QtGui.QApplication.translate("DUnSDCOInto", "&Documentation", None, QtGui.QApplication.UnicodeUTF8))
-        self.bHelp.setShortcut(QtGui.QApplication.translate("DUnSDCOInto", "Alt+D", None, QtGui.QApplication.UnicodeUTF8))
         self.tabuniqueinto.setTabText(self.tabuniqueinto.indexOf(self.Widget8), QtGui.QApplication.translate("DUnSDCOInto", "Saisir Valeur", None, QtGui.QApplication.UnicodeUTF8))
 
 
index c42947b9e8bcfcdd0af9b92e9efba08545902f59..ad293273ff39160e1eb4649b1bbdcf452f92003f 100644 (file)
-<ui version="4.0" stdsetdef="1" >
-  <author></author>
-  <comment></comment>
-  <exportmacro></exportmacro>
-  <class>DUnSDCOInto</class>
-  <widget class="QWidget" name="DUnSDCOInto" >
-    <property name="geometry" >
-      <rect>
-        <x>0</x>
-        <y>0</y>
-        <width>482</width>
-        <height>480</height>
-      </rect>
-    </property>
-    <property name="minimumSize" >
-      <size>
-        <width>350</width>
-        <height>0</height>
-      </size>
-    </property>
-    <property name="windowTitle" >
-      <string>DUnIn</string>
-    </property>
-    <layout class="QGridLayout" >
-      <item row="0" column="0" >
-        <widget class="QTabWidget" name="tabuniqueinto" >
-          <widget class="QWidget" name="Widget8" >
-            <attribute name="title" >
-              <string>Saisir Valeur</string>
-            </attribute>
-            <layout class="QGridLayout" >
-              <item rowspan="1" row="0" column="0" colspan="3" >
-                <widget class="QLabel" name="textLabel2" >
-                  <property name="text" >
-                    <string>&lt;font size="+1">&lt;u>Structures de données du type requis par l'objet courant &lt;/u>&lt;/font></string>
-                  </property>
-                  <property name="wordWrap" >
-                    <bool>false</bool>
-                  </property>
-                </widget>
-              </item>
-              <item rowspan="1" row="1" column="0" colspan="3" >
-                <widget class="QListWidget" name="LBSDCO" />
-              </item>
-              <item rowspan="1" row="5" column="0" colspan="3" >
-                <widget class="QLabel" name="textLabel2_3" >
-                  <property name="text" >
-                    <string>&lt;font size="+1">Un objet de type CO est attendu&lt;/font></string>
-                  </property>
-                  <property name="wordWrap" >
-                    <bool>false</bool>
-                  </property>
-                </widget>
-              </item>
-              <item rowspan="1" row="4" column="0" colspan="3" >
-                <widget class="QLabel" name="Commentaire" >
-                  <property name="minimumSize" >
-                    <size>
-                      <width>420</width>
-                      <height>30</height>
-                    </size>
-                  </property>
-                  <property name="text" >
-                    <string/>
-                  </property>
-                  <property name="wordWrap" >
-                    <bool>false</bool>
-                  </property>
-                </widget>
-              </item>
-              <item rowspan="1" row="2" column="0" colspan="3" >
-                <layout class="QGridLayout" />
-              </item>
-              <item rowspan="1" row="3" column="0" colspan="3" >
-                <layout class="QHBoxLayout" >
-                  <item>
-                    <widget class="QFrame" name="frame3" >
-                      <property name="minimumSize" >
-                        <size>
-                          <width>190</width>
-                          <height>50</height>
-                        </size>
-                      </property>
-                      <property name="frameShape" >
-                        <enum>StyledPanel</enum>
-                      </property>
-                      <property name="frameShadow" >
-                        <enum>Raised</enum>
-                      </property>
-                      <widget class="QLabel" name="textLabel2_2" >
-                        <property name="geometry" >
-                          <rect>
-                            <x>20</x>
-                            <y>10</y>
-                            <width>150</width>
-                            <height>30</height>
-                          </rect>
-                        </property>
-                        <property name="text" >
-                          <string>&lt;font size="+1"> Nom concept : &lt;/font></string>
-                        </property>
-                        <property name="wordWrap" >
-                          <bool>false</bool>
-                        </property>
-                      </widget>
-                    </widget>
-                  </item>
-                  <item>
-                    <widget class="QLineEdit" name="LESDCO" >
-                      <property name="minimumSize" >
-                        <size>
-                          <width>220</width>
-                          <height>40</height>
-                        </size>
-                      </property>
-                    </widget>
-                  </item>
-                </layout>
-              </item>
-              <item row="6" column="0" >
-                <widget class="QPushButton" name="bSup" >
-                  <property name="minimumSize" >
-                    <size>
-                      <width>0</width>
-                      <height>30</height>
-                    </size>
-                  </property>
-                  <property name="text" >
-                    <string>&amp;Supprimer</string>
-                  </property>
-                  <property name="shortcut" >
-                    <string>Alt+S</string>
-                  </property>
-                  <property name="autoDefault" >
-                    <bool>true</bool>
-                  </property>
-                  <property name="toolTip" stdset="0" >
-                    <string>suppression du mot clef</string>
-                  </property>
-                </widget>
-              </item>
-              <item row="6" column="1" >
-                <widget class="QPushButton" name="bOk" >
-                  <property name="minimumSize" >
-                    <size>
-                      <width>0</width>
-                      <height>30</height>
-                    </size>
-                  </property>
-                  <property name="text" >
-                    <string>&amp;Valider</string>
-                  </property>
-                  <property name="shortcut" >
-                    <string>Shift+A, Alt+A, Alt+A, Alt+A</string>
-                  </property>
-                  <property name="autoDefault" >
-                    <bool>true</bool>
-                  </property>
-                  <property name="default" >
-                    <bool>true</bool>
-                  </property>
-                  <property name="toolTip" stdset="0" >
-                    <string>validation de la saisie</string>
-                  </property>
-                </widget>
-              </item>
-              <item row="6" column="2" >
-                <widget class="QPushButton" name="bHelp" >
-                  <property name="minimumSize" >
-                    <size>
-                      <width>0</width>
-                      <height>30</height>
-                    </size>
-                  </property>
-                  <property name="text" >
-                    <string>&amp;Documentation</string>
-                  </property>
-                  <property name="shortcut" >
-                    <string>Alt+D</string>
-                  </property>
-                  <property name="autoDefault" >
-                    <bool>true</bool>
-                  </property>
-                  <property name="toolTip" stdset="0" >
-                    <string>affichage documentation aster</string>
-                  </property>
-                </widget>
-              </item>
-            </layout>
+<ui version="4.0" >
+ <class>DUnSDCOInto</class>
+ <widget class="QWidget" name="DUnSDCOInto" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>482</width>
+    <height>480</height>
+   </rect>
+  </property>
+  <property name="minimumSize" >
+   <size>
+    <width>350</width>
+    <height>0</height>
+   </size>
+  </property>
+  <property name="windowTitle" >
+   <string>DUnIn</string>
+  </property>
+  <layout class="QGridLayout" >
+   <item row="0" column="0" >
+    <widget class="QTabWidget" name="tabuniqueinto" >
+     <widget class="QWidget" name="Widget8" >
+      <attribute name="title" >
+       <string>Saisir Valeur</string>
+      </attribute>
+      <layout class="QGridLayout" >
+       <item row="0" column="0" colspan="3" >
+        <widget class="QLabel" name="textLabel2" >
+         <property name="text" >
+          <string>&lt;font size="+1">&lt;u>Structures de données du type requis par l'objet courant &lt;/u>&lt;/font></string>
+         </property>
+         <property name="wordWrap" >
+          <bool>false</bool>
+         </property>
+        </widget>
+       </item>
+       <item row="1" column="0" colspan="3" >
+        <widget class="QListWidget" name="LBSDCO" />
+       </item>
+       <item row="5" column="0" colspan="3" >
+        <widget class="QLabel" name="textLabel2_3" >
+         <property name="text" >
+          <string>&lt;font size="+1">Un objet de type CO est attendu&lt;/font></string>
+         </property>
+         <property name="wordWrap" >
+          <bool>false</bool>
+         </property>
+        </widget>
+       </item>
+       <item row="4" column="0" colspan="3" >
+        <widget class="QLabel" name="Commentaire" >
+         <property name="minimumSize" >
+          <size>
+           <width>420</width>
+           <height>30</height>
+          </size>
+         </property>
+         <property name="text" >
+          <string/>
+         </property>
+         <property name="wordWrap" >
+          <bool>false</bool>
+         </property>
+        </widget>
+       </item>
+       <item row="2" column="0" colspan="3" >
+        <layout class="QGridLayout" />
+       </item>
+       <item row="3" column="0" colspan="3" >
+        <layout class="QHBoxLayout" >
+         <item>
+          <widget class="QFrame" name="frame3" >
+           <property name="minimumSize" >
+            <size>
+             <width>190</width>
+             <height>50</height>
+            </size>
+           </property>
+           <property name="frameShape" >
+            <enum>QFrame::StyledPanel</enum>
+           </property>
+           <property name="frameShadow" >
+            <enum>QFrame::Raised</enum>
+           </property>
+           <widget class="QLabel" name="textLabel2_2" >
+            <property name="geometry" >
+             <rect>
+              <x>20</x>
+              <y>10</y>
+              <width>150</width>
+              <height>30</height>
+             </rect>
+            </property>
+            <property name="text" >
+             <string>&lt;font size="+1"> Nom concept : &lt;/font></string>
+            </property>
+            <property name="wordWrap" >
+             <bool>false</bool>
+            </property>
+           </widget>
+          </widget>
+         </item>
+         <item>
+          <widget class="QLineEdit" name="LESDCO" >
+           <property name="minimumSize" >
+            <size>
+             <width>220</width>
+             <height>40</height>
+            </size>
+           </property>
           </widget>
+         </item>
+        </layout>
+       </item>
+       <item row="6" column="1" >
+        <widget class="QPushButton" name="bOk" >
+         <property name="minimumSize" >
+          <size>
+           <width>0</width>
+           <height>30</height>
+          </size>
+         </property>
+         <property name="toolTip" >
+          <string>validation de la saisie</string>
+         </property>
+         <property name="text" >
+          <string>&amp;Valider</string>
+         </property>
+         <property name="shortcut" >
+          <string>Shift+A, Alt+A, Alt+A, Alt+A</string>
+         </property>
+         <property name="autoDefault" >
+          <bool>true</bool>
+         </property>
+         <property name="default" >
+          <bool>true</bool>
+         </property>
         </widget>
-      </item>
-    </layout>
-  </widget>
-  <layoutdefault spacing="6" margin="11" />
-  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
-  <tabstops>
-    <tabstop>LESDCO</tabstop>
-    <tabstop>LBSDCO</tabstop>
-    <tabstop>tabuniqueinto</tabstop>
-    <tabstop>bSup</tabstop>
-    <tabstop>bOk</tabstop>
-    <tabstop>bHelp</tabstop>
-  </tabstops>
+       </item>
+      </layout>
+     </widget>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <layoutdefault spacing="6" margin="11" />
+ <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
+ <tabstops>
+  <tabstop>LESDCO</tabstop>
+  <tabstop>LBSDCO</tabstop>
+  <tabstop>tabuniqueinto</tabstop>
+  <tabstop>bOk</tabstop>
+ </tabstops>
+ <resources/>
+ <connections/>
 </ui>
index 43e63fd3e5b9957f0616fce5504395c0c4b4cbc1..a83037c3e9ee74392ad03328378e9f47ed07615a 100644 (file)
@@ -2,8 +2,8 @@
 
 # Form implementation generated from reading ui file 'desViewTexte.ui'
 #
-# Created: Tue Nov 18 17:37:26 2008
-#      by: PyQt4 UI code generator 4.4.2
+# Created: Tue Jan 27 12:25:39 2009
+#      by: PyQt4 UI code generator 4.4.3
 #
 # WARNING! All changes made in this file will be lost!
 
@@ -12,20 +12,20 @@ from PyQt4 import QtCore, QtGui
 class Ui_dView(object):
     def setupUi(self, dView):
         dView.setObjectName("dView")
-        dView.resize(400,322)
+        dView.resize(400, 322)
         self.gridLayout = QtGui.QGridLayout(dView)
         self.gridLayout.setObjectName("gridLayout")
         self.view = QtGui.QTextBrowser(dView)
         self.view.setObjectName("view")
-        self.gridLayout.addWidget(self.view,0,0,1,4)
-        spacerItem = QtGui.QSpacerItem(209,20,QtGui.QSizePolicy.Expanding,QtGui.QSizePolicy.Minimum)
-        self.gridLayout.addItem(spacerItem,1,0,1,1)
+        self.gridLayout.addWidget(self.view, 0, 0, 1, 4)
+        spacerItem = QtGui.QSpacerItem(209, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
+        self.gridLayout.addItem(spacerItem, 1, 0, 1, 1)
         self.bclose = QtGui.QPushButton(dView)
         self.bclose.setObjectName("bclose")
-        self.gridLayout.addWidget(self.bclose,1,2,1,1)
+        self.gridLayout.addWidget(self.bclose, 1, 2, 1, 1)
         self.bsave = QtGui.QPushButton(dView)
         self.bsave.setObjectName("bsave")
-        self.gridLayout.addWidget(self.bsave,1,1,1,1)
+        self.gridLayout.addWidget(self.bsave, 1, 1, 1, 1)
 
         self.retranslateUi(dView)
         QtCore.QMetaObject.connectSlotsByName(dView)
index 687d2f4213379c865dcb61930ceff0a85090cfe6..ca7866cbcc5aa2c3c46d69b35ae8786fccda225b 100644 (file)
@@ -2,8 +2,8 @@
 
 # Form implementation generated from reading ui file 'desVisu.ui'
 #
-# Created: Tue Nov 18 17:37:26 2008
-#      by: PyQt4 UI code generator 4.4.2
+# Created: Tue Jan 27 12:25:38 2009
+#      by: PyQt4 UI code generator 4.4.3
 #
 # WARNING! All changes made in this file will be lost!
 
@@ -12,12 +12,12 @@ from PyQt4 import QtCore, QtGui
 class Ui_DVisu(object):
     def setupUi(self, DVisu):
         DVisu.setObjectName("DVisu")
-        DVisu.resize(501,394)
+        DVisu.resize(501, 394)
         self.gridlayout = QtGui.QGridLayout(DVisu)
         self.gridlayout.setObjectName("gridlayout")
         self.TB = QtGui.QTextBrowser(DVisu)
         self.TB.setObjectName("TB")
-        self.gridlayout.addWidget(self.TB,0,0,1,1)
+        self.gridlayout.addWidget(self.TB, 0, 0, 1, 1)
 
         self.retranslateUi(DVisu)
 
index 7720fb0c04a52c8d646075370a35a2d870520e1d..1f4c506e7b1e7fb428c05d3555d094a7ca3ed9ee 100644 (file)
@@ -2,8 +2,8 @@
 
 # Form implementation generated from reading ui file 'myMain.ui'
 #
-# Created: Tue Nov 18 17:37:26 2008
-#      by: PyQt4 UI code generator 4.4.2
+# Created: Thu Apr 23 16:20:17 2009
+#      by: PyQt4 UI code generator 4.4.3
 #
 # WARNING! All changes made in this file will be lost!
 
@@ -12,13 +12,12 @@ from PyQt4 import QtCore, QtGui
 class Ui_Eficas(object):
     def setupUi(self, Eficas):
         Eficas.setObjectName("Eficas")
-        Eficas.resize(1406,600)
+        Eficas.resize(1383, 811)
         self.centralwidget = QtGui.QWidget(Eficas)
-        self.centralwidget.setGeometry(QtCore.QRect(0,68,1406,510))
         self.centralwidget.setObjectName("centralwidget")
         Eficas.setCentralWidget(self.centralwidget)
         self.menubar = QtGui.QMenuBar(Eficas)
-        self.menubar.setGeometry(QtCore.QRect(0,0,1406,29))
+        self.menubar.setGeometry(QtCore.QRect(0, 0, 1383, 29))
         self.menubar.setObjectName("menubar")
         self.menuFichier = QtGui.QMenu(self.menubar)
         self.menuFichier.setObjectName("menuFichier")
@@ -36,29 +35,27 @@ class Ui_Eficas(object):
         self.menuPatrons.setObjectName("menuPatrons")
         Eficas.setMenuBar(self.menubar)
         self.statusbar = QtGui.QStatusBar(Eficas)
-        self.statusbar.setGeometry(QtCore.QRect(0,578,1406,22))
         self.statusbar.setObjectName("statusbar")
         Eficas.setStatusBar(self.statusbar)
         self.toolBar = QtGui.QToolBar(Eficas)
-        self.toolBar.setGeometry(QtCore.QRect(0,29,1406,39))
         self.toolBar.setObjectName("toolBar")
-        Eficas.addToolBar(QtCore.Qt.TopToolBarArea,self.toolBar)
+        Eficas.addToolBar(QtCore.Qt.TopToolBarArea, self.toolBar)
         self.action_Nouveau = QtGui.QAction(Eficas)
         icon = QtGui.QIcon()
-        icon.addPixmap(QtGui.QPixmap("icons/New24.gif"),QtGui.QIcon.Normal,QtGui.QIcon.Off)
+        icon.addPixmap(QtGui.QPixmap("../Editeur/icons/New24.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
         self.action_Nouveau.setIcon(icon)
         self.action_Nouveau.setObjectName("action_Nouveau")
         self.actionNouvel_Include = QtGui.QAction(Eficas)
         self.actionNouvel_Include.setObjectName("actionNouvel_Include")
         self.action_Ouvrir = QtGui.QAction(Eficas)
-        icon = QtGui.QIcon()
-        icon.addPixmap(QtGui.QPixmap("icons/Open24.gif"),QtGui.QIcon.Normal,QtGui.QIcon.Off)
-        self.action_Ouvrir.setIcon(icon)
+        icon1 = QtGui.QIcon()
+        icon1.addPixmap(QtGui.QPixmap("../Editeur/icons/Open24.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+        self.action_Ouvrir.setIcon(icon1)
         self.action_Ouvrir.setObjectName("action_Ouvrir")
         self.actionEnregistrer = QtGui.QAction(Eficas)
-        icon = QtGui.QIcon()
-        icon.addPixmap(QtGui.QPixmap("icons/Save24.gif"),QtGui.QIcon.Normal,QtGui.QIcon.Off)
-        self.actionEnregistrer.setIcon(icon)
+        icon2 = QtGui.QIcon()
+        icon2.addPixmap(QtGui.QPixmap("../Editeur/icons/Save24.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+        self.actionEnregistrer.setIcon(icon2)
         self.actionEnregistrer.setObjectName("actionEnregistrer")
         self.actionEnregistrer_sous = QtGui.QAction(Eficas)
         self.actionEnregistrer_sous.setObjectName("actionEnregistrer_sous")
@@ -67,19 +64,19 @@ class Ui_Eficas(object):
         self.actionFermer_tout = QtGui.QAction(Eficas)
         self.actionFermer_tout.setObjectName("actionFermer_tout")
         self.actionCouper = QtGui.QAction(Eficas)
-        icon = QtGui.QIcon()
-        icon.addPixmap(QtGui.QPixmap("icons/Cut24.gif"),QtGui.QIcon.Normal,QtGui.QIcon.Off)
-        self.actionCouper.setIcon(icon)
+        icon3 = QtGui.QIcon()
+        icon3.addPixmap(QtGui.QPixmap("../Editeur/icons/Cut24.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+        self.actionCouper.setIcon(icon3)
         self.actionCouper.setObjectName("actionCouper")
         self.actionCopier = QtGui.QAction(Eficas)
-        icon = QtGui.QIcon()
-        icon.addPixmap(QtGui.QPixmap("icons/Copy24.gif"),QtGui.QIcon.Normal,QtGui.QIcon.Off)
-        self.actionCopier.setIcon(icon)
+        icon4 = QtGui.QIcon()
+        icon4.addPixmap(QtGui.QPixmap("../Editeur/icons/Copy24.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+        self.actionCopier.setIcon(icon4)
         self.actionCopier.setObjectName("actionCopier")
         self.actionColler = QtGui.QAction(Eficas)
-        icon = QtGui.QIcon()
-        icon.addPixmap(QtGui.QPixmap("icons/Paste24.gif"),QtGui.QIcon.Normal,QtGui.QIcon.Off)
-        self.actionColler.setIcon(icon)
+        icon5 = QtGui.QIcon()
+        icon5.addPixmap(QtGui.QPixmap("../Editeur/icons/Paste24.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+        self.actionColler.setIcon(icon5)
         self.actionColler.setObjectName("actionColler")
         self.actionQuitter = QtGui.QAction(Eficas)
         self.actionQuitter.setObjectName("actionQuitter")
index 6025ed619b40ce0bb8e5038baaa385b4d38d3c23..d658dd50ab038516ed97db0708f3829d75370d22 100644 (file)
@@ -5,29 +5,20 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>1406</width>
-    <height>600</height>
+    <width>1383</width>
+    <height>811</height>
    </rect>
   </property>
   <property name="windowTitle" >
    <string>MainWindow</string>
   </property>
-  <widget class="QWidget" name="centralwidget" >
-   <property name="geometry" >
-    <rect>
-     <x>0</x>
-     <y>68</y>
-     <width>1406</width>
-     <height>510</height>
-    </rect>
-   </property>
-  </widget>
+  <widget class="QWidget" name="centralwidget" />
   <widget class="QMenuBar" name="menubar" >
    <property name="geometry" >
     <rect>
      <x>0</x>
      <y>0</y>
-     <width>1406</width>
+     <width>1383</width>
      <height>29</height>
     </rect>
    </property>
    <addaction name="menuTraduction" />
    <addaction name="menuPatrons" />
   </widget>
-  <widget class="QStatusBar" name="statusbar" >
-   <property name="geometry" >
-    <rect>
-     <x>0</x>
-     <y>578</y>
-     <width>1406</width>
-     <height>22</height>
-    </rect>
-   </property>
-  </widget>
+  <widget class="QStatusBar" name="statusbar" />
   <widget class="QToolBar" name="toolBar" >
-   <property name="geometry" >
-    <rect>
-     <x>0</x>
-     <y>29</y>
-     <width>1406</width>
-     <height>39</height>
-    </rect>
-   </property>
    <property name="windowTitle" >
     <string>toolBar</string>
    </property>
   <action name="action_Nouveau" >
    <property name="icon" >
     <iconset>
-     <normaloff>icons/New24.gif</normaloff>icons/New24.gif</iconset>
+     <normaloff>../Editeur/icons/New24.png</normaloff>../Editeur/icons/New24.png</iconset>
    </property>
    <property name="text" >
     <string>&amp;Nouveau</string>
   <action name="action_Ouvrir" >
    <property name="icon" >
     <iconset>
-     <normaloff>icons/Open24.gif</normaloff>icons/Open24.gif</iconset>
+     <normaloff>../Editeur/icons/Open24.png</normaloff>../Editeur/icons/Open24.png</iconset>
    </property>
    <property name="text" >
     <string>&amp;Ouvrir</string>
   <action name="actionEnregistrer" >
    <property name="icon" >
     <iconset>
-     <normaloff>icons/Save24.gif</normaloff>icons/Save24.gif</iconset>
+     <normaloff>../Editeur/icons/Save24.png</normaloff>../Editeur/icons/Save24.png</iconset>
    </property>
    <property name="text" >
     <string>Enregistrer</string>
   <action name="actionCouper" >
    <property name="icon" >
     <iconset>
-     <normaloff>icons/Cut24.gif</normaloff>icons/Cut24.gif</iconset>
+     <normaloff>../Editeur/icons/Cut24.png</normaloff>../Editeur/icons/Cut24.png</iconset>
    </property>
    <property name="text" >
     <string>Couper</string>
   <action name="actionCopier" >
    <property name="icon" >
     <iconset>
-     <normaloff>icons/Copy24.gif</normaloff>icons/Copy24.gif</iconset>
+     <normaloff>../Editeur/icons/Copy24.png</normaloff>../Editeur/icons/Copy24.png</iconset>
    </property>
    <property name="text" >
     <string>Copier</string>
   <action name="actionColler" >
    <property name="icon" >
     <iconset>
-     <normaloff>icons/Paste24.gif</normaloff>icons/Paste24.gif</iconset>
+     <normaloff>../Editeur/icons/Paste24.png</normaloff>../Editeur/icons/Paste24.png</iconset>
    </property>
    <property name="text" >
     <string>Coller</string>
diff --git a/convert/convert_SEP.py b/convert/convert_SEP.py
new file mode 100644 (file)
index 0000000..b318cea
--- /dev/null
@@ -0,0 +1,39 @@
+# -*- coding: utf-8 -*-
+#            CONFIGURATION MANAGEMENT OF EDF VERSION
+# ======================================================================
+# COPYRIGHT (C) 1991 - 2002  EDF R&D                  WWW.CODE-ASTER.ORG
+# THIS PROGRAM IS FREE SOFTWARE; YOU CAN REDISTRIBUTE IT AND/OR MODIFY
+# IT UNDER THE TERMS OF THE GNU GENERAL PUBLIC LICENSE AS PUBLISHED BY
+# THE FREE SOFTWARE FOUNDATION; EITHER VERSION 2 OF THE LICENSE, OR
+# (AT YOUR OPTION) ANY LATER VERSION.
+#
+# THIS PROGRAM IS DISTRIBUTED IN THE HOPE THAT IT WILL BE USEFUL, BUT
+# WITHOUT ANY WARRANTY; WITHOUT EVEN THE IMPLIED WARRANTY OF
+# MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. SEE THE GNU
+# GENERAL PUBLIC LICENSE FOR MORE DETAILS.
+#
+# YOU SHOULD HAVE RECEIVED A COPY OF THE GNU GENERAL PUBLIC LICENSE
+# ALONG WITH THIS PROGRAM; IF NOT, WRITE TO EDF R&D CODE_ASTER,
+#    1 AVENUE DU GENERAL DE GAULLE, 92141 CLAMART CEDEX, FRANCE.
+#
+#
+# ======================================================================
+"""
+"""
+
+import parseur_python
+from convert_python import *
+
+def entryPoint():
+   """
+       Retourne les informations nécessaires pour le chargeur de plugins
+       Ces informations sont retournées dans un dictionnaire
+   """
+   return {
+        # Le nom du plugin
+          'name' : 'SEP',
+        # La factory pour créer une instance du plugin
+          'factory' : PythonParser,
+          }
+
+
diff --git a/convert/convert_cuve2dg.py b/convert/convert_cuve2dg.py
new file mode 100644 (file)
index 0000000..1782778
--- /dev/null
@@ -0,0 +1,39 @@
+# -*- coding: utf-8 -*-
+#            CONFIGURATION MANAGEMENT OF EDF VERSION
+# ======================================================================
+# COPYRIGHT (C) 1991 - 2002  EDF R&D                  WWW.CODE-ASTER.ORG
+# THIS PROGRAM IS FREE SOFTWARE; YOU CAN REDISTRIBUTE IT AND/OR MODIFY
+# IT UNDER THE TERMS OF THE GNU GENERAL PUBLIC LICENSE AS PUBLISHED BY
+# THE FREE SOFTWARE FOUNDATION; EITHER VERSION 2 OF THE LICENSE, OR
+# (AT YOUR OPTION) ANY LATER VERSION.
+#
+# THIS PROGRAM IS DISTRIBUTED IN THE HOPE THAT IT WILL BE USEFUL, BUT
+# WITHOUT ANY WARRANTY; WITHOUT EVEN THE IMPLIED WARRANTY OF
+# MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. SEE THE GNU
+# GENERAL PUBLIC LICENSE FOR MORE DETAILS.
+#
+# YOU SHOULD HAVE RECEIVED A COPY OF THE GNU GENERAL PUBLIC LICENSE
+# ALONG WITH THIS PROGRAM; IF NOT, WRITE TO EDF R&D CODE_ASTER,
+#    1 AVENUE DU GENERAL DE GAULLE, 92141 CLAMART CEDEX, FRANCE.
+#
+#
+# ======================================================================
+"""
+"""
+
+import parseur_python
+from convert_python import *
+
+def entryPoint():
+   """
+       Retourne les informations nécessaires pour le chargeur de plugins
+       Ces informations sont retournées dans un dictionnaire
+   """
+   return {
+        # Le nom du plugin
+          'name' : 'cuve2dg',
+        # La factory pour créer une instance du plugin
+          'factory' : PythonParser,
+          }
+
+
index cc62f50451a614bb55e39c9ee7da291f241edf52..ba62b9f9da1c4d0d0de5714d4724f680a17327e8 100644 (file)
 #
 # ======================================================================
 """
-    Ce module contient le plugin convertisseur de fichier
-    au format python pour EFICAS.
-
-    Un plugin convertisseur doit fournir deux attributs de classe :
-    extensions et formats et deux méthodes : readfile,convert.
-
-    L'attribut de classe extensions est une liste d'extensions
-    de fichiers préconisées pour ce type de format. Cette information
-    est seulement indicative.
-
-    L'attribut de classe formats est une liste de formats de sortie
-    supportés par le convertisseur. Les formats possibles sont :
-    eval, dict ou exec.
-    Le format eval est un texte source Python qui peut etre evalué. Le
-    résultat de l'évaluation est un objet Python quelconque.
-    Le format dict est un dictionnaire Python.
-    Le format exec est un texte source Python qui peut etre executé. 
-
-    La méthode readfile a pour fonction de lire un fichier dont le
-    nom est passé en argument de la fonction.
-       - convertisseur.readfile(nom_fichier)
-
-    La méthode convert a pour fonction de convertir le fichier
-    préalablement lu dans un objet du format passé en argument.
-       - objet=convertisseur.convert(outformat)
-
-    Ce convertisseur supporte le format de sortie exec
-
 """
-import sys,string,traceback
 
 import parseur_python
-from Noyau import N_CR
+from convert_python import *
 
 def entryPoint():
    """
@@ -66,63 +37,3 @@ def entryPoint():
           }
 
 
-class PythonParser:
-   """
-       Ce convertisseur lit un fichier au format python avec la 
-       methode readfile : convertisseur.readfile(nom_fichier)
-       et retourne le texte au format outformat avec la 
-       methode convertisseur.convert(outformat)
-
-       Ses caractéristiques principales sont exposées dans 2 attributs 
-       de classe :
-          - extensions : qui donne une liste d'extensions de fichier préconisées
-          - formats : qui donne une liste de formats de sortie supportés
-   """
-   # Les extensions de fichier préconisées
-   extensions=('.py',)
-   # Les formats de sortie supportés (eval dict ou exec)
-   # Le format exec est du python executable (commande exec) converti avec PARSEUR_PYTHON
-   # Le format execnoparseur est du python executable (commande exec) non converti
-   formats=('exec','execnoparseur')
-
-   def __init__(self,cr=None):
-      # Si l'objet compte-rendu n'est pas fourni, on utilise le 
-      # compte-rendu standard
-      self.text=''
-      if cr :
-         self.cr=cr
-      else:
-         self.cr=N_CR.CR(debut='CR convertisseur format python',
-                         fin='fin CR format python')
-
-   def readfile(self,filename):
-      self.filename=filename
-      try:
-         self.text=open(filename).read()
-      except:
-         self.cr.fatal("Impossible ouvrir fichier %s" % filename)
-         return
-
-   def convert(self,outformat,appli=None):
-      if outformat == 'exec':
-         try:
-           #txt=parseur_python.PARSEUR_PYTHON(self.text).get_texte(appli)
-           #print txt
-           #return txt
-            return parseur_python.PARSEUR_PYTHON(self.text).get_texte(appli)
-         except:
-            # Erreur lors de la conversion
-            l=traceback.format_exception(sys.exc_info()[0],sys.exc_info()[1],
-                                         sys.exc_info()[2])
-            self.cr.exception("Impossible de convertir le fichier python \
-                               qui doit contenir des erreurs.\n \
-                               On retourne le fichier non converti \n \
-                               Prévenir la maintenance. \n" + string.join(l))
-            # On retourne néanmoins le source initial non converti (au cas où)
-            return self.text
-      elif outformat == 'execnoparseur':
-         return self.text
-      else:
-         raise "Format de sortie : %s, non supporté"
-         return None
-
index 0cc2ea112cf8dc014f79237c79cbf7a010336b72..b9119b3a419c36469831d9f365f1cbb5d0106383 100644 (file)
 #
 # ======================================================================
 """
-    Ce module contient le plugin convertisseur de fichier
-    au format python pour EFICAS.
-
-    Un plugin convertisseur doit fournir deux attributs de classe :
-    extensions et formats et deux méthodes : readfile,convert.
-
-    L'attribut de classe extensions est une liste d'extensions
-    de fichiers préconisées pour ce type de format. Cette information
-    est seulement indicative.
-
-    L'attribut de classe formats est une liste de formats de sortie
-    supportés par le convertisseur. Les formats possibles sont :
-    eval, dict ou exec.
-    Le format eval est un texte source Python qui peut etre evalué. Le
-    résultat de l'évaluation est un objet Python quelconque.
-    Le format dict est un dictionnaire Python.
-    Le format exec est un texte source Python qui peut etre executé. 
-
-    La méthode readfile a pour fonction de lire un fichier dont le
-    nom est passé en argument de la fonction.
-       - convertisseur.readfile(nom_fichier)
-
-    La méthode convert a pour fonction de convertir le fichier
-    préalablement lu dans un objet du format passé en argument.
-       - objet=convertisseur.convert(outformat)
-
-    Ce convertisseur supporte le format de sortie exec
-
 """
-import sys,string,traceback
 
 import parseur_python
-from Noyau import N_CR
+from convert_python import *
 
 def entryPoint():
    """
@@ -66,63 +37,3 @@ def entryPoint():
           }
 
 
-class PythonParser:
-   """
-       Ce convertisseur lit un fichier au format python avec la 
-       methode readfile : convertisseur.readfile(nom_fichier)
-       et retourne le texte au format outformat avec la 
-       methode convertisseur.convert(outformat)
-
-       Ses caractéristiques principales sont exposées dans 2 attributs 
-       de classe :
-          - extensions : qui donne une liste d'extensions de fichier préconisées
-          - formats : qui donne une liste de formats de sortie supportés
-   """
-   # Les extensions de fichier préconisées
-   extensions=('.py',)
-   # Les formats de sortie supportés (eval dict ou exec)
-   # Le format exec est du python executable (commande exec) converti avec PARSEUR_PYTHON
-   # Le format execnoparseur est du python executable (commande exec) non converti
-   formats=('exec','execnoparseur')
-
-   def __init__(self,cr=None):
-      # Si l'objet compte-rendu n'est pas fourni, on utilise le 
-      # compte-rendu standard
-      self.text=''
-      if cr :
-         self.cr=cr
-      else:
-         self.cr=N_CR.CR(debut='CR convertisseur format python',
-                         fin='fin CR format python')
-
-   def readfile(self,filename):
-      self.filename=filename
-      try:
-         self.text=open(filename).read()
-      except:
-         self.cr.fatal("Impossible ouvrir fichier %s" % filename)
-         return
-
-   def convert(self,outformat,appli=None):
-      if outformat == 'exec':
-         try:
-           #txt=parseur_python.PARSEUR_PYTHON(self.text).get_texte(appli)
-           #print txt
-           #return txt
-            return parseur_python.PARSEUR_PYTHON(self.text).get_texte(appli)
-         except:
-            # Erreur lors de la conversion
-            l=traceback.format_exception(sys.exc_info()[0],sys.exc_info()[1],
-                                         sys.exc_info()[2])
-            self.cr.exception("Impossible de convertir le fichier python \
-                               qui doit contenir des erreurs.\n \
-                               On retourne le fichier non converti \n \
-                               Prévenir la maintenance. \n" + string.join(l))
-            # On retourne néanmoins le source initial non converti (au cas où)
-            return self.text
-      elif outformat == 'execnoparseur':
-         return self.text
-      else:
-         raise "Format de sortie : %s, non supporté"
-         return None
-
index a8b0599fe7aa4635d7ae8f8f18267deee6948b16..41b3870aab425d5700f6c3183e95ee20757de4fd 100644 (file)
@@ -249,6 +249,11 @@ class Formatage :
         s=s+'\n'+texte
 
       elif ',' in valeur:
+        # il s'agit d'une liste de tuple
+        # c est trop complique on ne splitte pas
+        if valeur[0:2]=='((' : 
+           s=s+valeur
+           return s
         # il s'agit d'une liste
         liste = string.split(valeur,',')
         i=0
index 09f6945cb579c23c70707f3f70ce44d932cca344..5bd61e8c6d6047706fa3ce631c91159965e26375 100644 (file)
@@ -18,7 +18,7 @@ class StudyFileGenerationError:
   def __str__(self):
     return "'%s'" % self.st
 
-raise StudyFileGenerationError, "The study file was not generated"
+raise StudyFileGenerationError, "The study file was not generated. Check analysis type."
 """
 
 headerSTD = """#! /usr/bin/env python
@@ -32,12 +32,17 @@ import math
 
 # Chargement du module Open TURNS
 from openturns import *
-from openturns_viewer import ViewImage,StopViewer,WaitForViewer
+from openturns.viewer import ViewImage,StopViewer,WaitForViewer
+
+results = {}
 
 """
 
 footerSTD = """
 
+# Flush des messages en attente
+Log.Flush()
+
 # Terminaison du fichier
 #sys.exit( 0 )
 """
@@ -55,9 +60,9 @@ class STDGenerateur :
     self.DictMCVal = DictMCVal
     self.ListeVariables = ListeVariables
     self.DictLois = DictLois
-    print "DictMCVal=", DictMCVal
-    print "ListeVariables=", ListeVariables
-    print "DictLois=", DictLois
+    #print "DictMCVal=", DictMCVal
+    #print "ListeVariables=", ListeVariables
+    #print "DictLois=", DictLois
     self.texteSTD = defaultSTD
     self.OpenTURNS_path = appli.CONFIGURATION.OpenTURNS_path
 
@@ -97,6 +102,13 @@ class STDGenerateur :
     self.variable = {
       "n" : "n",
       "p" : "p",
+      "wrapper" : "wrapper",
+      "wrapperdata" : "wrapperdata",
+      "frameworkdata" : "frameworkdata",
+      "framework" : "framework",
+      "studyid" : "studyid",
+      "studycase" : "studycase",
+      "componentname" : "componentname",
       "model" : "model",
       "scaledVector" : "scaledVector",
       "translationVector" : "translationVector",
@@ -105,8 +117,8 @@ class STDGenerateur :
       "myExperimentPlane" : "myExperimentPlane",
       "inputSample" : "inputSample",
       "outputSample" : "outputSample",
-      "minValue" : "minValue",
-      "maxValue" : "maxValue",
+      "minValue" : 'results["minValue"]',
+      "maxValue" : 'results["maxValue"]',
       "flags" : "flags",
       "inSize" : "inSize",
       "distribution" : "distribution",
@@ -116,50 +128,50 @@ class STDGenerateur :
       "inputRandomVector" : "inputRandomVector",
       "outputRandomVector" : "outputRandomVector",
       "myQuadraticCumul" : "myQuadraticCumul",
-      "meanFirstOrder" : "meanFirstOrder",
-      "meanSecondOrder" : "meanSecondOrder",
-      "standardDeviationFirstOrder" : "standardDeviationFirstOrder",
-      "importanceFactors" : "importanceFactors",
+      "meanFirstOrder" : 'results["meanFirstOrder"]',
+      "meanSecondOrder" : 'results["meanSecondOrder"]',
+      "standardDeviationFirstOrder" : 'results["standardDeviationFirstOrder"]',
+      "importanceFactors" : 'results["importanceFactors"]',
       "importanceFactorsGraph" : "importanceFactorsGraph",
       "importanceFactorsDrawing" : "importanceFactorsDrawing",
-      "empiricalMean" : "empiricalMean",
-      "empiricalStandardDeviation" : "empiricalStandardDeviation",
-      "empiricalQuantile" : "empiricalQuantile",
+      "empiricalMean" : 'results["empiricalMean"]',
+      "empiricalStandardDeviation" : 'results["empiricalStandardDeviation"]',
+      "empiricalQuantile" : 'results["empiricalQuantile"]',
       "alpha" : "alpha",
       "beta" : "beta",
-      "PCCcoefficient" : "PCCcoefficient",
-      "PRCCcoefficient" : "PRCCcoefficient",
-      "SRCcoefficient" : "SRCcoefficient",
-      "SRRCcoefficient" : "SRRCcoefficient",
+      "PCCcoefficient" : 'results["PCCcoefficient"]',
+      "PRCCcoefficient" : 'results["PRCCcoefficient"]',
+      "SRCcoefficient" : 'results["SRCcoefficient"]',
+      "SRRCcoefficient" : 'results["SRRCcoefficient"]',
       "kernel" : "kernel",
       "kernelSmoothedDist" : "kernelSmoothedDist",
       "kernelSmoothedPDF" : "kernelSmoothedPDF",
       "myEvent" : "myEvent",
       "myAlgo" : "myAlgo",
       "myResult" : "myResult",
-      "probability" : "probability",
-      "standardDeviation" : "standardDeviation",
+      "probability" : 'results["probability"]',
+      "standardDeviation" : 'results["standardDeviation"]',
       "level" : "level",
       "length" : "length",
-      "coefficientOfVariation" : "coefficientOfVariation",
+      "coefficientOfVariation" : 'results["coefficientOfVariation"]',
       "convergenceGraph" : "convergenceGraph",
-      "iterations" : "iterations",
+      "iterations" : 'results["iterations"]',
       "myOptimizer" : "myOptimizer",
       "specificParameters" : "specificParameters",
       "startingPoint" : "startingPoint",
-      "hasoferReliabilityIndex" : "hasoferReliabilityIndex",
-      "standardSpaceDesignPoint" : "standardSpaceDesignPoint",
-      "physicalSpaceDesignPoint" : "physicalSpaceDesignPoint",
-      "eventProbabilitySensitivity" : "eventProbabilitySensitivity",
-      "hasoferReliabilityIndexSensitivity" : "hasoferReliabilityIndexSensitivity",
+      "hasoferReliabilityIndex" : 'results["hasoferReliabilityIndex"]',
+      "standardSpaceDesignPoint" : 'results["standardSpaceDesignPoint"]',
+      "physicalSpaceDesignPoint" : 'results["physicalSpaceDesignPoint"]',
+      "eventProbabilitySensitivity" : 'results["eventProbabilitySensitivity"]',
+      "hasoferReliabilityIndexSensitivity" : 'results["hasoferReliabilityIndexSensitivity"]',
       "eventProbabilitySensitivityGraph" : "eventProbabilitySensitivityGraph",
       "hasoferReliabilityIndexSensitivityGraph" : "hasoferReliabilityIndexSensitivityGraph",
-      "modelEvaluationCalls" : "modelEvaluationCalls",
-      "modelGradientCalls" : "modelGradientCalls",
-      "modelHessianCalls" : "modelHessianCalls",
-      "tvedtApproximation" : "tvedtApproximation",
-      "hohenBichlerApproximation" : "hohenBichlerApproximation",
-      "breitungApproximation" : "breitungApproximation",
+      "modelEvaluationCalls" : 'results["modelEvaluationCalls"]',
+      "modelGradientCalls" : 'results["modelGradientCalls"]',
+      "modelHessianCalls" : 'results["modelHessianCalls"]',
+      "tvedtApproximation" : 'results["tvedtApproximation"]',
+      "hohenBichlerApproximation" : 'results["hohenBichlerApproximation"]',
+      "breitungApproximation" : 'results["breitungApproximation"]',
       }
 
     # Ce dictionnaire fait la correspondance entre le mot-clef du catalogue et le flag de la bibliotheque
@@ -247,10 +259,21 @@ class STDGenerateur :
     fonction = None
     if ( self.DictMCVal.has_key( 'FileName' ) ):
       name =  self.DictMCVal[ 'FileName' ]
-      fonction = name[name.rfind('/')+1:name.rfind('.xml')]
+      #fonction = name[name.rfind('/')+1:name.rfind('.xml')]
       
     txt  = "# Charge le modele physique\n"
-    txt += "%s = NumericalMathFunction( '%s' )\n" % (self.variable["model"], fonction)
+    txt  = "%s = WrapperFile( '%s' )\n" % (self.variable["wrapper"], name)
+
+    txt += "if globals().has_key('%s'):\n" % self.variable["framework"]
+    txt += "  %s = %s.getWrapperData()\n" % (self.variable["wrapperdata"], self.variable["wrapper"])
+    txt += "  %s = %s.getFrameworkData()\n" % (self.variable["frameworkdata"], self.variable["wrapperdata"])
+    txt += "  %s.studyid_ = %s['%s']\n"  % (self.variable["frameworkdata"], self.variable["framework"], self.variable["studyid"])
+    txt += "  %s.studycase_ = %s['%s']\n"  % (self.variable["frameworkdata"], self.variable["framework"], self.variable["studycase"])
+    txt += "  %s.componentname_ = %s['%s']\n"  % (self.variable["frameworkdata"], self.variable["framework"], self.variable["componentname"])
+    txt += "  %s.setFrameworkData( %s )\n" % (self.variable["wrapperdata"], self.variable["frameworkdata"])
+    txt += "  %s.setWrapperData( %s )\n" % (self.variable["wrapper"], self.variable["wrapperdata"])
+    
+    txt += "%s = NumericalMathFunction( %s )\n" % (self.variable["model"], self.variable["wrapper"],)
     txt += "%s = %s.getInputNumericalPointDimension()\n" % (self.variable["n"], self.variable["model"])
     txt += "\n"
     return txt
@@ -1056,7 +1079,9 @@ class STDGenerateur :
     '''
     Definition de la loi Histogram
     '''
-    txt = "** Histogram not defined yet **"
+    arg1 = loi[ 'First' ]
+    arg2 = loi[ 'Values'  ]
+    txt = "Histogram( %g, %s )" % (arg1, arg2)
     return txt
 
   def Logistic (self, loi, i, collection):
index 7972a4bf3d90426f883084cffdde1c1ec6bcbe05..275e94ccd65283c222f6f947239f5f8308b4f12a 100644 (file)
@@ -49,7 +49,7 @@ WrapperDataTransferByName = {
   "pipe"      : openturns.WrapperDataTransfer.PIPE,
   "arguments" : openturns.WrapperDataTransfer.ARGUMENTS,
   "socket"    : openturns.WrapperDataTransfer.SOCKET,
-  "CORBA"     : openturns.WrapperDataTransfer.CORBA,
+  "corba"     : openturns.WrapperDataTransfer.CORBA,
   None        : openturns.WrapperDataTransfer.FILES,
   }
 
@@ -79,6 +79,7 @@ class XMLGenerateur :
     data.setHessianDescription(  self.HessianDefinition()  )
     data.setFileList( self.FileList() )
     data.setParameters( self.Parameters() )
+    data.setFrameworkData( self.FrameworkData() )
     
     wrapper=openturns.WrapperFile()
     wrapper.setWrapperData( data )
@@ -86,12 +87,19 @@ class XMLGenerateur :
     return wrapper
 
 
+  class __variable_ordering:
+    def __init__ (self, dictVar) :
+      self.dictVar = dictVar
+      
+    def __call__(self, a, b):
+      return self.dictVar[a]['numOrdre'] - self.dictVar[b]['numOrdre']
+  
   def VariableList (self) :
     '''
     Ecrit la liste des variables
     '''
     varList = openturns.WrapperDataVariableList()
-    for var in self.DictVariables.keys() :
+    for var in sorted( self.DictVariables.keys(), self.__variable_ordering( self.DictVariables ) ) :
       varList.add( self.Variable( var, self.DictVariables[var] ) )
     return varList
 
@@ -173,7 +181,14 @@ class XMLGenerateur :
     parameters.out_   = WrapperDataTransferByName[ self.GetMCVal('OutDataTransfer') ]
     return parameters
   
-
+  def FrameworkData (self) :
+    '''
+    Ecrit les donnees liees a l utilisation d un framework englobant
+    '''
+    framework = openturns.WrapperFrameworkData()
+    #framework.studycase_ = "12:23:34"
+    framework.componentname_ = self.GetMCVal('SolverComponentName')
+    return framework
 
 
   # ---------------------------------------------------------------------------------
diff --git a/generator/generator_SEP.py b/generator/generator_SEP.py
new file mode 100644 (file)
index 0000000..7439809
--- /dev/null
@@ -0,0 +1,100 @@
+# -*- coding: utf-8 -*-
+#            CONFIGURATION MANAGEMENT OF EDF VERSION
+# ======================================================================
+# COPYRIGHT (C) 1991 - 2002  EDF R&D                  WWW.CODE-ASTER.ORG
+# THIS PROGRAM IS FREE SOFTWARE; YOU CAN REDISTRIBUTE IT AND/OR MODIFY
+# IT UNDER THE TERMS OF THE GNU GENERAL PUBLIC LICENSE AS PUBLISHED BY
+# THE FREE SOFTWARE FOUNDATION; EITHER VERSION 2 OF THE LICENSE, OR
+# (AT YOUR OPTION) ANY LATER VERSION.
+#
+# THIS PROGRAM IS DISTRIBUTED IN THE HOPE THAT IT WILL BE USEFUL, BUT
+# WITHOUT ANY WARRANTY; WITHOUT EVEN THE IMPLIED WARRANTY OF
+# MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. SEE THE GNU
+# GENERAL PUBLIC LICENSE FOR MORE DETAILS.
+#
+# YOU SHOULD HAVE RECEIVED A COPY OF THE GNU GENERAL PUBLIC LICENSE
+# ALONG WITH THIS PROGRAM; IF NOT, WRITE TO EDF R&D CODE_ASTER,
+#    1 AVENUE DU GENERAL DE GAULLE, 92141 CLAMART CEDEX, FRANCE.
+#
+#
+# ======================================================================
+"""
+   Ce module contient le plugin generateur de fichier au format 
+   SEP pour EFICAS.
+
+"""
+import traceback
+import types,string,re,os
+
+from generator_python import PythonGenerator
+
+def entryPoint():
+   """
+      Retourne les informations necessaires pour le chargeur de plugins
+
+      Ces informations sont retournees dans un dictionnaire
+   """
+   return {
+        # Le nom du plugin
+          'name' : 'SEP',
+        # La factory pour creer une instance du plugin
+          'factory' : SEPGenerator,
+          }
+
+
+class SEPGenerator(PythonGenerator):
+   """
+      Ce generateur parcourt un objet de type JDC et produit
+      un texte au format eficas et 
+      un texte au format py 
+
+   """
+   # Les extensions de fichier permis?
+   extensions=('.comm',)
+
+   def gener(self,obj,format='brut'):
+      self.initDico()
+      self.text=PythonGenerator.gener(self,obj,format)
+      self.genereSEP()
+      return self.text
+
+   def getTubePy(self) :
+      return self.texteTubePy
+
+   def genereSEP(self) :
+      self.texteTubePy="# Parametres generes par Eficas \n"
+      for MC in self.dictMCVal.keys():
+        ligne = MC +"="+ repr(self.dictMCVal[MC])+'\n'
+         self.texteTubePy=self.texteTubePy+ligne
+      print self.texteTubePy
+
+      fichier=os.path.join(os.path.dirname(__file__),"tube.py")
+      f=open(fichier,'r')
+      for ligne in f.readlines():
+         self.texteTubePy=self.texteTubePy+ligne
+      f.close
+
+   def initDico(self) :
+      self.tube=0
+      self.coude=0
+      self.dictMCVal={}
+      self.texteTubePy=""
+
+   def generMCSIMP(self,obj) :
+      """
+      Convertit un objet MCSIMP en texte python
+      Remplit le dictionnaire des MCSIMP si nous ne sommes ni dans une loi, ni dans une variable
+      """
+      s=PythonGenerator.generMCSIMP(self,obj)
+      self.dictMCVal[obj.nom]=obj.valeur
+      return s
+  
+   def generMACRO_ETAPE(self,obj):
+      print obj.nom
+      if obj.nom == "M_TUBE" :
+        self.tube=1
+      if obj.nom == "M_COUDE" :
+        self.coude=1
+      s=PythonGenerator.generMACRO_ETAPE(self,obj)
+      return s
+
diff --git a/generator/generator_cuve2dg.py b/generator/generator_cuve2dg.py
new file mode 100644 (file)
index 0000000..1e616ce
--- /dev/null
@@ -0,0 +1,129 @@
+# -*- coding: utf-8 -*-
+#            CONFIGURATION MANAGEMENT OF EDF VERSION
+# ======================================================================
+# COPYRIGHT (C) 1991 - 2002  EDF R&D                  WWW.CODE-ASTER.ORG
+# THIS PROGRAM IS FREE SOFTWARE; YOU CAN REDISTRIBUTE IT AND/OR MODIFY
+# IT UNDER THE TERMS OF THE GNU GENERAL PUBLIC LICENSE AS PUBLISHED BY
+# THE FREE SOFTWARE FOUNDATION; EITHER VERSION 2 OF THE LICENSE, OR
+# (AT YOUR OPTION) ANY LATER VERSION.
+#
+# THIS PROGRAM IS DISTRIBUTED IN THE HOPE THAT IT WILL BE USEFUL, BUT
+# WITHOUT ANY WARRANTY; WITHOUT EVEN THE IMPLIED WARRANTY OF
+# MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. SEE THE GNU
+# GENERAL PUBLIC LICENSE FOR MORE DETAILS.
+#
+# YOU SHOULD HAVE RECEIVED A COPY OF THE GNU GENERAL PUBLIC LICENSE
+# ALONG WITH THIS PROGRAM; IF NOT, WRITE TO EDF R&D CODE_ASTER,
+#    1 AVENUE DU GENERAL DE GAULLE, 92141 CLAMART CEDEX, FRANCE.
+#
+#
+# ======================================================================
+"""
+    Ce module contient le plugin generateur de fichier au format 
+    homard pour EFICAS.
+
+"""
+import traceback
+import types,string,re
+
+from Noyau import N_CR
+from Noyau.N_utils import repr_float
+from Accas import ETAPE,PROC_ETAPE,MACRO_ETAPE,ETAPE_NIVEAU,JDC,FORM_ETAPE
+from Accas import MCSIMP,MCFACT,MCBLOC,MCList,EVAL
+from Accas import GEOM,ASSD,MCNUPLET
+from Accas import COMMENTAIRE,PARAMETRE, PARAMETRE_EVAL,COMMANDE_COMM
+from Formatage import Formatage
+from generator_python import PythonGenerator
+
+def entryPoint():
+   """
+       Retourne les informations nécessaires pour le chargeur de plugins
+
+       Ces informations sont retournées dans un dictionnaire
+   """
+   return {
+        # Le nom du plugin
+          'name' : 'cuve2dg',
+        # La factory pour créer une instance du plugin
+          'factory' : Cuve2dgGenerator,
+          }
+
+
+class Cuve2dgGenerator(PythonGenerator):
+   """
+       Ce generateur parcourt un objet de type JDC et produit
+       un texte au format eficas et 
+       un texte au format homard 
+
+   """
+   # Les extensions de fichier préconisées
+   extensions=('.comm',)
+
+   def __init__(self,cr=None):
+      # Si l'objet compte-rendu n'est pas fourni, on utilise le compte-rendu standard
+      if cr :
+         self.cr=cr
+      else:
+         self.cr=N_CR.CR(debut='CR generateur format homard pour homard',
+                         fin='fin CR format homard pour homard')
+      # Le texte au format homard est stocké dans l'attribut text
+      self.text=''
+      self.textCuve=''
+
+   def gener(self,obj,format='brut'):
+      self.text=''
+      self.textCuve=''
+      self.dico_mot={}
+      self.dico_genea={}
+      self.text=PythonGenerator.gener(self,obj,format)
+      return self.text
+
+   def generMCSIMP(self,obj) :
+       self.dico_mot[obj.nom]=obj.valeur
+       clef=""
+       for i in obj.get_genealogie() :
+           clef=clef+"_"+i
+       self.dico_genea[clef]=obj.valeur
+       s=PythonGenerator.generMCSIMP(self,obj)
+       return s
+
+   def writeCuve2DG(self):
+      print "je passe dans writeCuve2DG"
+      self.genereTexteCuve()
+      f = open( "/tmp/data_template", 'wb')
+      print self.texteCuve
+      f.write( self.texteCuve )
+      f.close()
+
+   def genereTexteCuve(self):
+      self.texteCuve=""
+      self.texteCuve+="############################################################################################"+"\n"
+      self.texteCuve+="# OPTIONS : Fichier Option.don"+"\n"
+      self.texteCuve+="############################################################################################"+"\n"
+      if self.dico_mot.has_key('IncrementTemporel'):
+         self.texteCuve+="INCRTPS = "+ str(self.dico_mot["IncrementTemporel"])+"\n"
+      if self.dico_mot.has_key('ProfilTemporel_Pression'):
+         self.imprime(2,(self.dico_mot["ProfilTemporel_Pression"]))
+      
+
+   def imprime(self,nbdeColonnes,valeur):
+      self.liste=[]
+      self.transforme(valeur)
+      i=0
+      while i < len(self.liste):
+          for k in range(nbdeColonnes) :
+              self.texteCuve+=str(self.liste[i+k]) +"  "
+          self.texteCuve+="\n"
+          i=i+k+1
+               
+
+   def transforme(self,valeur):
+      for i in valeur :
+          if type(i) == tuple :
+             self.transforme(i)
+          else :
+             self.liste.append(i)
+          
+
+
+
index 8a76087b12f31eb56023a729ed823b502b5ad8d5..1023eb901a90ebc3d3273150a34dc1d48bfcdd54 100644 (file)
@@ -87,20 +87,6 @@ class OpenturnsGenerator(PythonGenerator):
          self.dictTempo[obj.nom]=obj.valeur
       return s
 
-#   def generMCFACT(self,obj):
-#      # Il n est pas possible d utiliser obj.valeur qui n est pas 
-#      # a jour pour les nouvelles variables ou les modifications 
-#      if obj.nom in ( "Variables", "Files", ) :
-#         self.TraiteMCSIMP=0
-#         self.dictTempo={}
-#      s=PythonGenerator.generMCFACT(self,obj)
-#      if obj.nom in ( "Variables", ) :
-#         self.listeVariables.append(self.dictTempo)
-#         self.dictTempo={}
-#      else :
-#         self.listeFichiers.append(self.dictTempo)
-#      self.TraiteMCSIMP=1
-#      return s
 
    def generETAPE(self,obj):
       print "IDM: generETAPE dans generator_openturns_study.py"
index 393833a689579f6c6a69f74d7f238ace1cf921b9..20b4ec3bc1cf93629fb951932815f9ed10f4a579 100644 (file)
@@ -547,3 +547,5 @@ class PythonGenerator:
       #else :
          textformat=text
       return textformat
+
+
diff --git a/generator/tube.py b/generator/tube.py
new file mode 100644 (file)
index 0000000..b353d8f
--- /dev/null
@@ -0,0 +1,919 @@
+
+# ==========
+# PARAMETRES
+# ==========
+
+# methode de filling: par les generatrices ou par des ecailles de tortue
+
+# Longueur
+longueur_tube = 6363.655
+
+# Facteur d'amplification pour voir si le filling passe bien par les generatrices
+amplification_factor = 1
+
+# teste si le maillage gibi passe par tous les points
+test_gibi = False
+maillage_gibi = '/home/PROJETS/OUVERT/edf_anode/from_edf/2008_11_28/Tube/tube.mail.med'
+
+# MAILLAGE
+# ========
+
+type_maillage = "regle" # "regle" ou "libre"
+
+if type_maillage == "libre":
+     type_algo = "NETGEN_2D" # "BLSURF" ou "NETGEN_2D"
+
+if methode == "generatrices":
+    # nombre de segments dans la longueur des generatrices dans la zone de sous-epaisseur
+    nb_seg_generatrices = 150 # methode generatrices
+else:
+    # nombre de segments dans la longueur des generatrices dans la zone de sous-epaisseur
+    nb_seg_generatrices = 5 # methode tortue
+    # distance entre 2 abscisses de points de mesure au dessous de laquelle on discretise avec nb_seg_petites_distances
+    # au lieu de nb_seg_generatrices
+    petite_distance = 100
+    nb_seg_petites_distances = 3
+
+# nombre de segments dans l'epaisseur du tube
+nb_seg_ep= 3
+
+# nombre de segments dans l'arc du tube entre 2 generatrices
+if methode == "generatrices":
+    nb_seg_arc = 20 # methode generatrices: partition en 2
+else:
+    nb_seg_arc = 5 # methode tortue: partition en 8
+
+# nombre de segments dans la longueur de transition
+nb_seg_transition = 4
+
+# nombre de segments dans la longueur d'amortissement
+nb_seg_amortissement = 11
+
+# ===========
+
+import salome
+from geompy import *
+import smesh
+
+import os, csv, math, pdb, time
+
+# DEBUT DES FONCTIONS
+# ===================================================
+
+# supprime recursivement un element dans une liste
+# @exemple : 
+#    l=["a", " ", "b", " ", "c"]
+#    l = recursive_remove(l, " ")
+#    print l
+# => ["a", "b", "c"]
+def recursive_remove(l, txt):
+    finished = 0
+    while not finished:
+        try:
+            l.remove(txt)
+        except ValueError:
+            finished = 1
+    return l
+
+
+## lit les valeurs des epaisseurs sur les generatrices a partir d'un fichier csv
+# @return d_generatrices : dictionnaire dont la cle est le nom de la generatrice et la valeur est la liste des epaisseur sur cette generatrice
+# @return l_abscisses: liste des abscisses des points de mesures
+def read_generatrice(filename):
+    file = open(filename, "rb")
+
+    reader = csv.reader(file, delimiter=';', quoting=csv.QUOTE_NONE)
+    
+    # Dictionnaire pour stocker les mesures sur une generatrice donnee
+    d_generatrices = {}
+    
+    # Liste des noms des generatrices
+    l_noms_generatrices = []
+    
+    # Liste des abscisses des points de mesures
+    l_abscisses = []
+    
+    for i, row in enumerate(reader):
+        # On supprime les cases vides
+        row = recursive_remove(row, "")
+        # Sur la premiere ligne, on releve les noms des generatrices
+        if i==0:
+            for nom in row:
+                if nom not in ["Abscisse", "Longueur"]:
+                    # on initialise chaque generatrice avec une liste vide
+                    d_generatrices[nom] = []
+                    l_noms_generatrices.append(nom)
+            # nombre de generatrices trouvees:
+            nb_generatrices = len(d_generatrices)
+        else:
+            # sur les lignes suivantes, on releve les mesures des epaisseurs
+            for j, nom_generatrice in enumerate(l_noms_generatrices):
+                # la liste des epaisseurs commence a 1
+                epaisseur_str_fr = row[j+1]
+                # on convertit le format decimal francais par le format anglais
+                epaisseur_str = epaisseur_str_fr.replace(",", ".")
+                epaisseur = float(epaisseur_str)
+                d_generatrices[nom_generatrice].append(epaisseur)
+            # on ajoute la valeur de l'abscisse
+            abscisse_str = row[nb_generatrices+1]
+            abscisse = float(abscisse_str)
+            l_abscisses.append(abscisse)
+    
+    file.close()
+    
+    return d_generatrices, l_noms_generatrices, l_abscisses
+
+## lit les valeurs des angles definissant les generatrices a partir d'un fichier csv
+# @return l_angles : liste des angles definissant les generatrices
+def read_angles(filename):
+    file = open(filename, "rb")
+
+    reader = csv.reader(file, delimiter=';', quoting=csv.QUOTE_NONE)
+    
+    # Liste des angles des generatrices
+    l_angles = []
+    
+    for row in reader:
+        # On supprime les cases vides
+        row = recursive_remove(row, "")
+        
+        # si la ligne comporte 3 valeurs, on peut lire les angles
+        if len(row) == 3:
+            angle_str = row[2]
+            angle = float(angle_str)
+            l_angles.append(angle)
+    return l_angles
+
+## Cree une face a partir d'un nuage de points
+# @param l_arcs_points : liste de points sur un contour
+# @param closed_wire: flag pour savoir si le contour est deja ferme ou s'il faut le fermer
+# @return face : une face passant par tous les points
+# @warning: TODO: completer l'algo pour qu'il fonctionne si le nombre de generatrices est impair!!!
+def MakeShellFromPoints(l_arcs_points, closed_wire = False):
+    # on cree les arcs pour chaque quart de cercle
+    nb_generatrices = len(l_arcs_points[0])
+    nb_arcs_filling = nb_generatrices/2
+    l_arcs_filling = [[] for i in range(nb_arcs_filling)]
+    if closed_wire:
+        if nb_generatrices%2 != 1:
+            raise "L'algo ne fonctionne pour l'instant qu'avec un nombre de generatrices impair"
+    else:
+        if nb_generatrices%2 != 0:
+            raise "L'algo ne fonctionne pour l'instant qu'avec un nombre de generatrices pair"
+    # Creation des arcs a partir des points
+    for arc_points in l_arcs_points:
+        if not closed_wire:
+            # Pour cloturer le contour
+            arc_points.append(arc_points[0])
+        for i in range(nb_arcs_filling):
+            # 3 points a la meme abscisse sur 3 generatrices consecutives
+            arc = MakeArc(arc_points[2*i], arc_points[1+2*i], arc_points[2+2*i])
+            l_arcs_filling[i].append(arc)
+    
+    
+    # on fait un filling pour tous les 1ers arcs, tous les 2emes arcs, ... jusqu'au 4e arc
+    l_faces_filling = []
+    for i, arc_filling in enumerate(l_arcs_filling):
+        # On fait un filling entre 2 quarts de cercles
+        for j in range(0, len(arc_filling) - 1):
+            l_quart_arc = [arc_filling[j], arc_filling[j+1]]
+            compound_quart_arcs = MakeCompound(l_quart_arc)
+            quart_face_filling = MakeFilling(compound_quart_arcs, 0, 10, 1e-05, 1e-05, 0)
+            #addToStudy(quart_face_filling, "quart_face_filling_%i"%(j+1))
+            l_faces_filling.append(quart_face_filling)
+    face = MakeShell(l_faces_filling)
+    return face
+
+## Cree une face a partir d'un nuage de points par un filling sur les generatrices
+# @param l_arcs_points : liste de points sur un contour
+# @param closed_wire: flag pour savoir si le contour est deja ferme ou s'il faut le fermer
+# @return face : une face passant par tous les points
+def MakeFillingFromPoints(l_arcs_points, closed_wire = False):
+    nb_generatrices = len(l_arcs_points[0])
+    l_points_generatrices = [[] for i in range(nb_generatrices)]
+    l_generatrices = []
+    # Creation des generatrices a partir des points
+    for arc_points in l_arcs_points:
+        for i, point in enumerate(arc_points):
+            # on ajoute le point dans la generatrice correspondante
+            l_points_generatrices[i].append(point)
+    for points_generatrice in l_points_generatrices:
+        generatrice_i = MakeInterpol(points_generatrice)
+        l_generatrices.append(generatrice_i)
+    if not closed_wire:
+        # Pour cloturer le contour
+        l_generatrices.append(l_generatrices[0])
+    compound_generatrices = MakeCompound(l_generatrices)
+    face = MakeFilling(compound_generatrices, 0, 10, 1e-05, 1e-05, 0)
+    return face
+
+
+# FIN DES FONCTIONS
+# ===============================================
+
+time0 = time.time()
+
+# lecture des mesures dans le fichier csv
+mesures_filename = os.path.join(dir_name, "mesure-transposee.csv")
+d_generatrices, l_noms_generatrices, l_abscisses = read_generatrice(mesures_filename)
+
+# lecture des angles dans le fichier csv
+angles_filename = os.path.join(dir_name, "mesure-angles.csv")
+l_angles = read_angles(angles_filename)
+
+# dictionnaire indiquant les angles en fonction du nom de la generatrice
+d_angles = {}
+for nom, angle in zip(l_noms_generatrices, l_angles):
+    d_angles[nom] = angle
+
+time1 = time.time()
+
+print "Temps de lecture des fichiers: %.1f s."%(time1-time0)
+
+# Rq: pour conserver le point de plus faible epaisseur, il faut que la couture de la face de filling
+# se situe sur la generatrice ou se situe ce point
+
+# Points et vecteurs de base
+
+P0 = MakeVertex(0, 0, 0)
+
+Vx = MakeVectorDXDYDZ(1000, 0, 0)
+Vy = MakeVectorDXDYDZ(0, 1000, 0)
+Vz = MakeVectorDXDYDZ(0, 0, 1)
+plane_size = longueur_tube * 10
+
+P_ext = MakeVertex(0, r_ext, 0)
+cercle_ext = MakeRevolution(P_ext, Vx, 2*math.pi)
+face_ext_milieu = MakePrismVecH(cercle_ext, Vx, l_abscisses[-1])
+addToStudy(face_ext_milieu, "face_ext_milieu")
+
+# initialisation de l'epaisseur minimale pour l'algo de recherche de l'epaisseur minimale
+ep_min = r_ext
+# initialisation de la liste de generatrices
+l_generatrices = []
+# initialisation de la double liste d'arcs
+l_arcs_points = [[] for abscisse in l_abscisses]
+angle = 0
+# angle de la generatrice ou se situe l'epaisseur minimale
+angle_ep_mini = 0
+# Point ou se situe l'epaisseur minimale
+P_ep_mini = None
+# indice de la generatrice ou se situe le point d'epaisseur minimale
+i_generatrice_ep_mini = None
+# Creation des generatrices
+for i, nom_generatrice in enumerate(l_noms_generatrices):
+    angle += d_angles[nom_generatrice]
+    l_ep = d_generatrices[nom_generatrice]
+    l_points_ep = []
+    j = 0
+    for ep, abscisse in zip(l_ep, l_abscisses):
+        P_generatrice_tmp = MakeVertex(abscisse, r_ext - ep*amplification_factor, 0)
+        P_generatrice = MakeRotation(P_generatrice_tmp, Vx, math.radians(angle))
+        #addToStudy(P_generatrice, "P_generatrice_%i"%(i+1))
+        # pour la methode par les generatrices
+        l_points_ep.append(P_generatrice)
+        # pour la methode par les arcs
+        l_arcs_points[j].append(P_generatrice)
+        # Test sur l'epaisseur minimale
+        if ep < ep_min:
+            ep_min = ep
+            P_ep_mini = P_generatrice
+            i_generatrice_ep_mini = i
+            angle_ep_mini = angle
+        j+=1
+    # creation des generatrices
+    generatrice = MakeInterpol(l_points_ep)
+    addToStudy(generatrice, "Generatrice_%s"%nom_generatrice)
+    l_generatrices.append(generatrice)
+
+print "epaisseur minimale mesuree: ", ep_min
+addToStudy(P_ep_mini, "P_ep_mini")
+
+# On cree un objet contenant tous les points pour voir si la face generee passe par tous les points
+l_points = []
+for arcs_points in l_arcs_points:
+    l_points += arcs_points
+Tous_Points = MakeCompound(l_points)
+addToStudy(Tous_Points, "Tous_Points")
+
+# methode par les generatrices
+# ============================
+
+# Pour s'assurer de passer par le point d'epaisseur minimale,
+# on decalle la generatrice de recollement de la face et on l'ajoute a la fin pour fermer la face
+l_generatrices = l_generatrices[i_generatrice_ep_mini:] + l_generatrices[:i_generatrice_ep_mini] + [l_generatrices[i_generatrice_ep_mini]]
+# Creation de la face
+compound_generatrices = MakeCompound(l_generatrices)
+addToStudy(compound_generatrices, "compound_generatrices")
+min_compound_generatrices = MinDistance(face_ext_milieu, compound_generatrices)
+print "epaisseur minimale entre les generatrices et la face exterieure: ", min_compound_generatrices
+if methode == "generatrices":
+    face_int_milieu_tmp = MakeFilling(compound_generatrices, 0, 10, 1e-05, 1e-05, 0)
+    face_int_milieu = ChangeOrientation(face_int_milieu_tmp)
+    addToStudy(face_int_milieu, "face_int_milieu")
+    min_distance = MinDistance(face_ext_milieu, face_int_milieu)
+    print "epaisseur minimale avec la methode generatrices: ", min_distance
+
+
+# methode par les arcs avec filling arc par arc, 3 points par points (methode ecaille de tortue)
+# ==================================================================
+
+if methode != "generatrices":
+    face_int_milieu = MakeShellFromPoints(l_arcs_points)
+    addToStudy(face_int_milieu, "face_int_milieu")
+    
+    min_distance = MinDistance(face_ext_milieu, face_int_milieu)
+    print "epaisseur minimale avec la methode ecaille de tortue: ", min_distance
+
+# => La face suit a la fois les generatrices et les arcs. L'epaisseur minimale est respectee
+
+# Partie complementaire de la face interieure du tube
+# ===================================================
+
+# calcul de la longueur d'amortissement a partir de la formule de U4.PC.10-D
+r_moyen = r_ext - ep_nominale/2.
+l_amor_1 = 3/2.*math.sqrt(r_moyen**3/ep_nominale)
+l_amor_2 = 3*math.sqrt(r_moyen*ep_nominale)
+longueur_amortissement = max(l_amor_1, l_amor_2)
+
+print "longueur d'amortissement: ", longueur_amortissement
+
+# Longueur de transition entre tube deformé et longueur d'amortissement
+longueur_transition = longueur_amortissement/5.
+print "longueur de transition: ", longueur_transition
+
+
+# On cree un nuage de points definissant les contours de la face de transition
+r_int = r_ext - ep_nominale*amplification_factor
+l_faces = []
+l_abscisses_transition = []
+# boucle pour traiter en meme temps le prolongement en bas et en haut
+for i_abscisse, coef_translation in zip([0, -1], [-1, 1]):
+    l_arcs_points_transition = []
+    
+    # On cree les points sur le cercle de la face de transition, en vis-a-vis des points du premier cercle de la face int
+    abscisse_transition = l_abscisses[i_abscisse] + coef_translation*longueur_transition
+    l_abscisses_transition.append(abscisse_transition)
+    l_arcs_points_transition_base = []
+    angle = 0
+    for nom_generatrice in l_noms_generatrices:
+        angle += d_angles[nom_generatrice]
+        P_transition_base_tmp = MakeVertex(abscisse_transition, r_int, 0)
+        P_transition_base = MakeRotation(P_transition_base_tmp, Vx, math.radians(angle))
+        l_arcs_points_transition_base.append(P_transition_base)
+    
+    # contour bas
+    l_arcs_points_transition.append(l_arcs_points_transition_base)
+    # contour haut
+    l_arcs_points_transition.append(l_arcs_points[i_abscisse])
+    if methode == "generatrices":
+        face_transition = MakeFillingFromPoints(l_arcs_points_transition)
+        if coef_translation == -1:
+            face_transition = ChangeOrientation(face_transition)
+    else:
+        face_transition = MakeShellFromPoints(l_arcs_points_transition)
+    addToStudy(face_transition, "face_transition")
+    l_faces.append(face_transition)
+    
+    
+    # On recupere le contour bas pour creer la face d'amortissement
+    
+    P_transition = MakeVertex(abscisse_transition, 0, 0)
+    l_edge_transition = GetShapesOnPlaneWithLocation(face_transition, ShapeType["EDGE"], Vx, P_transition, GEOM.ST_ON)
+    wire_bas_transition = MakeWire(l_edge_transition)
+    face_amortissement = MakePrismVecH(wire_bas_transition, Vx, coef_translation*longueur_amortissement)
+    addToStudy(face_amortissement, "face_amortissement")
+    l_faces.append(face_amortissement)
+
+l_faces.append(face_int_milieu)
+
+if methode == "generatrices":
+    face_int = MakeSewing(l_faces, 0.1)
+else:
+    face_int = MakeShell(l_faces)
+addToStudy(face_int, "face_int")
+
+
+# Creation du tube solide
+# =======================
+
+# Face exterieure
+
+h_tube = l_abscisses[-1] - l_abscisses[0] + 2*(longueur_amortissement+longueur_transition)
+abscisse_base_tube = l_abscisses[0]-(longueur_amortissement+longueur_transition)
+cercle_ext_bas = MakeTranslation(cercle_ext, abscisse_base_tube, 0, 0)
+face_ext_tmp = MakePrismVecH(cercle_ext_bas, Vx, h_tube)
+# on tourne la face, pour ne pas avoir l'edge de couture
+face_ext = MakeRotation(face_ext_tmp, Vx, math.radians(l_angles[0]))
+#face_ext = face_ext_tmp
+addToStudy(face_ext, "face_ext")
+
+# Face bas
+P_bas_ext = MakeTranslation(P_ext, abscisse_base_tube, 0, 0)
+cercle_int_bas = CreateGroup(face_int, ShapeType["EDGE"])
+l_cercle_int_bas = GetShapesOnPlaneWithLocation(face_int, ShapeType["EDGE"], Vx, P_bas_ext, GEOM.ST_ON)
+UnionList(cercle_int_bas, l_cercle_int_bas)
+
+face_bas = MakeFaceWires([cercle_ext_bas, cercle_int_bas], 1)
+addToStudy(face_bas, "face_bas")
+
+# Face haut
+P_haut_ext = MakeTranslation(P_bas_ext, h_tube, 0, 0)
+cercle_ext_haut = MakeTranslation(cercle_ext_bas, h_tube, 0, 0)
+cercle_int_haut = CreateGroup(face_int, ShapeType["EDGE"])
+l_cercle_int_haut = GetShapesOnPlaneWithLocation(face_int, ShapeType["EDGE"], Vx, P_haut_ext, GEOM.ST_ON)
+UnionList(cercle_int_haut, l_cercle_int_haut)
+
+face_haut = MakeFaceWires([cercle_ext_haut, cercle_int_haut], 1)
+addToStudy(face_haut, "face_haut")
+
+l_faces_tube = [face_int, face_ext, face_bas, face_haut]
+shell_tube = MakeShell(l_faces_tube)
+addToStudy(shell_tube, "shell_tube")
+
+tube = MakeSolid([shell_tube])
+addToStudy(tube, "tube")
+
+time2 = time.time()
+
+print "Temps de creation de la geometrie: %.1f s."%(time2-time1)
+
+    
+# Partition pour que le maillage passe par les points de mesure
+# =============================================================
+
+l_plans_abscisses = []
+
+
+if methode == "generatrices":
+    l_abscisses_plan = [l_abscisses_transition[0]] + [l_abscisses[0], l_abscisses[-1]] + [l_abscisses_transition[1]]
+else:
+    l_abscisses_plan = [l_abscisses_transition[0]] + l_abscisses[:] + [l_abscisses_transition[1]]
+
+# un plan par abscisse
+for abscisse in l_abscisses_plan:
+    P_plan_part = MakeVertex(abscisse, 0, 0)
+    plan_part = MakePlane(P_plan_part, Vx, plane_size)
+    l_plans_abscisses.append(plan_part)
+
+P_axe_tube = MakeVertex(abscisse_base_tube, 0, 0)
+axe_tube = MakePrismVecH(P_axe_tube, Vx, h_tube)
+
+# pour rabotter les plans de partition
+P_bas = MakeVertex(abscisse_base_tube, 0, 0)
+cylindre_int = MakeCylinder(P_bas, Vx, r_int/2., h_tube)
+
+angle = 0
+l_plans_diag = []
+# un plan sur toutes les generatrices
+# Rq: si on cree un plan toutes les 2 generatrices uniquement, 
+# le maillage ne passera pas par les points  de mesure de l'autre generatrice sur 2
+for i, nom_generatrice in enumerate(l_noms_generatrices):
+    angle += d_angles[nom_generatrice]
+    if (methode != "generatrices") or (methode == "generatrices" and (i==i_generatrice_ep_mini)):
+        # TODO: lorsque MakePartition fonctionnera mieux (!),
+        # supprimer le if ci-dessus pour toujours partitionner par les plans des generatrices
+        P_vec_plan_tmp = MakeVertex(0, r_int, 0)
+        P_vec_plan = MakeRotation(P_vec_plan_tmp, Vx, math.radians(angle))
+        V_plan = MakeVector(P0, P_vec_plan)
+        plan_diag_tmp = MakePrismVecH(axe_tube, V_plan, 2*r_ext)
+        plan_diag = MakeCut(plan_diag_tmp, cylindre_int)
+        l_plans_diag.append(plan_diag)
+
+# TODO: lorsque MakePartition fonctionnera mieux (!), supprimer ce bloc
+# car on aura partitionne par toutes les generatrices dans le bloc precedent.
+if methode == "generatrices":
+    plan_oppose = MakeRotation(l_plans_diag[-1], Vx, math.pi)
+    l_plans_diag.append(plan_oppose)
+
+tous_plans = MakeCompound(l_plans_abscisses + l_plans_diag)
+addToStudy(tous_plans, "tous_plans")
+
+plans_diag = MakeCompound(l_plans_diag)
+addToStudy(plans_diag, "plans_diag")
+
+plans_abscisses = MakeCompound(l_plans_abscisses)
+addToStudy(plans_abscisses, "plans_abscisses")
+
+if type_maillage == "regle":
+    # Partion d'un tube plein par la face_int
+    cylindre_tmp = MakeCylinder(P_bas, Vx, r_ext, h_tube)
+    # le cylindre ainsi cree a sa ligne de couture sur Z
+    # => on la decalle sur l'edge de couture de la face interieure: -pi/2 + angle_ep_mini
+    if methode == "generatrices":
+        cylindre = MakeRotation(cylindre_tmp, Vx, -math.pi/2. + math.radians(angle_ep_mini))
+    else:
+        # en methode ecailles de tortue, la reparation plante si on tourne le cylindre
+        # mais reussi si le cylindre reste avec des edges de couture non paralleles!
+        cylindre = cylindre_tmp
+    addToStudy(cylindre, "cylindre")
+    
+    cylindre_part = MakePartition([cylindre, face_int])
+    addToStudy(cylindre_part, "cylindre_part")
+    
+    # on recupere le solide correspondant au tube
+    P_tube = MakeVertex(abscisse_base_tube, (r_ext+r_int)/2., 0)
+    tube = GetBlockNearPoint(cylindre_part, P_tube)
+    addToStudy(tube, "tube")
+    
+    if methode == "generatrices":
+        # partition par plans diag puis plans abscisses
+        tube_part_tmp = MakePartition([tube], [plans_diag])
+        addToStudy(tube_part_tmp, "tube_part_tmp")
+        tube_part = MakePartition([tube_part_tmp], [plans_abscisses])
+    else:
+        # partition par plans abscisses puis plans diag
+        tube_part_tmp = MakePartition([tube], [plans_abscisses])
+        addToStudy(tube_part_tmp, "tube_part_tmp")
+        tube_part = MakePartition([tube_part_tmp], [plans_diag])
+    addToStudy(tube_part, "tube_part")
+        
+    tube_part_improved = CheckAndImprove(tube_part)
+    if not tube_part_improved:
+        print "pas de reparation effectuee"
+        tube_part_improved = tube_part
+    addToStudy(tube_part_improved, "tube_part_improved")
+
+else:
+    # on partitionne les faces du bas et du haut pour pouvoir imposer le nombre de segments dans l'epaisseur
+    face_bas_part = MakePartition([face_bas], [tous_plans], Limit=ShapeType["FACE"])
+    face_haut_part = MakePartition([face_haut], [tous_plans], Limit=ShapeType["FACE"])
+    # pour le maillage libre, on partitionne uniquement avec les points de mesure
+    # pour qu'ils soient contenus dans le maillage
+    if methode == "generatrices":
+        # pour la methode generatrices, il faut partitionner la face interieure
+        face_int_part = MakePartition([face_int], [tous_plans], Limit=ShapeType["FACE"])
+    else:
+        # pour la methode tortue, il suffit de partitionner par les points
+        # (en fait, seuls manquent les points au milieu des arcs)
+        face_int_part = MakePartition([face_int], [Tous_Points], Limit=ShapeType["FACE"])
+    
+    l_faces_tube = [face_int_part, face_ext, face_bas_part, face_haut_part]
+    shell_tube = MakeShell(l_faces_tube)
+    addToStudy(shell_tube, "shell_tube")
+    
+    tube_part_improved = MakeSolid([shell_tube])
+    addToStudy(tube_part_improved, "tube_part_improved")
+    
+time3 = time.time()
+
+print "Temps de partitionnement: %.1f s."%(time3-time2)
+
+# Sous-geometries pour les sous-maillages
+# =======================================
+
+# edges dans l'epaisseur
+l_edges_bas = GetShapesOnPlaneWithLocation(tube_part_improved, ShapeType["EDGE"], Vx, P_bas, GEOM.ST_ON)
+edges_bas = CreateGroup(tube_part_improved, ShapeType["EDGE"])
+UnionList(edges_bas, l_edges_bas)
+edges_ep_bas = GetEdgesByLength (edges_bas, 0, r_ext-r_int + 1e-1)
+addToStudyInFather(tube_part_improved, edges_ep_bas, "edges_ep_bas")
+
+if type_maillage == "libre":
+    # on recupere les faces bas et haut
+    l_faces_bas = GetShapesOnPlaneWithLocation(tube_part_improved, ShapeType["FACE"], Vx, P_bas, GEOM.ST_ON)
+    l_faces_haut = GetShapesOnPlaneWithLocation(tube_part_improved, ShapeType["FACE"], Vx, P_haut_ext, GEOM.ST_ON)
+    faces_extremites = CreateGroup(tube_part_improved, ShapeType["FACE"])
+    UnionList(faces_extremites, l_faces_bas + l_faces_haut)
+    addToStudyInFather(tube_part_improved, faces_extremites, "faces_extremites")
+
+# edges sur les arcs
+edges_arc_bas = CreateGroup(edges_bas, ShapeType["EDGE"])
+l_edges_ep_bas = SubShapeAllSorted(edges_ep_bas, ShapeType["EDGE"])
+UnionList(edges_arc_bas, l_edges_bas)
+DifferenceList(edges_arc_bas, l_edges_ep_bas)
+addToStudyInFather(tube_part_improved, edges_arc_bas, "edges_arc_bas")
+
+# on recupere la face interieure
+l_face_int = GetShapesOnCylinder(tube_part_improved, ShapeType["FACE"], Vx, r_ext - ep_min, GEOM.ST_IN)
+sub_face_int = CreateGroup(tube_part_improved, ShapeType["FACE"])
+UnionList(sub_face_int, l_face_int)
+addToStudyInFather(tube_part_improved, sub_face_int, "SURF_INT")
+
+# on recupere les edges d'amortissement
+P_bas_int = MakeTranslation(P_bas, 0, r_int, 0)
+P_edge_tmp = MakeRotation(P_bas_int, Vx, math.radians(angle_ep_mini))
+P_edge_amortissement_1 = MakeTranslation(P_edge_tmp, longueur_amortissement/2., 0, 0)
+P_edge_amortissement_2 = MakeTranslation(P_edge_tmp, h_tube-longueur_amortissement/2., 0, 0)
+edge_amortissement_1 = GetEdgeNearPoint(tube_part_improved, P_edge_amortissement_1)
+edge_amortissement_2 = GetEdgeNearPoint(tube_part_improved, P_edge_amortissement_2)
+edges_amortissement = CreateGroup(tube_part_improved, ShapeType["EDGE"])
+UnionList(edges_amortissement, [edge_amortissement_1, edge_amortissement_2])
+addToStudyInFather(tube_part_improved, edges_amortissement, "edges_amortissement")
+
+# on recupere les edges de transition
+P_edge_transition_1 = MakeTranslation(P_edge_tmp, longueur_transition/2. + longueur_amortissement, 0, 0)
+P_edge_transition_2 = MakeTranslation(P_edge_tmp, h_tube-(longueur_transition/2. + longueur_amortissement), 0, 0)
+edge_transition_1 = GetEdgeNearPoint(tube_part_improved, P_edge_transition_1)
+edge_transition_2 = GetEdgeNearPoint(tube_part_improved, P_edge_transition_2)
+edges_transition = CreateGroup(tube_part_improved, ShapeType["EDGE"])
+UnionList(edges_transition, [edge_transition_1, edge_transition_2])
+addToStudyInFather(tube_part_improved, edges_transition, "edges_transition")
+
+# on recupere les edges d'une generatrice
+
+axe_generatrice_tmp = MakeTranslation(Vx, 0, r_int, 0)
+axe_generatrice = MakeRotation(axe_generatrice_tmp, Vx, math.radians(angle_ep_mini))
+l_edges_generatrice = GetShapesOnCylinder(tube_part_improved, ShapeType["EDGE"], axe_generatrice, ep_nominale, GEOM.ST_IN)
+edges_generatrice = CreateGroup(tube_part_improved, ShapeType["EDGE"])
+UnionList(edges_generatrice, l_edges_generatrice)
+DifferenceList(edges_generatrice, [edge_amortissement_1, edge_amortissement_2]+[edge_transition_1, edge_transition_2])
+addToStudyInFather(tube_part_improved, edges_generatrice, "edges_generatrice")
+
+# on recupere les edges d'une generatrice dont la longueur est inferieure a petite_distance
+# pour pouvoir imposer moins de segments
+if methode != "generatrices":
+    edges_petite_distance = CreateGroup(tube_part_improved, ShapeType["EDGE"])
+    l_petite_distance = []
+    for edge in l_edges_generatrice:
+        length = BasicProperties(edge)[0]
+        if length <= petite_distance:
+            l_petite_distance.append(edge)
+    UnionList(edges_petite_distance, l_petite_distance)
+    addToStudyInFather(tube_part_improved, edges_petite_distance, "edges_petite_distance")
+
+
+
+# Sous-geometries pour les groupes
+# ================================
+
+# on recupere la face interieure sans les zones de transition et d'amortissement
+P_abs_first = MakeVertex(l_abscisses[0], 0, 0)
+l_face_int_inf = GetShapesOnPlaneWithLocation(tube_part_improved, ShapeType["FACE"], Vx, P_abs_first, GEOM.ST_IN)
+P_abs_last = MakeVertex(l_abscisses[-1], 0, 0)
+l_face_int_sup = GetShapesOnPlaneWithLocation(tube_part_improved, ShapeType["FACE"], Vx, P_abs_last, GEOM.ST_OUT)
+sub_face_int_milieu = CreateGroup(tube_part_improved, ShapeType["FACE"])
+UnionList(sub_face_int_milieu, l_face_int)
+DifferenceList(sub_face_int_milieu, l_face_int_inf + l_face_int_sup)
+addToStudyInFather(tube_part_improved, sub_face_int_milieu, "FaceIntM")
+
+# on recupere la face exterieure
+l_face_ext = GetShapesOnCylinder(tube_part_improved, ShapeType["FACE"], Vx, r_ext, GEOM.ST_ON)
+sub_face_ext = CreateGroup(tube_part_improved, ShapeType["FACE"])
+UnionList(sub_face_ext, l_face_ext)
+addToStudyInFather(tube_part_improved, sub_face_ext, "SURF_EXT")
+
+# on recupere la face a l'extremite amont du tube
+l_face_bas = GetShapesOnPlaneWithLocation(tube_part_improved, ShapeType["FACE"], Vx, P_bas, GEOM.ST_ON)
+sub_face_bas = CreateGroup(tube_part_improved, ShapeType["FACE"])
+UnionList(sub_face_bas, l_face_bas)
+addToStudyInFather(tube_part_improved, sub_face_bas, "CLGV")
+
+# on recupere la face a l'extremite aval du tube
+l_face_haut = GetShapesOnPlaneWithLocation(tube_part_improved, ShapeType["FACE"], Vx, P_haut_ext, GEOM.ST_ON)
+sub_face_haut = CreateGroup(tube_part_improved, ShapeType["FACE"])
+UnionList(sub_face_haut, l_face_haut)
+addToStudyInFather(tube_part_improved, sub_face_haut, "EXTUBE")
+
+# On recupere les edges communs a face_int et face_haut
+l_edge_int = GetShapesOnCylinderIDs(tube_part_improved, ShapeType["EDGE"], Vx, r_ext - ep_min, GEOM.ST_IN)
+l_edge_haut = GetShapesOnPlaneWithLocationIDs(tube_part_improved, ShapeType["EDGE"], Vx, P_haut_ext, GEOM.ST_ON)
+l_edge_bord_int_haut = []
+for id_edge in l_edge_int:
+    if id_edge in l_edge_haut:
+        l_edge_bord_int_haut.append(id_edge)
+
+edge_bord_int_haut = CreateGroup(tube_part_improved, ShapeType["EDGE"])
+UnionIDs(edge_bord_int_haut, l_edge_bord_int_haut)
+addToStudyInFather(tube_part_improved, edge_bord_int_haut, "BORDTU")
+
+# on recupere le point d'epaisseur minimale
+# avec la methode tortue le maillage passe forcement par le point d'epaisseur minimale
+#if methode != "generatrices":
+x, y, z = PointCoordinates(P_ep_mini)
+P_ep_mini_sub = GetPoint(tube_part_improved, x, y, z, 1e-5)
+addToStudyInFather(tube_part_improved, P_ep_mini_sub, "P_ep_mini")
+
+time4 = time.time()
+
+print "Temps de recuperation des sous-geometries: %.1f s."%(time4-time3)
+
+# MAILLAGE
+# ========
+
+# on divise le nombre de segments par le nombre de plans suivant les abscisses
+
+Maillage = smesh.Mesh(tube_part_improved, "Tube")
+
+if type_maillage == "regle":
+    algo1D = Maillage.Segment()
+    algo1D.NumberOfSegments(nb_seg_generatrices)
+    #algo1D.QuadraticMesh()
+    
+    Maillage.Quadrangle()
+    
+    Maillage.Hexahedron()
+else:
+    # 30
+    average_length = h_tube/(nb_seg_generatrices + 2*(nb_seg_amortissement+nb_seg_transition))/5.
+    # BLSURF est un algo 1D/2D
+    if type_algo == "BLSURF":
+         algo2D = Maillage.Triangle(algo=smesh.BLSURF)
+         algo2D.SetPhySize(average_length)
+    else:
+         algo1D = Maillage.Segment()
+         algo1D.LocalLength(average_length)
+         
+        Maillage.Triangle(smesh.NETGEN_2D)
+    
+    
+    #algo3D = Maillage.Tetrahedron(smesh.GHS3D)
+    algo3D = Maillage.Tetrahedron()
+
+
+# hypotheses locales
+# ==================
+
+# On impose finalement un maillage fin partout, seul moyen d'avoir plusieurs elements dans l'epaisseur
+if type_maillage == "libre":
+    # 8
+    average_length_extremites = average_length/8.
+    # BLSURF est un aglo 1D/2D
+    if type_algo == "BLSURF":
+         #algo2D = Maillage.Triangle(geom=faces_extremites, algo=smesh.BLSURF)
+         #algo2D.SetPhySize(average_length_extremites)
+        pass
+    else:
+        # 8
+        algo1D = Maillage.Segment(faces_extremites)
+        algo1D.LocalLength(average_length_extremites)
+
+if type_maillage == "regle":
+    # dans l'epaisseur
+    algo1D = Maillage.Segment(edges_ep_bas)
+    algo1D.NumberOfSegments(nb_seg_ep)
+    algo1D.Propagation()
+    
+    # sur les arcs
+    algo1D = Maillage.Segment(edges_arc_bas)
+    algo1D.NumberOfSegments(nb_seg_arc)
+    algo1D.Propagation()
+
+    # sur les longueurs d'amortissement
+    algo1D = Maillage.Segment(edges_amortissement)
+    algo1D.NumberOfSegments(nb_seg_amortissement)
+    algo1D.Propagation()
+    
+    # sur les longueurs de transition
+    algo1D = Maillage.Segment(edges_transition)
+    algo1D.NumberOfSegments(nb_seg_transition)
+    algo1D.Propagation()
+    
+    if methode == "tortue":
+        algo1D = Maillage.Segment(edges_petite_distance)
+        algo1D.NumberOfSegments(nb_seg_petites_distances)
+        algo1D.Propagation()
+
+Maillage.Compute()
+
+# on fait passer le maillage par le point de plus faible epaisseur
+#if methode == "generatrices":
+    #x, y, z = PointCoordinates(P_ep_mini)
+    #id_node = Maillage.MeshToPassThroughAPoint(x, y, z)
+    ## on cree le groupe avec le point de plus faible epaisseur
+    #Maillage.MakeGroupByIds("P_ep_mini", smesh.NODE, [id_node])
+
+# on a deja cree le groupe geometrique
+#if methode != "generatrices":
+Maillage.Group(P_ep_mini_sub)
+
+# conversion en quadratique (tres long à afficher)
+#Maillage.ConvertToQuadratic(1)
+
+# on ajoute deux points aux extremites de l'axe du tube
+x, y, z = PointCoordinates(P_bas)
+id_p2 = Maillage.AddNode(x, y, z)
+Maillage.MakeGroupByIds("P2", smesh.NODE, [id_p2])
+
+id_p1 = Maillage.AddNode(x+h_tube, y, z)
+Maillage.MakeGroupByIds("P1", smesh.NODE, [id_p1])
+
+# Groupes
+# =========
+
+Maillage.Group(edge_bord_int_haut)
+Maillage.Group(sub_face_int)
+Maillage.Group(sub_face_int, "PEAUINT")
+Maillage.Group(sub_face_ext)
+Maillage.Group(sub_face_ext, "PEAUEXT")
+Maillage.Group(sub_face_bas)
+Maillage.Group(sub_face_bas, "FACE1")
+Maillage.Group(sub_face_haut)
+Maillage.Group(sub_face_haut, "FACE2")
+group_nodes_int_milieu = Maillage.GroupOnGeom(sub_face_int_milieu, "NodesInt", smesh.NODE)
+Maillage.GroupOnGeom(tube_part_improved, "VOL_TUBE", smesh.VOLUME)
+Maillage.GroupOnGeom(tube_part_improved, "COUDE", smesh.VOLUME)
+
+if test_gibi:
+    time4 = time.time()
+    ([MaillageGibi], status) = smesh.smesh.CreateMeshesFromMED(maillage_gibi)
+    
+    # on met le maillage gibi dans le meme axe que le maillage SALOME
+    MaillageGibi.RotateObject(MaillageGibi, Vz, -math.pi/2., False)
+    
+    V_trans = MakeVectorDXDYDZ(-longueur_amortissement-longueur_transition+l_abscisses[0], 0, 0)
+    MaillageGibi.TranslateObject(MaillageGibi, V_trans, False)
+    
+    MaillageInt = MaillageGibi
+    
+    gibi_groupes = MaillageGibi.GetGroups()
+    
+    # on determine le groupe correspondant a la face interieure
+    group_int = None
+    for groupe in gibi_groupes:
+        name = groupe.GetName()
+        if name.strip() == "SURF_INT":
+            group_int = groupe
+            break
+    l_faces_int = group_int.GetIDs()
+    l_nodes_ids = []
+    for face_id in l_faces_int:
+        l_nodes = MaillageGibi.GetElemNodes(face_id)
+        for node in l_nodes:
+            if node not in l_nodes_ids:
+                l_nodes_ids.append(node)
+
+time5 = time.time()
+
+print "Temps de generation du maillage: %.1f s."%(time5-time4)
+
+# Verifions si le maillage passe par les points de mesure
+# =======================================================
+
+# on cree un maillage avec les points de mesure
+MaillageTousPoints = smesh.Mesh(Tous_Points, "Tous_Points")
+## BUG: smesh ne peut pas creer un maillage de points!
+#MaillageTousPoints.Compute()
+# => On ajoute les points un par un...
+l_tous_points = SubShapeAllSorted(Tous_Points, ShapeType["VERTEX"])
+for point in l_tous_points:
+    x, y, z = PointCoordinates(point)
+    MaillageTousPoints.AddNode(x, y, z)
+
+l_points_mesures_ids = MaillageTousPoints.GetNodesId()
+
+# on ajoute les noeuds mailles de la face interieure
+if not test_gibi:
+    l_nodes_ids = group_nodes_int_milieu.GetIDs()
+    MaillageInt = Maillage
+for node in l_nodes_ids:
+    # on recupere les coordonnees depuis le maillage global
+    x, y, z = MaillageInt.GetNodeXYZ(node)
+    # on ajoute ce noeud dans le maillage de points
+    MaillageTousPoints.AddNode(x, y, z)
+
+# on trouve les noeuds en double
+tolerance = 1e0
+coincident_nodes = MaillageTousPoints.FindCoincidentNodes(tolerance)
+
+# nombre de points de mesure
+nb_points = len(l_points)
+
+# nombre de noeuds en commun
+nb_coincident_nodes = len(coincident_nodes)
+
+# nombre de points perdus
+nb_points_perdus = nb_points - nb_coincident_nodes
+
+print "%i/%i points de mesure ont ete conserves dans le maillage"%(nb_coincident_nodes, nb_points)
+if nb_points_perdus:
+    print "%i/%i points de mesure ont ete perdus dans le maillage"%(nb_points_perdus, nb_points)
+
+# affichage des points de mesure conserves
+group_kept_nodes = MaillageTousPoints.CreateEmptyGroup(smesh.NODE, "Kept_measure_points")
+l_id_coincident_nodes = []
+for l_id in coincident_nodes:
+    l_id_coincident_nodes += l_id
+group_kept_nodes.Add(l_id_coincident_nodes)
+
+# affichage des points de mesure perdus
+group_lost_nodes = MaillageTousPoints.CreateEmptyGroup(smesh.NODE, "Lost_measure_points")
+l_id_lost_points = []
+for id_point in l_points_mesures_ids:
+    if id_point not in l_id_coincident_nodes:
+        l_id_lost_points.append(id_point)
+group_lost_nodes.Add(l_id_lost_points)
+
+# On merge les noeuds en double
+if coincident_nodes:
+    MaillageTousPoints.MergeNodes(coincident_nodes)
+
+# on regarde si le point d'epaisseur minimale fait partie des points garde
+x_mini, y_mini, z_mini = PointCoordinates(P_ep_mini)
+id_p_ep_mini = MaillageTousPoints.AddNode(x_mini, y_mini, z_mini)
+MaillageTousPoints.MakeGroupByIds("P_ep_mini", smesh.NODE, [id_p_ep_mini])
+
+coincident_nodes_ep_mini = MaillageTousPoints.FindCoincidentNodes(tolerance)
+if coincident_nodes_ep_mini:
+    print "Le point d'epaisseur minimale a ete conserve"
+else:
+    print "Le point d'epaisseur minimale a ete perdu"
+
+time6 = time.time()
+
+print "Temps de verification du maillage: %.1f s."%(time6-time5)
+
+print "Temps total: %.1f s."%(time6 - time0)
+
+salome.sg.updateObjBrowser(0)
+