Moved parametric types to SALOME_TYPES module and added them to the KERNEL catalog.

diff --git a/idl/SALOME_Parametric.idl b/idl/SALOME_Parametric.idl
index f4ae0aa69cb28bc154bef00c7e7eb839406a6e76..093fcfc3cd6f1a87f63c07b29f32eb953dc2c0b3 100644 (file)
--- a/idl/SALOME_Parametric.idl
+++ b/idl/SALOME_Parametric.idl
@@ -31,7 +31,7 @@
      This module contains type definitions for the communication between
      supervision codes and computation codes in parametric studies.
 */
-module SALOME_Parametric
+module SALOME_TYPES
 {
 /*! \brief Structure describing a parameter that can be used for specific
     information exchange between the codes.

diff --git a/resources/KERNELCatalog.xml.in b/resources/KERNELCatalog.xml.in
index c60881e1718134c04afc6d34ba8d9a3563cfd902..4a7f336614675b6ddebfb6374247af47a3614f48 100644 (file)
--- a/resources/KERNELCatalog.xml.in
+++ b/resources/KERNELCatalog.xml.in
@@ -41,6 +41,30 @@
   <objref name="SALOME/SenderDouble"/>
   <objref name="SALOME/SenderInt"/>
   <objref name="SALOME/Matrix"/>
+  
+  <!-- Types for parametric computations -->
+  <struct name="SALOME_TYPES/Parameter">
+    <member type="string" name="name"></member>
+    <member type="string" name="value"></member>
+  </struct>
+  <sequence content="SALOME_TYPES/Parameter" name="SALOME_TYPES/ParameterList"></sequence>
+  <sequence content="double" name="Value1D"></sequence>
+  <sequence content="Value1D" name="SALOME_TYPES/Value"></sequence>
+  <sequence content="string" name="SALOME_TYPES/VarList"></sequence>
+  <sequence content="SALOME_TYPES/Value" name="SALOME_TYPES/ValueList"></sequence>
+  <struct name="SALOME_TYPES/ParametricInput">
+    <member type="SALOME_TYPES/VarList" name="inputVarList"></member>
+    <member type="SALOME_TYPES/VarList" name="outputVarList"></member>
+    <member type="SALOME_TYPES/ValueList" name="inputValues"></member>
+    <member type="SALOME_TYPES/ParameterList" name="specificParameters"></member>
+  </struct>
+  <struct name="SALOME_TYPES/ParametricOutput">
+    <member type="SALOME_TYPES/ValueList" name="outputValues"></member>
+    <member type="SALOME_TYPES/ParameterList" name="specificOutputInfos"></member>
+    <member type="long" name="returnCode"></member>
+    <member type="string" name="errorMessage"></member>
+  </struct>
+
 </type-list>
 
 <!-- Component list -->