From 33710eec386cda83f9d0f546dd8b1e1ff62b6145 Mon Sep 17 00:00:00 2001 From: Pascale Noyret Date: Fri, 16 Nov 2007 10:09:02 +0000 Subject: [PATCH] *** empty log message *** --- .../cataSTA9/Macro/macr_ascouf_calc_ops.py | 8 +- .../cataSTA9/Macro/macr_aspic_calc_ops.py | 8 +- .../cataSTA9/Macro/macr_cabri_calc_ops.py | 4 +- .../cataSTA9/Macro/macro_elas_mult_ops.py | 24 +- .../cataSTA9/Macro/macro_mode_meca_ops.py | 3 +- InterfaceQT/compooper.py | 9 +- InterfaceQT/gereTraduction.py | 1 + InterfaceQT/monUniqueCompPanel.py | 4 +- InterfaceQT/monUniqueIntoPanel.py | 2 +- InterfaceQT/politiquesValidation.py | 8 +- InterfaceQT/qtCommun.py | 17 +- InterfaceQT/qtEficas.py | 15 ++ InterfaceQT/viewManager.py | 31 --- InterfaceTK/compocomm.py | 1 + InterfaceTK/compooper.py | 9 +- Ui/desChoixCata.py | 2 +- Ui/desCommande.py | 2 +- Ui/desCommentaire.py | 2 +- Ui/desCommentaire.ui | 7 + Ui/desError.py | 8 +- Ui/desFormule.ui | 7 + Ui/desInactif.py | 8 +- Ui/desInclude.py | 2 +- Ui/desInclude.ui | 7 + Ui/desListeParam.py | 2 +- Ui/desMCFact.py | 2 +- Ui/desMCListAjout.py | 6 +- Ui/desMacro.py | 2 +- Ui/desParam.py | 2 +- Ui/desPlusieursBase.py | 2 +- Ui/desPlusieursInto.py | 2 +- Ui/desPlusieursInto.ui | 208 +++++++++--------- Ui/desRacine.py | 2 +- Ui/desSelectVal.py | 2 +- Ui/desUniqueASSD.py | 2 +- Ui/desUniqueBase.py | 2 +- Ui/desUniqueComp.py | 2 +- ...desUniqueIntoPanel.py => desUniqueInto.py} | 47 ++-- Ui/desUniqueSDCO.py | 2 +- Ui/desUniqueSDCOInto.py | 2 +- Ui/desVisu.py | 2 +- Ui/myMain.py | 2 +- 42 files changed, 270 insertions(+), 210 deletions(-) rename Ui/{desUniqueIntoPanel.py => desUniqueInto.py} (80%) diff --git a/Aster/Cata/cataSTA9/Macro/macr_ascouf_calc_ops.py b/Aster/Cata/cataSTA9/Macro/macr_ascouf_calc_ops.py index 87cce779..5dad645f 100644 --- a/Aster/Cata/cataSTA9/Macro/macr_ascouf_calc_ops.py +++ b/Aster/Cata/cataSTA9/Macro/macr_ascouf_calc_ops.py @@ -1,4 +1,4 @@ -#@ MODIF macr_ascouf_calc_ops Macro DATE 16/10/2007 AUTEUR REZETTE C.REZETTE +#@ MODIF macr_ascouf_calc_ops Macro DATE 13/11/2007 AUTEUR SALMONA L.SALMONA # -*- coding: iso-8859-1 -*- # CONFIGURATION MANAGEMENT OF EDF VERSION # ====================================================================== @@ -164,12 +164,12 @@ def macr_ascouf_calc_ops(self,TYPE_MAILLAGE,CL_BOL_P2_GV,MAILLAGE,MODELE,CHAM_MA # if RESU_THER!=None : self.DeclareOut('resuth',RESU_THER) mcsimp={} - if INCREMENT['NUME_INST_INIT']!=None : mcsimp['NUME_INIT']=INCREMENT['NUME_INST_INIT'] - if INCREMENT['NUME_INST_FIN' ]!=None : mcsimp['NUME_FIN' ]=INCREMENT['NUME_INST_FIN' ] + if INCREMENT['NUME_INST_INIT']!=None : mcsimp['NUME_INST_INIT']=INCREMENT['NUME_INST_INIT'] + if INCREMENT['NUME_INST_FIN' ]!=None : mcsimp['NUME_INST_FIN' ]=INCREMENT['NUME_INST_FIN' ] mcfact=_F(LIST_INST=INCREMENT['LIST_INST'],**mcsimp) resuth = THER_LINEAIRE( MODELE = __modthe , CHAM_MATER = __affmat , - TEMP_INIT = _F(STATIONNAIRE='OUI',), + ETAT_INIT = _F(STATIONNAIRE='OUI',), EXCIT = _F(CHARGE=__chther,), INCREMENT = mcfact, ) # diff --git a/Aster/Cata/cataSTA9/Macro/macr_aspic_calc_ops.py b/Aster/Cata/cataSTA9/Macro/macr_aspic_calc_ops.py index 93b0cd03..d6ad072b 100644 --- a/Aster/Cata/cataSTA9/Macro/macr_aspic_calc_ops.py +++ b/Aster/Cata/cataSTA9/Macro/macr_aspic_calc_ops.py @@ -1,4 +1,4 @@ -#@ MODIF macr_aspic_calc_ops Macro DATE 16/10/2007 AUTEUR REZETTE C.REZETTE +#@ MODIF macr_aspic_calc_ops Macro DATE 08/11/2007 AUTEUR SALMONA L.SALMONA # -*- coding: iso-8859-1 -*- # CONFIGURATION MANAGEMENT OF EDF VERSION # ====================================================================== @@ -173,12 +173,12 @@ def macr_aspic_calc_ops(self,TYPE_MAILLAGE,TUBULURE,MAILLAGE,MODELE,CHAM_MATER,C # if RESU_THER!=None : self.DeclareOut('resuth',RESU_THER) mcsimp={} - if INCREMENT['NUME_INST_INIT']!=None : mcsimp['NUME_INIT']=INCREMENT['NUME_INST_INIT'] - if INCREMENT['NUME_INST_FIN' ]!=None : mcsimp['NUME_FIN' ]=INCREMENT['NUME_INST_FIN' ] + if INCREMENT['NUME_INST_INIT']!=None : mcsimp['NUME_INST_INIT']=INCREMENT['NUME_INST_INIT'] + if INCREMENT['NUME_INST_FIN' ]!=None : mcsimp['NUME_INST_FIN' ]=INCREMENT['NUME_INST_FIN' ] mcfact=_F(LIST_INST=INCREMENT['LIST_INST'],**mcsimp) resuth = THER_LINEAIRE( MODELE = __modthe , CHAM_MATER = __affmat , - TEMP_INIT = _F(STATIONNAIRE='OUI',), + ETAT_INIT = _F(STATIONNAIRE='OUI',), EXCIT = _F(CHARGE=__chther,), INCREMENT = mcfact, ) # diff --git a/Aster/Cata/cataSTA9/Macro/macr_cabri_calc_ops.py b/Aster/Cata/cataSTA9/Macro/macr_cabri_calc_ops.py index e448efd6..a0d10667 100644 --- a/Aster/Cata/cataSTA9/Macro/macr_cabri_calc_ops.py +++ b/Aster/Cata/cataSTA9/Macro/macr_cabri_calc_ops.py @@ -1,4 +1,4 @@ -#@ MODIF macr_cabri_calc_ops Macro DATE 09/05/2007 AUTEUR REZETTE C.REZETTE +#@ MODIF macr_cabri_calc_ops Macro DATE 08/11/2007 AUTEUR SALMONA L.SALMONA # -*- coding: iso-8859-1 -*- # CONFIGURATION MANAGEMENT OF EDF VERSION # ====================================================================== @@ -277,7 +277,7 @@ def macr_cabri_calc_ops(self,MAILLAGE,MODELE_MECA,MODELE_THER,CHAR_THER, _F(CHARGE=cl_th3,), _F(CHARGE=cl_th4,),), INCREMENT=_F(LIST_INST=transi1,), - TEMP_INIT=_F(VALE=temp_ini,), + ETAT_INIT=_F(VALE=temp_ini,), TITRE='CABRI THERMIQUE &DATE &HEURE',); # Affectation des materiaux (mécanique) diff --git a/Aster/Cata/cataSTA9/Macro/macro_elas_mult_ops.py b/Aster/Cata/cataSTA9/Macro/macro_elas_mult_ops.py index a55f5e61..0d5a4139 100644 --- a/Aster/Cata/cataSTA9/Macro/macro_elas_mult_ops.py +++ b/Aster/Cata/cataSTA9/Macro/macro_elas_mult_ops.py @@ -1,4 +1,4 @@ -#@ MODIF macro_elas_mult_ops Macro DATE 16/10/2007 AUTEUR REZETTE C.REZETTE +#@ MODIF macro_elas_mult_ops Macro DATE 22/10/2007 AUTEUR PELLET J.PELLET # -*- coding: iso-8859-1 -*- # CONFIGURATION MANAGEMENT OF EDF VERSION # ====================================================================== @@ -29,7 +29,7 @@ def macro_elas_mult_ops(self,MODELE,CHAM_MATER,CARA_ELEM,NUME_DDL, ier=0 import types from Accas import _F - from Utilitai.Utmess import UTMESS + from Utilitai.Utmess import UTMESS # On met le mot cle NUME_DDL dans une variable locale pour le proteger numeddl=NUME_DDL @@ -234,11 +234,13 @@ def macro_elas_mult_ops(self,MODELE,CHAM_MATER,CARA_ELEM,NUME_DDL, motscles['NUME_MODE']=m['MODE_FOURIER'] motscles['EXCIT']=[] if m['CHAR_MECA'] : - for chargt in m['CHAR_MECA'] : motscles['EXCIT'].append(_F(CHARGE=chargt)) + for chargt in m['CHAR_MECA'] : motscles['EXCIT'].append(_F(CHARGE=chargt)) elif m['CHAR_CINE'] : - for chargt in m['CHAR_CINE'] : motscles['EXCIT'].append(_F(CHARGE=chargt)) - if CHAR_MECA_GLOBAL: motscles['EXCIT'].append(_F(CHARGE=CHAR_MECA_GLOBAL)) - elif CHAR_CINE_GLOBAL: motscles['EXCIT'].append(_F(CHARGE=CHAR_CINE_GLOBAL)) + for chargt in m['CHAR_CINE'] : motscles['EXCIT'].append(_F(CHARGE=chargt)) + if CHAR_MECA_GLOBAL: + for chargt in CHAR_MECA_GLOBAL : motscles['EXCIT'].append(_F(CHARGE=chargt)) + elif CHAR_CINE_GLOBAL: + for chargt in CHAR_CINE_GLOBAL : motscles['EXCIT'].append(_F(CHARGE=chargt)) CALC_ELEM(reuse=nomres, RESULTAT=nomres, MODELE=MODELE, @@ -256,11 +258,13 @@ def macro_elas_mult_ops(self,MODELE,CHAM_MATER,CARA_ELEM,NUME_DDL, motscles['NUME_MODE']=m['MODE_FOURIER'] motscles['EXCIT']=[] if m['CHAR_MECA'] : - for chargt in m['CHAR_MECA'] : motscles['EXCIT'].append(_F(CHARGE=chargt)) + for chargt in m['CHAR_MECA'] : motscles['EXCIT'].append(_F(CHARGE=chargt)) elif m['CHAR_CINE'] : - for chargt in m['CHAR_CINE'] : motscles['EXCIT'].append(_F(CHARGE=chargt)) - if CHAR_MECA_GLOBAL: motscles['EXCIT'].append(_F(CHARGE=CHAR_MECA_GLOBAL)) - elif CHAR_CINE_GLOBAL: motscles['EXCIT'].append(_F(CHARGE=CHAR_CINE_GLOBAL)) + for chargt in m['CHAR_CINE'] : motscles['EXCIT'].append(_F(CHARGE=chargt)) + if CHAR_MECA_GLOBAL: + for chargt in CHAR_MECA_GLOBAL : motscles['EXCIT'].append(_F(CHARGE=chargt)) + elif CHAR_CINE_GLOBAL: + for chargt in CHAR_CINE_GLOBAL : motscles['EXCIT'].append(_F(CHARGE=chargt)) CALC_NO(reuse=nomres, RESULTAT=nomres, MODELE=MODELE, diff --git a/Aster/Cata/cataSTA9/Macro/macro_mode_meca_ops.py b/Aster/Cata/cataSTA9/Macro/macro_mode_meca_ops.py index a24af1f6..1ed675e3 100644 --- a/Aster/Cata/cataSTA9/Macro/macro_mode_meca_ops.py +++ b/Aster/Cata/cataSTA9/Macro/macro_mode_meca_ops.py @@ -1,4 +1,4 @@ -#@ MODIF macro_mode_meca_ops Macro DATE 14/06/2005 AUTEUR DURAND C.DURAND +#@ MODIF macro_mode_meca_ops Macro DATE 30/10/2007 AUTEUR BOYERE E.BOYERE # -*- coding: iso-8859-1 -*- # CONFIGURATION MANAGEMENT OF EDF VERSION # ====================================================================== @@ -110,7 +110,6 @@ def macro_mode_meca_ops(self,MATR_A,MATR_B,INFO,METHODE,OPTION,CALC_FREQ, **motscit) __nomre0=NORM_MODE(reuse =__nomre0, - MASS_INER =normode['MASS_INER'], MODE =__nomre0, NORME =normode['NORME'], INFO =normode['INFO'],) diff --git a/InterfaceQT/compooper.py b/InterfaceQT/compooper.py index 4f4a9b77..f078cd8c 100644 --- a/InterfaceQT/compooper.py +++ b/InterfaceQT/compooper.py @@ -74,7 +74,14 @@ class EtapeTreeItem(Objecttreeitem.ObjectTreeItem): elif self.object.isvalid(): return "ast-green-square" else: - return "ast-red-square" + valid=self.valid_child() + valid=valid * self.valid_regles("non") + if self.reste_val != {}: + valid=0 + if valid==0 : + return "ast-red-square" + else : + return "ast-yellow-square" def GetLabelText(self): """ Retourne 3 valeurs : diff --git a/InterfaceQT/gereTraduction.py b/InterfaceQT/gereTraduction.py index de8e7274..f4712ff9 100644 --- a/InterfaceQT/gereTraduction.py +++ b/InterfaceQT/gereTraduction.py @@ -39,6 +39,7 @@ def traduction(directPath,editor,version): from desVisu import DVisu titre = "conversion de "+ FichieraTraduire monVisu=DVisu(parent=editor,fl=Qt.WType_Dialog) + monVisu.setCaption(titre) monVisu.TB.setText(texte) monVisu.show() diff --git a/InterfaceQT/monUniqueCompPanel.py b/InterfaceQT/monUniqueCompPanel.py index ccca1053..05647db6 100644 --- a/InterfaceQT/monUniqueCompPanel.py +++ b/InterfaceQT/monUniqueCompPanel.py @@ -114,9 +114,9 @@ class MonUniqueCompPanel(DUnComp,QTPanel,PolitiqueUnique): Retourne le complexe saisi par l'utilisateur """ l=[] - if (self.buttonGroup1.selectedId() == 0 ) : + if (self.buttonGroup1.selectedId() == 1 ) : l.append("MP") - elif (self.buttonGroup1.selectedId() == 1) : + elif (self.buttonGroup1.selectedId() == 0) : l.append("RI") else : commentaire="saisir le type de complexe" diff --git a/InterfaceQT/monUniqueIntoPanel.py b/InterfaceQT/monUniqueIntoPanel.py index 86a19958..568410e2 100644 --- a/InterfaceQT/monUniqueIntoPanel.py +++ b/InterfaceQT/monUniqueIntoPanel.py @@ -26,7 +26,7 @@ import prefs from qt import * -from desUniqueIntoPanel import DUnIn +from desUniqueInto import DUnIn from qtCommun import QTPanel from qtSaisie import SaisieValeur from politiquesValidation import PolitiqueUnique diff --git a/InterfaceQT/politiquesValidation.py b/InterfaceQT/politiquesValidation.py index d105c954..07543d5e 100644 --- a/InterfaceQT/politiquesValidation.py +++ b/InterfaceQT/politiquesValidation.py @@ -122,10 +122,17 @@ class PolitiquePlusieurs: commentaire="Nouvelle valeur acceptée" commentaire2="" valide=1 + if listevaleur==None: return + if not( type(listevaleur) in (types.ListType,types.TupleType)) : + listevaleur=tuple(listevaleur) for valeur in listevaleur : # On teste le type de la valeur valide=self.node.item.valide_item(valeur) if not valide : + testtype,commentaire = self.node.item.object.verif_type(valeur) + print self.__class__ + if not testtype : + return testtype,commentaire,"",listeRetour try : valeur,valide=self.node.item.eval_valeur(valeur) except : @@ -146,7 +153,6 @@ class PolitiquePlusieurs: return valide,commentaire,commentaire2,listeRetour if len(listecourante) + 1 > min : return valide,commentaire,commentaire2,listeRetour - # On ajoute la valeur testee a la liste courante et a la liste acceptee listecourante.insert(index,valeur) index=index+1 diff --git a/InterfaceQT/qtCommun.py b/InterfaceQT/qtCommun.py index 7c6944e9..2c8c7dd5 100644 --- a/InterfaceQT/qtCommun.py +++ b/InterfaceQT/qtCommun.py @@ -48,13 +48,28 @@ class QTPanel: def ViewDoc(self) : cle_doc = self.node.item.get_docu() - if cle_doc == None : return + 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.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': diff --git a/InterfaceQT/qtEficas.py b/InterfaceQT/qtEficas.py index a42420b0..813f344a 100644 --- a/InterfaceQT/qtEficas.py +++ b/InterfaceQT/qtEficas.py @@ -66,6 +66,7 @@ class Appli(Eficas): self.ihm="QT" self.salome=0 self.code=code + self.monAssistant=QAssistantClient(QString(""), self.viewmanager) def ouvreFichiers(self) : @@ -97,6 +98,20 @@ class Appli(Eficas): from gereTraduction import traduction traduction(self.CONFIGURATION.rep_user,self.viewmanager,"V7V8") + def version(self) : + from desVisu import DVisu + titre = "version " + monVisu=DVisu(parent=self.viewmanager,fl=Qt.WType_Dialog) + monVisu.setCaption(titre) + monVisu.TB.setText("Eficas V1.13") + monVisu.adjustSize() + monVisu.show() + + def aidePPal(self) : + maD=INSTALLDIR+"/AIDE/fichiers" + docsPath = QDir(maD).absPath() + self.monAssistant.showPage( QString("%1/index.html").arg(docsPath) ) + def handleShowRecentMenu(self): """ Private method to set up recent files menu. diff --git a/InterfaceQT/viewManager.py b/InterfaceQT/viewManager.py index 62133da5..ade9f8c9 100644 --- a/InterfaceQT/viewManager.py +++ b/InterfaceQT/viewManager.py @@ -1095,37 +1095,6 @@ class ViewManager: else: return -## def handleShowRecentMenu(self): -## """ -## Private method to set up recent files menu. -## """ -## idx = 0 -## self.recentMenu.clear() -## -## for rp in self.recent: -## id = self.recentMenu.insertItem('&%d. %s' % (idx+1, unicode(rp)), -## self.handleOpenRecent) -## self.recentMenu.setItemParameter(id,idx) -## -## idx = idx + 1 -## -## self.recentMenu.insertSeparator() -## self.recentMenu.insertItem(self.trUtf8('&Clear'), self.handleClearRecent) -## -## def handleOpenRecent(self, idx): -## """ -## Private method to open a file from the list of rencently opened files. -## -## @param idx index of the selected entry (int) -## """ -## self.handlePythonFile(unicode(self.recent[idx])) -## -## def handleClearRecent(self): -## """ -## Private method to clear the recent files menu. -## """ -## self.recent = QStringList() - def handleViewJdcFichierSource(self): if self.activeWindow()== None : return diff --git a/InterfaceTK/compocomm.py b/InterfaceTK/compocomm.py index 2d96384a..9843dc08 100644 --- a/InterfaceTK/compocomm.py +++ b/InterfaceTK/compocomm.py @@ -61,6 +61,7 @@ class COMMPanel(panels.OngletPanel): self.widget_text.pack(side='top',expand=1,fill='both') self.widget_text.configure(hscrollmode='dynamic', vscrollmode='dynamic') + self.widget_text.component('text').configure(background = 'white') self.make_buttons() self.display_valeur() diff --git a/InterfaceTK/compooper.py b/InterfaceTK/compooper.py index f153122d..ce7c7b5f 100644 --- a/InterfaceTK/compooper.py +++ b/InterfaceTK/compooper.py @@ -156,7 +156,14 @@ class EtapeTreeItem(Objecttreeitem.ObjectTreeItem): elif self.object.isvalid(): return "ast-green-square" else: - return "ast-red-square" + valid=self.valid_child() + valid=valid * self.valid_regles("non") + if self.reste_val != {}: + valid=0 + if valid==0 : + return "ast-red-square" + else : + return "ast-yellow-square" def GetLabelText(self): """ Retourne 3 valeurs : diff --git a/Ui/desChoixCata.py b/Ui/desChoixCata.py index a0b01de5..171e3222 100644 --- a/Ui/desChoixCata.py +++ b/Ui/desChoixCata.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'desChoixCata.ui' # -# Created: ven nov 9 14:51:34 2007 +# Created: mer nov 14 11:57:46 2007 # by: The PyQt User Interface Compiler (pyuic) 3.13 # # WARNING! All changes made in this file will be lost! diff --git a/Ui/desCommande.py b/Ui/desCommande.py index fc7abbc0..dea29549 100644 --- a/Ui/desCommande.py +++ b/Ui/desCommande.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'desCommande.ui' # -# Created: sam nov 10 08:41:43 2007 +# Created: mer nov 14 11:57:46 2007 # by: The PyQt User Interface Compiler (pyuic) 3.13 # # WARNING! All changes made in this file will be lost! diff --git a/Ui/desCommentaire.py b/Ui/desCommentaire.py index dc1f1c37..8b756d74 100644 --- a/Ui/desCommentaire.py +++ b/Ui/desCommentaire.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'desCommentaire.ui' # -# Created: ven nov 9 14:51:34 2007 +# Created: mer nov 14 11:57:46 2007 # by: The PyQt User Interface Compiler (pyuic) 3.13 # # WARNING! All changes made in this file will be lost! diff --git a/Ui/desCommentaire.ui b/Ui/desCommentaire.ui index 0d6a904a..d0e95e84 100644 --- a/Ui/desCommentaire.ui +++ b/Ui/desCommentaire.ui @@ -111,9 +111,16 @@ DComment TexteCommentaireEntre() + + bHelp + clicked() + DComment + ViewDoc() + TexteCommentaireEntre() + ViewDoc() diff --git a/Ui/desError.py b/Ui/desError.py index 25375029..b9f56506 100644 --- a/Ui/desError.py +++ b/Ui/desError.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'desError.ui' # -# Created: sam nov 10 08:21:36 2007 +# Created: mer nov 14 11:57:46 2007 # by: The PyQt User Interface Compiler (pyuic) 3.13 # # WARNING! All changes made in this file will be lost! @@ -57,6 +57,12 @@ class DError(QWidget): def BSupPressed(self): print "DError.BSupPressed(): Not implemented yet" + def ViewDoc(self): + print "DError.ViewDoc(): Not implemented yet" + + def BOkPressed(self): + print "DError.BOkPressed(): Not implemented yet" + def __tr(self,s,c = None): return qApp.translate("DError",s,c) diff --git a/Ui/desFormule.ui b/Ui/desFormule.ui index 09f8ba62..5e92c7d8 100644 --- a/Ui/desFormule.ui +++ b/Ui/desFormule.ui @@ -433,6 +433,12 @@ valeurs seront effectivement prises en compte DFormule FormuleSaisie() + + bHelp + clicked() + DFormule + ViewDoc() + LBNouvCommandeClicked() @@ -445,6 +451,7 @@ valeurs seront effectivement prises en compte NomFormuleSaisi() argsSaisis() FormuleSaisie() + ViewDoc() diff --git a/Ui/desInactif.py b/Ui/desInactif.py index a1c284ef..a998b79c 100644 --- a/Ui/desInactif.py +++ b/Ui/desInactif.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'desInactif.ui' # -# Created: sam nov 10 08:23:03 2007 +# Created: mer nov 14 11:57:46 2007 # by: The PyQt User Interface Compiler (pyuic) 3.13 # # WARNING! All changes made in this file will be lost! @@ -62,6 +62,12 @@ class DInactif(QWidget): def BSupPressed(self): print "DInactif.BSupPressed(): Not implemented yet" + def ViewDoc(self): + print "DInactif.ViewDoc(): Not implemented yet" + + def BOkPressed(self): + print "DInactif.BOkPressed(): Not implemented yet" + def __tr(self,s,c = None): return qApp.translate("DInactif",s,c) diff --git a/Ui/desInclude.py b/Ui/desInclude.py index fdf345f9..5cdcfb1a 100644 --- a/Ui/desInclude.py +++ b/Ui/desInclude.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'desInclude.ui' # -# Created: ven nov 9 14:51:34 2007 +# Created: mer nov 14 11:57:46 2007 # by: The PyQt User Interface Compiler (pyuic) 3.13 # # WARNING! All changes made in this file will be lost! diff --git a/Ui/desInclude.ui b/Ui/desInclude.ui index 18c426ac..82bedc76 100644 --- a/Ui/desInclude.ui +++ b/Ui/desInclude.ui @@ -428,6 +428,12 @@ Il faut d'abord choisir un numéro d'unité</p></font> DInc1 LENomFichReturnPressed() + + bHelp + clicked() + DInc1 + ViewDoc() + LBNouvCommandeClicked() @@ -439,6 +445,7 @@ Il faut d'abord choisir un numéro d'unité</p></font> BNextPressed() BBrowsePressed() LENomFichReturnPressed() + ViewDoc() diff --git a/Ui/desListeParam.py b/Ui/desListeParam.py index 8a80b977..68750294 100644 --- a/Ui/desListeParam.py +++ b/Ui/desListeParam.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'desListeParam.ui' # -# Created: ven nov 9 14:51:34 2007 +# Created: mer nov 14 11:57:47 2007 # by: The PyQt User Interface Compiler (pyuic) 3.13 # # WARNING! All changes made in this file will be lost! diff --git a/Ui/desMCFact.py b/Ui/desMCFact.py index bdd39ea0..e1ea6a0b 100644 --- a/Ui/desMCFact.py +++ b/Ui/desMCFact.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'desMCFact.ui' # -# Created: sam nov 10 09:00:26 2007 +# Created: mer nov 14 11:57:47 2007 # by: The PyQt User Interface Compiler (pyuic) 3.13 # # WARNING! All changes made in this file will be lost! diff --git a/Ui/desMCListAjout.py b/Ui/desMCListAjout.py index 53c427ba..e9fe0096 100644 --- a/Ui/desMCListAjout.py +++ b/Ui/desMCListAjout.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'desMCListAjout.ui' # -# Created: ven nov 9 14:51:34 2007 +# Created: mer nov 14 11:57:47 2007 # by: The PyQt User Interface Compiler (pyuic) 3.13 # # WARNING! All changes made in this file will be lost! @@ -86,6 +86,7 @@ class DMCListAjout(QWidget): 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 languageChange(self): @@ -114,5 +115,8 @@ class DMCListAjout(QWidget): def BSupPressed(self): print "DMCListAjout.BSupPressed(): Not implemented yet" + def ViewDoc(self): + print "DMCListAjout.ViewDoc(): Not implemented yet" + def __tr(self,s,c = None): return qApp.translate("DMCListAjout",s,c) diff --git a/Ui/desMacro.py b/Ui/desMacro.py index 44d92b7d..1c3f081f 100644 --- a/Ui/desMacro.py +++ b/Ui/desMacro.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'desMacro.ui' # -# Created: sam nov 10 08:41:54 2007 +# Created: mer nov 14 11:57:47 2007 # by: The PyQt User Interface Compiler (pyuic) 3.13 # # WARNING! All changes made in this file will be lost! diff --git a/Ui/desParam.py b/Ui/desParam.py index f2d07720..6e86c7a6 100644 --- a/Ui/desParam.py +++ b/Ui/desParam.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'desParam.ui' # -# Created: sam nov 10 08:53:40 2007 +# Created: mer nov 14 11:57:47 2007 # by: The PyQt User Interface Compiler (pyuic) 3.13 # # WARNING! All changes made in this file will be lost! diff --git a/Ui/desPlusieursBase.py b/Ui/desPlusieursBase.py index f813a08c..5e38c0b3 100644 --- a/Ui/desPlusieursBase.py +++ b/Ui/desPlusieursBase.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'desPlusieursBase.ui' # -# Created: ven nov 9 14:51:34 2007 +# Created: mer nov 14 11:57:47 2007 # by: The PyQt User Interface Compiler (pyuic) 3.13 # # WARNING! All changes made in this file will be lost! diff --git a/Ui/desPlusieursInto.py b/Ui/desPlusieursInto.py index 04ec74cf..410391b1 100644 --- a/Ui/desPlusieursInto.py +++ b/Ui/desPlusieursInto.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'desPlusieursInto.ui' # -# Created: ven nov 9 14:51:34 2007 +# Created: mer nov 14 11:57:47 2007 # by: The PyQt User Interface Compiler (pyuic) 3.13 # # WARNING! All changes made in this file will be lost! diff --git a/Ui/desPlusieursInto.ui b/Ui/desPlusieursInto.ui index cbb6940c..1accb364 100644 --- a/Ui/desPlusieursInto.ui +++ b/Ui/desPlusieursInto.ui @@ -40,7 +40,7 @@ unnamed - + Commentaire @@ -48,7 +48,7 @@ - + layout1 @@ -112,7 +112,7 @@ - + textLabel1_2 @@ -120,7 +120,7 @@ <u><font size="+1">Valeur(s) possibles(s)</font></u> - + textLabel1 @@ -128,121 +128,111 @@ <u><font size="+1">Valeur(s) actuelle(s)</font></u> - + - layout6 + LBValeurs - + + + + listBoxVal + + + + + layout4 + + unnamed - + - LBValeurs + spacer2 - - + + Vertical + + + Expanding + + + + 21 + 72 + + + + - layout5 - - - - unnamed - - - - spacer2 - - - Vertical - - - Expanding - - - - 21 - 31 - - - - - - BSup1Val - - - - 40 - 31 - - - - - 40 - 31 - - - - - - - image0 - - - enleve l occurence selectionnee - - - - - BAjout1Val - - - - 40 - 31 - - - - - 40 - 31 - - - - - - - image1 - - - ajoute la valeur saisie sous l occurence selectionnée (en fin de liste si il n y a pas de selection) - - - - - spacer3 - - - Vertical - - - Expanding - - - - 21 - 181 - - - - + BAjout1Val + + + + 40 + 31 + + + + + 40 + 31 + + + + + + + image0 + + + ajoute la valeur saisie sous l occurence selectionnée (en fin de liste si il n y a pas de selection) + - + - listBoxVal + BSup1Val + + + + 40 + 31 + + + + + 40 + 31 + + + + + + + image1 + + + enleve l occurence selectionnee - + + + spacer3 + + + Vertical + + + Expanding + + + + 21 + 181 + + + + @@ -251,10 +241,10 @@ - 89504e470d0a1a0a0000000d49484452000000210000000e0806000000a11e758c000000cf49444154388dd594db0ec3200c43edfdf8d897bb0f345b480845d51eb64888f412e76001c00f046fd6e99bba77200480924a1032c92efbd8c7d5cabcc025400099e957849568fe7f06c0ded1deb32b4a1ec4ea824b9e74097165bd01f85527f78a7201e0a3129f345a017c543bafdc983d0f7109d15a331b471f47072c17494a82338f6178203a8817e67306b1f08b07ba03e602c9b831077e37e0209e67e3386710977b17de80c185ad38695a51d522c82ce77912e2fed8be83762092f52b1820dd11bb10e565b53a5a3bbaff130713d66fa6981857060000000049454e44ae426082 + 89504e470d0a1a0a0000000d49484452000000210000000e0806000000a11e758c000000c749444154388dcd94590ec3200c4471d57bc73df9f407d331b159a228aa254448bc3cc68152fec0e4420ceeceb912e08a0239838848f5df02c99c11f86004300119054ae868c56ac206c06b4b109111c802874f3a52a587757123897e4039c46b50d8865b07f5400a450053330893cf8674a30028d492deef04626b559dfe48ac842b1a6daae6850155033b99c5009f70ceda111aab413b6f6a70d118e008e6fd8bc51d5d00a0f614556d1ff9b9be4952aabc3721f8f8b6f624c557ef8947afedf48c5e60b8dfbeb81d6dab9aff99270000000049454e44ae426082 - 89504e470d0a1a0a0000000d49484452000000210000000e0806000000a11e758c000000c749444154388dcd94590ec3200c4471d57bc73df9f407d331b159a228aa254448bc3cc68152fec0e4420ceeceb912e08a0239838848f5df02c99c11f86004300119054ae868c56ac206c06b4b109111c802874f3a52a587757123897e4039c46b50d8865b07f5400a450053330893cf8674a30028d492deef04626b559dfe48ac842b1a6daae6850155033b99c5009f70ceda111aab413b6f6a70d118e008e6fd8bc51d5d00a0f614556d1ff9b9be4952aabc3721f8f8b6f624c557ef8947afedf48c5e60b8dfbeb81d6dab9aff99270000000049454e44ae426082 + 89504e470d0a1a0a0000000d49484452000000210000000e0806000000a11e758c000000cf49444154388dd594db0ec3200c43edfdf8d897bb0f345b480845d51eb64888f412e76001c00f046fd6e99bba77200480924a1032c92efbd8c7d5cabcc025400099e957849568fe7f06c0ded1deb32b4a1ec4ea824b9e74097165bd01f85527f78a7201e0a3129f345a017c543bafdc983d0f7109d15a331b471f47072c17494a82338f6178203a8817e67306b1f08b07ba03e602c9b831077e37e0209e67e3386710977b17de80c185ad38695a51d522c82ce77912e2fed8be83762092f52b1820dd11bb10e565b53a5a3bbaff130713d66fa6981857060000000049454e44ae426082 diff --git a/Ui/desRacine.py b/Ui/desRacine.py index f68055f4..5593f115 100644 --- a/Ui/desRacine.py +++ b/Ui/desRacine.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'desRacine.ui' # -# Created: sam nov 10 08:45:32 2007 +# Created: mer nov 14 11:57:47 2007 # by: The PyQt User Interface Compiler (pyuic) 3.13 # # WARNING! All changes made in this file will be lost! diff --git a/Ui/desSelectVal.py b/Ui/desSelectVal.py index 90fc043f..e48ad642 100644 --- a/Ui/desSelectVal.py +++ b/Ui/desSelectVal.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'desSelectVal.ui' # -# Created: ven nov 9 14:51:34 2007 +# Created: mer nov 14 11:57:47 2007 # by: The PyQt User Interface Compiler (pyuic) 3.13 # # WARNING! All changes made in this file will be lost! diff --git a/Ui/desUniqueASSD.py b/Ui/desUniqueASSD.py index 82d543d8..4c77a0c6 100644 --- a/Ui/desUniqueASSD.py +++ b/Ui/desUniqueASSD.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'desUniqueASSD.ui' # -# Created: ven nov 9 14:51:34 2007 +# Created: mer nov 14 11:57:47 2007 # by: The PyQt User Interface Compiler (pyuic) 3.13 # # WARNING! All changes made in this file will be lost! diff --git a/Ui/desUniqueBase.py b/Ui/desUniqueBase.py index 7d31bca0..c0181862 100644 --- a/Ui/desUniqueBase.py +++ b/Ui/desUniqueBase.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'desUniqueBase.ui' # -# Created: ven nov 9 14:51:34 2007 +# Created: mer nov 14 11:57:47 2007 # by: The PyQt User Interface Compiler (pyuic) 3.13 # # WARNING! All changes made in this file will be lost! diff --git a/Ui/desUniqueComp.py b/Ui/desUniqueComp.py index 1ef60309..9bdb94e5 100644 --- a/Ui/desUniqueComp.py +++ b/Ui/desUniqueComp.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'desUniqueComp.ui' # -# Created: ven nov 9 14:51:34 2007 +# Created: mer nov 14 11:57:47 2007 # by: The PyQt User Interface Compiler (pyuic) 3.13 # # WARNING! All changes made in this file will be lost! diff --git a/Ui/desUniqueIntoPanel.py b/Ui/desUniqueInto.py similarity index 80% rename from Ui/desUniqueIntoPanel.py rename to Ui/desUniqueInto.py index b48c58b9..d49a4980 100644 --- a/Ui/desUniqueIntoPanel.py +++ b/Ui/desUniqueInto.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'desUniqueInto.ui' # -# Created: mar mar 20 12:00:55 2007 +# Created: mer nov 14 11:57:47 2007 # by: The PyQt User Interface Compiler (pyuic) 3.13 # # WARNING! All changes made in this file will be lost! @@ -19,37 +19,47 @@ class DUnIn(QWidget): self.setName("DUnIn") self.setMinimumSize(QSize(350,0)) - self.tabuniqueinto = QTabWidget(self,"tabuniqueinto") - self.tabuniqueinto.setGeometry(QRect(20,20,450,440)) - self.Widget8 = QWidget(self.tabuniqueinto,"Widget8") + DUnInLayout = QGridLayout(self,1,1,11,6,"DUnInLayout") - self.textLabel2 = QLabel(self.Widget8,"textLabel2") - self.textLabel2.setGeometry(QRect(170,30,100,21)) + self.tabuniqueinto = QTabWidget(self,"tabuniqueinto") - self.textLabel1 = QLabel(self.Widget8,"textLabel1") - self.textLabel1.setGeometry(QRect(170,-10,90,31)) + self.Widget8 = QWidget(self.tabuniqueinto,"Widget8") + Widget8Layout = QGridLayout(self.Widget8,1,1,11,6,"Widget8Layout") - self.Commentaire = QLabel(self.Widget8,"Commentaire") - self.Commentaire.setGeometry(QRect(38,316,381,41)) + layout1 = QHBoxLayout(None,0,6,"layout1") self.bHelp = QPushButton(self.Widget8,"bHelp") - self.bHelp.setGeometry(QRect(0,370,142,30)) self.bHelp.setAutoDefault(1) - - self.listBoxVal = QListBox(self.Widget8,"listBoxVal") - self.listBoxVal.setGeometry(QRect(80,60,290,240)) + layout1.addWidget(self.bHelp) self.bOk = QPushButton(self.Widget8,"bOk") - self.bOk.setGeometry(QRect(150,370,142,30)) self.bOk.setAutoDefault(1) self.bOk.setDefault(1) + layout1.addWidget(self.bOk) self.bSup = QPushButton(self.Widget8,"bSup") - self.bSup.setGeometry(QRect(300,370,142,30)) self.bSup.setAutoDefault(1) + layout1.addWidget(self.bSup) + + Widget8Layout.addLayout(layout1,3,0) + + self.textLabel2 = QLabel(self.Widget8,"textLabel2") + + Widget8Layout.addWidget(self.textLabel2,0,0) + + self.listBoxVal = QListBox(self.Widget8,"listBoxVal") + + Widget8Layout.addWidget(self.listBoxVal,1,0) + + self.Commentaire = QLabel(self.Widget8,"Commentaire") + self.Commentaire.setMinimumSize(QSize(420,30)) + + Widget8Layout.addWidget(self.Commentaire,2,0) self.tabuniqueinto.insertTab(self.Widget8,QString("")) + DUnInLayout.addWidget(self.tabuniqueinto,0,0) + self.languageChange() self.resize(QSize(482,480).expandedTo(self.minimumSizeHint())) @@ -62,9 +72,6 @@ class DUnIn(QWidget): def languageChange(self): self.setCaption(self.__tr("DUnIn")) - self.textLabel2.setText(self.__tr("

Valeurs possibles

")) - self.textLabel1.setText(self.__tr("

Choisir une valeur

")) - self.Commentaire.setText(QString.null) self.bHelp.setText(self.__tr("&Documentation")) self.bHelp.setAccel(self.__tr("Alt+D")) QToolTip.add(self.bHelp,self.__tr("affichage documentation aster")) @@ -74,6 +81,8 @@ class DUnIn(QWidget): self.bSup.setText(self.__tr("&Supprimer")) self.bSup.setAccel(self.__tr("Alt+S")) QToolTip.add(self.bSup,self.__tr("suppression du mot clef")) + self.textLabel2.setText(self.__tr("

Valeurs possibles

")) + self.Commentaire.setText(QString.null) self.tabuniqueinto.changeTab(self.Widget8,self.__tr("Saisir Valeur")) diff --git a/Ui/desUniqueSDCO.py b/Ui/desUniqueSDCO.py index c95da867..51799021 100644 --- a/Ui/desUniqueSDCO.py +++ b/Ui/desUniqueSDCO.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'desUniqueSDCO.ui' # -# Created: ven nov 9 14:51:34 2007 +# Created: mer nov 14 11:57:48 2007 # by: The PyQt User Interface Compiler (pyuic) 3.13 # # WARNING! All changes made in this file will be lost! diff --git a/Ui/desUniqueSDCOInto.py b/Ui/desUniqueSDCOInto.py index c95d1e69..6561f5b5 100644 --- a/Ui/desUniqueSDCOInto.py +++ b/Ui/desUniqueSDCOInto.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'desUniqueSDCOInto.ui' # -# Created: ven nov 9 14:51:34 2007 +# Created: mer nov 14 11:57:47 2007 # by: The PyQt User Interface Compiler (pyuic) 3.13 # # WARNING! All changes made in this file will be lost! diff --git a/Ui/desVisu.py b/Ui/desVisu.py index 3245479e..b4d80a14 100644 --- a/Ui/desVisu.py +++ b/Ui/desVisu.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'desVisu.ui' # -# Created: ven nov 9 14:51:34 2007 +# Created: mer nov 14 11:57:48 2007 # by: The PyQt User Interface Compiler (pyuic) 3.13 # # WARNING! All changes made in this file will be lost! diff --git a/Ui/myMain.py b/Ui/myMain.py index 45a97ce1..d675f50f 100644 --- a/Ui/myMain.py +++ b/Ui/myMain.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'myMain.ui' # -# Created: lun nov 12 11:37:10 2007 +# Created: mer nov 14 11:57:48 2007 # by: The PyQt User Interface Compiler (pyuic) 3.13 # # WARNING! All changes made in this file will be lost! -- 2.39.2