Merge tag 'V8_3_0a2' into ngr/python3_dev

[modules/smesh.git] / src / Tools / blocFissure / ihm / fissureCoude_plugin.py

diff --git a/src/Tools/blocFissure/ihm/fissureCoude_plugin.py b/src/Tools/blocFissure/ihm/fissureCoude_plugin.py
index 0d56f689a1b58238718ea6e7940e9f8417599f09..622f82ee6326eb74dff4f2105d63297e16a9412a 100644 (file)
--- 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-2016  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
@@ -25,14 +25,6 @@
 import sys, traceback
 import math
 from blocFissure import gmu
-from blocFissure.gmu import initLog
-#initLog.setDebug()
-initLog.setVerbose()
-
-from blocFissure.gmu import geomsmesh
-from blocFissure.gmu.casStandard import casStandard
-
-from blocFissure.ihm.fissureCoude_ihm import fissureCoude_ihm
 
 def fissureCoudeDlg(context):
   # get context study, studyId, salomeGui
@@ -257,12 +249,12 @@ 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):
@@ -277,7 +269,7 @@ def fissureCoudeDlg(context):
         f = open(filedef, 'r')
         txt = f.read()
         dico = eval(txt)
-        print dico
+        print(dico)
         self.initDialog(dico)
 
     def resetVal(self):
@@ -285,7 +277,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)")
@@ -299,7 +291,7 @@ def fissureCoudeDlg(context):
         f.close()
         
     def recharger(self):
-      print "recharger"
+      print("recharger")
       fileDiag = QFileDialog(self)
       fileDiag.setFileMode(QFileDialog.ExistingFile)
       fileDiag.setNameFilter("Parametres *.dic (*.dic)")
@@ -307,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()
           dico = eval(txt)
-          print dico
+          print(dico)
           self.initDialog(dico)
          
     def creeDico(self):
@@ -346,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()
@@ -399,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