Added catalog and modified idl file to make GENERICSOLVER component usable in YACS.

diff --git a/idl/GENERICSOLVER_Gen.idl b/idl/GENERICSOLVER_Gen.idl
index e0e9b0e899b4d11e1f678d3c1c5d5d5ea5dc5636..1b405050c2c5f78d473f8ac0705d1d45a03d8990 100644 (file)
--- a/idl/GENERICSOLVER_Gen.idl
+++ b/idl/GENERICSOLVER_Gen.idl
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,9 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+//  $Id$
+//
+
 #ifndef __GENERICSOLVER_GEN__
 #define __GENERICSOLVER_GEN__
 
@@ -49,7 +52,7 @@ module GENERICSOLVER_ORB
      * @param entry              the identifier of the study case within the study
      * @param wrapperDescription a string containing the XML wrapper description
      */
-    short Init(in short studyID, in ID entry, in string wrapperDescription)
+    long Init(in long studyID, in ID entry, in string wrapperDescription)
       raises (SALOME::SALOME_Exception);
 
     /**
@@ -62,7 +65,7 @@ module GENERICSOLVER_ORB
      * @param inPoint   a vector of floating point values to be modified
      * @param outPoint  the result of the computation as a vector of floating point values
      */
-    short Exec(in Point inPoint, inout Point outPoint)
+    long Exec(in Point inPoint, out Point outPoint)
       raises (SALOME::SALOME_Exception);
 
     /**
@@ -73,7 +76,7 @@ module GENERICSOLVER_ORB
      *
      * @return          0 if success, non zero if failure
      */
-    short Finalize()
+    long Finalize()
       raises (SALOME::SALOME_Exception);
 
   };

diff --git a/resources/GENERICSOLVERCatalog.xml.in b/resources/GENERICSOLVERCatalog.xml.in
index e1a3e52d7451534b220cd8d2b632b6f786907940..2406aaac1cc931584e5338d61a2d5fa8286558f4 100644 (file)
--- a/resources/GENERICSOLVERCatalog.xml.in
+++ b/resources/GENERICSOLVERCatalog.xml.in
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='us-ascii' ?>
 <!--
-  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 
   Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
   CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -21,30 +21,110 @@
 
   See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 
+  $Id$
+
 -->
  
 <!-- XML component catalog -->
 <begin-catalog>
 
-<!-- Path prefix information -->
-
-<path-prefix-list>
-</path-prefix-list>
-
-<!-- Component list -->
-<component-list>
-        <component>
-                <!-- Component identification -->
-                <component-name>GENERICSOLVER</component-name>
-               <component-username>GENERICSOLVER GUI</component-username>
-                <component-type>Data</component-type>
-                <component-author>I. Dutka-Malen</component-author>
-                <component-version>@VERSION@</component-version>
-                <component-comment>EDF - RD</component-comment>
-                <component-multistudy>1</component-multistudy>
-                <component-icone>GENERICSOLVER.png</component-icone>
-                <constraint>'linux' ~ OS</constraint>
-       
-       </component>
-</component-list>
+       <!-- Path prefix information -->
+       <path-prefix-list>
+       </path-prefix-list>
+
+       <!-- Commonly used types -->
+       <type-list>
+               <sequence name="Point" content="double"/>
+       </type-list>
+
+       <!-- Component list -->
+       <component-list>
+               <component>
+                       <!-- Component identification -->
+                       <component-name>GENERICSOLVER</component-name>
+                       <component-username>GENERICSOLVER GUI</component-username>
+                       <component-type>Data</component-type>
+                       <component-author>I. Dutka-Malen</component-author>
+                       <component-version>@VERSION@</component-version>
+                       <component-comment>EDF - RD</component-comment>
+                       <component-multistudy>1</component-multistudy>
+                       <component-icone>GENERICSOLVER.png</component-icone>
+                       <constraint>'linux' ~ OS</constraint>
+                       <component-interface-list>
+                               <component-interface-name>GENERICSOLVER</component-interface-name>
+                               <component-interface-comment></component-interface-comment>
+                               <component-service-list>
+                                       <component-service>
+                                               <!-- service-identification -->
+                                               <service-name>Init</service-name>
+                                               <service-author>EDF-RD</service-author>
+                                               <service-version>@VERSION@</service-version>
+                                               <service-comment></service-comment>
+                                               <service-by-default>0</service-by-default>
+                                               <!-- service-connexion -->
+                                               <inParameter-list>
+                                                       <inParameter>
+                                                               <inParameter-name>studyID</inParameter-name>
+                                                               <inParameter-type>long</inParameter-type>
+                                                       </inParameter>
+                                                       <inParameter>
+                                                               <inParameter-name>entry</inParameter-name>
+                                                               <inParameter-type>string</inParameter-type>
+                                                       </inParameter>
+                                                       <inParameter>
+                                                               <inParameter-name>wrapperDescription</inParameter-name>
+                                                               <inParameter-type>string</inParameter-type>
+                                                       </inParameter>
+                                               </inParameter-list>
+                                               <outParameter-list>
+                                                       <outParameter>
+                                                               <outParameter-name>return</outParameter-name>
+                                                               <outParameter-type>long</outParameter-type>
+                                                       </outParameter>
+                                               </outParameter-list>
+                                       </component-service>
+                                       <component-service>
+                                               <!-- service-identification -->
+                                               <service-name>Exec</service-name>
+                                               <service-author>EDF-RD</service-author>
+                                               <service-version>@VERSION@</service-version>
+                                               <service-comment></service-comment>
+                                               <service-by-default>0</service-by-default>
+                                               <!-- service-connexion -->
+                                               <inParameter-list>
+                                                       <inParameter>
+                                                               <inParameter-name>inPoint</inParameter-name>
+                                                               <inParameter-type>Point</inParameter-type>
+                                                       </inParameter>
+                                               </inParameter-list>
+                                               <outParameter-list>
+                                                       <outParameter>
+                                                               <outParameter-name>return</outParameter-name>
+                                                               <outParameter-type>long</outParameter-type>
+                                                       </outParameter>
+                                                       <outParameter>
+                                                               <outParameter-name>outPoint</outParameter-name>
+                                                               <outParameter-type>Point</outParameter-type>
+                                                       </outParameter>
+                                               </outParameter-list>
+                                       </component-service>
+                                       <component-service>
+                                               <!-- service-identification -->
+                                               <service-name>Finalize</service-name>
+                                               <service-author>EDF-RD</service-author>
+                                               <service-version>@VERSION@</service-version>
+                                               <service-comment></service-comment>
+                                               <service-by-default>0</service-by-default>
+                                               <!-- service-connexion -->
+                                               <outParameter-list>
+                                                       <outParameter>
+                                                               <outParameter-name>return</outParameter-name>
+                                                               <outParameter-type>long</outParameter-type>
+                                                       </outParameter>
+                                               </outParameter-list>
+                                       </component-service>
+                               </component-service-list>
+                       </component-interface-list>
+               </component>
+       </component-list>
 </begin-catalog>

diff --git a/src/GENERICSOLVER/GENERICSOLVER.py b/src/GENERICSOLVER/GENERICSOLVER.py
index 87dd0f8ff75e46804e5d3742726ea8952ef262c9..6a852f477b0021af684200e9ac62d7df3dc10bcb 100644 (file)
--- a/src/GENERICSOLVER/GENERICSOLVER.py
+++ b/src/GENERICSOLVER/GENERICSOLVER.py
@@ -1,4 +1,4 @@
-#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+#  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 #  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 #  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,9 @@
 #
 #  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
+#  $Id$
+#
+
 import traceback
 import GENERICSOLVER_ORB__POA
 import SALOME_ComponentPy
@@ -186,17 +189,16 @@ class GENERICSOLVER(GENERICSOLVER_ORB__POA.GENERICSOLVER_Gen,
         print "GENERICSOLVER.Init : exit"
         return 0
 
-    def Exec ( self , inPoint, outPoint ):
+    def Exec ( self , inPoint ):
         """
         This method is an implementation for the GENERICSOLVER interface.
         It runs the component with some new parameters compared with the deterministic ones.
         """
         if self.case is None :
             print "GENERICSOLVER.Exec : Init not run"
-            return 1, outPoint
+            return 1, None
         
         print "GENERICSOLVER.Exec (1): inPoint  = ", inPoint
-        print "GENERICSOLVER.Exec (1): outPoint = ", outPoint
 
         try:
             case = dict( self.case )
@@ -219,7 +221,7 @@ class GENERICSOLVER(GENERICSOLVER_ORB__POA.GENERICSOLVER_Gen,
             outPoint = self.BeamModel( **case )
         except:
             traceback.print_exc()
-            return 1, outPoint
+            return 1, None
          
 
         print "GENERICSOLVER.Exec (2): inPoint  = ", inPoint