From 178f7905ea220dce1ded83f748d564d54b23f8fb Mon Sep 17 00:00:00 2001 From: "pascale.noyret" Date: Mon, 18 Jul 2016 10:21:54 +0200 Subject: [PATCH] 180716 --- InterfaceQT4/gereIcones.py | 1 + InterfaceQT4/monChoixCode.py | 20 ++--- InterfaceQT4/monViewRegles.py | 2 +- PSEN_N1/mesScripts_PSEN_N1.py | 56 ++++++++++++ UiQT4/eficas_en.qm | Bin 85600 -> 0 bytes UiQT4/eficas_fr.qm | Bin 854 -> 0 bytes UiQT5/desChoixCode.ui | 15 ++++ UiQT5/desChoixCommandes.ui | 164 ++++++++++++++++++---------------- 8 files changed, 167 insertions(+), 91 deletions(-) create mode 100644 PSEN_N1/mesScripts_PSEN_N1.py delete mode 100644 UiQT4/eficas_en.qm delete mode 100644 UiQT4/eficas_fr.qm diff --git a/InterfaceQT4/gereIcones.py b/InterfaceQT4/gereIcones.py index ea71360b..08802800 100644 --- a/InterfaceQT4/gereIcones.py +++ b/InterfaceQT4/gereIcones.py @@ -204,6 +204,7 @@ class FacultatifOuOptionnel: def ajoutScript(self): + if not hasattr(self,'CBScripts') : return # Cas des Widgets Plies self.dictCommandes={} listeCommandes=self.dict_commandes_mesScripts[self.obj.nom] if type(listeCommandes) != types.TupleType: listeCommandes=(listeCommandes,) diff --git a/InterfaceQT4/monChoixCode.py b/InterfaceQT4/monChoixCode.py index 45babb13..74f2fb4d 100644 --- a/InterfaceQT4/monChoixCode.py +++ b/InterfaceQT4/monChoixCode.py @@ -24,7 +24,7 @@ import os,sys,re from desChoixCode import Ui_ChoixCode from determine import monEnvQT5 if monEnvQT5: - from PyQt5.QtWidgets import QDialog, QRadioButton + from PyQt5.QtWidgets import QDialog, QRadioButton, QGroupBox, QButtonGroup from PyQt5.QtGui import QPalette from PyQt5.QtCore import QProcess, QFileInfo, Qt, QSize else : @@ -61,30 +61,22 @@ class MonChoixCode(Ui_ChoixCode,QDialog): self.groupCodes=QButtonGroup(self.groupBox) vars=os.environ.items() listeCode=('Aster','Adao','Carmel3D','CarmelCND','CF','MAP','MT','PSEN','PSEN_N1','Telemac','ZCracks',) - i=1 for code in listeCode: - nom='rB_'+code dirCode=os.path.abspath(os.path.join(os.path.abspath(__file__),'../..',code)) try : l=os.listdir(dirCode) - bouton=QRadioButton(self) - bouton.setMinimumSize(QSize(0, 30)) + bouton=QRadioButton(self.groupBox) bouton.setText(code) - bouton.setGeometry(QRect(10,20+30*i, 300, 30)) - bouton.show() self.groupCodes.addButton(bouton) - i=i+1 + self.vlBouton.addWidget(bouton) except : clef="PREFS_CATA_"+code try : repIntegrateur=os.path.abspath(os.environ[clef]) l=os.listdir(repIntegrateur) - bouton=QRadioButton(self) - bouton.setGeometry(QRect(10,20+30*i, 300, 30)) - bouton.setMinimumSize(QSize(0, 30)) + bouton=QRadioButton(self.groupBox) bouton.setText(code) bouton.show() - i=i+1 self.groupCodes.addButton(bouton) except : pass @@ -98,9 +90,6 @@ class MonChoixCode(Ui_ChoixCode,QDialog): repIntegrateur=os.path.abspath(os.environ[clef]) l=os.listdir(repIntegrateur) bouton=QRadioButton(self) - bouton.setGeometry(QRect(10,20+30*i, 300, 30)) - i=i+1 - bouton.setMinimumSize(QSize(0, 30)) bouton.setText(code) bouton.show() self.groupCodes.addButton(bouton) @@ -110,6 +99,7 @@ class MonChoixCode(Ui_ChoixCode,QDialog): def choisitCode(self): bouton=self.groupCodes.checkedButton() + if bouton==None : return code=str(bouton.text()) codeUpper=code.upper() self.parentAppli.code=codeUpper diff --git a/InterfaceQT4/monViewRegles.py b/InterfaceQT4/monViewRegles.py index 3eda61ad..b2a74597 100644 --- a/InterfaceQT4/monViewRegles.py +++ b/InterfaceQT4/monViewRegles.py @@ -25,7 +25,7 @@ from Extensions.i18n import tr from determine import monEnvQT5 if monEnvQT5: from PyQt5.QtCore import Qt - from PyQt5.QtWidgets import QDialog + from PyQt5.QtWidgets import QDialog, QListWidgetItem else : from PyQt4.QtGui import * from PyQt4.QtCore import * diff --git a/PSEN_N1/mesScripts_PSEN_N1.py b/PSEN_N1/mesScripts_PSEN_N1.py new file mode 100644 index 00000000..7ffd8d0a --- /dev/null +++ b/PSEN_N1/mesScripts_PSEN_N1.py @@ -0,0 +1,56 @@ +def processXLS(listeparam) : + print "dans processXLS" + item=listeparam[0] + fileNameObj=item.object.get_child('XLS_file') + if fileNameObj : fileName=fileNameObj.get_valeur() + else : fileName = "" + if fileName == "" : return 0, 'Nom de fichier invalide' + + ongletListObj=item.object.get_child('Onglets') + if ongletListObj : ongletList= ongletListObj.get_valeur() + else : ongletList = [] + if ongletList == [] : return 0, 'ongletList invalide' + + busListObj=item.object.get_child('BusList') + if busListObj : busList= busListObj.get_valeur() + else : busList = [] + if busList == [] : return 0, 'BusList invalide' + + contListObj=item.object.get_child('ContList') + if contListObj : contList=contListObj.get_valeur() + else : contList = [] + if contList == [] : return 0, 'ContList invalide' + + dicoBus={} + dicoCont={} + for onglet in ongletList: + recherche=str(" ("+ str(onglet) +" )") + listeBusPourOnglet=[] + listeContPourOnglet=[] + for bus in busList : + nomBusSplit=str(bus).split(recherche) + if len(nomBusSplit) == 2 : listeBusPourOnglet.append(nomBusSplit[0]) + for cont in contList : + nomContSplit=str(cont).split(recherche) + if len(nomContSplit) == 2 : listeContPourOnglet.append(nomContSplit[0]) + if listeBusPourOnglet != [] : dicoBus[onglet]=listeBusPourOnglet + if listeContPourOnglet != [] : dicoCont[onglet]=listeContPourOnglet + + from Processor import processXLS + processXLS(fileName,dicoBus,dicoCont) + #if nouvelleVal != [] : prob.set_valeur(nouvelleVal) + +# le dictionnaire des commandes a la structure suivante : +# la clef est la commande qui va proposer l action +# puis un tuple qui contient +# - la fonction a appeler +# - le label dans le menu du clic droit +# - un tuple contenant les parametres attendus par la fonction +# - appelable depuis Salome uniquement -) +# - appelable depuis un item valide uniquement +# - toolTip +dict_commandes={ + 'DATA_PROCESSING': ( + (processXLS,"process",('item',),False,True,"process values "), + ), + } diff --git a/UiQT4/eficas_en.qm b/UiQT4/eficas_en.qm deleted file mode 100644 index d54e6f9640130aa517f1d72dc3bcd02dd899c0ea..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 85600 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 diff --git a/UiQT4/eficas_fr.qm b/UiQT4/eficas_fr.qm deleted file mode 100644 index 9bfe425358df1e113dd649250f67f5f8dcb6bbcb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 854 zcmb_av1(f}6unNG)OFSnLMc=k;)Vp=rBlcd*Da-`U@x7rRDP1N@UxU$Ne2Hz*KQe- zAIQ?BP)hbd$By}dEd7NZDb1@(426*Q;N7EprE{*%yL(^N`o*u~&p$SvoPRw1e)*D! zwup8P5NYw-^A5tN2Pf~5U--H7;>{J}(NcH&3-V2aEvt(_%haSUjp~5F$Tqv9hlurk zr3W&Wp_X=Sk)TMHB=xBzja49rF9S-uy+mj*11OyXgjW@_LS z_wahKMer5bnLkc|*O13Ic@%Qp0;$|-8{RCP_(K=p-=bC*NU|o|d`@kugWH8Xxm_x^{0360KpV+Za^|J5?T(WIb0V Yt~A?yX_d29b2|O#-K)-PWrE|{Z(abi`2YX_ diff --git a/UiQT5/desChoixCode.ui b/UiQT5/desChoixCode.ui index 33ea0f8b..d283155e 100644 --- a/UiQT5/desChoixCode.ui +++ b/UiQT5/desChoixCode.ui @@ -50,6 +50,21 @@ + + + + + Qt::Vertical + + + + 20 + 40 + + + + + diff --git a/UiQT5/desChoixCommandes.ui b/UiQT5/desChoixCommandes.ui index be67512d..f048c3d2 100644 --- a/UiQT5/desChoixCommandes.ui +++ b/UiQT5/desChoixCommandes.ui @@ -32,7 +32,16 @@ 0 - + + 2 + + + 2 + + + 2 + + 2 @@ -64,7 +73,22 @@ QFrame::Raised - + + + 0 + + + 0 + + + 0 + + + 0 + + + 0 + @@ -132,11 +156,8 @@ - - - 5 - - + + @@ -176,7 +197,7 @@ - + Qt::Vertical @@ -187,12 +208,12 @@ 20 - 2 + 13 - + @@ -217,75 +238,68 @@ - - - - QLayout::SetMinimumSize + + + + + 0 + 0 + - - - - - 0 - 0 - - - - Sensible à la casse - - - false - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - 0 - 0 - - - - - 100 - 30 - - - - - 70 - 40 - - - - ré-affiche toutes les commandes - - - background-color:rgb(104,110,149); + + Sensible à la casse + + + false + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + 0 + 0 + + + + + 100 + 30 + + + + + 70 + 40 + + + + ré-affiche toutes les commandes + + + background-color:rgb(104,110,149); color :white; border-radius : 12px - - - Effacer - - - - + + + Effacer + + -- 2.39.2