Merge multi-study removal branch.

[samples/pycalculator.git] / resources / PYCALCULATORCatalog.xml.in

diff --git a/resources/PYCALCULATORCatalog.xml.in b/resources/PYCALCULATORCatalog.xml.in
index caecefcd9a99bb812c811d60cdc8d91640f2a280..4e103fdf78b567e1e4aef8b907b6149deea7f785 100644 (file)
--- a/resources/PYCALCULATORCatalog.xml.in
+++ b/resources/PYCALCULATORCatalog.xml.in
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='us-ascii' ?>
 <!--
-  Copyright (C) 2007-2013  CEA/DEN, EDF R&D, OPEN CASCADE
+  Copyright (C) 2007-2016  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
@@ -8,7 +8,7 @@
   This library is free software; you can redistribute it and/or
   modify it under the terms of the GNU Lesser General Public
   License as published by the Free Software Foundation; either
-  version 2.1 of the License.
+  version 2.1 of the License, or (at your option) any later version.
 
   This library is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -35,10 +35,9 @@
             <component-username>PyCalculator</component-username>
             <component-type>OTHER</component-type>
             <component-author>LD</component-author>
-            <component-version>@VERSION@</component-version>
+            <component-version>@SALOMEPYCALCULATOR_VERSION@</component-version>
             <component-comment>Test component (Arithmetic operations with MED_Field)</component-comment>
-            <component-multistudy>0</component-multistudy>
-            <component-icone>PYCALCULATOR.png</component-icone>
+            <component-icone></component-icone>
             <constraint>hostname = localhost</constraint>
             <component-impltype>0</component-impltype>
            <!-- Component interfaces -->
@@ -47,6 +46,30 @@
                 <component-interface-comment>No comment</component-interface-comment>
                 <!-- Service list -->
                <component-service-list>
+                   <component-service>
+                        <!-- service-identification -->
+                        <service-name>Clone</service-name>
+                        <service-author>LD</service-author>
+                        <service-version>1.0</service-version>
+                        <service-comment>Clone field</service-comment>
+                        <service-by-default>1</service-by-default>
+                        <!-- service-connexion -->
+                        <inParameter-list>
+                            <inParameter>
+                                <inParameter-name>field</inParameter-name>
+                                <inParameter-type>SALOME_MED/MEDCouplingFieldDoubleCorbaInterface</inParameter-type>
+                                <inParameter-comment>a field of double</inParameter-comment>
+                            </inParameter>
+                        </inParameter-list>
+                        <outParameter-list>
+                            <outParameter>
+                                <outParameter-name>result</outParameter-name>
+                                <outParameter-type>SALOME_MED/MEDCouplingFieldDoubleCorbaInterface</outParameter-type>
+                                <outParameter-comment>result</outParameter-comment>
+                            </outParameter>
+                        </outParameter-list>
+                        <DataStream-list></DataStream-list>
+                    </component-service>
                     <component-service>
                         <!-- service-identification -->
                         <service-name>Add</service-name>
@@ -58,19 +81,19 @@
                         <inParameter-list>
                             <inParameter>
                                 <inParameter-name>field1</inParameter-name>
-                                <inParameter-type>SALOME_MED/FIELDDOUBLE</inParameter-type>
+                                <inParameter-type>SALOME_MED/MEDCouplingFieldDoubleCorbaInterface</inParameter-type>
                                 <inParameter-comment>first field of double</inParameter-comment>
                             </inParameter>
                             <inParameter>
                                 <inParameter-name>field2</inParameter-name>
-                                <inParameter-type>SALOME_MED/FIELDDOUBLE</inParameter-type>
+                                <inParameter-type>SALOME_MED/MEDCouplingFieldDoubleCorbaInterface</inParameter-type>
                                 <inParameter-comment>second field of double</inParameter-comment>
                             </inParameter>
                         </inParameter-list>
                         <outParameter-list>
                             <outParameter>
                                 <outParameter-name>result</outParameter-name>
-                                <outParameter-type>SALOME_MED/FIELDDOUBLE</outParameter-type>
+                                <outParameter-type>SALOME_MED/MEDCouplingFieldDoubleCorbaInterface</outParameter-type>
                                 <outParameter-comment>result</outParameter-comment>
                             </outParameter>
                         </outParameter-list>
@@ -87,19 +110,19 @@
                         <inParameter-list>
                             <inParameter>
                                 <inParameter-name>field1</inParameter-name>
-                                <inParameter-type>SALOME_MED/FIELDDOUBLE</inParameter-type>
-                                <inParameter-comment>initial field of double</inParameter-comment>
+                                <inParameter-type>SALOME_MED/MEDCouplingFieldDoubleCorbaInterface</inParameter-type>
+                                <inParameter-comment>first field of double</inParameter-comment>
                             </inParameter>
                             <inParameter>
-                                <inParameter-name>x1</inParameter-name>
-                                <inParameter-type>double</inParameter-type>
-                                <inParameter-comment>multiplicator</inParameter-comment>
+                                <inParameter-name>field2</inParameter-name>
+                                <inParameter-type>SALOME_MED/MEDCouplingFieldDoubleCorbaInterface</inParameter-type>
+                                <inParameter-comment>second field of double</inParameter-comment>
                             </inParameter>
                         </inParameter-list>
                         <outParameter-list>
                             <outParameter>
                                 <outParameter-name>result</outParameter-name>
-                                <outParameter-type>SALOME_MED/FIELDDOUBLE</outParameter-type>
+                                <outParameter-type>SALOME_MED/MEDCouplingFieldDoubleCorbaInterface</outParameter-type>
                                 <outParameter-comment>result</outParameter-comment>
                             </outParameter>
                         </outParameter-list>
@@ -107,54 +130,60 @@
                     </component-service>
                     <component-service>
                         <!-- service-identification -->
-                        <service-name>Constant</service-name>
+                        <service-name>AddConstant</service-name>
                         <service-author>LD</service-author>
                         <service-version>1.0</service-version>
-                        <service-comment>Build a constant field of doubles</service-comment>
+                        <service-comment>Add a constant to a field of doubles</service-comment>
                         <service-by-default>0</service-by-default>
                         <!-- service-connexion -->
                         <inParameter-list>
                             <inParameter>
-                                <inParameter-name>field1</inParameter-name>
-                                <inParameter-type>SALOME_MED/FIELDDOUBLE</inParameter-type>
+                                <inParameter-name>field</inParameter-name>
+                                <inParameter-type>SALOME_MED/MEDCouplingFieldDoubleCorbaInterface</inParameter-type>
                                 <inParameter-comment>allows to build the support</inParameter-comment>
                             </inParameter>
                             <inParameter>
-                                <inParameter-name>x1</inParameter-name>
+                                <inParameter-name>val</inParameter-name>
                                 <inParameter-type>double</inParameter-type>
-                                <inParameter-comment>the constant</inParameter-comment>
+                                <inParameter-comment>a constant</inParameter-comment>
                             </inParameter>
                         </inParameter-list>
                         <outParameter-list>
                             <outParameter>
                                 <outParameter-name>result</outParameter-name>
-                                <outParameter-type>SALOME_MED/FIELDDOUBLE</outParameter-type>
-                                <outParameter-comment>result based on first field support</outParameter-comment>
+                                <outParameter-type>SALOME_MED/MEDCouplingFieldDoubleCorbaInterface</outParameter-type>
+                                <outParameter-comment>result</outParameter-comment>
                             </outParameter>
                         </outParameter-list>
                         <DataStream-list></DataStream-list>
                     </component-service>
                     <component-service>
                         <!-- service-identification -->
-                        <service-name>writeMEDfile</service-name>
+                        <service-name>MulConstant</service-name>
                         <service-author>LD</service-author>
                         <service-version>1.0</service-version>
-                        <service-comment>write a field in a Med file</service-comment>
+                        <service-comment>multiply a field to a constant</service-comment>
                         <service-by-default>0</service-by-default>
                         <!-- service-connexion -->
                         <inParameter-list>
                             <inParameter>
-                                <inParameter-name>field1</inParameter-name>
-                                <inParameter-type>SALOME_MED/FIELDDOUBLE</inParameter-type>
-                                <inParameter-comment>transient Med field</inParameter-comment>
+                                <inParameter-name>field</inParameter-name>
+                                <inParameter-type>SALOME_MED/MEDCouplingFieldDoubleCorbaInterface</inParameter-type>
+                                <inParameter-comment>a field of double</inParameter-comment>
                             </inParameter>
                             <inParameter>
-                                <inParameter-name>filename</inParameter-name>
-                                <inParameter-type>string</inParameter-type>
-                                <inParameter-comment>Med filename</inParameter-comment>
+                                <inParameter-name>val</inParameter-name>
+                                <inParameter-type>double</inParameter-type>
+                                <inParameter-comment>a constant</inParameter-comment>
                             </inParameter>
                         </inParameter-list>
-                        <outParameter-list></outParameter-list>
+                       <outParameter-list>
+                            <outParameter>
+                                <outParameter-name>result</outParameter-name>
+                                <outParameter-type>SALOME_MED/MEDCouplingFieldDoubleCorbaInterface</outParameter-type>
+                                <outParameter-comment>result</outParameter-comment>
+                            </outParameter>
+                        </outParameter-list>
                         <DataStream-list></DataStream-list>
                     </component-service>
                 </component-service-list>