X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=InterfaceQT4%2FqtEficas.py;h=ced79316317932dcd097893a1a85079cd659349b;hb=9bf98fc1cb51814c31679120598dc309e0802e31;hp=c5b6bc99fd428c2c282c0f7c59ccbe7b56dd6cd5;hpb=42895950e564e837c445896b5bac263370bdf37b;p=tools%2Feficas.git diff --git a/InterfaceQT4/qtEficas.py b/InterfaceQT4/qtEficas.py index c5b6bc99..ced79316 100755 --- a/InterfaceQT4/qtEficas.py +++ b/InterfaceQT4/qtEficas.py @@ -18,73 +18,112 @@ # 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 - 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 +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 + 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 """ QMainWindow.__init__(self,parent) Ui_Eficas.__init__(self) + version=getEficasVersion() - self.VERSION_EFICAS="Eficas QT4 "+version + self.VERSION_EFICAS="Eficas QT5 Salome " + version self.salome=salome + self.parentMainWindow=parent self.ihm="QT" self.ssIhm=ssIhm self.top = self #(pour CONFIGURATION) self.QWParent=None #(Pour lancement sans IHM) self.code=code 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=[] - self.ListeCode=['Aster','Carmel3D','Cuve2dg','Openturns_Study','Openturns_Wrapper','MAP','ZCracks', 'CarmelCND','MT'] + self.ListePathCode=['Adao','ADAO','Carmel3D','Telemac','CF','MAP','ZCracks', 'SEP','SPECA','PSEN_Eficas','PSEN_N1'] + 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 import eficasSalome Accas.SalomeEntry = eficasSalome.SalomeEntry self.multi=multi + self.demande=multi # specifique PSEN + + if self.multi == False : self.definitCode(code,ssCode) if code==None: return - if not self.salome and hasattr(self.CONFIGURATION,'lang') : langue=self.CONFIGURATION.lang - if langue=='fr': self.langue=langue - else : self.langue="ang" + + + if not self.salome and hasattr (self, 'CONFIGURATION') and hasattr(self.CONFIGURATION,'lang') : langue=self.CONFIGURATION.lang + + + self.suiteTelemac=False + if hasattr (self, 'CONFIGURATION') : + if self.CONFIGURATION.force_langue : + from .monChoixLangue import MonChoixLangue + widgetLangue = MonChoixLangue(self) + ret=widgetLangue.exec_() + self.suiteTelemac=self.CONFIGURATION.suiteTelemac + from Extensions import localisation app=QApplication - localisation.localise(app,langue) + if hasattr (self, 'CONFIGURATION') : localisation.localise(None,self.langue,translatorFichier=self.CONFIGURATION.translatorFichier) + + self.setupUi(self) + #if parent != None : self.parentCentralWidget = parent.centralWidget() + #else : self.parentCentralWidget = None + + if not self.salome : + if hasattr (self, 'CONFIGURATION') and hasattr(self.CONFIGURATION,'taille') : self.taille=self.CONFIGURATION.taille + else : self.taille=1700 + + if self.code in ['MAP',] : self.resize(1440,self.height()) + else : self.resize(self.taille,self.height()) + icon = QIcon(self.repIcon+"/parametres.png") self.actionParametres.setIcon(icon) @@ -94,33 +133,43 @@ class Appli(Ui_Eficas,QMainWindow): self.blEntete.insertWidget(0,self.toolBar) self.blEntete.insertWidget(0,self.menubar) + if hasattr (self, 'CONFIGURATION') and self.CONFIGURATION.closeEntete==True and self.salome: self.closeEntete() eficas_root_dir = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) + #self.resize(20,20) self.viewmanager = MyTabview(self) self.recentMenu=QMenu(tr('&Recents')) #self.menuFichier.insertMenu(self.actionOuvrir,self.recentMenu) # 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() self.setWindowTitle(self.VERSION_EFICAS) - try : + #try : + if 1 : self.ouvreFichiers() - except EficasException, exc: - exit() + #except EficasException, exc: + #except: + # print "je suis dans le except" + #if self.salome == 0 : exit() + #self.adjustSize() + + def closeEntete(self): + self.menuBar().close() + self.toolBar.close() + self.frameEntete.close() def definitCode(self,code,ssCode) : self.code=code 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 @@ -141,27 +190,33 @@ class Appli(Ui_Eficas,QMainWindow): self.CONFIGStyle = None if hasattr(configuration,'make_config_style'): self.CONFIGStyle = configuration.make_config_style(self,prefsCode.repIni) - if hasattr(prefsCode,'encoding'): - import sys - reload(sys) - sys.setdefaultencoding(prefsCode.encoding) + 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'): + # import sys + # reload(sys) + # sys.setdefaultencoding(prefsCode.encoding) def construitMenu(self): self.initPatrons() self.initRecents() self.initAides() - for intituleMenu in ("menuTraduction","menuOptions","menuMesh","menuExecution"): + for intituleMenu in ("menuTraduction","menuOptions","menuMesh","menuExecution","menuN1"): if hasattr(self,intituleMenu): menu=getattr(self,intituleMenu) 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): #print "je passe la" @@ -181,22 +236,60 @@ class Appli(Ui_Eficas,QMainWindow): self.actionCode.setEnabled(True) self.menuAide.addAction(self.actionCode) + def newN1(self): + ssCode=None + code="PSEN_N1" + self.cleanPath() + dirCode=os.path.abspath(os.path.join(os.path.abspath(__file__),'../..',"ProcessOutputs_Eficas")) + sys.path.insert(0,dirCode) + self.code=code + self.definitCode(code,ssCode) + self.initRecents() + self.multi=True + self.demande=False + self.fileNew() + + def newPSEN(self): + ssCode=None + code="PSEN" + self.cleanPath() + dirCode=os.path.abspath(os.path.join(os.path.abspath(__file__),'../..',code)) + sys.path.insert(0,dirCode) + self.code=code + self.definitCode(code,ssCode) + self.multi=True + self.demande=False + self.fileNew() + + def ajoutN1(self): + self.menuN1 = self.menubar.addMenu(tr("Process Output")) + self.actionN1 = QAction(self) + self.actionN1.setText(tr("Process Output")) + self.menuN1.addAction(self.actionN1) + self.actionN1.triggered.connect(self.newN1) + + + if hasattr(self,'actionOpenProcess'):return + + self.actionOpenProcess = QAction(self) + self.actionOpenProcess.setText(tr("Open Process_Output File")) + self.menuN1.addAction(self.actionOpenProcess) + self.actionOpenProcess.triggered.connect(self.openProcess) def ajoutExecution(self): - self.menuExecution = self.menubar.addMenu(QApplication.translate("Eficas", "Execution", None, QApplication.UnicodeUTF8)) + self.menuExecution = self.menubar.addMenu(tr("&Run")) self.actionExecution = QAction(self) if sys.platform[0:5]=="linux": icon6 = QIcon(self.repIcon+"/roue.png") self.actionExecution.setIcon(icon6) else : - self.actionExecution.setText(QApplication.translate("Eficas", "Run", None)) + self.actionExecution.setText(tr("Run")) self.actionExecution.setObjectName("actionExecution") self.menuExecution.addAction(self.actionExecution) if not(self.actionExecution in self.toolBar.actions()): self.toolBar.addAction(self.actionExecution) - self.actionExecution.setText(QApplication.translate("Eficas", "Execution ", None, QApplication.UnicodeUTF8)) - if monEnvQT5 : self.actionExecution.triggered.connect(self.run) - else : self.connect(self.actionExecution,SIGNAL("triggered()"),self.run) + self.actionExecution.setText(tr("Run")) + self.actionExecution.triggered.connect(self.run) def ajoutSauveExecution(self): self.actionSaveRun = QAction(self) @@ -206,9 +299,8 @@ class Appli(Ui_Eficas,QMainWindow): self.menuExecution.addAction(self.actionSaveRun) if not(self.actionSaveRun in self.toolBar.actions()): self.toolBar.addAction(self.actionSaveRun) - self.actionSaveRun.setText(QApplication.translate("Eficas", "Save Run", None, QApplication.UnicodeUTF8)) - if monEnvQT5 : self.actionSaveRun.triggered.connect(self.saveRun) - else : self.connect(self.actionSaveRun,SIGNAL("triggered()"),self.saveRun) + self.actionSaveRun.setText(tr("Save Run")) + self.actionSaveRun.triggered.connect(self.saveRun) def griserActionsStructures(self): self.actionCouper.setEnabled(False) @@ -229,6 +321,8 @@ class Appli(Ui_Eficas,QMainWindow): self.toolBar.removeAction(self.actionParametres) self.menuJdC.removeAction(self.actionParametres) + def enleverSupprimer(self): + self.toolBar.removeAction(self.actionSupprimer) def enleverNewInclude(self): self.actionNouvel_Include.setVisible(False) @@ -236,6 +330,19 @@ class Appli(Ui_Eficas,QMainWindow): def enleverRechercherDsCatalogue(self): self.actionRechercherDsCatalogue.setVisible(False) + def connectRechercherDsCatalogue(self): + 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) + self.actionSortieLegere.triggered.connect(self.handleSortieLegere) + + def ZCRACKS(self): self.enleverNewInclude() self.toolBar.addSeparator() @@ -248,7 +355,6 @@ class Appli(Ui_Eficas,QMainWindow): def ADAO(self): self.enleverActionsStructures() self.enleverNewInclude() - self.enleverRechercherDsCatalogue() def ASTER(self) : self.menuTraduction = self.menubar.addMenu("menuTraduction") @@ -289,24 +395,46 @@ class Appli(Ui_Eficas,QMainWindow): self.menuOptions.setTitle(tr("Options")) def PSEN(self): + 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() self.enleverNewInclude() self.ajoutExecution() + self.ajoutN1() self.ajoutHelpPSEN() self.ajoutIcones() + def PSEN_N1(self): + self.enleverActionsStructures() + self.enleverParametres() + self.enleverRechercherDsCatalogue() + self.enleverNewInclude() + self.ajoutExecution() + self.ajoutIcones() + def TELEMAC(self): self.enleverActionsStructures() self.enleverNewInclude() + self.connectRechercherDsCatalogue() + self.ajoutSortieLegere() + + def lookSuiteTelemac(self): + self.enleverActionsStructures() + self.enleverNewInclude() + self.enleverParametres() + self.enleverSupprimer() + self.enleverRechercherDsCatalogue() def ajoutHelpPSEN(self): self.actionParametres_Eficas.setText('Help PSEN') -# - #Oself.disconnect(self.actionParametres_Eficas) - 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) @@ -315,19 +443,19 @@ 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 ChercheGrpMaille(self): # Normalement la variable self.salome permet de savoir si on est ou non dans Salome try: - Msg,listeGroup=self.ChercheGrpMailleInSalome() # recherche dans Salomé - #Msg = None; listeGroup = None # recherche manuelle, i.e., sans Salomé si ligne précédente commentée + Msg,listeGroup=self.ChercheGrpMailleInSalome() # recherche dans Salome + #Msg = None; listeGroup = None # recherche manuelle, i.e., sans Salome si ligne precedente commentee except: raise ValueError('Salome non ouvert') if Msg == None : self.viewmanager.handleAjoutGroup(listeGroup) else : - print "il faut gerer les erreurs" + print ("il faut gerer les erreurs") def ChercheGrp(self): @@ -335,12 +463,13 @@ class Appli(Ui_Eficas,QMainWindow): #if Msg == None : # self.viewmanager.handleAjoutGroup(listeGroup) #else : - print "il faut gerer " + #print "il faut gerer " + pass def ajoutIcones(self) : # Pour pallier les soucis de repertoire d icone - print self.repIcon + #print self.repIcon icon = QIcon(self.repIcon+"/new_file.png") self.action_Nouveau.setIcon(icon) icon1 = QIcon(self.repIcon+"/ouvrir.png") @@ -385,6 +514,7 @@ class Appli(Ui_Eficas,QMainWindow): + # Pour Aster self.actionTraduitV9V10 = QAction(self) self.actionTraduitV9V10.setObjectName("actionTraduitV9V10") @@ -422,6 +552,7 @@ class Appli(Ui_Eficas,QMainWindow): self.connect(self.actionCode,SIGNAL("triggered()"),self.aideCode) def connecterSignaux(self) : + self.recentMenu.aboutToShow.connect(self.handleShowRecentMenu) self.action_Nouveau.triggered.connect(self.fileNew) self.actionNouvel_Include.triggered.connect(self.NewInclude) @@ -435,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) @@ -447,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 @@ -486,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() @@ -507,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() @@ -517,22 +654,22 @@ class Appli(Ui_Eficas,QMainWindow): self.menuPatrons = QMenu(self.menubar) self.menuPatrons.setObjectName("menuPatrons") self.menubar.addAction(self.menuPatrons.menuAction()) - self.menuPatrons.setTitle(QApplication.translate("Eficas", "Patrons", None, QApplication.UnicodeUTF8)) + self.menuPatrons.setTitle(tr("Patrons")) else : 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): + self.recent = [] try : if sys.platform[0:5]=="linux" : rep=os.path.join(os.environ['HOME'],'.config/Eficas',self.code) @@ -543,7 +680,7 @@ class Appli(Ui_Eficas,QMainWindow): f=open(monFichier) while ( index < 9) : ligne=f.readline() - if ligne != "" : + if ligne != "" : l=(ligne.split("\n"))[0] self.recent.append(l) index=index+1 @@ -554,8 +691,6 @@ class Appli(Ui_Eficas,QMainWindow): except : pass def addToRecentList(self, fn): - if not monEnvQT5 : addToRecentListQT4(self, fn); return - while fn in self.recent: self.recent.remove(fn) self.recent.insert(0,fn) if len(self.recent) > 9: @@ -599,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) @@ -674,6 +809,9 @@ class Appli(Ui_Eficas,QMainWindow): monOption=OptionPdf(parent=self,modal = 0 ,configuration=self.CONFIGURATION) monOption.show() + def handleSortieLegere(self): + return self.viewmanager.saveLegerCurrentEditor() + def handleShowRecentMenu(self): """ Private method to set up recent files menu. @@ -683,8 +821,7 @@ class Appli(Ui_Eficas,QMainWindow): for rp in self.recent: id = self.recentMenu.addAction(rp) self.ficRecents[id]=rp - if monEnvQT5 : self.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) @@ -702,19 +839,36 @@ class Appli(Ui_Eficas,QMainWindow): self.recent = QStringList() self.sauveRecents() + def handleRechercherDsCatalogue(self): + if not self.viewmanager : return + self.viewmanager.handleRechercherDsCatalogue() + def fileNew(self): try: self.viewmanager.newEditor() - except EficasException, exc: - msg = unicode(exc) - if msg != "": - QMessageBox.warning(self, tr(u"Erreur"), msg) + except EficasException as exc: + msg = six.text_type(exc) + if msg != "": QMessageBox.warning(self, tr(u"Erreur"), msg) + + def openProcess(self): + ssCode=None + code="PSEN_N1" + self.cleanPath() + dirCode=os.path.abspath(os.path.join(os.path.abspath(__file__),'../..',"ProcessOutputs_Eficas")) + sys.path.insert(0,dirCode) + self.code=code + self.definitCode(code,ssCode) + self.multi=True + self.demande=False + self.initRecents() + self.fileOpen() + def fileOpen(self): try: self.viewmanager.handleOpen() - except EficasException, exc: - msg = unicode(exc) + except EficasException as exc: + msg = six.text_type(exc) if msg != "": QMessageBox.warning(self, tr(u"Erreur"), msg) @@ -777,12 +931,17 @@ 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() def cleanPath(self): - for pathCode in self.ListeCode: + for pathCode in self.ListePathCode: try: aEnlever=os.path.abspath(os.path.join(os.path.dirname(__file__),'..',pathCode)) sys.path.remove(aEnlever) @@ -799,6 +958,7 @@ class Appli(Ui_Eficas,QMainWindow): res=self.fileExit() if res==2 : event.ignore() + if __name__=='__main__': # Modules Eficas