From: vsr Date: Thu, 24 Mar 2016 13:01:26 +0000 (+0300) Subject: Merge branch 'V7_dev' X-Git-Tag: V8_1_0a1~25 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=a17b36970bc61da1d664453c615754997c925b18;p=modules%2Fsmesh.git Merge branch 'V7_dev' --- a17b36970bc61da1d664453c615754997c925b18 diff --cc src/Tools/MGCleanerPlug/MGCleanerMonPlugDialog.py index 122bb4558,b51f9ebc6..d96c8b1a4 --- a/src/Tools/MGCleanerPlug/MGCleanerMonPlugDialog.py +++ b/src/Tools/MGCleanerPlug/MGCleanerMonPlugDialog.py @@@ -22,9 -22,11 +22,10 @@@ # Modules Eficas import os, subprocess + import tempfile from MGCleanerPlugDialog_ui import Ui_MGCleanerPlugDialog from MGCleanerMonViewText import MGCleanerMonViewText -from PyQt4.QtGui import * -from PyQt4.QtCore import * +from qtsalome import * class MGCleanerMonPlugDialog(Ui_MGCleanerPlugDialog,QWidget): diff --cc src/Tools/MGCleanerPlug/MGCleanerMonViewText.py index 81a2c26a8,e4030cc44..a8dafeed4 --- a/src/Tools/MGCleanerPlug/MGCleanerMonViewText.py +++ b/src/Tools/MGCleanerPlug/MGCleanerMonViewText.py @@@ -19,10 -19,13 +19,11 @@@ # # Modules Python - import string,types,os + import string,types,os,sys + import tempfile import traceback -from PyQt4 import * -from PyQt4.QtGui import * -from PyQt4.QtCore import * +from qtsalome import * # Import des panels diff --cc src/Tools/YamsPlug/monViewText.py index 478e1833d,7d02228e4..38aeed49b --- a/src/Tools/YamsPlug/monViewText.py +++ b/src/Tools/YamsPlug/monViewText.py @@@ -19,10 -19,13 +19,11 @@@ # # Modules Python - import string,types,os + import string,types,os, sys import traceback + import tempfile -from PyQt4 import * -from PyQt4.QtGui import * -from PyQt4.QtCore import * +from qtsalome import * # Import des panels diff --cc src/Tools/YamsPlug/monYamsPlugDialog.py index 27953a1b8,37a15f6cc..17f2dd640 --- a/src/Tools/YamsPlug/monYamsPlugDialog.py +++ b/src/Tools/YamsPlug/monYamsPlugDialog.py @@@ -22,9 -22,12 +22,10 @@@ # Modules Eficas import os, subprocess + import tempfile from YamsPlugDialog_ui import Ui_YamsPlugDialog from monViewText import MonViewText -from PyQt4.QtGui import * -from PyQt4.QtCore import * - +from qtsalome import * class MonYamsPlugDialog(Ui_YamsPlugDialog,QWidget): """