Join modifications from branch OCC_debug_for_3_2_0b1

diff --git a/INSTALL b/INSTALL
index b276aadb11a4ca985071e16fdf65a2fc0ce93af4..bc7df72c147f9551d99e6b3bfc9524f05158f8c6 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -1,4 +1,4 @@
-This is the version 3.2.0a2 of PYCALCULATOR
+This is the version 3.2.0b1 of PYCALCULATOR
 Compatible with :
-       - KERNEL 3.2.0a2
-        - SALOMEGUI 3.2.0a2
+       - KERNEL 3.2.0b1
+        - SALOMEGUI 3.2.0b1

diff --git a/Makefile.in b/Makefile.in
index 1daa1676754b030ba46f78d29668b549ba22e842..580e142ebe4766ac827c3e273da455c552437538 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,3 +1,21 @@
+#  Copyright (C) 2005  CEA/DEN, EDF R&D
+#
+#  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.
+#
+#  This library is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#  Lesser General Public License for more details.
+#
+#  You should have received a copy of the GNU Lesser General Public
+#  License along with this library; if not, write to the Free Software
+#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+#
+#  See http://www.salome-platform.org/
+#
 # -* Makefile *- 
 #
 # Author : Patrick GOLDBRONN (CEA)
@@ -17,7 +35,9 @@ VPATH=.:@srcdir@:@top_srcdir@/bin:@top_srcdir@/resources:./bin:@top_srcdir@/idl:
 SUBDIRS = idl src
 
 RESOURCES_FILES = \
-PYCALCULATORCatalog.xml
+PYCALCULATORCatalog.xml \
+SalomeApp.xml \
+PYCALCULATOR.png
 
 BIN_SCRIPT= \
 VERSION

diff --git a/adm_local/unix/make_commence.in b/adm_local/unix/make_commence.in
index 262171089ba2762ae26892c414557891d788d82a..e2e9a591beb003de0f6df41ded05bd2262f9354c 100644 (file)
--- a/adm_local/unix/make_commence.in
+++ b/adm_local/unix/make_commence.in
@@ -157,7 +157,13 @@ all:
 Makefile: $(top_builddir)/config.status $(srcdir)/Makefile.in
        cd $(top_builddir) ; ./config.status
 
-$(top_builddir)/config.status: $(top_srcdir)/configure
+LOCAL_MAKE = make_commence make_omniorb
+
+KERNEL_MAKE = make_module make_conclude depend SALOMEconfig.h F77config.h sstream envScript
+
+$(top_builddir)/config.status: $(top_srcdir)/configure \
+                              $(LOCAL_MAKE:%=$(top_srcdir)/adm_local/unix/%.in) \
+                              $(KERNEL_MAKE:%=$(KERNEL_ROOT_DIR)/salome_adm/unix/%.in)
        cd $(top_builddir) ; ./config.status --recheck
 
 # VPATH contain $(srcdir), so make configure is good in top_srcdir and we must add target configure otherwise :-)
@@ -172,7 +178,7 @@ $(top_srcdir)/configure.in: $(top_srcdir)/configure.in.base
        cd $(top_srcdir) && ./build_configure
 
 
-ACLOCAL_SRC = \
+ACLOCAL_KERNEL = \
 ac_cxx_bool.m4                         check_corba.m4          \
 ac_cxx_depend_flag.m4                  enable_pthreads.m4      \
 ac_cxx_mutable.m4                      check_mico.m4           \
@@ -182,5 +188,5 @@ ac_cxx_partial_specialization.m4    ac_cxx_typename.m4      \
 check_pthreads.m4                      ac_cc_warnings.m4       \
 python.m4
 
-$(top_srcdir)/aclocal.m4: $(ACLOCAL_SRC:%=@KERNEL_ROOT_DIR@/salome_adm/unix/config_files/%)
-       cd $(top_srcdir) ; aclocal --acdir=adm_local/unix/config_files -I @KERNEL_ROOT_DIR@/salome_adm/unix/config_files
+$(top_srcdir)/aclocal.m4: $(ACLOCAL_KERNEL:%=@KERNEL_ROOT_DIR@/salome_adm/unix/config_files/%)
+       cd $(top_srcdir) ; aclocal -I adm_local/unix/config_files -I @KERNEL_ROOT_DIR@/salome_adm/unix/config_files

diff --git a/bin/VERSION b/bin/VERSION
index 92de7001e3e3f6c22cf06a3f14fd55bf7eaf4624..a79abc89491260fde18cca6523ac1731d73b0447 100755 (executable)
--- a/bin/VERSION
+++ b/bin/VERSION
@@ -1 +1 @@
-THIS IS SALOME - PYCALCULATOR VERSION: 3.2.0a2
+THIS IS SALOME - PYCALCULATOR VERSION: 3.2.0b1

diff --git a/build_configure b/build_configure
index d48fdb6ba949f922c883ba1b91c04241de09ea36..7c0074a3bbd7ccfc325b8eae4306004260bd7dfc 100755 (executable)
--- a/build_configure
+++ b/build_configure
@@ -127,7 +127,7 @@ echo "      ./salome_adm/unix/F77config.h \\" >> configure.in_tmp1
 echo " ./salome_adm/unix/sstream \\" >> configure.in_tmp1
 
 echo " ./salome_adm/unix/depend \\" >> configure.in_tmp1
-echo " ./adm_local/unix/make_omniorb \\" >> configure.in_tmp1
+echo " ./adm_local/unix/make_omniorb:${ABS_CONF_DIR}/adm_local/unix/make_omniorb.in \\" >> configure.in_tmp1
 echo " ./salome_adm/unix/envScript \\" >> configure.in_tmp1
 echo " ./salome_adm/unix/make_module \\" >> configure.in_tmp1
 
@@ -137,7 +137,7 @@ echo "      ./salome_adm/unix/make_module \\" >> configure.in_tmp1
 # salome_adm, par le make_conclude (resp. make_commence) du module,
 # c'est à dire le make_conclude (resp. make_commence) du répertoire
 # adm_local
-echo " ./adm_local/unix/make_commence \\" >> configure.in_tmp1
+echo " ./adm_local/unix/make_commence:${ABS_CONF_DIR}/adm_local/unix/make_commence.in \\" >> configure.in_tmp1
 echo " ./salome_adm/unix/make_conclude \\" >> configure.in_tmp1
 
 \rm -f configure.in_tmp2 configure.in_tmp3

diff --git a/doc/Makefile.in b/doc/Makefile.in
index 13412b7e69dc0df7c9c8a842fd31e885f39b5603..b64444fbf95027cdaef4cd568917978d393f8a80 100644 (file)
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -1,3 +1,21 @@
+#  Copyright (C) 2005  CEA/DEN, EDF R&D
+#
+#  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.
+#
+#  This library is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#  Lesser General Public License for more details.
+#
+#  You should have received a copy of the GNU Lesser General Public
+#  License along with this library; if not, write to the Free Software
+#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+#
+#  See http://www.salome-platform.org/
+#
 
 # -* Makefile *- 
 #

diff --git a/doc/salome/Makefile.in b/doc/salome/Makefile.in
index c1bec59a389a0aa739a5c8d7ed0bd07b3c0cfde1..cfb7130a0b2fbf233d63da232095bf299754cbfb 100644 (file)
--- a/doc/salome/Makefile.in
+++ b/doc/salome/Makefile.in
@@ -1,3 +1,21 @@
+#  Copyright (C) 2005  CEA/DEN, EDF R&D
+#
+#  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.
+#
+#  This library is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#  Lesser General Public License for more details.
+#
+#  You should have received a copy of the GNU Lesser General Public
+#  License along with this library; if not, write to the Free Software
+#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+#
+#  See http://www.salome-platform.org/
+#
 
 # -* Makefile *- 
 #

diff --git a/doc/salome/tui/PYCALCULATOR/doxyfile b/doc/salome/tui/PYCALCULATOR/doxyfile
index 1c82d7063d0bc21431a83424a97917a91b1dcedd..49b83eef089b363d5bb161c070811d252dff1347 100755 (executable)
--- a/doc/salome/tui/PYCALCULATOR/doxyfile
+++ b/doc/salome/tui/PYCALCULATOR/doxyfile
@@ -3,7 +3,7 @@
 #---------------------------------------------------------------------------
 # General configuration options
 #---------------------------------------------------------------------------
-PROJECT_NAME           = "SALOME - PYCALCULATOR - v.3.2.0a2"
+PROJECT_NAME           = "SALOME - PYCALCULATOR - v.3.2.0b1"
 PROJECT_NUMBER         = id#1.0
 OUTPUT_DIRECTORY       = ../
 OUTPUT_LANGUAGE        = English

diff --git a/doc/salome/tui/PYCALCULATOR/sources/static/tree.js b/doc/salome/tui/PYCALCULATOR/sources/static/tree.js
index abfc6261b4bbd63e353050c6610ed4144afe66b9..9831e4dd258f6bfdc70219720f544d37dfb21cb4 100755 (executable)
--- a/doc/salome/tui/PYCALCULATOR/sources/static/tree.js
+++ b/doc/salome/tui/PYCALCULATOR/sources/static/tree.js
@@ -1,4 +1,4 @@
-foldersTree = gFld("<b>SALOME v.3.2.0a2 </b>", "", "")
+foldersTree = gFld("<b>SALOME v.3.2.0b1 </b>", "", "")
      insDoc(foldersTree, gLnk("Main Page", "", "main.html"))
 
 aux1 = insFld(foldersTree, gFld("TUI Reference Guide", ""))

diff --git a/idl/Makefile.in b/idl/Makefile.in
index 316253032b688fe1f410786db506ec0e1a3f3c1a..f89db4b6a1293ac2a49c35f86d6c917d3cb6380e 100644 (file)
--- a/idl/Makefile.in
+++ b/idl/Makefile.in
@@ -1,3 +1,21 @@
+#  Copyright (C) 2005  CEA/DEN, EDF R&D
+#
+#  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.
+#
+#  This library is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#  Lesser General Public License for more details.
+#
+#  You should have received a copy of the GNU Lesser General Public
+#  License along with this library; if not, write to the Free Software
+#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+#
+#  See http://www.salome-platform.org/
+#
 #
 # generate dependencies for idl file :
 #

diff --git a/idl/PYCALCULATOR_Gen.idl b/idl/PYCALCULATOR_Gen.idl
index b0c2ad1d32111ebfac3d03414a67628407931756..1d8edbd6f1b8a3251c3cbee33eff3de7f82f3176 100644 (file)
--- a/idl/PYCALCULATOR_Gen.idl
+++ b/idl/PYCALCULATOR_Gen.idl
@@ -1,3 +1,21 @@
+// Copyright (C) 2005  CEA/DEN, EDF R&D
+//
+// 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.
+//
+// This library is distributed in the hope that it will be useful
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/
+//
 //=============================================================================
 // File      : Calculator.idl
 // Created   : jeu nov 08 12:08:17 CEST 2001

diff --git a/resources/PYCALCULATOR.png b/resources/PYCALCULATOR.png
new file mode 100755 (executable)
index 0000000..96b020a
Binary files /dev/null and b/resources/PYCALCULATOR.png differ

diff --git a/resources/PYCALCULATORCatalog.xml b/resources/PYCALCULATORCatalog.xml
index 14cccf9e6d4d349bf8be8a3b64bdfbdc2cc2cfc5..633474d0c2dfcf4c9ec96fafeeb58776db0c23fd 100644 (file)
--- a/resources/PYCALCULATORCatalog.xml
+++ b/resources/PYCALCULATORCatalog.xml
@@ -2,139 +2,140 @@
  
 <!-- XML component catalog -->
 <begin-catalog>
-
-<!-- Path prefix information -->
-
-<path-prefix-list>
-</path-prefix-list>
-
-<!-- Component list -->
-<component-list>
-       <component>
-               <!-- Component identification -->
-               <component-name>PYCALCULATOR</component-name>
-               <component-username>PyCalculator</component-username>
-               <component-type>SOLVER</component-type>
-               <component-author>LD</component-author>
-               <component-version>3.2.0a2</component-version>
-               <component-comment>Test component (Arithmetic operations with MED_Field)</component-comment>
-               <component-multistudy>0</component-multistudy>
-               <constraint>hostname = localhost</constraint>
-               <component-impltype>0</component-impltype>
-
-               <component-interface-list>
-                       <component-interface-name>PYCALCULATOR</component-interface-name>
-                       <component-interface-comment>No comment</component-interface-comment>
-
-                       <component-service-list>
-                               <component-service>
-                                       <!-- service-identification -->
-                                       <service-name>Mul</service-name>
-                                       <service-author>LD</service-author>
-                                       <service-version>1.0</service-version>
-                                       <service-comment>Multiplication of 2 fields of double</service-comment>
-                                       <service-by-default>1</service-by-default>
-                                       <!-- service-connexion -->
-                                       <inParameter-list>
-                                               <inParameter>
-                                                       <inParameter-type>FIELDDOUBLE</inParameter-type>
-                                                       <inParameter-name>field1</inParameter-name>
-                                                       <inParameter-comment>initial field of double</inParameter-comment>
-                                               </inParameter>
-                                               <inParameter>
-                                                       <inParameter-type>double</inParameter-type>
-                                                       <inParameter-name>x1</inParameter-name>
-                                                       <inParameter-comment>multiplicator</inParameter-comment>
-                                               </inParameter>
-                                       </inParameter-list>
-                                        <outParameter-list>
-                                                 <outParameter>
-                                                        <outParameter-type>FIELDDOUBLE</outParameter-type>
-                                                        <outParameter-name>field2</outParameter-name>
-                                                        <outParameter-comment>result</outParameter-comment>
-                                                 </outParameter>
-                                        </outParameter-list>
-                               </component-service>
-                               <component-service>
-                                       <!-- service-identification -->
-                                       <service-name>Add</service-name>
-                                       <service-author>LD</service-author>
-                                       <service-version>1.0</service-version>
-                                       <service-comment>Addition of 2 fields of double</service-comment>
-                                       <service-by-default>1</service-by-default>
-                                       <!-- service-connexion -->
-                                       <inParameter-list>
-                                               <inParameter>
-                                                       <inParameter-type>FIELDDOUBLE</inParameter-type>
-                                                       <inParameter-name>field1</inParameter-name>
-                                                       <inParameter-comment>first field of double</inParameter-comment>
-                                               </inParameter>
-                                               <inParameter>
-                                                       <inParameter-type>FIELDDOUBLE</inParameter-type>
-                                                       <inParameter-name>field2</inParameter-name>
-                                                       <inParameter-comment>second field of double</inParameter-comment>
-                                               </inParameter>
-                                       </inParameter-list>
-                                        <outParameter-list>
-                                                 <outParameter>
-                                                        <outParameter-type>FIELDDOUBLE</outParameter-type>
-                                                        <outParameter-name>field3</outParameter-name>
-                                                        <outParameter-comment>result</outParameter-comment>
-                                                 </outParameter>
-                                        </outParameter-list>
-                               </component-service>
-                               <component-service>
-                                       <!-- service-identification -->
-                                       <service-name>Constant</service-name>
-                                       <service-author>LD</service-author>
-                                       <service-version>1.0</service-version>
-                                       <service-comment>Build a constant field of doubles</service-comment>
-                                       <service-by-default>1</service-by-default>
-                                       <!-- service-connexion -->
-                                       <inParameter-list>
-                                               <inParameter>
-                                                       <inParameter-type>FIELDDOUBLE</inParameter-type>
-                                                       <inParameter-name>field1</inParameter-name>
-                                                       <inParameter-comment>allows to build the support</inParameter-comment>
-                                               </inParameter>
-                                               <inParameter>
-                                                       <inParameter-type>double</inParameter-type>
-                                                       <inParameter-name>x1</inParameter-name>
-                                                       <inParameter-comment>the constant</inParameter-comment>
-                                               </inParameter>
-                                       </inParameter-list>
-                                        <outParameter-list>
-                                                 <outParameter>
-                                                        <outParameter-type>FIELDDOUBLE</outParameter-type>
-                                                        <outParameter-name>field2</outParameter-name>
-                                                        <outParameter-comment>result based on first field support</outParameter-comment>
-                                                 </outParameter>
-                                        </outParameter-list>
-                               </component-service>
-                               <component-service>
-                                       <!-- service-identification -->
-                                       <service-name>writeMEDfile</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-by-default>1</service-by-default>
-                                       <!-- service-connexion -->
-                                       <inParameter-list>
-                                               <inParameter>
-                                                       <inParameter-type>FIELDDOUBLE</inParameter-type>
-                                                       <inParameter-name>field1</inParameter-name>
-                                                       <inParameter-comment>transient Med field</inParameter-comment>
-                                               </inParameter>
-                                               <inParameter>
-                                                       <inParameter-type>string</inParameter-type>
-                                                       <inParameter-name>filename</inParameter-name>
-                                                       <inParameter-comment>Med filename</inParameter-comment>
-                                               </inParameter>
-                                       </inParameter-list>
-                               </component-service>
-                       </component-service-list>
-               </component-interface-list>
-
+    <!-- Path prefix information -->
+    <path-prefix-list></path-prefix-list>
+    <!-- Component list -->
+    <component-list>
+        <component>
+            <!-- Component identification -->
+            <component-name>PYCALCULATOR</component-name>
+            <component-username>PyCalculator</component-username>
+            <component-type>OTHER</component-type>
+            <component-author>LD</component-author>
+            <component-version>3.2.0b1</component-version>
+            <component-comment>Test component (Arithmetic operations with MED_Field)</component-comment>
+            <component-multistudy>0</component-multistudy>
+            <component-icone>PYCALCULATOR.png</component-icone>
+            <constraint>hostname = localhost</constraint>
+            <component-impltype>0</component-impltype>
+           <!-- Component interfaces -->
+            <component-interface-list>
+                <component-interface-name>PYCALCULATOR_Gen</component-interface-name>
+                <component-interface-comment>No comment</component-interface-comment>
+                <!-- Service list -->
+               <component-service-list>
+                    <component-service>
+                        <!-- service-identification -->
+                        <service-name>Add</service-name>
+                        <service-author>LD</service-author>
+                        <service-version>1.0</service-version>
+                        <service-comment>Addition of 2 fields of double</service-comment>
+                        <service-by-default>1</service-by-default>
+                        <!-- service-connexion -->
+                        <inParameter-list>
+                            <inParameter>
+                                <inParameter-name>field1</inParameter-name>
+                                <inParameter-type>FIELDDOUBLE</inParameter-type>
+                                <inParameter-comment>first field of double</inParameter-comment>
+                            </inParameter>
+                            <inParameter>
+                                <inParameter-name>field2</inParameter-name>
+                                <inParameter-type>FIELDDOUBLE</inParameter-type>
+                                <inParameter-comment>second field of double</inParameter-comment>
+                            </inParameter>
+                        </inParameter-list>
+                        <outParameter-list>
+                            <outParameter>
+                                <outParameter-name>result</outParameter-name>
+                                <outParameter-type>FIELDDOUBLE</outParameter-type>
+                                <outParameter-comment>result</outParameter-comment>
+                            </outParameter>
+                        </outParameter-list>
+                        <DataStream-list></DataStream-list>
+                    </component-service>
+                    <component-service>
+                        <!-- service-identification -->
+                        <service-name>Mul</service-name>
+                        <service-author>LD</service-author>
+                        <service-version>1.0</service-version>
+                        <service-comment>Multiplication of 2 fields of double</service-comment>
+                        <service-by-default>0</service-by-default>
+                        <!-- service-connexion -->
+                        <inParameter-list>
+                            <inParameter>
+                                <inParameter-name>field1</inParameter-name>
+                                <inParameter-type>FIELDDOUBLE</inParameter-type>
+                                <inParameter-comment>initial field of double</inParameter-comment>
+                            </inParameter>
+                            <inParameter>
+                                <inParameter-name>x1</inParameter-name>
+                                <inParameter-type>double</inParameter-type>
+                                <inParameter-comment>multiplicator</inParameter-comment>
+                            </inParameter>
+                        </inParameter-list>
+                        <outParameter-list>
+                            <outParameter>
+                                <outParameter-name>result</outParameter-name>
+                                <outParameter-type>FIELDDOUBLE</outParameter-type>
+                                <outParameter-comment>result</outParameter-comment>
+                            </outParameter>
+                        </outParameter-list>
+                        <DataStream-list></DataStream-list>
+                    </component-service>
+                    <component-service>
+                        <!-- service-identification -->
+                        <service-name>Constant</service-name>
+                        <service-author>LD</service-author>
+                        <service-version>1.0</service-version>
+                        <service-comment>Build a constant field of doubles</service-comment>
+                        <service-by-default>0</service-by-default>
+                        <!-- service-connexion -->
+                        <inParameter-list>
+                            <inParameter>
+                                <inParameter-name>field1</inParameter-name>
+                                <inParameter-type>FIELDDOUBLE</inParameter-type>
+                                <inParameter-comment>allows to build the support</inParameter-comment>
+                            </inParameter>
+                            <inParameter>
+                                <inParameter-name>x1</inParameter-name>
+                                <inParameter-type>double</inParameter-type>
+                                <inParameter-comment>the constant</inParameter-comment>
+                            </inParameter>
+                        </inParameter-list>
+                        <outParameter-list>
+                            <outParameter>
+                                <outParameter-name>result</outParameter-name>
+                                <outParameter-type>FIELDDOUBLE</outParameter-type>
+                                <outParameter-comment>result based on first field support</outParameter-comment>
+                            </outParameter>
+                        </outParameter-list>
+                        <DataStream-list></DataStream-list>
+                    </component-service>
+                    <component-service>
+                        <!-- service-identification -->
+                        <service-name>writeMEDfile</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-by-default>0</service-by-default>
+                        <!-- service-connexion -->
+                        <inParameter-list>
+                            <inParameter>
+                                <inParameter-name>field1</inParameter-name>
+                                <inParameter-type>FIELDDOUBLE</inParameter-type>
+                                <inParameter-comment>transient Med field</inParameter-comment>
+                            </inParameter>
+                            <inParameter>
+                                <inParameter-name>filename</inParameter-name>
+                                <inParameter-type>string</inParameter-type>
+                                <inParameter-comment>Med filename</inParameter-comment>
+                            </inParameter>
+                        </inParameter-list>
+                        <outParameter-list></outParameter-list>
+                        <DataStream-list></DataStream-list>
+                    </component-service>
+                </component-service-list>
+            </component-interface-list>
         </component>
-</component-list>
+    </component-list>
 </begin-catalog>

diff --git a/resources/SalomeApp.xml b/resources/SalomeApp.xml
new file mode 100644 (file)
index 0000000..2c83ea6
--- /dev/null
+++ b/resources/SalomeApp.xml
@@ -0,0 +1,11 @@
+<document>
+  <section name="PYCALCULATOR">
+    <!-- Major module parameters -->
+    <parameter name="name" value="PyCalculator"/>
+    <parameter name="icon" value="PYCALCULATOR.png"/>
+  </section>
+  <section name="resources">
+    <!-- Module resources -->
+    <parameter name="PYCALCULATOR" value="${PYCALCULATOR_ROOT_DIR}/share/salome/resources"/>
+  </section>
+</document>

diff --git a/src/PYCALCULATOR/PYCALCULATOR.py b/src/PYCALCULATOR/PYCALCULATOR.py
index 7b254fd0e8f32902a883890b90b2dbcf3da072ed..1b112687d4763aa969fba20c63cdd0befd4d05cc 100755 (executable)
--- a/src/PYCALCULATOR/PYCALCULATOR.py
+++ b/src/PYCALCULATOR/PYCALCULATOR.py
@@ -1,3 +1,21 @@
+#  Copyright (C) 2005  CEA/DEN, EDF R&D
+#
+#  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.
+#
+#  This library is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#  Lesser General Public License for more details.
+#
+#  You should have received a copy of the GNU Lesser General Public
+#  License along with this library; if not, write to the Free Software
+#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+#
+#  See http://www.salome-platform.org/
+#
 import PYCALCULATOR_ORB__POA
 import SALOME_ComponentPy
 

diff --git a/src/PYCALCULATOR/PYCALCULATOR_TEST.py b/src/PYCALCULATOR/PYCALCULATOR_TEST.py
index 1a38e0b983b84be9533bc6e074368a39c0e7482d..e324f7734bced4a51dfd966bad495d0b1f91524a 100755 (executable)
--- a/src/PYCALCULATOR/PYCALCULATOR_TEST.py
+++ b/src/PYCALCULATOR/PYCALCULATOR_TEST.py
@@ -1,3 +1,21 @@
+#  Copyright (C) 2005  CEA/DEN, EDF R&D
+#
+#  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.
+#
+#  This library is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#  Lesser General Public License for more details.
+#
+#  You should have received a copy of the GNU Lesser General Public
+#  License along with this library; if not, write to the Free Software
+#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+#
+#  See http://www.salome-platform.org/
+#
 import salome
 import SALOME
 import SALOME_MED