From 0df6e9e4689027b488a925c7fad8bb750896cf8d Mon Sep 17 00:00:00 2001 From: cvw Date: Wed, 5 Jun 2013 10:54:50 +0000 Subject: [PATCH] best enregistreResultat --- src/Tools/YamsPlug/monViewText.py | 29 ++++++++++++++++++------- src/Tools/YamsPlug/monYamsPlugDialog.py | 16 +++++++++----- 2 files changed, 32 insertions(+), 13 deletions(-) diff --git a/src/Tools/YamsPlug/monViewText.py b/src/Tools/YamsPlug/monViewText.py index 2151fe9a1..ce291033b 100644 --- a/src/Tools/YamsPlug/monViewText.py +++ b/src/Tools/YamsPlug/monViewText.py @@ -1,4 +1,4 @@ -# -*- coding: iso-8859-1 -*- +# -*- coding: utf-8 -*- # Copyright (C) 2007-2013 EDF R&D # # This library is free software; you can redistribute it and/or @@ -30,19 +30,19 @@ from PyQt4.QtCore import * from ViewText import Ui_ViewExe -class MonViewText(Ui_ViewExe,QDialog): +class MonViewText(Ui_ViewExe, QDialog): """ Classe permettant la visualisation de texte """ - def __init__(self,parent,txt): + def __init__(self, parent, txt): QDialog.__init__(self,parent) self.setupUi(self) self.resize( QSize(1000,600).expandedTo(self.minimumSizeHint()) ) - self.connect( self.PB_Ok,SIGNAL("clicked()"), self, SLOT("close()") ) + #self.connect( self.PB_Ok,SIGNAL("clicked()"), self, SLOT("close()") ) + self.connect( self.PB_Ok,SIGNAL("clicked()"), self.theClose ) self.connect( self.PB_Save,SIGNAL("clicked()"), self.saveFile ) self.monExe=QProcess(self) - self.connect(self.monExe, SIGNAL("readyReadStandardOutput()"), self.readFromStdOut ) self.connect(self.monExe, SIGNAL("readyReadStandardError()"), self.readFromStdErr ) @@ -66,7 +66,9 @@ class MonViewText(Ui_ViewExe,QDialog): else: cmds+="# $DISTENE_PATH_FOR_YAMS NOT SET\n" #cmds+='env\n' + cmds+='rm -f '+self.parent().fichierOut+'\n' cmds+=txt+'\n' + cmds+='echo END_OF_Yams\n' pid=self.monExe.pid() nomFichier='/tmp/Yams_'+str(pid)+'.sh' f=open(nomFichier,'w') @@ -76,9 +78,9 @@ class MonViewText(Ui_ViewExe,QDialog): maBidouille='sh ' + nomFichier self.monExe.start(maBidouille) self.monExe.closeWriteChannel() + self.enregistreResultatsDone=False self.show() - def saveFile(self): #recuperation du nom du fichier savedir=os.environ['HOME'] @@ -96,8 +98,19 @@ class MonViewText(Ui_ViewExe,QDialog): def readFromStdErr(self): a=self.monExe.readAllStandardError() - self.TB_Exe.append(QString.fromUtf8(a.data(),len(a))) ; + self.TB_Exe.append(QString.fromUtf8(a.data(),len(a))) def readFromStdOut(self) : a=self.monExe.readAllStandardOutput() - self.TB_Exe.append(QString.fromUtf8(a.data(),len(a))) ; + aa=QString.fromUtf8(a.data(),len(a)) + self.TB_Exe.append(aa) + if "END_OF_Yams" in aa: + self.parent().enregistreResultat() + self.enregistreResultatsDone=True + #self.theClose() + + def theClose(self): + if not self.enregistreResultatsDone: + self.parent().enregistreResultat() + self.enregistreResultatsDone=True + self.close() diff --git a/src/Tools/YamsPlug/monYamsPlugDialog.py b/src/Tools/YamsPlug/monYamsPlugDialog.py index d77b1b08a..1518ae9f5 100644 --- a/src/Tools/YamsPlug/monYamsPlugDialog.py +++ b/src/Tools/YamsPlug/monYamsPlugDialog.py @@ -97,15 +97,18 @@ class MonYamsPlugDialog(Ui_YamsPlugDialog,QWidget): try : mydir=os.environ["SMESH_ROOT_DIR"] except Exception: - QMessageBox.warning( self, "Help unavailable $SMESH_ROOT_DIR not found") + QMessageBox.warning(self, "Help", "Help unavailable $SMESH_ROOT_DIR not found") + return maDoc=mydir+"/share/doc/salome/gui/SMESH/yams/_downloads/YamsWhitePaper_3.2.pdf" command="xdg-open "+maDoc+";" subprocess.call(command, shell=True) def PBOKPressed(self): - if not(self.PrepareLigneCommande()) : return + if not(self.PrepareLigneCommande()): + #warning done yet + #QMessageBox.warning(self, "Compute", "Command not found") + return maFenetre=MonViewText(self,self.commande) - if os.path.isfile(self.fichierOut): self.enregistreResultat() def enregistreResultat(self): import smesh @@ -113,6 +116,9 @@ class MonYamsPlugDialog(Ui_YamsPlugDialog,QWidget): import salome from salome.kernel import studyedit + if not os.path.isfile(self.fichierOut): + QMessageBox.warning(self, "Compute", "Result file "+self.fichierOut+" not found") + maStudy=studyedit.getActiveStudy() smesh.SetCurrentStudy(maStudy) (outputMesh, status) = smesh.CreateMeshesFromGMF(self.fichierOut) @@ -327,7 +333,7 @@ class MonYamsPlugDialog(Ui_YamsPlugDialog,QWidget): self.MeshIn="" self.LE_MeshSmesh.setText("") return - QMessageBox.warning( self, "Unknown File", "File doesn't exist") + QMessageBox.warning(self, "Mesh file", "File doesn't exist") def meshSmeshNameChanged(self): """only change by GUI mouse selection, otherwise clear""" @@ -396,7 +402,7 @@ class MonYamsPlugDialog(Ui_YamsPlugDialog,QWidget): self.commande+=" -O "+self.style.toLatin1() deb=os.path.splitext(self.fichierIn) - self.fichierOut=deb[0]+".d.meshb" + self.fichierOut=deb[0] + ".d.meshb" if self.RB_Absolute.isChecked()==True : self.commande+=" -Dabsolute" -- 2.39.2