#
import os, sys
-
-from PyQt4.QtGui import *
-from PyQt4.QtCore import *
-from myMain import Ui_Eficas
-from viewManager import MyTabview
-from getVersion import getEficasVersion
+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 *
from Extensions.i18n import tr
from Extensions.eficas_exception import EficasException
+from myMain import Ui_Eficas
+from viewManager import MyTabview
+from getVersion import getEficasVersion
from Editeur import session
+
class Appli(Ui_Eficas,QMainWindow):
"""
Class implementing the main user interface.
QMainWindow.__init__(self,parent)
Ui_Eficas.__init__(self)
self.setupUi(self)
- self.myQtab.removeTab(0)
- self.blEntete= QBoxLayout(0,self.frameEntete)
- self.blEntete.insertWidget(0,self.toolBar)
- self.blEntete.insertWidget(0,self.menubar)
version=getEficasVersion()
- self.VERSION_EFICAS="Eficas QT4 "+version
+ self.VERSION_EFICAS="Eficas QT4 Salome "+version
+ if monEnvQT5 : self.VERSION_EFICAS="Eficas QT5 Salome "
self.salome=salome
self.ihm="QT"
self.ssIhm=ssIhm
self.QWParent=None #(Pour lancement sans IHM)
self.code=code
self.indice=0
+ self.first=1
self.dict_reels={}
- self.recent = QStringList()
+ if monEnvQT5 : self.recent = []
+ else : self.recent = QStringList()
self.ficRecents={}
+ self.mesScripts={}
self.listeAEnlever=[]
- self.ListeCode=['Aster','Carmel3D','Cuve2dg','Openturns_Study','Openturns_Wrapper','MAP','ZCracks', 'CarmelCND','MT']
- #self.repIcon=os.path.join( os.path.dirname(os.path.abspath(__file__)),'../Editeur/icons')
+ self.ListePathCode=['Adao','Carmel3D','Telemac','CF','MAP','ZCracks', 'SEP','SPECA','PSEN_Eficas','PSEN_N1']
+ self.listeCode=['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 self.salome:
import Accas
import eficasSalome
Accas.SalomeEntry = eficasSalome.SalomeEntry
- #self.ajoutIcones()
self.multi=multi
- if langue=='fr': self.langue=langue
- else : self.langue="ang"
+ 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') and hasattr(self.CONFIGURATION,'lang') : langue=self.CONFIGURATION.lang
+ if langue=='fr': self.langue=langue
+ else : self.langue="ang"
+
+ self.action_Nouveau.triggered.connect(self.fileNew)
+ from Extensions import localisation
+ app=QApplication
+ localisation.localise(app,langue)
+
+ if self.code in ['MAP',] : self.resize(1440,self.height())
+ else : self.resize(1800,self.height())
+
+ icon = QIcon(self.repIcon+"/parametres.png")
+ self.actionParametres.setIcon(icon)
+
+
+ self.myQtab.removeTab(0)
+ self.blEntete= QBoxLayout(0,self.frameEntete)
+ self.blEntete.insertWidget(0,self.toolBar)
+ self.blEntete.insertWidget(0,self.menubar)
+
+ if hasattr (self, 'CONFIGURATION') and self.CONFIGURATION.closeEntete==True : self.closeEntete()
+
eficas_root_dir = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
self.viewmanager = MyTabview(self)
- #self.recentMenu=self.menuFichier.addMenu(tr('&Recents'))
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)
- self.connecterSignaux()
+ if monEnvQT5 : self.connecterSignaux()
+ else : self.connecterSignauxQT4()
self.toolBar.addSeparator()
if self.code != None : self.construitMenu()
-
self.setWindowTitle(self.VERSION_EFICAS)
- self.ouvreFichiers()
+ try :
+ self.ouvreFichiers()
+ #except EficasException, exc:
+ except:
+ #print "je suis dans le except"
+ if self.salome == 0 : exit()
+ def closeEntete(self):
+ self.menuBar().close()
+ self.toolBar.close()
+ self.frameEntete.close()
def definitCode(self,code,ssCode) :
self.code=code
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)
+ #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)
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.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)
+ if monEnvQT5 : self.actionN1.triggered.connect(self.newN1)
+ else : self.connect(self.actionN1,SIGNAL("triggered()"),self.newN1)
def ajoutExecution(self):
- self.menuExecution = self.menubar.addMenu(QApplication.translate("Eficas", "Execution", None, QApplication.UnicodeUTF8))
+ self.menuExecution = self.menubar.addMenu(tr("Execution"))
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))
- self.connect(self.actionExecution,SIGNAL("triggered()"),self.run)
+ self.actionExecution.setText(tr("Execution"))
+ if monEnvQT5 : self.actionExecution.triggered.connect(self.run)
+ else : self.connect(self.actionExecution,SIGNAL("triggered()"),self.run)
def ajoutSauveExecution(self):
self.actionSaveRun = QAction(self)
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))
- self.connect(self.actionSaveRun,SIGNAL("triggered()"),self.saveRun)
+ self.actionSaveRun.setText(tr("Save Run"))
+ if monEnvQT5 : self.actionSaveRun.triggered.connect(self.saveRun)
+ else : self.connect(self.actionSaveRun,SIGNAL("triggered()"),self.saveRun)
def griserActionsStructures(self):
self.actionCouper.setEnabled(False)
def enleverRechercherDsCatalogue(self):
self.actionRechercherDsCatalogue.setVisible(False)
+ def connectRechercherDsCatalogue(self):
+ if monEnvQT5:
+ self.actionRechercherDsCatalogue.triggered.connect(self.handleRechercherDsCatalogue)
+ else :
+ self.connect(self.actionRechercherDsCatalogue,SIGNAL("triggered()"),self.handleRechercherDsCatalogue)
+
def ZCRACKS(self):
self.enleverNewInclude()
self.toolBar.addSeparator()
def ADAO(self):
self.enleverActionsStructures()
self.enleverNewInclude()
- self.enleverRechercherDsCatalogue()
def ASTER(self) :
self.menuTraduction = self.menubar.addMenu("menuTraduction")
def CARMEL3D(self):
#if self.salome == 0 : return
self.enleverNewInclude()
- self.menuMesh = self.menubar.addMenu("menuMesh")
+ self.menuMesh = self.menubar.addMenu(tr("Gestion Maillage"))
self.menuMesh.setObjectName("Mesh")
self.menuMesh.addAction(self.actionChercheGrpMaille)
- self.griserActionsStructures()
+ #self.griserActionsStructures()
def CARMELCND(self):
self.enleverNewInclude()
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)
+ 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()
+
+ 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)
+
+
def ChercheGrpMesh(self):
Msg,listeGroup=self.ChercheGrpMeshInSalome()
#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
- icon = QIcon(self.repIcon+"/New24.png")
+ #print self.repIcon
+ icon = QIcon(self.repIcon+"/new_file.png")
self.action_Nouveau.setIcon(icon)
- icon1 = QIcon(self.repIcon+"/Open24.png")
+ icon1 = QIcon(self.repIcon+"/ouvrir.png")
self.actionOuvrir.setIcon(icon1)
- icon2 = QIcon(self.repIcon+"/Save24.png")
+ icon2 = QIcon(self.repIcon+"/save.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)
- icon6 = QIcon(self.repIcon+"/Delete24.png")
+ icon6 = QIcon(self.repIcon+"/delete.png")
self.actionSupprimer.setIcon(icon6)
+ icon7 = QIcon(self.repIcon+"/roue.png")
+ self.actionExecution.setIcon(icon7)
- def connecterSignaux(self) :
+
+ def connecterSignauxQT4(self) :
self.connect(self.recentMenu,SIGNAL('aboutToShow()'),self.handleShowRecentMenu)
self.connect(self.action_Nouveau,SIGNAL("triggered()"),self.fileNew)
self.connect(self.actionDeplier_replier,SIGNAL("triggered()"),self.Deplier)
self.connect(self.actionRapport_de_Validation,SIGNAL("triggered()"),self.jdcRapport)
+ self.connect(self.actionRegles_du_JdC,SIGNAL("triggered()"),self.jdcRegles)
self.connect(self.actionFichier_Source,SIGNAL("triggered()"),self.jdcFichierSource)
self.connect(self.actionFichier_Resultat,SIGNAL("triggered()"),self.visuJdcPy)
- #self.connect(self.helpIndexAction,SIGNAL("triggered()"),self.helpIndex)
- #self.connect(self.helpContentsAction,SIGNAL("triggered()"),self.helpContents)
# Pour Aster
self.actionTraduitV9V10 = QAction(self)
self.actionSauveLigne = QAction(self)
self.actionSauveLigne.setText(tr("Sauve Format Ligne"))
- self.connect(self.actionParametres_Eficas,SIGNAL("triggered()"),self.optionEditeur)
+ #self.connect(self.actionParametres_Eficas,SIGNAL("triggered()"),self.optionEditeur)
self.connect(self.actionLecteur_Pdf,SIGNAL("triggered()"),self.optionPdf)
self.connect(self.actionTraduitV9V10,SIGNAL("triggered()"),self.traductionV9V10)
self.connect(self.actionTraduitV10V11,SIGNAL("triggered()"),self.traductionV10V11)
# Pour Carmel
self.actionChercheGrpMaille = QAction(self)
- self.actionChercheGrpMaille.setText(tr("Acquiert Groupe Maille"))
+ self.actionChercheGrpMaille.setText(tr("Acquiert groupe mailles"))
self.connect(self.actionChercheGrpMaille,SIGNAL("triggered()"),self.ChercheGrpMaille)
# Pour CarmelCND
self.actionChercheGrp = QAction(self)
- self.actionChercheGrp.setText(tr("Accquisition Groupe Maille"))
+ self.actionChercheGrp.setText(tr("Acquisition Groupe Maille"))
self.connect(self.actionChercheGrp,SIGNAL("triggered()"),self.ChercheGrp)
# Pour Aide
self.actionCode.setText(tr("Specificites Maille"))
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)
+ self.actionOuvrir.triggered.connect(self.fileOpen)
+ self.actionEnregistrer.triggered.connect(self.fileSave)
+ self.actionEnregistrer_sous.triggered.connect(self.fileSaveAs)
+ self.actionFermer.triggered.connect(self.fileClose)
+ self.actionFermer_tout.triggered.connect(self.fileCloseAll)
+ self.actionQuitter.triggered.connect(self.fileExit)
+
+ self.actionEficas.triggered.connect(self.aidePPal)
+ self.actionVersion.triggered.connect(self.version)
+ self.actionParametres.triggered.connect(self.gestionParam)
+
+ self.actionCouper.triggered.connect(self.editCut)
+ self.actionCopier.triggered.connect(self.editCopy)
+ self.actionColler.triggered.connect(self.editPaste)
+ self.actionSupprimer.triggered.connect(self.supprimer)
+ self.actionRechercher.triggered.connect(self.rechercher)
+ self.actionDeplier_replier.triggered.connect(self.Deplier)
+
+ self.actionRapport_de_Validation.triggered.connect(self.jdcRapport)
+ self.actionRegles_du_JdC.triggered.connect(self.jdcRegles)
+ self.actionFichier_Source.triggered.connect(self.jdcFichierSource)
+ self.actionFichier_Resultat.triggered.connect(self.visuJdcPy)
+
+
+ # Pour Aster
+ self.actionTraduitV9V10 = QAction(self)
+ self.actionTraduitV9V10.setObjectName("actionTraduitV9V10")
+ self.actionTraduitV9V10.setText(tr("TraduitV9V10"))
+ self.actionTraduitV10V11 = QAction(self)
+ self.actionTraduitV10V11.setObjectName("actionTraduitV10V11")
+ self.actionTraduitV10V11.setText(tr("TraduitV10V11"))
+ self.actionTraduitV11V12 = QAction(self)
+ self.actionTraduitV11V12.setObjectName("actionTraduitV11V12")
+ self.actionTraduitV11V12.setText(tr("TraduitV11V12"))
+ self.actionSauveLigne = QAction(self)
+ self.actionSauveLigne.setText(tr("Sauve Format Ligne"))
+
+ #self.actionParametres_Eficas.triggered.connect(self.optionEditeur)
+ self.actionTraduitV9V10.triggered.connect(self.traductionV9V10)
+ self.actionTraduitV10V11.triggered.connect(self.traductionV10V11)
+ self.actionTraduitV11V12.triggered.connect(self.traductionV11V12)
+ self.actionSauveLigne.triggered.connect(self.sauveLigne)
+
+ # Pour Carmel
+ self.actionChercheGrpMaille = QAction(self)
+ self.actionChercheGrpMaille.setText(tr("Acquiert Groupe Maille"))
+
+ # Pour CarmelCND
+ self.actionChercheGrp = QAction(self)
+ self.actionChercheGrp.setText(tr("Accquisition Groupe Maille"))
+ self.actionChercheGrp.triggered.connect(self.ChercheGrp)
+
+ # Pour Aide
+ self.actionCode = QAction(self)
+ self.actionCode.setText(tr("Specificites Maille"))
+ self.actionCode.triggered.connect(self.aideCode)
+
+
def Deplier(self):
self.viewmanager.handleDeplier()
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)
for fichier in self.listePatrons.liste[nomSsMenu]:
id = ssmenu.addAction(fichier)
self.ficPatrons[id]=fichier
- self.connect(id, SIGNAL('triggered()'),self.handleOpenPatrons)
+ if monEnvQT5 : self.id.triggered.connect(self.handleOpenPatrons)
+ else : self.connect(id, SIGNAL('triggered()'),self.handleOpenPatrons)
# self.Patrons.setItemParameter(id,idx)
idx=idx+1
def initRecents(self):
- self.recent = QStringList()
try :
- #if 1 :
if sys.platform[0:5]=="linux" :
rep=os.path.join(os.environ['HOME'],'.config/Eficas',self.code)
else :
self.recent.append(l)
index=index+1
except :
- #else :
pass
try : f.close()
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:
+ self.recent = self.recent[:9]
+
+
+ def addToRecentListQT4(self, fn):
"""
Public slot to add a filename to the list of recently opened files.
monVisuDialg.show()
def aidePPal(self) :
- if self.code==None : return
repAide=os.path.dirname(os.path.abspath(__file__))
- maD=repAide+"/../Aide"
+ maD=os.path.join( repAide,'..','Doc','html')
try :
- indexAide=maD+"/fichiers_EFICAS/index.html"
+ indexAide=os.path.join(maD,'index.html')
if sys.platform[0:5]=="linux" : cmd="xdg-open "+indexAide
else : cmd="start "+indexAide
os.system(cmd)
except:
QMessageBox.warning( self,tr( "Aide Indisponible"),tr( "l'aide n est pas installee "))
+ def aidePSEN(self) :
+ repAide=os.path.dirname(os.path.abspath(__file__))
+ maD=os.path.join( repAide,'..','Doc','html')
+ try :
+ indexAide=os.path.join(maD,'index.html')
+ if sys.platform[0:5]=="linux" : cmd="xdg-open "+indexAide
+ else : cmd="start "+indexAide
+ os.system(cmd)
+ except:
+ QMessageBox.warning( self,tr( "Aide Indisponible"),tr( "l'aide n est pas installee "))
def aideCode(self) :
if self.code==None : return
for rp in self.recent:
id = self.recentMenu.addAction(rp)
self.ficRecents[id]=rp
- self.connect(id, SIGNAL('triggered()'),self.handleOpenRecent)
+ if monEnvQT5 : id.triggered.connect(self.handleOpenRecent)
+ else : self.connect(id, SIGNAL('triggered()'),self.handleOpenRecent)
self.recentMenu.addSeparator()
self.recentMenu.addAction(tr('&Effacer'), self.handleClearRecent)
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)
+ if msg != "": QMessageBox.warning(self, tr(u"Erreur"), msg)
def fileOpen(self):
try:
def jdcRapport(self):
self.viewmanager.handleViewJdcRapport()
+ def jdcRegles(self):
+ self.viewmanager.handleViewJdcRegles()
+
def gestionParam(self):
self.viewmanager.handlegestionParam()
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)
res=self.fileExit()
if res==2 : event.ignore()
+
if __name__=='__main__':
# Modules Eficas
Eficas=Appli()
Eficas.show()
- #app.connect(app, SIGNAL("lastWindowClosed()"), app, SLOT("quit()"))
#mw.ouvreFichiers()
#mw.show()
