From 16605001730f62ed2d219bda747946af151451aa Mon Sep 17 00:00:00 2001 From: Pascale Noyret Date: Thu, 25 Oct 2012 13:58:29 +0000 Subject: [PATCH] Include dans carmel --- Carmel3D/opsCarmel.py | 3 ++- Ihm/I_MACRO_ETAPE.py | 5 ++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Carmel3D/opsCarmel.py b/Carmel3D/opsCarmel.py index b2365bea..ad1c7c04 100644 --- a/Carmel3D/opsCarmel.py +++ b/Carmel3D/opsCarmel.py @@ -26,13 +26,14 @@ def INCLUDE(self,FileName,**args): delattr(self,'change_fichier') delattr(self,'fichier_ini') - self.make_include(fichier=FileName) + self.make_include3(fichier=FileName) def INCLUDE_context(self,d): """ Fonction op_init pour macro INCLUDE """ for k,v in self.g_context.items(): + print k,v d[k]=v diff --git a/Ihm/I_MACRO_ETAPE.py b/Ihm/I_MACRO_ETAPE.py index 31356d94..112639d5 100644 --- a/Ihm/I_MACRO_ETAPE.py +++ b/Ihm/I_MACRO_ETAPE.py @@ -754,7 +754,10 @@ class MACRO_ETAPE(I_ETAPE.ETAPE): def make_include3(self,fichier=None): - # Pour Map + self.make_includeCarmel(fichier) + + def make_includeCarmel(self,fichier=None): + # Pour Carmel unite=999 if hasattr(self,'fichier_ini') : return reevalue=0 -- 2.39.2