ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2025-04-24 01:22:05 +05:00
Code Issues Packages Projects Releases Wiki Activity

Qt5 migration

Browse Source
This commit is contained in:
Paul RASCLE 2016-10-21 14:47:37 +02:00
parent 766145cb04
commit 0bd9fcdbe7
3 changed files with 56 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Tools/blocFissure/ihm/fissureCoude.ui
View File

@ -6,7 +6,7 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>959</width> <width>974</width>
<height>618</height> <height>618</height>
</rect> </rect>
</property> </property>

2
src/Tools/blocFissure/ihm/fissureGenerale.ui
View File

@ -6,7 +6,7 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>663</width> <width>664</width>
<height>624</height> <height>624</height>
</rect> </rect>
</property> </property>

117
src/Tools/blocFissure/ihm/fissureGenerale_plugin.py
View File

@ -31,60 +31,50 @@ def fissureGeneraleDlg(context):
study = context.study study = context.study
studyId = context.studyId studyId = context.studyId
sg = context.sg sg = context.sg
import os import os
#import subprocess #import subprocess
#import tempfile #import tempfile
from PyQt4 import QtCore from PyQt5 import QtCore
from PyQt4 import QtGui from PyQt5 import QtWidgets
from PyQt4.QtGui import QFileDialog from PyQt5 import QtGui
from PyQt4.QtGui import QMessageBox from PyQt5.QtWidgets import QFileDialog
from PyQt4.QtGui import QPalette from PyQt5.QtWidgets import QMessageBox
from PyQt4.QtGui import QColor from PyQt5.QtGui import QPalette
from PyQt4.QtCore import QString from PyQt5.QtGui import QColor
from fissureGenerale_ui import Ui_Dialog from fissureGenerale_ui import Ui_Dialog
class fissureGeneraleDialog(QtGui.QDialog): class fissureGeneraleDialog(QtWidgets.QDialog):
def __init__(self): def __init__(self):
print "__init__" print "__init__"
QtGui.QDialog.__init__(self) QtWidgets.QDialog.__init__(self)
# Set up the user interface from Designer. # Set up the user interface from Designer.
self.ui = Ui_Dialog() self.ui = Ui_Dialog()
self.ui.setupUi(self) self.ui.setupUi(self)
self.blackPalette = self.ui.dsb_influence.palette() self.blackPalette = self.ui.dsb_influence.palette()
self.redPalette = QPalette() self.redPalette = QPalette()
self.redPalette.setColor(QPalette.Text, QColor(255,0,0)) self.redPalette.setColor(QPalette.Text, QColor(255,0,0))
self.NOK = False self.NOK = False
self.initDefaut() self.initDefaut()
self.initDialog(self.defaut) self.initDialog(self.defaut)
self.ui.lb_calcul.hide() self.ui.lb_calcul.hide()
# Connect up the buttons. # Connect up the buttons.
self.connect(self.ui.pb_exemple, QtCore.SIGNAL("clicked()"),
self.genereExemples) self.ui.pb_exemple.clicked.connect(self.genereExemples)
self.connect(self.ui.pb_valPrec, QtCore.SIGNAL("clicked()"), self.ui.pb_valPrec.clicked.connect(self.readValPrec)
self.readValPrec) self.ui.pb_reset.clicked.connect(self.resetVal)
self.connect(self.ui.pb_reset, QtCore.SIGNAL("clicked()"), self.ui.pb_recharger.clicked.connect(self.recharger)
self.resetVal) self.ui.pb_sauver.clicked.connect(self.sauver)
self.connect(self.ui.pb_recharger, QtCore.SIGNAL("clicked()"), self.ui.pb_maillage.clicked.connect(self.selectMaillage)
self.recharger) self.ui.pb_facefiss.clicked.connect(self.selectFacefiss)
self.connect(self.ui.pb_sauver, QtCore.SIGNAL("clicked()"), self.ui.pb_reptrav.clicked.connect(self.selectReptrav)
self.sauver) self.ui.bb_OkCancel.accepted.disconnect(self.accept)
self.connect(self.ui.pb_maillage, QtCore.SIGNAL("clicked()"), self.ui.bb_OkCancel.accepted.connect(self.execute)
self.selectMaillage)
self.connect(self.ui.pb_facefiss, QtCore.SIGNAL("clicked()"),
self.selectFacefiss)
self.connect(self.ui.pb_reptrav, QtCore.SIGNAL("clicked()"),
self.selectReptrav)
self.connect(self.ui.pb_nomres, QtCore.SIGNAL("clicked()"),
self.selectNomres)
self.disconnect(self.ui.bb_OkCancel, QtCore.SIGNAL("accepted()"), self.accept)
self.connect(self.ui.bb_OkCancel, QtCore.SIGNAL("accepted()"),
self.execute)
def initDefaut(self): def initDefaut(self):
self.defaut = dict( self.defaut = dict(
nomCas = 'angleCube', nomCas = 'angleCube',
@ -103,7 +93,7 @@ def fissureGeneraleDlg(context):
nomres = 'casStandard_fissure.med', nomres = 'casStandard_fissure.med',
verbosite = 0) verbosite = 0)
def initDialog(self, dico): def initDialog(self, dico):
self.ui.le_maillage.setText(dico['maillageSain']) self.ui.le_maillage.setText(dico['maillageSain'])
self.ui.le_facefiss.setText(dico['brepFaceFissure']) self.ui.le_facefiss.setText(dico['brepFaceFissure'])
@ -125,7 +115,7 @@ def fissureGeneraleDlg(context):
self.ui.cb_log.setCurrentIndex(dico['verbosite']) self.ui.cb_log.setCurrentIndex(dico['verbosite'])
incomplet = self.testval(dico) incomplet = self.testval(dico)
pass pass
def testval(self, dico): def testval(self, dico):
incomplet = False incomplet = False
if not os.path.lexists(dico['maillageSain']): if not os.path.lexists(dico['maillageSain']):
@ -180,21 +170,21 @@ def fissureGeneraleDlg(context):
incomplet = True incomplet = True
else: else:
self.ui.dsb_areteFaceFissure.setPalette(self.blackPalette) self.ui.dsb_areteFaceFissure.setPalette(self.blackPalette)
print "incomplet: ", incomplet print "incomplet: ", incomplet
return incomplet return incomplet
def fileDefault(self): def fileDefault(self):
filedef = os.path.expanduser("~/.config/salome/dialogFissureGenerale.dic") filedef = os.path.expanduser("~/.config/salome/dialogFissureGenerale.dic")
print filedef print filedef
return filedef return filedef
def writeDefault(self, dico): def writeDefault(self, dico):
filedef = self.fileDefault() filedef = self.fileDefault()
f = open(filedef, 'w') f = open(filedef, 'w')
f.write(str(dico)) f.write(str(dico))
f.close() f.close()
def genereExemples(self): def genereExemples(self):
maillageSain = os.path.join(gmu.pathBloc, 'materielCasTests/CubeAngle.med') maillageSain = os.path.join(gmu.pathBloc, 'materielCasTests/CubeAngle.med')
brepFaceFissure = os.path.join(gmu.pathBloc, "materielCasTests/CubeAngleFiss.brep") brepFaceFissure = os.path.join(gmu.pathBloc, "materielCasTests/CubeAngleFiss.brep")
@ -206,7 +196,7 @@ def fissureGeneraleDlg(context):
from blocFissure.materielCasTests import genereMateriel from blocFissure.materielCasTests import genereMateriel
self.ui.lb_calcul.hide() self.ui.lb_calcul.hide()
self.initDialog(self.defaut) self.initDialog(self.defaut)
def readValPrec(self): def readValPrec(self):
filedef = self.fileDefault() filedef = self.fileDefault()
if os.path.exists(filedef): if os.path.exists(filedef):
@ -219,7 +209,7 @@ def fissureGeneraleDlg(context):
def resetVal(self): def resetVal(self):
#self.initDefaut() #self.initDefaut()
self.initDialog(self.defaut) self.initDialog(self.defaut)
def setLogVerbosity(self, logfile): def setLogVerbosity(self, logfile):
from blocFissure.gmu import initLog # le mode de log s'initialise une seule fois from blocFissure.gmu import initLog # le mode de log s'initialise une seule fois
print "setLogVerbosity" print "setLogVerbosity"
@ -231,8 +221,8 @@ def fissureGeneraleDlg(context):
initLog.setVerbose(logfile) initLog.setVerbose(logfile)
elif index == 2: elif index == 2:
initLog.setDebug(logfile) initLog.setDebug(logfile)
def sauver(self): def sauver(self):
print "sauver" print "sauver"
fileDiag = QFileDialog(self) fileDiag = QFileDialog(self)
@ -241,6 +231,7 @@ def fissureGeneraleDlg(context):
fileDiag.setViewMode(QFileDialog.List) fileDiag.setViewMode(QFileDialog.List)
if fileDiag.exec_() : if fileDiag.exec_() :
fileNames = fileDiag.selectedFiles() fileNames = fileDiag.selectedFiles()
print fileNames
filedef = fileNames[0] filedef = fileNames[0]
if filedef[-4:] not in ['.dic']: if filedef[-4:] not in ['.dic']:
filedef += '.dic' filedef += '.dic'
@ -248,7 +239,7 @@ def fissureGeneraleDlg(context):
f = open(filedef, 'w') f = open(filedef, 'w')
f.write(str(dico)) f.write(str(dico))
f.close() f.close()
def recharger(self): def recharger(self):
print "recharger" print "recharger"
fileDiag = QFileDialog(self) fileDiag = QFileDialog(self)
@ -265,7 +256,7 @@ def fissureGeneraleDlg(context):
dico = eval(txt) dico = eval(txt)
print dico print dico
self.initDialog(dico) self.initDialog(dico)
def selectMaillage(self): def selectMaillage(self):
fileDiag = QFileDialog(self) fileDiag = QFileDialog(self)
fileDiag.setFileMode(QFileDialog.ExistingFile) fileDiag.setFileMode(QFileDialog.ExistingFile)
@ -276,7 +267,7 @@ def fissureGeneraleDlg(context):
filedef = fileNames[0] filedef = fileNames[0]
print filedef print filedef
self.ui.le_maillage.setText(filedef) self.ui.le_maillage.setText(filedef)
def selectFacefiss(self): def selectFacefiss(self):
fileDiag = QFileDialog(self) fileDiag = QFileDialog(self)
fileDiag.setFileMode(QFileDialog.ExistingFile) fileDiag.setFileMode(QFileDialog.ExistingFile)
@ -287,7 +278,7 @@ def fissureGeneraleDlg(context):
filedef = fileNames[0] filedef = fileNames[0]
print filedef print filedef
self.ui.le_facefiss.setText(filedef) self.ui.le_facefiss.setText(filedef)
def selectReptrav(self): def selectReptrav(self):
fileDiag = QFileDialog(self) fileDiag = QFileDialog(self)
fileDiag.setFileMode(QFileDialog.Directory) fileDiag.setFileMode(QFileDialog.Directory)
@ -298,8 +289,8 @@ def fissureGeneraleDlg(context):
reptrav = str(fileNames[0]) reptrav = str(fileNames[0])
print "reptrav ", reptrav print "reptrav ", reptrav
self.ui.le_reptrav.setText(os.path.abspath(reptrav)) self.ui.le_reptrav.setText(os.path.abspath(reptrav))
def selectNomres(self): def selectNomres(self):
fileDiag = QFileDialog(self) fileDiag = QFileDialog(self)
fileDiag.setFileMode(QFileDialog.AnyFile) fileDiag.setFileMode(QFileDialog.AnyFile)
@ -316,7 +307,7 @@ def fissureGeneraleDlg(context):
self.ui.le_nomres.setText(tempnom) self.ui.le_nomres.setText(tempnom)
else: else:
self.ui.le_nomres.setText(nomres) self.ui.le_nomres.setText(nomres)
def creeDico(self): def creeDico(self):
dico = dict( dico = dict(
maillageSain = str(self.ui.le_maillage.text()), maillageSain = str(self.ui.le_maillage.text()),
@ -336,7 +327,7 @@ def fissureGeneraleDlg(context):
) )
print dico print dico
return dico return dico
def checkValues(self): def checkValues(self):
return self.NOK return self.NOK
@ -362,7 +353,7 @@ def fissureGeneraleDlg(context):
print erreur.msg print erreur.msg
print '-'*60 print '-'*60
for ligne in erreur.pile: for ligne in erreur.pile:
print repr(ligne) print repr(ligne)
print '-'*60 print '-'*60
texte = erreur.msg texte = erreur.msg
# texte += +"<br>" +'-'*60 +"<br>" # texte += +"<br>" +'-'*60 +"<br>"
@ -370,19 +361,19 @@ def fissureGeneraleDlg(context):
# texte += repr(ligne) +"<br>" # texte += repr(ligne) +"<br>"
mbox = QMessageBox(self) mbox = QMessageBox(self)
mbox.setWindowTitle("erreur blocFissure") mbox.setWindowTitle("erreur blocFissure")
mbox.setText(QString.fromUtf8(texte)) mbox.setText(str(texte))
mbox.exec_() mbox.exec_()
# except Exception as erreur: # except Exception as erreur:
# print "exception non répertoriée" # print "exception non répertoriée"
self.NOK = NOK self.NOK = NOK
self.ui.lb_calcul.hide() self.ui.lb_calcul.hide()
#self.accept() #self.accept()
pass pass
# ---------------------------------------------------------------------------- # ----------------------------------------------------------------------------
print "main" print "main"
window = fissureGeneraleDialog() window = fissureGeneraleDialog()
retry = True retry = True
while(retry): while(retry):
@ -396,4 +387,4 @@ def fissureGeneraleDlg(context):
else: else:
print "dialog rejected, exit" print "dialog rejected, exit"
pass pass