From: ilct <>
Date: Thu, 25 Oct 2012 09:08:04 +0000 (+0000)
Subject: il : test des include
X-Git-Tag: LOGILAB~44
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=12101c06a032d79d852b726b0f4016d945c8130d;p=tools%2Feficas.git

il : test des include
---

diff --git a/Carmel3D/Carmel3D_Cata_V0.py b/Carmel3D/Carmel3D_Cata_V0.py
index 0caf9fc4..b6a64246 100644
--- a/Carmel3D/Carmel3D_Cata_V0.py
+++ b/Carmel3D/Carmel3D_Cata_V0.py
@@ -29,6 +29,7 @@ from decimal import Decimal
 # et les fichiers de donnees des materiaux de reference
 from prefs_CARMEL3D import repIni
 
+
 #print "catalogue carmel"
 #print "repIni = ", repIni
 
@@ -57,6 +58,23 @@ JdC = JDC_CATA ( code = 'CARMEL3D',
                            ),
                  ) # Fin JDC_CATA
 ##=========================================================
+import opsCarmel
+MODEL = MACRO ( nom = "MODEL",
+                 op = None,
+                 UIinfo = { "groupes" : ( "Gestion du travail", ) },
+                 sd_prod = opsCarmel.INCLUDE,
+                 op_init = opsCarmel.INCLUDE_context,
+                 fichier_ini = 1,
+ 
+   FileName = SIMP ( statut = "o",
+                    typ = ('Fichier', 'Wrapper Files (*.xml);;All Files (*)',),
+                     fr = "Nom du modele physique",
+                    ang = "Physical model identifier",
+                     ),
+  
+ ) # Fin PROC MODEL
+
+
 
 # --------------------------------------------------
 # definition de groupe de mailles
diff --git a/Carmel3D/opsCarmel.py b/Carmel3D/opsCarmel.py
new file mode 100644
index 00000000..b2365bea
--- /dev/null
+++ b/Carmel3D/opsCarmel.py
@@ -0,0 +1,38 @@
+# -*- coding: iso-8859-1 -*-
+# Copyright (C) 2007-2012   EDF R&D
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+#
+# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+#
+
+def INCLUDE(self,FileName,**args):
+   """ 
+       Fonction sd_prod pour la macro INCLUDE
+   """
+   if hasattr(self,'change_fichier'):
+       delattr(self,'change_fichier')
+       delattr(self,'fichier_ini')
+
+   self.make_include(fichier=FileName)
+
+def INCLUDE_context(self,d):
+   """ 
+       Fonction op_init pour macro INCLUDE
+   """
+   for k,v in self.g_context.items():
+      d[k]=v
+
+