From 68ba6ff9271b6cf0d0ea137921c793cc9858e332 Mon Sep 17 00:00:00 2001
From: Renaud Barate <renaud.barate@edf.fr>
Date: Thu, 30 Sep 2010 09:25:19 +0000
Subject: [PATCH] Changed SALOME_Parametric to SALOME_TYPES and removed the
 types from the catalog

---
 idl/DEVIATION_Gen.idl                 | 16 ++++++++--------
 resources/GENERICSOLVERCatalog.xml.in | 25 ++-----------------------
 src/GENERICSOLVER/DEVIATION.py        | 10 +++++-----
 3 files changed, 15 insertions(+), 36 deletions(-)

diff --git a/idl/DEVIATION_Gen.idl b/idl/DEVIATION_Gen.idl
index 306406c..15d8f61 100644
--- a/idl/DEVIATION_Gen.idl
+++ b/idl/DEVIATION_Gen.idl
@@ -51,16 +51,16 @@ module GENERICSOLVER_ORB
      * @brief Execute a computation with a given sample of variables.
      *
      * The Exec method realizes the computation with the probabilistic variables
-     * described in inputDesc and the deterministic variables set previously with
-     * the Init method. The result is put in outputValues in the order specified by
-     * inputDesc.outputVarList.
+     * described in paramInput and the deterministic variables set previously with
+     * the Init method. The result is put in paramOutput in the order specified by
+     * paramInput.outputVarList.
      *
-     * @param inputDesc     a structure describing the probabilistic variables and the order
-     *                      of the output variables.
-     * @param outputValues  the result of the computation
+     * @param paramInput   a structure describing the probabilistic variables and the order
+     *                     of the output variables.
+     * @param paramOutput  a structure containing the result of the computation
      */
-    void Exec(in SALOME_Parametric::ParametricInput paramInput,
-              out SALOME_Parametric::ParametricOutput paramOutput)
+    void Exec(in SALOME_TYPES::ParametricInput paramInput,
+              out SALOME_TYPES::ParametricOutput paramOutput)
       raises (SALOME::SALOME_Exception);
 
     /**
diff --git a/resources/GENERICSOLVERCatalog.xml.in b/resources/GENERICSOLVERCatalog.xml.in
index 620d104..784591c 100644
--- a/resources/GENERICSOLVERCatalog.xml.in
+++ b/resources/GENERICSOLVERCatalog.xml.in
@@ -33,27 +33,6 @@
 	<type-list>
 		<sequence name="Point" content="double"/>
 		<objref name="pyobj" id="python:obj:1.0"/>
-        <struct name="SALOME_Parametric/Parameter">
-            <member type="string" name="name"></member>
-            <member type="string" name="value"></member>
-        </struct>
-        <sequence content="SALOME_Parametric/Parameter" name="SALOME_Parametric/ParameterList"></sequence>
-        <sequence content="double" name="Value1D"></sequence>
-        <sequence content="Value1D" name="SALOME_Parametric/Value"></sequence>
-        <sequence content="string" name="SALOME_Parametric/VarList"></sequence>
-        <sequence content="SALOME_Parametric/Value" name="SALOME_Parametric/ValueList"></sequence>
-        <struct name="SALOME_Parametric/ParametricInput">
-            <member type="SALOME_Parametric/VarList" name="inputVarList"></member>
-            <member type="SALOME_Parametric/VarList" name="outputVarList"></member>
-            <member type="SALOME_Parametric/ValueList" name="inputValues"></member>
-            <member type="SALOME_Parametric/ParameterList" name="specificParameters"></member>
-        </struct>
-        <struct name="SALOME_Parametric/ParametricOutput">
-            <member type="SALOME_Parametric/ValueList" name="outputValues"></member>
-            <member type="SALOME_Parametric/ParameterList" name="specificOutputInfos"></member>
-            <member type="long" name="returnCode"></member>
-            <member type="string" name="errorMessage"></member>
-        </struct>
     </type-list>
 
 	<!-- Component list -->
@@ -190,13 +169,13 @@
                         <inParameter-list>
                             <inParameter>
                                 <inParameter-name>paramInput</inParameter-name>
-                                <inParameter-type>SALOME_Parametric/ParametricInput</inParameter-type>
+                                <inParameter-type>SALOME_TYPES/ParametricInput</inParameter-type>
                             </inParameter>
                         </inParameter-list>
                         <outParameter-list>
                             <outParameter>
                                 <outParameter-name>paramOutput</outParameter-name>
-                                <outParameter-type>SALOME_Parametric/ParametricOutput</outParameter-type>
+                                <outParameter-type>SALOME_TYPES/ParametricOutput</outParameter-type>
                             </outParameter>
                         </outParameter-list>
 					</component-service>
diff --git a/src/GENERICSOLVER/DEVIATION.py b/src/GENERICSOLVER/DEVIATION.py
index 369cabb..f734ad4 100644
--- a/src/GENERICSOLVER/DEVIATION.py
+++ b/src/GENERICSOLVER/DEVIATION.py
@@ -29,7 +29,7 @@ import GENERICSOLVER_ORB__POA
 import SALOME_ComponentPy
 import SALOME_DriverPy
 import SALOME
-import SALOME_Parametric
+import SALOME_TYPES
 
 from salome.kernel.logger import Logger
 from salome.kernel import termcolor
@@ -168,10 +168,10 @@ class DEVIATION(GENERICSOLVER_ORB__POA.DEVIATION_Gen,
             for outputVar in paramInput.outputVarList:
                 outputValues.append([[resDict[outputVar]]])
             logger.debug("paramOutput: %s" % outputValues)
-            return SALOME_Parametric.ParametricOutput(outputValues,
-                                                      specificOutputInfos = [],
-                                                      returnCode = 0,
-                                                      errorMessage = "")
+            return SALOME_TYPES.ParametricOutput(outputValues,
+                                                 specificOutputInfos = [],
+                                                 returnCode = 0,
+                                                 errorMessage = "")
         except:
             self._raiseSalomeError()
 
-- 
2.39.2