ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2024-12-29 10:50:34 +05:00
Code Issues Packages Projects Releases Wiki Activity

best enregistreResultat

Browse Source
This commit is contained in:
cvw 2013-06-05 10:32:14 +00:00
parent 21bded888b
commit e79c5fa3c5
2 changed files with 30 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/Tools/MGCleanerPlug/MGCleanerMonPlugDialog.py
View File

@ -103,16 +103,18 @@ class MGCleanerMonPlugDialog(Ui_MGCleanerPlugDialog,QWidget):
try: try:
mydir=os.environ["SMESH_ROOT_DIR"] mydir=os.environ["SMESH_ROOT_DIR"]
except Exception: 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/MGCleaner/_downloads/mg-cleaner_user_manual.pdf" maDoc=mydir+"/share/doc/salome/gui/SMESH/MGCleaner/_downloads/mg-cleaner_user_manual.pdf"
command="xdg-open "+maDoc+";" command="xdg-open "+maDoc+";"
subprocess.call(command, shell=True) subprocess.call(command, shell=True)
def PBOKPressed(self): def PBOKPressed(self):
if not(self.PrepareLigneCommande()): return if not(self.PrepareLigneCommande()):
#print "compute Pressed" #warning done yet
#QMessageBox.warning(self, "Compute", "Command not found")
return
maFenetre=MGCleanerMonViewText(self, self.commande) maFenetre=MGCleanerMonViewText(self, self.commande)
if os.path.isfile(self.fichierOut): self.enregistreResultat()
def enregistreResultat(self): def enregistreResultat(self):
import smesh import smesh
@ -120,6 +122,9 @@ class MGCleanerMonPlugDialog(Ui_MGCleanerPlugDialog,QWidget):
import salome import salome
from salome.kernel import studyedit 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() maStudy=studyedit.getActiveStudy()
smesh.SetCurrentStudy(maStudy) smesh.SetCurrentStudy(maStudy)
(outputMesh, status) = smesh.CreateMeshesFromGMF(self.fichierOut) (outputMesh, status) = smesh.CreateMeshesFromGMF(self.fichierOut)
@ -355,7 +360,7 @@ class MGCleanerMonPlugDialog(Ui_MGCleanerPlugDialog,QWidget):
self.MeshIn="" self.MeshIn=""
self.LE_MeshSmesh.setText("") self.LE_MeshSmesh.setText("")
return return
QMessageBox.warning( self, "Unknown File", "File doesn't exist") QMessageBox.warning(self, "Mesh file", "File doesn't exist")
def meshSmeshNameChanged(self): def meshSmeshNameChanged(self):
"""only change by GUI mouse selection, otherwise clear""" """only change by GUI mouse selection, otherwise clear"""

27
src/Tools/MGCleanerPlug/MGCleanerMonViewText.py
View File

@ -30,21 +30,21 @@ from PyQt4.QtCore import *
from MGCleanerViewText import Ui_ViewExe from MGCleanerViewText import Ui_ViewExe
class MGCleanerMonViewText(Ui_ViewExe,QDialog): class MGCleanerMonViewText(Ui_ViewExe, QDialog):
""" """
Classe permettant la visualisation de texte Classe permettant la visualisation de texte
""" """
def __init__(self,parent,txt): def __init__(self, parent, txt, ):
QDialog.__init__(self,parent) QDialog.__init__(self,parent)
self.setupUi(self) self.setupUi(self)
self.resize( QSize(1000,600).expandedTo(self.minimumSizeHint()) ) 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.connect( self.PB_Save,SIGNAL("clicked()"), self.saveFile )
self.PB_Save.setToolTip("Save trace in log file") self.PB_Save.setToolTip("Save trace in log file")
self.PB_Ok.setToolTip("Close view") self.PB_Ok.setToolTip("Close view")
self.monExe=QProcess(self) self.monExe=QProcess(self)
self.connect(self.monExe, SIGNAL("readyReadStandardOutput()"), self.readFromStdOut ) self.connect(self.monExe, SIGNAL("readyReadStandardOutput()"), self.readFromStdOut )
self.connect(self.monExe, SIGNAL("readyReadStandardError()"), self.readFromStdErr ) self.connect(self.monExe, SIGNAL("readyReadStandardError()"), self.readFromStdErr )
@ -68,7 +68,9 @@ class MGCleanerMonViewText(Ui_ViewExe,QDialog):
else: else:
cmds+="# $DISTENE_PATH_FOR_MGCLEANER NOT SET\n" cmds+="# $DISTENE_PATH_FOR_MGCLEANER NOT SET\n"
#cmds+='env\n' #cmds+='env\n'
cmds+='rm -f /tmp/ForMGCleaner*fix.mesh\n'
cmds+=txt+'\n' cmds+=txt+'\n'
cmds+='echo END_OF_MGCleaner\n'
pid=self.monExe.pid() pid=self.monExe.pid()
nomFichier='/tmp/MGCleaner_'+str(pid)+'.sh' nomFichier='/tmp/MGCleaner_'+str(pid)+'.sh'
f=open(nomFichier,'w') f=open(nomFichier,'w')
@ -78,9 +80,9 @@ class MGCleanerMonViewText(Ui_ViewExe,QDialog):
maBidouille='sh ' + nomFichier maBidouille='sh ' + nomFichier
self.monExe.start(maBidouille) self.monExe.start(maBidouille)
self.monExe.closeWriteChannel() self.monExe.closeWriteChannel()
self.enregistreResultatsDone=False
self.show() self.show()
def saveFile(self): def saveFile(self):
#recuperation du nom du fichier #recuperation du nom du fichier
savedir=os.environ['HOME'] savedir=os.environ['HOME']
@ -98,8 +100,19 @@ class MGCleanerMonViewText(Ui_ViewExe,QDialog):
def readFromStdErr(self): def readFromStdErr(self):
a=self.monExe.readAllStandardError() 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) : def readFromStdOut(self) :
a=self.monExe.readAllStandardOutput() 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_MGCleaner" 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()