il : test des include

diff --git a/Carmel3D/Carmel3D_Cata_V0.py b/Carmel3D/Carmel3D_Cata_V0.py
index 0caf9fc417290130fcb1a9792d6efc0561c2ce29..b6a6424643e244f38ddc98e17e904d8edc30e043 100644 (file)
--- 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\r
 from prefs_CARMEL3D import repIni\r
 \r
+\r
 #print "catalogue carmel"\r
 #print "repIni = ", repIni\r
 \r
@@ -57,6 +58,23 @@ JdC = JDC_CATA ( code = 'CARMEL3D',
                            ),\r
                  ) # Fin JDC_CATA\r
 ##=========================================================\r
+import opsCarmel\r
+MODEL = MACRO ( nom = "MODEL",\r
+                 op = None,\r
+                 UIinfo = { "groupes" : ( "Gestion du travail", ) },\r
+                 sd_prod = opsCarmel.INCLUDE,\r
+                 op_init = opsCarmel.INCLUDE_context,\r
+                 fichier_ini = 1,\r
+ \r
+   FileName = SIMP ( statut = "o",\r
+                    typ = ('Fichier', 'Wrapper Files (*.xml);;All Files (*)',),\r
+                     fr = "Nom du modele physique",\r
+                    ang = "Physical model identifier",\r
+                     ),\r
+  \r
+ ) # Fin PROC MODEL\r
+\r
+\r
 \r
 # --------------------------------------------------\r
 # definition de groupe de mailles\r

diff --git a/Carmel3D/opsCarmel.py b/Carmel3D/opsCarmel.py
new file mode 100644 (file)
index 0000000..b2365be
--- /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
+
+