X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=InterfaceQT4%2FqtEficas.py;h=ced79316317932dcd097893a1a85079cd659349b;hb=9bf98fc1cb51814c31679120598dc309e0802e31;hp=fa00cdd13ffa7a87b82c08011693f1e09861868a;hpb=7a819d10c5ddd2e047bf1c63501b2ce17112813d;p=tools%2Feficas.git diff --git a/InterfaceQT4/qtEficas.py b/InterfaceQT4/qtEficas.py index fa00cdd1..ced79316 100755 --- a/InterfaceQT4/qtEficas.py +++ b/InterfaceQT4/qtEficas.py @@ -18,15 +18,19 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # +from __future__ import absolute_import +from __future__ import print_function +try : + from builtins import str +except : pass + import os, sys -from determine import monEnvQT5 -if monEnvQT5 : - from PyQt5.QtWidgets import QApplication, QMainWindow, QBoxLayout, QMenu, QAction, QMessageBox - from PyQt5.QtGui import QIcon - from PyQt5.QtCore import Qt -else: - from PyQt4.QtGui import * - from PyQt4.QtCore import * +import six + + +from PyQt5.QtWidgets import QApplication, QMainWindow, QBoxLayout, QMenu, QAction, QMessageBox +from PyQt5.QtGui import QIcon +from PyQt5.QtCore import Qt from Extensions.i18n import tr from Extensions.eficas_exception import EficasException @@ -34,8 +38,8 @@ from Extensions import param2 from myMain import Ui_Eficas -from viewManager import MyTabview -from getVersion import getEficasVersion +from .viewManager import MyTabview +from .getVersion import getEficasVersion from Editeur import session @@ -44,7 +48,7 @@ class Appli(Ui_Eficas,QMainWindow): """ Class implementing the main user interface. """ - def __init__(self,code=None,salome=0,parent=None,ssCode=None,multi=False,langue='fr',ssIhm=False): + def __init__(self,code=None,salome=0,parent=None,ssCode=None,multi=False,langue='ang',ssIhm=False): """ Constructor """ @@ -53,8 +57,7 @@ class Appli(Ui_Eficas,QMainWindow): version=getEficasVersion() - self.VERSION_EFICAS="Eficas QT4 Salome "+version - if monEnvQT5 : self.VERSION_EFICAS="Eficas QT5 Salome " + self.VERSION_EFICAS="Eficas QT5 Salome " + version self.salome=salome self.parentMainWindow=parent self.ihm="QT" @@ -65,8 +68,7 @@ class Appli(Ui_Eficas,QMainWindow): self.indice=0 self.first=1 self.dict_reels={} - if monEnvQT5 : self.recent = [] - else : self.recent = QStringList() + self.recent = [] self.ficRecents={} self.mesScripts={} self.listeAEnlever=[] @@ -74,6 +76,8 @@ class Appli(Ui_Eficas,QMainWindow): self.listeCode=['Adao','ADAO','Carmel3D','Telemac','CF','MAP','ZCracks', 'SEP','SPECA','PSEN_Eficas','PSEN_N1'] self.repIcon=os.path.join( os.path.dirname(os.path.abspath(__file__)),'..','Editeur','icons') + if langue=='fr': self.langue=langue + else : self.langue="ang" if self.salome: import Accas @@ -92,13 +96,11 @@ class Appli(Ui_Eficas,QMainWindow): if not self.salome and hasattr (self, 'CONFIGURATION') and hasattr(self.CONFIGURATION,'lang') : langue=self.CONFIGURATION.lang - if langue=='fr': self.langue=langue - else : self.langue="ang" self.suiteTelemac=False if hasattr (self, 'CONFIGURATION') : if self.CONFIGURATION.force_langue : - from monChoixLangue import MonChoixLangue + from .monChoixLangue import MonChoixLangue widgetLangue = MonChoixLangue(self) ret=widgetLangue.exec_() self.suiteTelemac=self.CONFIGURATION.suiteTelemac @@ -106,7 +108,9 @@ class Appli(Ui_Eficas,QMainWindow): from Extensions import localisation app=QApplication - localisation.localise(None,self.langue) + if hasattr (self, 'CONFIGURATION') : localisation.localise(None,self.langue,translatorFichier=self.CONFIGURATION.translatorFichier) + + self.setupUi(self) #if parent != None : self.parentCentralWidget = parent.centralWidget() @@ -140,8 +144,7 @@ class Appli(Ui_Eficas,QMainWindow): # actionARemplacer ne sert que pour l insert Menu self.menuFichier.insertMenu(self.actionARemplacer ,self.recentMenu) self.menuFichier.removeAction(self.actionARemplacer) - if monEnvQT5 : self.connecterSignaux() - else : self.connecterSignauxQT4() + self.connecterSignaux() self.toolBar.addSeparator() if self.code != None : self.construitMenu() @@ -166,7 +169,7 @@ class Appli(Ui_Eficas,QMainWindow): self.ssCode=ssCode if self.code==None : self.cleanPath() - from monChoixCode import MonChoixCode + from .monChoixCode import MonChoixCode widgetChoix = MonChoixCode(self) ret=widgetChoix.exec_() import sys @@ -187,6 +190,9 @@ class Appli(Ui_Eficas,QMainWindow): self.CONFIGStyle = None if hasattr(configuration,'make_config_style'): self.CONFIGStyle = configuration.make_config_style(self,prefsCode.repIni) + from Extensions import localisation + app=QApplication + if hasattr (self, 'CONFIGURATION') : localisation.localise(None,self.langue,translatorFichier=self.CONFIGURATION.translatorFichier) #PN --> pb d exception qui font planter salome # plus supporte en python 3 #if hasattr(prefsCode,'encoding'): @@ -204,12 +210,12 @@ class Appli(Ui_Eficas,QMainWindow): menu.setAttribute(Qt.WA_DeleteOnClose) menu.close() delattr(self,intituleMenu) - for intituleAction in ("actionExecution","actionSaveRun",): + for intituleAction in ("actionExecution","actionSaveRun"): if hasattr(self,intituleAction): action=getattr(self,intituleAction) self.toolBar.removeAction(action) - if self.code.upper() in Appli.__dict__.keys(): - listeTexte=apply(Appli.__dict__[self.code.upper()],(self,)) + if self.code.upper() in Appli.__dict__: + Appli.__dict__[self.code.upper()](self,) if self.suiteTelemac : self.lookSuiteTelemac() def initAides(self): @@ -260,9 +266,7 @@ class Appli(Ui_Eficas,QMainWindow): self.actionN1 = QAction(self) self.actionN1.setText(tr("Process Output")) self.menuN1.addAction(self.actionN1) - if monEnvQT5 : self.actionN1.triggered.connect(self.newN1) - else : self.connect(self.actionN1,SIGNAL("triggered()"),self.newN1) - + self.actionN1.triggered.connect(self.newN1) if hasattr(self,'actionOpenProcess'):return @@ -270,8 +274,7 @@ class Appli(Ui_Eficas,QMainWindow): self.actionOpenProcess = QAction(self) self.actionOpenProcess.setText(tr("Open Process_Output File")) self.menuN1.addAction(self.actionOpenProcess) - if monEnvQT5 : self.actionOpenProcess.triggered.connect(self.openProcess) - else : self.connect(self.actionOpenProcess,SIGNAL("triggered()"),self.openProcess) + self.actionOpenProcess.triggered.connect(self.openProcess) def ajoutExecution(self): self.menuExecution = self.menubar.addMenu(tr("&Run")) @@ -286,8 +289,7 @@ class Appli(Ui_Eficas,QMainWindow): if not(self.actionExecution in self.toolBar.actions()): self.toolBar.addAction(self.actionExecution) self.actionExecution.setText(tr("Run")) - if monEnvQT5 : self.actionExecution.triggered.connect(self.run) - else : self.connect(self.actionExecution,SIGNAL("triggered()"),self.run) + self.actionExecution.triggered.connect(self.run) def ajoutSauveExecution(self): self.actionSaveRun = QAction(self) @@ -298,8 +300,7 @@ class Appli(Ui_Eficas,QMainWindow): if not(self.actionSaveRun in self.toolBar.actions()): self.toolBar.addAction(self.actionSaveRun) self.actionSaveRun.setText(tr("Save Run")) - if monEnvQT5 : self.actionSaveRun.triggered.connect(self.saveRun) - else : self.connect(self.actionSaveRun,SIGNAL("triggered()"),self.saveRun) + self.actionSaveRun.triggered.connect(self.saveRun) def griserActionsStructures(self): self.actionCouper.setEnabled(False) @@ -330,20 +331,16 @@ class Appli(Ui_Eficas,QMainWindow): self.actionRechercherDsCatalogue.setVisible(False) def connectRechercherDsCatalogue(self): - if monEnvQT5: - self.actionRechercherDsCatalogue.triggered.connect(self.handleRechercherDsCatalogue) - else : - self.connect(self.actionRechercherDsCatalogue,SIGNAL("triggered()"),self.handleRechercherDsCatalogue) + if hasattr(self,'rechercherDejaLa') : return + self.rechercherDejaLa=True + self.actionRechercherDsCatalogue.triggered.connect(self.handleRechercherDsCatalogue) def ajoutSortieLegere(self): if hasattr(self,'actionSortieLegere') : return self.actionSortieLegere = QAction(self) self.actionSortieLegere.setText(tr("Sortie Legere")) self.menuFichier.insertAction(self.actionEnregistrer_sous,self.actionSortieLegere) - if monEnvQT5: - self.actionSortieLegere.triggered.connect(self.handleSortieLegere) - else : - self.connect(self.actionSortieLegere,SIGNAL("triggered()"),self.handleSortieLegere) + self.actionSortieLegere.triggered.connect(self.handleSortieLegere) def ZCRACKS(self): @@ -398,15 +395,13 @@ class Appli(Ui_Eficas,QMainWindow): self.menuOptions.setTitle(tr("Options")) def PSEN(self): - if self.first: - self.first=0 - if monEnvQT5: - self.action_Nouveau.triggered.disconnect(self.fileNew) - self.action_Nouveau.triggered.connect(self.newPSEN) - self - else : - self.disconnect(self.action_Nouveau,SIGNAL("triggered()"),self.fileNew) - self.connect(self.action_Nouveau,SIGNAL("triggered()"),self.newPSEN) + if self.first: self.first=0 + try : self.action_Nouveau.triggered.disconnect(self.fileNew) + except : pass + try : self.action_Nouveau.triggered.disconnect(self.newPSEN) + except : pass + + self.action_Nouveau.triggered.connect(self.newPSEN) self.enleverActionsStructures() self.enleverParametres() self.enleverRechercherDsCatalogue() @@ -439,8 +434,7 @@ class Appli(Ui_Eficas,QMainWindow): def ajoutHelpPSEN(self): self.actionParametres_Eficas.setText('Help PSEN') - if monEnvQT5 : self.actionParametres_Eficas.triggered.connect(self.aidePSEN) - else : self.connect(self.actionParametres_Eficas,SIGNAL("triggered()"),self.aidePSEN) + self.actionParametres_Eficas.triggered.connect(self.aidePSEN) @@ -461,7 +455,7 @@ class Appli(Ui_Eficas,QMainWindow): if Msg == None : self.viewmanager.handleAjoutGroup(listeGroup) else : - print "(il faut gerer les erreurs") + print ("il faut gerer les erreurs") def ChercheGrp(self): @@ -520,6 +514,7 @@ class Appli(Ui_Eficas,QMainWindow): + # Pour Aster self.actionTraduitV9V10 = QAction(self) self.actionTraduitV9V10.setObjectName("actionTraduitV9V10") @@ -571,6 +566,7 @@ class Appli(Ui_Eficas,QMainWindow): self.actionEficas.triggered.connect(self.aidePPal) self.actionVersion.triggered.connect(self.version) self.actionParametres.triggered.connect(self.gestionParam) + self.actionCommentaire.triggered.connect(self.ajoutCommentaire) self.actionCouper.triggered.connect(self.editCut) self.actionCopier.triggered.connect(self.editCopy) @@ -583,6 +579,8 @@ class Appli(Ui_Eficas,QMainWindow): self.actionRegles_du_JdC.triggered.connect(self.jdcRegles) self.actionFichier_Source.triggered.connect(self.jdcFichierSource) self.actionFichier_Resultat.triggered.connect(self.visuJdcPy) + self.actionAfficher_l_Arbre.triggered.connect(self.ouvreArbre) + self.actionCacher_l_Arbre.triggered.connect(self.fermeArbre) # Pour Aster @@ -622,6 +620,9 @@ class Appli(Ui_Eficas,QMainWindow): def Deplier(self): self.viewmanager.handleDeplier() + def ajoutCommentaire(self): + self.viewmanager.ajoutCommentaire() + def ouvreFichiers(self) : # Ouverture des fichiers de commandes donnes sur la ligne de commande cwd=os.getcwd() @@ -643,7 +644,7 @@ class Appli(Ui_Eficas,QMainWindow): def initPatrons(self) : # Mise a jour du menu des fichiers recemment ouverts from Editeur import listePatrons - if not(self.code in listePatrons.sous_menus.keys()) : + if not(self.code in listePatrons.sous_menus) : if hasattr(self,"menuPatrons"): self.menuPatrons.setAttribute(Qt.WA_DeleteOnClose) self.menuPatrons.close() @@ -658,19 +659,17 @@ class Appli(Ui_Eficas,QMainWindow): self.menuPatrons.clear() self.listePatrons = listePatrons.listePatrons(self.code) idx = 0 - for nomSsMenu in self.listePatrons.liste.keys(): + for nomSsMenu in self.listePatrons.liste: ssmenu=self.menuPatrons.addMenu(nomSsMenu) for fichier in self.listePatrons.liste[nomSsMenu]: id = ssmenu.addAction(fichier) self.ficPatrons[id]=fichier - if monEnvQT5 : self.id.triggered.connect(self.handleOpenPatrons) - else : self.connect(id, SIGNAL('triggered()'),self.handleOpenPatrons) + self.id.triggered.connect(self.handleOpenPatrons) # self.Patrons.setItemParameter(id,idx) idx=idx+1 def initRecents(self): - if monEnvQT5 : self.recent = [] - else : self.recent = QStringList() + self.recent = [] try : if sys.platform[0:5]=="linux" : rep=os.path.join(os.environ['HOME'],'.config/Eficas',self.code) @@ -692,7 +691,6 @@ class Appli(Ui_Eficas,QMainWindow): except : pass def addToRecentList(self, fn): - if not monEnvQT5 : self.addToRecentListQT4(fn); return while fn in self.recent: self.recent.remove(fn) self.recent.insert(0,fn) if len(self.recent) > 9: @@ -736,19 +734,19 @@ class Appli(Ui_Eficas,QMainWindow): def traductionV11V12(self): - from gereTraduction import traduction + from .gereTraduction import traduction traduction(self.CONFIGURATION.repIni,self.viewmanager,"V11V12") def traductionV10V11(self): - from gereTraduction import traduction + from .gereTraduction import traduction traduction(self.CONFIGURATION.repIni,self.viewmanager,"V10V11") def traductionV9V10(self): - from gereTraduction import traduction + from .gereTraduction import traduction traduction(self.CONFIGURATION.repIni,self.viewmanager,"V9V10") def version(self) : - from monVisu import DVisu + from .monVisu import DVisu titre = tr("version ") monVisuDialg=DVisu(parent=self,fl=0) monVisuDialg.setWindowTitle(titre) @@ -823,8 +821,7 @@ class Appli(Ui_Eficas,QMainWindow): for rp in self.recent: id = self.recentMenu.addAction(rp) self.ficRecents[id]=rp - if monEnvQT5 : id.triggered.connect(self.handleOpenRecent) - else : self.connect(id, SIGNAL('triggered()'),self.handleOpenRecent) + id.triggered.connect(self.handleOpenRecent) self.recentMenu.addSeparator() self.recentMenu.addAction(tr('&Effacer'), self.handleClearRecent) @@ -850,7 +847,7 @@ class Appli(Ui_Eficas,QMainWindow): try: self.viewmanager.newEditor() except EficasException as exc: - msg = unicode(exc) + msg = six.text_type(exc) if msg != "": QMessageBox.warning(self, tr(u"Erreur"), msg) def openProcess(self): @@ -871,7 +868,7 @@ class Appli(Ui_Eficas,QMainWindow): try: self.viewmanager.handleOpen() except EficasException as exc: - msg = unicode(exc) + msg = six.text_type(exc) if msg != "": QMessageBox.warning(self, tr(u"Erreur"), msg) @@ -934,6 +931,11 @@ class Appli(Ui_Eficas,QMainWindow): def visuJdcPy(self): self.viewmanager.handleViewJdcPy() + def ouvreArbre(self): + self.viewmanager.ouvreArbre() + + def fermeArbre(self): + self.viewmanager.fermeArbre() def NewInclude(self): self.viewmanager.newIncludeEditor()