From 4682ddfa988632facf5de5b9958301d8e0588dc0 Mon Sep 17 00:00:00 2001 From: Paul RASCLE Date: Thu, 8 Mar 2018 09:50:32 +0100 Subject: [PATCH] Yoann : Mise a jour Eficas V9_DEV --- .../eficas/configuration_boundary_conditions.py | 6 +++--- src/salome_hydro/mascaret/eficas/configuration_mascaret.py | 6 +++--- src/salome_hydro/pytel/eficas/configuration_pytel.py | 6 +++--- src/salome_hydro/telemac2d/eficas/CMakeLists.txt | 1 - src/salome_hydro/telemac2d/eficas/appli.py | 2 +- .../telemac2d/eficas/configuration_telemac2d.py | 6 +++--- src/salome_hydro/telemac2d/eficas/telemac2d_V6_cata.py | 4 ++-- 7 files changed, 15 insertions(+), 16 deletions(-) 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 ffed4a6..1255be2 100644 --- 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 7695ed4..ac321f2 100644 --- 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 2396e3a..b25ad32 100644 --- 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 f22ca41..ade8037 100644 --- 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 69b982f..be3c984 100644 --- 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 7623f91..29051ae 100644 --- 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 da9ff2b..9822a5b 100644 --- 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")', ), -- 2.30.2