fin merge python 3

diff --git a/src/CONFIG/eficasConfig.py b/src/CONFIG/eficasConfig.py
index e17160bef8859e1485025257617c1bf4c60cb187..2965345bd9eb57e2821f61aa17e1ec92c0b9f8bc 100644 (file)
--- a/src/CONFIG/eficasConfig.py
+++ b/src/CONFIG/eficasConfig.py
@@ -5,11 +5,3 @@ eficasPath = ''
 if "EFICAS_ROOT" in os.environ:
     eficasPath = os.environ["EFICAS_ROOT"]
 
-
-    
-    
-    
-    
-    
-    
-

diff --git a/src/EFICAS/EFICAS.py b/src/EFICAS/EFICAS.py
index 035906e61a92b6767631a55c8f0720ca6838a802..ab1e86b5cb493b50ddb510b80ecdea6cd0fd83e9 100644 (file)
--- a/src/EFICAS/EFICAS.py
+++ b/src/EFICAS/EFICAS.py
@@ -1,15 +1,9 @@
 # -*- coding: utf-8 -*-
 
-print "EFICAS.__init__: 1"
 import EFICAS_ORB__POA
 import SALOMEDS__POA
 import SALOME_ComponentPy
 
-print "EFICAS.__init__: 2"
-
-
-
-
 class SALOME_DriverPy_i(SALOMEDS__POA.Driver):
     """
     Python implementation of generic SALOMEDS driver.
@@ -17,7 +11,7 @@ class SALOME_DriverPy_i(SALOMEDS__POA.Driver):
     to provide persistence mechanism.
     """
     def __init__ (self, componentDataType):
-        print "SALOME_DriverPy.__init__: ",componentDataType
+        print ("SALOME_DriverPy.__init__: ", componentDataType)
         self._ComponentDataType = componentDataType
 
     def IORToLocalPersistentID(self, theSObject, IORString, isMultiFile, isASCII):
@@ -56,8 +50,8 @@ class SALOME_DriverPy_i(SALOMEDS__POA.Driver):
 
 
 class EFICAS(EFICAS_ORB__POA.EFICAS_Gen,
-              SALOME_ComponentPy.SALOME_ComponentPy_i,
-              SALOME_DriverPy_i ):
+        SALOME_ComponentPy.SALOME_ComponentPy_i,
+        SALOME_DriverPy_i ):
     """
         Pour etre un composant SALOME cette classe Python
         doit avoir le nom du composant et heriter de la
@@ -67,13 +61,10 @@ class EFICAS(EFICAS_ORB__POA.EFICAS_Gen,
     """
     def __init__ (self, orb, poa, contID, containerName, instanceName, 
                   interfaceName):
-        print "EFICAS.__init__: ",containerName,' ',instanceName
+        print ("EFICAS.__init__: ", containerName,' ', instanceName)
         SALOME_ComponentPy.SALOME_ComponentPy_i.__init__(self, orb, poa,
                     contID, containerName,instanceName, interfaceName, 0 )
         SALOME_DriverPy_i.__init__( self, 'OTHER' )                    
         # On stocke dans l'attribut _naming_service, une reference sur
         # le Naming Service CORBA
         self._naming_service=SALOME_ComponentPy.SALOME_NamingServicePy_i(self._orb)
-
-
-        

diff --git a/src/EFICASGUI/EFICASGUI.py b/src/EFICASGUI/EFICASGUI.py
index 9c99d82726426a2d97e10cdd39150771516f0e23..289db796af117109a51f89146e68dea86f0b47d8 100644 (file)
--- a/src/EFICASGUI/EFICASGUI.py
+++ b/src/EFICASGUI/EFICASGUI.py
@@ -2,21 +2,17 @@
 
 import os
 
-"""
-    Interface PyQt
-"""
 from PyQt5.QtWidgets import QMessageBox
-
-import salome
+from salome.kernel.studyedit import getStudyEditor
 import SalomePyQt
+import salome
 
-from salome.kernel.studyedit import getStudyEditor
 
-sgPyQt=SalomePyQt.SalomePyQt()
+sgPyQt = SalomePyQt.SalomePyQt()
 
 # -----------------------------------------------------------------------------
 
-print "EFicasGUI :: :::::::::::::::::::::::::::::::::::::::::::::::::::::"
+print("EFicasGUI :: :::::::::::::::::::::::::::::::::::::::::::::::::::::")
 
 # Test Eficas directory
 eficasRoot = os.getenv("EFICAS_ROOT")
@@ -39,15 +35,15 @@ elif not os.path.isdir(eficasRoot):
 class GUIcontext:
     # menus/toolbars/actions IDs
     EFICAS_MENU_ID = 90
-    TELEMAC_ID       = 941
-    ADAO_ID          = 942
-    MAP_ID           = 943
-    CF_ID            = 944
-    MT_ID            = 945
-    SPECA_ID         = 946
-    SEP_ID           = 947
-    CARMEL3D_ID      = 948
-    MULTICATALOG_ID  = 949
+    TELEMAC_ID = 941
+    ADAO_ID = 942
+    MAP_ID = 943
+    CF_ID = 944
+    MT_ID = 945
+    SPECA_ID = 946
+    SEP_ID = 947
+    CARMEL3D_ID = 948
+    MULTICATALOG_ID = 949
 
     # constructor
     def __init__(self):
@@ -57,7 +53,7 @@ class GUIcontext:
         # create toolbar
         self.tid = sgPyQt.createTool("Eficas")
 
-        a = sgPyQt.createAction(GUIcontext.MULTICATALOG_ID, "Eficas MultiCatalogue","Lancer Eficas" , "Lancer Eficas",  "eficas.png")
+        a = sgPyQt.createAction(GUIcontext.MULTICATALOG_ID, "Eficas MultiCatalogue", "Lancer Eficas", "Lancer Eficas", "eficas.png")
         sgPyQt.createMenu(a, self.mid)
         sgPyQt.createTool(a, self.tid)
 
@@ -107,20 +103,21 @@ class GUIcontext:
 ################################################
 
 # study-to-context map
-__study2context__   = {}
+__study2context__ = {}
 # current context
 __current_context__ = None
 
-###
+
+# ##
 # set and return current GUI context
 # study ID is passed as parameter
-###
-def _setContext( studyID ):
+# ##
+def _setContext(studyID):
     global eficasRoot
     if eficasRoot is None:
         return
     global __study2context__, __current_context__
-    if not __study2context__.has_key(studyID):
+    if studyID not in __study2context__:
         __study2context__[studyID] = GUIcontext()
         pass
     __current_context__ = __study2context__[studyID]
@@ -129,162 +126,138 @@ def _setContext( studyID ):
 
 # -----------------------------------------------------------------------------
 
-def OnGUIEvent(commandID) :
-   if dict_command.has_key(commandID):
-      print "OnGUIEvent ::::::::::  commande associée  : ",commandID      
-      dict_command[commandID]()
-   else:
-      print "Pas de commande associée a : ",commandID
+def OnGUIEvent(commandID):
+    if commandID in dict_command:
+        print("OnGUIEvent ::::::::::  commande associée  : ", commandID)
+        dict_command[commandID]()
+    else:
+        print("Pas de commande associée a : ", commandID)
+
 
 # -----------------------------------------------------------------------------
 
 def setSettings():
-   """
-   Cette méthode permet les initialisations.
-   """
-   _setContext(sgPyQt.getStudyId())
+    """
+    Cette méthode permet les initialisations.
+    """
+    _setContext(sgPyQt.getStudyId())
+
 
 def activate():
-   """
-   Cette méthode permet l'activation du module, s'il a été chargé mais pas encore
-   activé dans une étude précédente.
-   
-   Portage V3.
-   """
-   setSettings()
+    """
+    Cette méthode permet l'activation du module, s'il a été chargé mais pas encore
+    activé dans une étude précédente.
+
+    Portage V3.
+    """
+    setSettings()
 
 
 # -----------------------------------------------------------------------------
 
 def activeStudyChanged(ID):
-   _setContext(ID)
+    _setContext(ID)
 
 
-#def definePopup(theContext, theObject, theParent):    
-#   print "EFICASGUI --- definePopup"
-#   print "EFICASGUI --- definePopup"
-#   theContext= ""
-#   theObject = "100"
-#   theParent = "ObjectBrowser"
-#   a=salome.sg.getAllSelected()
-    
-#   selectedEntry = a[0]
-#   mySO = monEditor.study.FindObjectID(selectedEntry);
-#   aType = monEditor.getFileType(mySO)
-#   print aType
-#   return (theContext, theObject, theParent)
-
+# -----------------------------------------------------------------------------
 
-#def customPopup(popup, theContext, theObject, theParent):
-#   a=salome.sg.getAllSelected()
+def runEficas():
+    print("-------------------------EFICASGUI::runEficas-------------------------")
+    import eficasSalome
+    eficasSalome.runEficas(multi=True)
 
-#   selectedEntry = a[0]
-#   mySO = monEditor.study.FindObjectID(selectedEntry);
-#   aType = monEditor.getFileType(mySO)
 
-#   print "EFICASGUI --- customPopup"
-#   print "EFICASGUI --- customPopup"
-#   print "EFICASGUI --- customPopup"
-#   print "EFICASGUI --- customPopup"
-#   print "EFICASGUI --- customPopup"
-#   print "EFICASGUI --- customPopup"
-#   print "EFICASGUI --- customPopup"
-#   print "EFICASGUI --- customPopup"
-#   popup.removeItem(99003)
+def runEficaspourTelemac():
+    import eficasSalome
+    eficasSalome.runEficas("TELEMAC")
 
 
+def runEficaspourAdao():
+    print("runEficas Pour Ada")
+    import eficasSalome
+    eficasSalome.runEficas("ADAO")
 
-# -----------------------------------------------------------------------------
 
-def runEficas():
-   print "-------------------------EFICASGUI::runEficas-------------------------"
-   import eficasSalome
-   eficasSalome.runEficas(multi=True)
-   
-def runEficaspourTelemac():
-   import eficasSalome
-   eficasSalome.runEficas( "TELEMAC" )
-   
-   
-def runEficaspourAdao():
-   print "runEficas Pour Ada"
-   import eficasSalome
-   eficasSalome.runEficas( "ADAO" ) 
-   
 def runEficaspourMT():
-   print "runEficas Pour MT"
-   import eficasSalome
-   eficasSalome.runEficas( "MT" ) 
-   
+    print("runEficas Pour MT")
+    import eficasSalome
+    eficasSalome.runEficas("MT")
+
+
 def runEficaspourSPECA():
-   print "runEficas Pour SPECA"
-   import eficasSalome
-   eficasSalome.runEficas( "SPECA" )
-   
+    print("runEficas Pour SPECA")
+    import eficasSalome
+    eficasSalome.runEficas("SPECA")
+
+
 def runEficaspourSEP():
-   print "runEficas Pour SEP"
-   import eficasSalome
-   eficasSalome.runEficas( "SEP" )
-   
+    print("runEficas Pour SEP")
+    import eficasSalome
+    eficasSalome.runEficas("SEP")
+
+
 def runEficaspourMap():
-   print "runEficas Pour Map "
-   import eficasSalome
-   eficasSalome.runEficas( "MAP" )
-   
-   
+    print("runEficas Pour Map ")
+    import eficasSalome
+    eficasSalome.runEficas("MAP")
+
+
 def runEficaspourCarmel3D():
-   print "runEficas Pour Carmel3D "
-   import eficasSalome
-   eficasSalome.runEficas( "CARMEL3D" )
-   
+    print("runEficas Pour Carmel3D ")
+    import eficasSalome
+    eficasSalome.runEficas("CARMEL3D")
+
+
 def runEficaspourCF():
-   print "runEficas Pour CF "
-   import eficasSalome
-   eficasSalome.runEficas( "CF" )
+    print("runEficas Pour CF ")
+    import eficasSalome
+    eficasSalome.runEficas("CF")
+
 
 def runEficasFichier(version=None):
-   """
-   Lancement d'eficas pour ASTER
-   si un fichier est sélectionné, il est ouvert dans eficas
-   """
-   fileName = None
-   code     = None
-   a=salome.sg.getAllSelected()
-   if len(a) == 1:
-      selectedEntry = a[0]
-      
-      editor = getStudyEditor()
-      mySO = editor.study.FindObjectID(selectedEntry);
-      aType = editor.getFileType(mySO)
-      aValue = editor.getFileName(mySO)
-      if aType !=  None :
-        fileName = aValue
-        code     = aType[15:]
-   else:        
-      QMessageBox.critical(None, "Selection Invalide",
-             "Selectionner un seul fichier SVP") 
-      return;
- 
-   import eficasSalome        
-   if code:
-        if version :
-            eficasSalome.runEficas( code, fileName, version=version)
-        else :
-            eficasSalome.runEficas( code, fileName)
-        
+    """
+    Lancement d'eficas pour ASTER
+    si un fichier est sélectionné, il est ouvert dans eficas
+    """
+    fileName = None
+    code = None
+    a = salome.sg.getAllSelected()
+    if len(a) == 1:
+        selectedEntry = a[0]
+
+        editor = getStudyEditor()
+        mySO = editor.study.FindObjectID(selectedEntry)
+        aType = editor.getFileType(mySO)
+        aValue = editor.getFileName(mySO)
+        if aType is not None:
+            fileName = aValue
+            code = aType[15:]
+    else:
+        QMessageBox.critical(None, "Selection Invalide",
+                             "Selectionner un seul fichier SVP")
+        return
+
+    import eficasSalome
+    if code:
+        if version:
+            eficasSalome.runEficas(code, fileName, version=version)
+        else:
+            eficasSalome.runEficas(code, fileName)
+
 
 # Partie applicative
 
-dict_command={
-                GUIcontext.TELEMAC_ID      : runEficaspourTelemac,
-                GUIcontext.ADAO_ID         : runEficaspourAdao,
-                GUIcontext.MT_ID           : runEficaspourMT,
-                GUIcontext.SPECA_ID        : runEficaspourSPECA,
-                GUIcontext.SEP_ID          : runEficaspourSEP,
-                GUIcontext.CF_ID           : runEficaspourCF,
-                GUIcontext.MAP_ID          : runEficaspourMap,
-                GUIcontext.CARMEL3D_ID     : runEficaspourCarmel3D,
-                GUIcontext.MULTICATALOG_ID : runEficas,
-
-                9041:runEficasFichier,
+dict_command = {
+                GUIcontext.TELEMAC_ID: runEficaspourTelemac,
+                GUIcontext.ADAO_ID: runEficaspourAdao,
+                GUIcontext.MT_ID: runEficaspourMT,
+                GUIcontext.SPECA_ID: runEficaspourSPECA,
+                GUIcontext.SEP_ID: runEficaspourSEP,
+                GUIcontext.CF_ID: runEficaspourCF,
+                GUIcontext.MAP_ID: runEficaspourMap,
+                GUIcontext.CARMEL3D_ID: runEficaspourCarmel3D,
+                GUIcontext.MULTICATALOG_ID: runEficas,
+
+                9041: runEficasFichier,
              }
+