From: pascale.noyret <pascale.noyret@edf.fr>
Date: Thu, 3 Oct 2019 13:38:48 +0000 (+0200)
Subject: Preparation a la V9_4
X-Git-Tag: V9_4_0rc1~1
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=03a214df205496eeae1d2f5b81154986664d8d0c;p=tools%2Feficas.git

Preparation a la V9_4
---

diff --git a/InterfaceQT4/eficas_go.py b/InterfaceQT4/eficas_go.py
index d7aea420..0bd3abfb 100755
--- a/InterfaceQT4/eficas_go.py
+++ b/InterfaceQT4/eficas_go.py
@@ -26,7 +26,6 @@ try :
    from builtins import str
 except : pass
 
-from PyQt5.QtWidgets import QApplication
 
 import sys,os
 repIni=os.path.abspath(os.path.join(os.path.dirname(os.path.abspath(__file__)),".."))
@@ -52,6 +51,12 @@ def lanceEficas(code=None,fichier=None,ssCode=None,multi=False,langue='en'):
         Lance l'appli EFICAS
     """
     # Analyse des arguments de la ligne de commande
+    try :
+      from PyQt5.QtWidgets import QApplication
+    except :
+      print('Please, set qt environment')
+      return
+
     from Editeur  import session
     options=session.parse(sys.argv)
     if options.code!= None : code=options.code
diff --git a/MT/configuration_MT.py b/MT/configuration_MT.py
index b9b56fe0..b4ca36bd 100644
--- a/MT/configuration_MT.py
+++ b/MT/configuration_MT.py
@@ -26,7 +26,7 @@ from InterfaceQT4 import configuration
 import os
 
 
-class CONFIG(configuration.CONFIG_BASE):
+class CONFIG(configuration.configBase):
 
   #-----------------------------------
   def __init__(self,appli,repIni):
@@ -35,7 +35,7 @@ class CONFIG(configuration.CONFIG_BASE):
       self.labels_user=['catalogues','lang']
       self.labels_eficas=['lang','rep_cata','catalogues']
 
-      configuration.CONFIG_BASE.__init__(self,appli,repIni)
+      configuration.configBase.__init__(self,appli,repIni)
 
 
 def make_config(appli,rep):
diff --git a/MT/qtEficasMT.py b/MT/qtEficasMT.py
index e07cbaf3..3fa63c87 100755
--- a/MT/qtEficasMT.py
+++ b/MT/qtEficasMT.py
@@ -23,16 +23,14 @@
 """
 # Modules Python
 # Modules Eficas
+import sys
 import prefs
 name='prefs_'+prefs.code
 __import__(name)
 
-import sys
-reload(sys)
-sys.setdefaultencoding('latin1')
 import os
 sys.path.append(os.path.join(os.path.abspath(os.path.dirname(__file__)),'..'))
 
 import prefs
 from InterfaceQT4 import eficas_go
-eficas_go.lance_eficas(code=prefs.code)
+eficas_go.lanceEficas(code=prefs.code)