Merge remote branch 'origin/V7_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 d8884190069f47ec713697d42a15b49c3799c6be..30936d50cbabb3a66f838cac69da3373cd34aa4f 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
@@ -43,18 +35,13 @@ def fissureCoudeDlg(context):
   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 qtsalome import QFileDialog, QMessageBox, QPalette, QColor, QDialog
   from 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 +73,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(
@@ -363,6 +345,13 @@ def fissureCoudeDlg(context):
       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):