X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=InterfaceQT4%2Feditor.py;h=2080558497e2791346de93d845b1eaba6f1490d1;hb=80eb29926b88137b9f0f19175c0d0c52d7dcc206;hp=92f39b254988530ae1defc47f52a4c471d858aa6;hpb=97c204c49d4c9e2785779957f56d9b13a1e93181;p=tools%2Feficas.git diff --git a/InterfaceQT4/editor.py b/InterfaceQT4/editor.py old mode 100644 new mode 100755 index 92f39b25..20805584 --- a/InterfaceQT4/editor.py +++ b/InterfaceQT4/editor.py @@ -24,6 +24,7 @@ from PyQt4 import * from PyQt4.QtGui import * from PyQt4.QtCore import * import time +import pdb from datetime import date from Extensions.i18n import tr @@ -36,7 +37,7 @@ from Editeur import comploader from Editeur import Objecttreeitem from desBaseWidget import Ui_baseWidget from monViewTexte import ViewText -from monWidgetParam import MonWidgetParam +from monWidgetCreeParam import MonWidgetCreeParam import browser import readercata @@ -53,10 +54,13 @@ class JDCEditor(Ui_baseWidget,QtGui.QWidget): def __init__ (self,appli,fichier = None, jdc = None, QWParent=None, units = None, include=0 , vm=None): #----------------------------------------------------------------------------------------------------------# + self.a=0 QtGui.QWidget.__init__(self,None) self.setupUi(self) self.monOptionnel=None self.fenetreCentraleAffichee=None + self.dejaDansPlieTout=False + self.afficheCommandesPliees = True self.appliEficas = appli self.appli = appli #---- attendu par IHM self.vm = vm @@ -73,8 +77,10 @@ class JDCEditor(Ui_baseWidget,QtGui.QWidget): # ces attributs sont mis a jour par definitCode appelee par newEditor self.code = self.appliEficas.CONFIGURATION.code - self.affiche_alpha=1 - if self.code in ['MAP','Adao'] : + self.mode_nouv_commande=self.appliEficas.CONFIGURATION.mode_nouv_commande + self.affiche=self.appliEficas.CONFIGURATION.affiche + if self.code in ['MAP','CARMELCND'] : self.afficheCommandesPliees=False + if self.code in ['MAP',] : self.widgetTree.close() self.widgetTree=None self.appliEficas.resize(1440,self.appliEficas.height()) @@ -90,6 +96,8 @@ class JDCEditor(Ui_baseWidget,QtGui.QWidget): self.readercata=self.appliEficas.readercata if self.readercata.fic_cata == None : return #Sortie Salome self.titre=self.readercata.titre + self.Ordre_Des_Commandes=self.readercata.Ordre_Des_Commandes + self.Classement_Commandes_Ds_Arbre=self.readercata.Classement_Commandes_Ds_Arbre self.format = self.appliEficas.format_fichier @@ -130,22 +138,29 @@ class JDCEditor(Ui_baseWidget,QtGui.QWidget): self.node_selected = [] self.deplier = True self.message='' + if self.code in ['Adao','MAP'] : self.afficheApresInsert=True + else : self.afficheApresInsert=False + if self.code in ['TELEMAC',] : self.enteteQTree='premier' + else : self.enteteQTree='complet' + if self.code in ['Adao','TELEMAC'] : self.affichePlie=True + else : self.affichePlie=False self.Commandes_Ordre_Catalogue =self.readercata.Commandes_Ordre_Catalogue #------- construction du jdc -------------- jdc_item = None - self.mode_nouv_commande=self.readercata.mode_nouv_commande self.nouveau=0 if self.fichier is not None: # fichier jdc fourni self.fileInfo = QFileInfo(self.fichier) self.fileInfo.setCaching(0) if jdc==None : - try : + # try : + if 1: self.jdc = self.readFile(self.fichier) - except : + #except : + else : print "mauvaise lecture" else : self.jdc=jdc @@ -163,6 +178,7 @@ class JDCEditor(Ui_baseWidget,QtGui.QWidget): if self.jdc: self.jdc.appli = self self.jdc.lang = self.appli.langue + self.jdc.aReafficher=False txt_exception = None if not jdc: self.jdc.analyse() @@ -177,12 +193,36 @@ class JDCEditor(Ui_baseWidget,QtGui.QWidget): jdc_item=Objecttreeitem.make_objecttreeitem( self, "nom", self.jdc ) if (not self.jdc.isvalid()) and (not self.nouveau) and (self.appliEficas.ssIhm == False): self.viewJdcRapport() + + # if self.code=="TELEMAC" : print "kkkkkkkk" + if jdc_item: self.tree = browser.JDCTree( jdc_item, self ) - self.jdc.aReafficher=False self.appliEficas.construitMenu() + #-------------------# + def runPSEN(self): + #-------------------# + if self.modified or self.fichier==None : + QMessageBox.critical( self, tr( "Execution impossible "),tr("Sauvegarder SVP avant l'execution ")) + return + + #lancement avec le .bat + textePython="PSEN_Path='EficasV2\PSEN_Eficas\PSEN\PSSEWrapper.py'\ + \nimport subprocess\ + \np=subprocess.Popen(['python',PSEN_Path])\ + \n(out,err)=p.communicate()" + + #lancement avec qteficas_psen.py + + #textePython='C:\Users\plscist\Desktop\Vico\sauveEficasPSEN~\EficasV1\PSEN_Eficas\PSEN\PSSEWrapper.py' + try : + self._viewTextExecute( textePython,"psen_run",".py") + except Exception, e: + print traceback.print_exc() + + #--------------------------------# def _newJDC( self ,units = None): #--------------------------------# @@ -379,7 +419,7 @@ class JDCEditor(Ui_baseWidget,QtGui.QWidget): #-----------------------# def gestionParam(self): #-----------------------# - w = MonWidgetParam( self) + w = MonWidgetCreeParam( self) w.show() #-----------------------# @@ -468,14 +508,23 @@ class JDCEditor(Ui_baseWidget,QtGui.QWidget): #---------------------# def handleDeplier(self): #---------------------# + print "je passe ici" if self.tree == None : return - self.tree.collapseAll() + #self.tree.collapseAll() if self.deplier : - self.tree.collapseItem(self.tree.topLevelItem(0)) + #print "je plie" + self.tree.expandItem(self.tree.topLevelItem(0)) self.deplier = False + if self.fenetreCentraleAffichee != None : + if hasattr(self.fenetreCentraleAffichee.node,'plieToutEtReaffiche'): + self.fenetreCentraleAffichee.node.plieToutEtReaffiche() else: + #print "je deplie" self.tree.expandItem(self.tree.topLevelItem(0)) self.deplier = True + if self.fenetreCentraleAffichee != None : + if hasattr(self.fenetreCentraleAffichee.node,'deplieToutEtReaffiche'): + self.fenetreCentraleAffichee.node.deplieToutEtReaffiche() #---------------------# def handleEditCut(self): @@ -679,9 +728,9 @@ class JDCEditor(Ui_baseWidget,QtGui.QWidget): self.appliEficas.trUtf8('Wrapper Files (*.xml);;''All Files (*)')) return fichier - #----------------------------------# - def writeFile(self, fn, txt = None): - #----------------------------------# + #--------------------------------------------------# + def writeFile(self, fn, txt = None,formatLigne="beautifie"): + #--------------------------------------------------# """ Public slot to write the text to a file. @@ -690,9 +739,9 @@ class JDCEditor(Ui_baseWidget,QtGui.QWidget): """ fn = unicode(fn) - + if txt == None : - txt = self.get_text_JDC(self.format) + txt = self.get_text_JDC(self.format,formatLigne=formatLigne) eol = '\n' if len(txt) >= len(eol): if txt[-len(eol):] != eol: @@ -713,15 +762,17 @@ class JDCEditor(Ui_baseWidget,QtGui.QWidget): .arg(unicode(fn)).arg(str(why))) return 0 - #-------------------------------------# - def get_text_JDC(self,format,pourRun=0): - #-------------------------------------# + #-----------------------------------------------------------# + def get_text_JDC(self,format,pourRun=0,formatLigne="beautifie"): + #-----------------------------------------------------------# if self.code == "MAP" and not(generator.plugins.has_key(format)): format = "MAP" if generator.plugins.has_key(format): + print "get_text_JDC" + # Le generateur existe on l'utilise self.generator=generator.plugins[format]() try : - jdc_formate=self.generator.gener(self.jdc,format='beautifie',config=self.appliEficas.CONFIGURATION) + jdc_formate=self.generator.gener(self.jdc,format=formatLigne,config=self.appliEficas.CONFIGURATION) if pourRun : jdc_formate=self.generator.textePourRun except ValueError,e: QMessageBox.critical(self, tr("Erreur a la generation"),str(e)) @@ -891,7 +942,7 @@ class JDCEditor(Ui_baseWidget,QtGui.QWidget): ) return if hasattr(self.CONFIGURATION, "savedir"): path=self.CONFIGURATION.savedir - else : path=os.environ['HOME'] + else : path='C:/' monNomFichier="" if self.fichier is not None and self.fichier != "" : @@ -935,6 +986,41 @@ class JDCEditor(Ui_baseWidget,QtGui.QWidget): (output, err) = p.communicate() + #-----------------# + def saveRunPSEN(self): + #-----------------# + print "saveRunPSEN" + self.saveFile() + return + if not(self.jdc.isvalid()): + QMessageBox.critical( self, tr( "Sauvegarde de l'input impossible "), + tr("Un JdC valide est necessaire pour creer un .input") + ) + return + + print generator.plugins.has_key(self.format) + if generator.plugins.has_key(self.format): + # Le generateur existe on l'utilise + self.generator=generator.plugins[self.format]() + try : + self.generator.gener(self.jdc) + self.generator.writeDefault('') + except ValueError,e: + QMessageBox.critical(self, tr("Erreur a la generation"),str(e)) + if not self.generator.cr.estvide(): + self.affiche_infos(tr("Erreur a la generation"),Qt.red) + QMessageBox.critical( self, tr("Erreur a la generation"),tr("EFICAS ne sait pas convertir ce JDC")) + return "" + else: + # Il n'existe pas c'est une erreur + self.affiche_infos(tr("Format %s non reconnu" , self.format),Qt.red) + QMessageBox.critical( self, "Format non reconnu" ,tr("EFICAS ne sait pas convertir le JDC selon le format "+ self.format)) + return "" + print "HELLO" + + + + #-----------------------------------------# def cherche_Groupes(self): #-----------------------------------------# @@ -968,9 +1054,9 @@ class JDCEditor(Ui_baseWidget,QtGui.QWidget): #else : pass - #-----------------------------------------# - def saveFile(self, path = None, saveas= 0): - #-----------------------------------------# + #-----------------------------------------------------------------# + def saveFile(self, path = None, saveas= 0,formatLigne="beautifie"): + #-----------------------------------------------------------------# """ Public slot to save the text to a file. @@ -979,7 +1065,7 @@ class JDCEditor(Ui_baseWidget,QtGui.QWidget): the name of the saved file """ - #self.modified=1 + self.modified=1 if not self.modified and not saveas: return (0, None) # do nothing if text wasn't changed @@ -1004,7 +1090,8 @@ class JDCEditor(Ui_baseWidget,QtGui.QWidget): fn = unicode(QDir.convertSeparators(fn)) newName = fn - if not (self.writeFile(fn)): return (0, None) + + if not (self.writeFile(fn,formatLigne=formatLigne)): return (0, None) self.fichier = fn self.modified = False if self.fileInfo is None or saveas: @@ -1027,6 +1114,14 @@ class JDCEditor(Ui_baseWidget,QtGui.QWidget): return (1, self.fichier) # + + #----------------------------------------------# + def sauveLigneFile(self): + #----------------------------------------------# + self.modified=1 + return self.saveFile(formatLigne="Ligne") + + #----------------------------------------------# def saveFileAs(self, path = None,fileName=None): #----------------------------------------------# @@ -1040,7 +1135,7 @@ class JDCEditor(Ui_baseWidget,QtGui.QWidget): if fileName != None : self.fichier = fileName return self.saveFile() - return self.saveFile(path,1) + return self.saveFile(path,1,"beautifie") @@ -1167,7 +1262,8 @@ class JDCEditor(Ui_baseWidget,QtGui.QWidget): #---------------------------# def _newTELEMAC(self): #---------------------------# - texte="INITIALIZATION();TIDE_PARAMETERS();INITIAL_STATE();NUMERICAL_PARAMETERS();PHYSICAL_PARAMETERS()" + texte="INITIALIZATION();BOUNDARY_CONDITIONS();GENERAL_PARAMETERS();PHYSICAL_PARAMETERS();NUMERICAL_PARAMETERS();" + #texte="" return texte #---------------------------#