From 82850d57ca6d204630f6d005ff7574c6aed94fdb Mon Sep 17 00:00:00 2001 From: caremoli Date: Mon, 28 Jan 2008 09:35:47 +0000 Subject: [PATCH] CCAR: change datastream type management (now same as dataflow types=string) and implementation type (now an enum EXE, SO, PY) --- idl/SALOME_ModuleCatalog.idl | 34 ++++++++++++++++++++-------------- 1 file changed, 20 insertions(+), 14 deletions(-) diff --git a/idl/SALOME_ModuleCatalog.idl b/idl/SALOME_ModuleCatalog.idl index 9fc9dac5b..dfc8764f6 100644 --- a/idl/SALOME_ModuleCatalog.idl +++ b/idl/SALOME_ModuleCatalog.idl @@ -64,19 +64,10 @@ This struct contains fields defining the parameter of the service. DATASTREAM_ITERATIVE } ; - enum DataStreamType { - DATASTREAM_UNKNOWN, - DATASTREAM_INTEGER, - DATASTREAM_FLOAT, - DATASTREAM_DOUBLE, - DATASTREAM_STRING, - DATASTREAM_BOOLEAN - } ; - struct ServicesDataStreamParameter { - DataStreamType Parametertype; /*! PathPrefixes; +/*! +Implementation type +*/ + enum ImplType { + SO, /* component implemented as a dynamic library loadable with dlopen */ + PY, /* component implemented as a python module loadable with import */ + EXE /* component implemented as an executable */ + } ; + /*! Description of a component */ @@ -183,7 +183,8 @@ Description of a component string name; string username; boolean multistudy; - boolean implementationType; + ImplType implementationType; + string implname; string icon; string constraint; ListOfDefInterface interfaces; @@ -324,9 +325,14 @@ Gets the icone of the component (for IAPP) readonly attribute string component_icone; /*! -Gets the implementation type of the component : C++ or Python (for IAPP) +Gets the implementation type of the component : C++ (dyn lib), Python (module) or executable +*/ + readonly attribute ImplType implementation_type; +/*! +Gets the implementation name of the component : name of the dyn lib or the python module or the executable +if the default naming scheme is not convenient. */ - readonly attribute boolean implementation_type; + readonly attribute string implementation_name; } ; /*! \brief %Module catalog interface -- 2.39.2