X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FTools%2FblocFissure%2Fihm%2FfissureCoude_plugin.py;h=19aa8406458a9ae52efd812ae5a99cc34621e9e9;hp=d8884190069f47ec713697d42a15b49c3799c6be;hb=6d32f944a0a115b6419184c50b57bf7c4eef5786;hpb=f6e2eed4240c426f1e65b40d1bd7e8d109a4d4b5 diff --git a/src/Tools/blocFissure/ihm/fissureCoude_plugin.py b/src/Tools/blocFissure/ihm/fissureCoude_plugin.py index d88841900..19aa84064 100644 --- a/src/Tools/blocFissure/ihm/fissureCoude_plugin.py +++ b/src/Tools/blocFissure/ihm/fissureCoude_plugin.py @@ -1,11 +1,11 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2006-2015 EDF R&D +# Copyright (C) 2006-2019 EDF R&D # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public # License as published by the Free Software Foundation; either -# version 2.1 of the License. +# version 2.1 of the License, or (at your option) any later version. # # This library is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -22,39 +22,28 @@ # if you already have plugins defined in a salome_plugins.py file, add this file at the end. # if not, copy this file as ${HOME}/Plugins/smesh_plugins.py or ${APPLI}/Plugins/smesh_plugins.py -import sys, traceback import math -from blocFissure import gmu -from blocFissure.gmu import initLog -#initLog.setDebug() -initLog.setVerbose() +import sys +import traceback -from blocFissure.gmu import geomsmesh -from blocFissure.gmu.casStandard import casStandard +from blocFissure import gmu -from blocFissure.ihm.fissureCoude_ihm import fissureCoude_ihm def fissureCoudeDlg(context): - # get context study, studyId, salomeGui + # get context study, salomeGui study = context.study - studyId = context.studyId sg = context.sg import os #import subprocess #import tempfile - from PyQt4 import QtCore - from PyQt4 import QtGui - from PyQt4.QtGui import QFileDialog - from PyQt4.QtGui import QMessageBox - from PyQt4.QtGui import QPalette - from PyQt4.QtGui import QColor - from fissureCoude_ui import Ui_Dialog + from qtsalome import QFileDialog, QMessageBox, QPalette, QColor, QDialog + from blocFissure.ihm.fissureCoude_ui import Ui_Dialog - class fissureCoudeDialog(QtGui.QDialog): + class fissureCoudeDialog(QDialog): def __init__(self): - QtGui.QDialog.__init__(self) + QDialog.__init__(self) # Set up the user interface from Designer. self.ui = Ui_Dialog() self.ui.setupUi(self) @@ -86,17 +75,12 @@ def fissureCoudeDlg(context): self.ui.lb_calcul.hide() # Connect up the buttons. - self.connect(self.ui.pb_valPrec, QtCore.SIGNAL("clicked()"), - self.readValPrec) - self.connect(self.ui.pb_reset, QtCore.SIGNAL("clicked()"), - self.resetVal) - self.connect(self.ui.pb_recharger, QtCore.SIGNAL("clicked()"), - self.recharger) - self.connect(self.ui.pb_sauver, QtCore.SIGNAL("clicked()"), - self.sauver) - self.disconnect(self.ui.buttonBox, QtCore.SIGNAL("accepted()"), self.accept) - self.connect(self.ui.buttonBox, QtCore.SIGNAL("accepted()"), - self.execute) + self.ui.pb_valPrec.clicked.connect(self.readValPrec) + self.ui.pb_reset.clicked.connect(self.resetVal) + self.ui.pb_recharger.clicked.connect(self.recharger) + self.ui.pb_sauver.clicked.connect(self.sauver) + self.ui.buttonBox.accepted.disconnect(self.accept) + self.ui.buttonBox.accepted.connect(self.execute) def initDefaut(self): self.defaut = dict( @@ -267,27 +251,26 @@ def fissureCoudeDlg(context): else: self.ui.sb_nbSecteur.setPalette(self.blackPalette) - print "incomplet: ", incomplet + print("incomplet: ", incomplet) return incomplet def fileDefault(self): filedef = os.path.expanduser("~/.config/salome/dialogFissureCoude.dic") - print filedef + print(filedef) return filedef def writeDefault(self, dico): filedef = self.fileDefault() - f = open(filedef, 'w') - f.write(str(dico)) - f.close() + with open(filedef, 'w') as f: + f.write(str(dico)) def readValPrec(self): filedef = self.fileDefault() if os.path.exists(filedef): - f = open(filedef, 'r') - txt = f.read() + with open(filedef, 'r') as f: + txt = f.read() dico = eval(txt) - print dico + print(dico) self.initDialog(dico) def resetVal(self): @@ -295,7 +278,7 @@ def fissureCoudeDlg(context): self.initDialog(self.defaut) def sauver(self): - print "sauver" + print("sauver") fileDiag = QFileDialog(self) fileDiag.setFileMode(QFileDialog.AnyFile) fileDiag.setNameFilter("Parametres *.dic (*.dic)") @@ -304,12 +287,11 @@ def fissureCoudeDlg(context): fileNames = fileDiag.selectedFiles() filedef = fileNames[0] dico = self.creeDico() - f = open(filedef, 'w') - f.write(str(dico)) - f.close() + with open(filedef, 'w') as f: + f.write(str(dico)) def recharger(self): - print "recharger" + print("recharger") fileDiag = QFileDialog(self) fileDiag.setFileMode(QFileDialog.ExistingFile) fileDiag.setNameFilter("Parametres *.dic (*.dic)") @@ -317,12 +299,12 @@ def fissureCoudeDlg(context): if fileDiag.exec_() : fileNames = fileDiag.selectedFiles() filedef = fileNames[0] - print filedef + print(filedef) if os.path.exists(filedef): - f = open(filedef, 'r') - txt = f.read() + with open(filedef, 'r') as f: + txt = f.read() dico = eval(txt) - print dico + print(dico) self.initDialog(dico) def creeDico(self): @@ -356,37 +338,44 @@ def fissureCoudeDlg(context): aretesFaceFissure = self.ui.dsb_aretesFaceFissure.value(), influence = self.ui.dsb_influence.value(), ) - print dico + print(dico) return dico def checkValues(self): return self.NOK def execute(self): + from blocFissure.gmu import initLog + #initLog.setDebug() + initLog.setVerbose() # don't set the level too early, to be able to modify it + from blocFissure.gmu import geomsmesh + from blocFissure.gmu.casStandard import casStandard + from blocFissure.ihm.fissureCoude_ihm import fissureCoude_ihm + dico = self.creeDico() NOK = self.testval(dico) if not(NOK): dico['lenSegPipe'] = (dico['longueur'] + math.pi*dico['profondeur'])/dico['nbTranches'] - print 'lenSegPipe', dico['lenSegPipe'] + print('lenSegPipe', dico['lenSegPipe']) areteMinAngle = (dico['rCintr'] -dico['dext']/2.0)*(dico['angle']*math.pi/180.0)/dico['nbAxeCoude'] - print'areteMinAngle', areteMinAngle + print('areteMinAngle', areteMinAngle) areteMinCirco = dico['dext']*math.pi/(2*dico['nbCirconf']) - print'areteMinCirco', areteMinCirco + print('areteMinCirco', areteMinCirco) areteMinEpais = dico['epais']/dico['nbEpaisseur'] - print'areteMinEpais', areteMinEpais + print('areteMinEpais', areteMinEpais) if dico['influence'] == 0: dico['influence'] = max(areteMinAngle, areteMinCirco, areteMinEpais) - print 'influence', dico['influence'] + print('influence', dico['influence']) if dico['aretesFaceFissure'] == 0: dico['aretesFaceFissure'] = (areteMinAngle + areteMinCirco)/2.0 - print 'aretesFaceFissure', dico['aretesFaceFissure'] + print('aretesFaceFissure', dico['aretesFaceFissure']) if dico['rbPosiAngul'] == False: rmoy = (dico['dext'] - dico['epais'])/2.0 eta = 1 if dico['rbFissExt'] == False: eta = -1 dico['posiAngul'] = (180.0/math.pi)*dico['absCurv']/(dico['rCintr']+(rmoy+eta*dico['epais']/2.0)*math.cos(math.pi*dico['azimut']/180.)) - print 'posiAngul' , dico['posiAngul'] + print('posiAngul' , dico['posiAngul']) self.writeDefault(dico) self.ui.lb_calcul.show() @@ -409,9 +398,9 @@ def fissureCoudeDlg(context): result = window.result() if result: # dialog accepted - print "dialog accepted, check" + print("dialog accepted, check") retry = window.checkValues() else: - print "dialog rejected, exit" + print("dialog rejected, exit") pass