merge from BR_pluginMGCleaner tag mergeto_v7_main_17jun13

This commit is contained in:
cvw 2013-06-18 08:31:15 +00:00
parent dc02ba1daa
commit ca40d2121f

View File

@ -347,15 +347,15 @@ class MGCleanerMonPlugDialog(Ui_MGCleanerPlugDialog,QWidget):
def PBLoadPressed(self): def PBLoadPressed(self):
"""load last hypothesis saved in tail of file""" """load last hypothesis saved in tail of file"""
try: try:
f=open(self.paramsFile,"r") f=open(self.paramsFile,"r")
except : except:
QMessageBox.warning(self, "File", "Unable to open "+self.paramsFile) QMessageBox.warning(self, "File", "Unable to open "+self.paramsFile)
return return
try: try:
text=f.read() text=f.read()
except : except:
QMessageBox.warning(self, "File", "Unable to read "+self.paramsFile) QMessageBox.warning(self, "File", "Unable to read "+self.paramsFile)
return return
f.close() f.close()
self.loadResumeData(text, separator="\n") self.loadResumeData(text, separator="\n")
@ -555,7 +555,7 @@ def getDialog():
""" """
global __dialog global __dialog
if __dialog is None: if __dialog is None:
__dialog = MGCleanerMonPlugDialog() __dialog = MGCleanerMonPlugDialog()
#else : #else :
# __dialog.clean() # __dialog.clean()
return __dialog return __dialog
@ -570,10 +570,10 @@ def TEST_standalone():
""" """
works only if a salome is launched yet with a study loaded works only if a salome is launched yet with a study loaded
to launch standalone python do: to launch standalone python do:
/export/home/wambeke/2013/V6_main_MGC_CO6.4_64/APPLI/runSession ./APPLI/runSession
python python
or (do not works) or (do not works)
python /export/home/wambeke/2013/V6_main_MGC_CO6.4_64/INSTALL/SMESH/share/salome/plugins/smesh/MGCleanerMonPlugDialog.py python ./INSTALL/SMESH/share/salome/plugins/smesh/MGCleanerMonPlugDialog.py
""" """
import salome import salome
import SMESH import SMESH
@ -588,7 +588,6 @@ def TEST_standalone():
# ============================================================================== # ==============================================================================
# #
def TEST_MGCleanerMonPlugDialog(): def TEST_MGCleanerMonPlugDialog():
#print "TEST_MGCleanerMonPlugDialog"
import sys import sys
from PyQt4.QtGui import QApplication from PyQt4.QtGui import QApplication
from PyQt4.QtCore import QObject, SIGNAL, SLOT from PyQt4.QtCore import QObject, SIGNAL, SLOT