From: André Ribes <andre.ribes@edf.fr>
Date: Thu, 8 Jul 2010 14:48:00 +0000 (+0200)
Subject: Ajout du support de : AlgorithmParameters
X-Git-Tag: V6_4_0rc3~120
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=952680cb41182dab19832f36b64680dc44fdf9a6;p=modules%2Fadao.git

Ajout du support de : AlgorithmParameters
Ajout du support de : FunctionDict
---

diff --git a/bin/AdaoCalatogGenerator.py b/bin/AdaoCalatogGenerator.py
index 7c27456..6524ad4 100644
--- a/bin/AdaoCalatogGenerator.py
+++ b/bin/AdaoCalatogGenerator.py
@@ -53,21 +53,22 @@ String_data_bloc = """
 """
 
 Script_data_bloc = """
-                                     FILE_DATA = BLOC ( condition = " FROM in ( 'File', ) ",
+                                     FILE_DATA = BLOC ( condition = " FROM in ( 'Script', ) ",
 
                                                   FILE = SIMP(statut = "o", typ = "Fichier"),
                                                  ),
 """
 
 Dict_data_bloc = """
-                                     FILE_DATA = BLOC ( condition = " FROM in ( 'File', ) ",
+                                     FILE_DATA = BLOC ( condition = " FROM in ( 'Script', ) ",
 
                                                   FILE = SIMP(statut = "o", typ = "Fichier"),
                                                  ),
 """
 
+# Pour l'instant on ne gère qu'un seul script pour toutes les functions
 FunctionDict_data_bloc = """
-                                     FILE_DATA = BLOC ( condition = " FROM in ( 'File', ) ",
+                                     FILE_DATA = BLOC ( condition = " FROM in ( 'FunctionDict', ) ",
 
                                                   FILE = SIMP(statut = "o", typ = "Fichier"),
                                                  ),
@@ -104,6 +105,7 @@ assim_algo = """
                                                  Observation = F_Observation("o"),
                                                  ObservationError = F_ObservationError("o"),
                                                  ObservationOperator = F_ObservationOperator("o"),
+                                                 AlgorithmParameters = F_AlgorithmParameters("f"),
 ${decl_opts}
                                                 ),
 """