From: caremoli <caremoli>
Date: Thu, 24 Sep 2009 09:13:10 +0000 (+0000)
Subject: CCAR: add dataref data type
X-Git-Tag: V5_1_3rc1
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=caa17388f7310a0ec7a2406f9486808234f680e6;p=tools%2Fyacsgen.git

CCAR: add dataref data type
---

diff --git a/module_generator/cata_tmpl.py b/module_generator/cata_tmpl.py
index 8add366..63c0b27 100644
--- a/module_generator/cata_tmpl.py
+++ b/module_generator/cata_tmpl.py
@@ -18,6 +18,7 @@ module ${module}
 typedef sequence<string> stringvec;
 typedef sequence<double> dblevec;
 typedef sequence<long> intvec;
+typedef Engines::dataref dataref;
 
 ${interfaces}
 };
diff --git a/module_generator/cpp_tmpl.py b/module_generator/cpp_tmpl.py
index bc842fa..055e67c 100644
--- a/module_generator/cpp_tmpl.py
+++ b/module_generator/cpp_tmpl.py
@@ -232,6 +232,7 @@ hxxCompo="""
 #ifndef _${component}_HXX_
 #define _${component}_HXX_
 
+#include <SALOME_Component.hh>
 #include "Superv_Component_i.hxx"
 #include "${module}.hh"
 
diff --git a/module_generator/gener.py b/module_generator/gener.py
index 5c857dc..aae9af4 100644
--- a/module_generator/gener.py
+++ b/module_generator/gener.py
@@ -22,10 +22,15 @@ from aster_tmpl import check_aster
 
 corbaTypes = {"double":"CORBA::Double", "long":"CORBA::Long",
               "string":"const char*", "dblevec":"const %s::dblevec&",
-              "stringvec":"const %s::stringvec&", "intvec":"const %s::intvec&"}
+              "stringvec":"const %s::stringvec&", "intvec":"const %s::intvec&",
+              "dataref":"const Engines::dataref&",
+             }
+
 corbaOutTypes = {"double":"CORBA::Double&", "long":"CORBA::Long&",
-                "string":"CORBA::String_out", "dblevec":"%s::dblevec_out",
-                "stringvec":"%s::stringvec_out", "intvec":"%s::intvec_out"}
+                 "string":"CORBA::String_out", "dblevec":"%s::dblevec_out",
+                 "stringvec":"%s::stringvec_out", "intvec":"%s::intvec_out",
+                 "dataref":"Engines::dataref_out",
+                }
 
 def corba_in_type(typ, module):
   if typ in ("dblevec", "intvec", "stringvec"):
diff --git a/module_generator/pyth_tmpl.py b/module_generator/pyth_tmpl.py
index dd74576..03a288b 100644
--- a/module_generator/pyth_tmpl.py
+++ b/module_generator/pyth_tmpl.py
@@ -10,6 +10,7 @@ import ${module}__POA
 import calcium
 import dsccalcium
 import SALOME
+import Engines
 import cPickle
 
 try: