# 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
+#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 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=1,parent=None,ssCode=None,multi=False,langue='ang',ssIhm=False):
"""
Constructor
"""
QMainWindow.__init__(self,parent)
Ui_Eficas.__init__(self)
- self.setupUi(self)
+
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"
self.ssIhm=ssIhm
self.top = self #(pour CONFIGURATION)
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.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.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
+ try :
+ import eficasSalome
+ Accas.SalomeEntry = eficasSalome.SalomeEntry
+ except :
+ print ('eficas hors salome')
self.multi=multi
self.demande=multi # specifique PSEN
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.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)
- if self.code in ['MAP',] : self.resize(1440,self.height())
- else : self.resize(1800,self.height())
+
+ 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)
self.blEntete.insertWidget(0,self.toolBar)
self.blEntete.insertWidget(0,self.menubar)
- if hasattr (self, 'CONFIGURATION') and self.CONFIGURATION.closeEntete==True : self.closeEntete()
+ 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()
# print "je suis dans le except"
#if self.salome == 0 : exit()
+ #self.adjustSize()
def closeEntete(self):
self.menuBar().close()
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
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'):
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"
sys.path.insert(0,dirCode)
self.code=code
self.definitCode(code,ssCode)
+ self.initRecents()
self.multi=True
self.demande=False
self.fileNew()
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
+
+ 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(tr("Execution"))
+ self.menuExecution = self.menubar.addMenu(tr("&Run"))
self.actionExecution = QAction(self)
if sys.platform[0:5]=="linux":
icon6 = QIcon(self.repIcon+"/roue.png")
self.menuExecution.addAction(self.actionExecution)
if not(self.actionExecution in self.toolBar.actions()):
self.toolBar.addAction(self.actionExecution)
- self.actionExecution.setText(tr("Execution"))
- 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)
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)
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)
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)
+ self.actionSortieLegere.triggered.connect(self.handleSortieLegere)
+
def ZCRACKS(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)
+ 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.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)
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):
+
# Pour Aster
self.actionTraduitV9V10 = QAction(self)
self.actionTraduitV9V10.setObjectName("actionTraduitV9V10")
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)
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
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()
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()
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)
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
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:
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)
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.
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)
def fileNew(self):
try:
self.viewmanager.newEditor()
- except EficasException, exc:
- msg = unicode(exc)
+ 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)
def visuJdcPy(self):
self.viewmanager.handleViewJdcPy()
+ def ouvreArbre(self):
+ self.viewmanager.ouvreArbre()
+
+ def fermeArbre(self):
+ self.viewmanager.fermeArbre()
def NewInclude(self):
self.viewmanager.newIncludeEditor()
