Yoann : Mise a jour Eficas V9_DEV

diff --git a/src/salome_hydro/boundary_conditions/eficas/configuration_boundary_conditions.py b/src/salome_hydro/boundary_conditions/eficas/configuration_boundary_conditions.py
index ffed4a66bc46f05eb83ff3f1a43ce9d301d9962e..1255be243c1b9e87a5cb3f1dd1e8b309408f847c 100644 (file)
--- a/src/salome_hydro/boundary_conditions/eficas/configuration_boundary_conditions.py
+++ b/src/salome_hydro/boundary_conditions/eficas/configuration_boundary_conditions.py
@@ -20,15 +20,15 @@
 import os
 
 from Editeur.catadesc import CatalogDescription
-from InterfaceQT4.configuration import CONFIG_BASE
+from InterfaceQT4.configuration import configBase
 
-class CONFIG(CONFIG_BASE):
+class CONFIG(configBase):
 
   def __init__(self, appli, repIni):
     """
     This class stores the configuration parameters for Eficas
     """
-    CONFIG_BASE.__init__(self, appli, repIni)
+    configBase.__init__(self, appli, repIni)
 
     # Configuration parameters
     self.savedir    = os.getenv("HOME")

diff --git a/src/salome_hydro/mascaret/eficas/configuration_mascaret.py b/src/salome_hydro/mascaret/eficas/configuration_mascaret.py
index 7695ed4162d67bf3c6936242e79195e034355fe9..ac321f26055edd86ff71edd16431fd0423c201f5 100644 (file)
--- a/src/salome_hydro/mascaret/eficas/configuration_mascaret.py
+++ b/src/salome_hydro/mascaret/eficas/configuration_mascaret.py
@@ -20,15 +20,15 @@
 import os
 
 from Editeur.catadesc import CatalogDescription
-from InterfaceQT4.configuration import CONFIG_BASE
+from InterfaceQT4.configuration import configBase
 
-class CONFIG(CONFIG_BASE):
+class CONFIG(configBase):
 
     def __init__(self, appli, repIni):
         """
         This class stores the configuration parameters for Eficas
         """
-        CONFIG_BASE.__init__(self, appli, repIni)
+        configBase.__init__(self, appli, repIni)
 
         # Configuration parameters
         self.savedir    = os.getenv("HOME")

diff --git a/src/salome_hydro/pytel/eficas/configuration_pytel.py b/src/salome_hydro/pytel/eficas/configuration_pytel.py
index 2396e3aef93ca027e914ec0d82b88e1d73cde53d..b25ad324fd11910d2c7b5f76bf6c80190b4633d8 100644 (file)
--- a/src/salome_hydro/pytel/eficas/configuration_pytel.py
+++ b/src/salome_hydro/pytel/eficas/configuration_pytel.py
@@ -18,15 +18,15 @@
 import os
 
 from Editeur.catadesc import CatalogDescription
-from InterfaceQT4.configuration import CONFIG_BASE
+from InterfaceQT4.configuration import configBase
 
-class CONFIG(CONFIG_BASE):
+class CONFIG(configBase):
 
     def __init__(self, appli, repIni):
         """
         This class stores the configuration parameters for Eficas
         """
-        CONFIG_BASE.__init__(self, appli, repIni)
+        configBase.__init__(self, appli, repIni)
 
         # Configuration parameters
         self.savedir    = os.getenv("HOME")

diff --git a/src/salome_hydro/telemac2d/eficas/CMakeLists.txt b/src/salome_hydro/telemac2d/eficas/CMakeLists.txt
index f22ca41e9437ce494d1bffb3a7f05d5d1eb5beff..ade8037272839749a40c6ec3d457c8c925d5dac1 100644 (file)
--- a/src/salome_hydro/telemac2d/eficas/CMakeLists.txt
+++ b/src/salome_hydro/telemac2d/eficas/CMakeLists.txt
@@ -22,7 +22,6 @@ SET(PYFILES
   configuration_telemac2d.py
   prefs_telemac2d.py
   prefs.py
-  telemac2d_V6_cata.py
   appli.py
 )
 

diff --git a/src/salome_hydro/telemac2d/eficas/appli.py b/src/salome_hydro/telemac2d/eficas/appli.py
index 69b982f8b697fbccd6504bda7861d06bb918cf0a..be3c9846bde6cb47fca4def19ee74199acfb5879 100644 (file)
--- a/src/salome_hydro/telemac2d/eficas/appli.py
+++ b/src/salome_hydro/telemac2d/eficas/appli.py
@@ -44,7 +44,7 @@ def importFirst():
     """
     eficasTelemacPath = os.path.join(eficasSalome.eficasConfig.eficasPath,'Telemac')
     sys.path.insert(0, eficasTelemacPath)
-    from enum_Telemac2d_auto import TelemacdicoEn
+    from eficas.telemac2d_enum_auto import TelemacdicoEn
     sys.path.pop(0)
 
 importFirst()

diff --git a/src/salome_hydro/telemac2d/eficas/configuration_telemac2d.py b/src/salome_hydro/telemac2d/eficas/configuration_telemac2d.py
index 7623f9137150511d91ad9e70327bcd3fa06d915c..29051aeeac1aa4c7f6be0f5eb6b508e5b03da279 100644 (file)
--- a/src/salome_hydro/telemac2d/eficas/configuration_telemac2d.py
+++ b/src/salome_hydro/telemac2d/eficas/configuration_telemac2d.py
@@ -20,15 +20,15 @@
 import os
 
 from Editeur.catadesc import CatalogDescription
-from InterfaceQT4.configuration import CONFIG_BASE
+from InterfaceQT4.configuration import configBase
 
-class CONFIG(CONFIG_BASE):
+class CONFIG(configBase):
 
     def __init__(self, appli, repIni):
         """
         This class stores the configuration parameters for Eficas
         """
-        CONFIG_BASE.__init__(self, appli, repIni)
+        configBase.__init__(self, appli, repIni)
 
         # Configuration parameters
         self.savedir    = os.getenv("HOME")

diff --git a/src/salome_hydro/telemac2d/eficas/telemac2d_V6_cata.py b/src/salome_hydro/telemac2d/eficas/telemac2d_V6_cata.py
index da9ff2b3aa9bdcdd77757262fd99ec28e7d7b100..9822a5bcbb5397d9ee4b326d287712f29de2dc61 100644 (file)
--- a/src/salome_hydro/telemac2d/eficas/telemac2d_V6_cata.py
+++ b/src/salome_hydro/telemac2d/eficas/telemac2d_V6_cata.py
@@ -105,7 +105,7 @@ TELEMAC2D = PROC(
                         ang = u'Telemac2D model variable',
 
             VAR_NAME = SIMP(statut = "o", typ = 'TXM',
-                            into = get_list_var_api('TELEMAC2D'),
+                            intoSug = get_list_var_api('TELEMAC2D'),
                             fr = u'Nom de la variable du modèle (ex: "MODEL.DEBIT")',
                             ang = u'Model variable name (ex: "MODEL.DEBIT")'
             ),
@@ -180,7 +180,7 @@ TELEMAC2D = PROC(
                         fr = u'Variable du modèle Telemac2D',
                         ang = u'Telemac2D model variable',
             VAR_NAME = SIMP(statut = "o", typ = 'TXM',
-                            into = get_list_var_api('TELEMAC2D'),
+                            intoSug = get_list_var_api('TELEMAC2D'),
                             fr = u'Nom de la variable du modèle (ex: "MODEL.DEBIT")',
                             ang = u'Model variable name (ex: "MODEL.DEBIT")',
             ),