Join modifications from branch OCC_debug_for_3_2_0b1

diff --git a/INSTALL b/INSTALL
index ab9dfd12ae70fdc44795e81efa946870808f6da7..968bce7d690e09eebf6b2182f23da5e66ba3f908 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -1,4 +1,4 @@
-This is the version 3.2.0a2 of PYHELLO (SALOME 2 EXAMPLE MODULE)
+This is the version 3.2.0b1 of PYHELLO (SALOME 2 EXAMPLE MODULE)
 Compatible with :
-       - KERNEL 3.2.0a2
-        - GUI 3.2.0a2
+       - KERNEL 3.2.0b1
+        - GUI 3.2.0b1

diff --git a/Makefile.in b/Makefile.in
index 33913b7b3ad08bfa2abbd1c5a20d21af12db8504..bd44218613573e1d79c1a89facb2d2a78bc2ae1d 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 : C. Caremoli
@@ -16,7 +34,7 @@ VPATH=.:@srcdir@:@top_srcdir@/bin:@top_srcdir@/resources:./bin:@top_srcdir@/idl
 SUBDIRS = idl src adm_local
 
 RESOURCES_FILES = PYHELLOCatalog.xml PYHELLO.png PYHELLO_en.xml \
-                  ExecPYHELLO.png
+                  ExecPYHELLO.png SalomeApp.xml
 
 BIN_SCRIPT= VERSION runAppli myrunSalome.py
 

diff --git a/adm_local/Makefile.in b/adm_local/Makefile.in
index 9b5e810db5609f348cfc90502d69bd7da12b084f..40cecedb639bcd74fe032f2c3a4c68cd83c4dd17 100644 (file)
--- a/adm_local/Makefile.in
+++ b/adm_local/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/
+#
 # source path
 top_srcdir=@top_srcdir@
 top_builddir=..

diff --git a/adm_local/unix/make_commence.in b/adm_local/unix/make_commence.in
index e6c484b72a3bed924fcc017999e782d3b3aa41b0..5ad69cc0ddb56e419e7f1f6593d55c4371c634cd 100644 (file)
--- a/adm_local/unix/make_commence.in
+++ b/adm_local/unix/make_commence.in
@@ -223,7 +223,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 :-)
@@ -238,7 +244,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             check_hdf5.m4      enable_pthreads.m4        \
 ac_cxx_mutable.m4                 check_mico.m4      libtool.m4                \
@@ -251,8 +257,8 @@ ACLOCAL_GUI = \
 check_vtk.m4                      check_opengl.m4    check_qt.m4        \
 check_GUI.m4                      check_corba_in_GUI.m4
 
-$(top_srcdir)/aclocal.m4: $(ACLOCAL_SRC:%=@KERNEL_ROOT_DIR@/salome_adm/unix/config_files/%) \
+$(top_srcdir)/aclocal.m4: $(ACLOCAL_KERNEL:%=@KERNEL_ROOT_DIR@/salome_adm/unix/config_files/%) \
                           $(ACLOCAL_GUI:%=@GUI_ROOT_DIR@/adm_local/unix/config_files/%)
-       cd $(top_srcdir) ; aclocal --acdir=adm_local/unix/config_files -I @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
                                                                       -I @GUI_ROOT_DIR@/adm_local/unix/config_files
 

diff --git a/bin/VERSION b/bin/VERSION
index f9a67f9a3c17e2633ddb23cef7f5063b0e0c97eb..0fc7088c7d7ff856daaad5162440f1eff1c6bc45 100755 (executable)
--- a/bin/VERSION
+++ b/bin/VERSION
@@ -1 +1 @@
-THIS IS SALOME - PYHELLO VERSION: 3.2.0a2
+THIS IS SALOME - PYHELLO VERSION: 3.2.0b1

diff --git a/bin/myrunSalome.py b/bin/myrunSalome.py
index 42cff9d227dcd3a9feefe0ab83535c86f40079d2..a3a2d538292a94860f42b5bea6eb15c7d4afddf1 100755 (executable)
--- a/bin/myrunSalome.py
+++ b/bin/myrunSalome.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/
+#
 #!/usr/bin/env python
 
 def test(clt):

diff --git a/build_configure b/build_configure
index f2ef6da018628081bf187daec392f125c572a2fd..bc34d96c9ffab8adeba9fb998cfbd73f511f9ced 100755 (executable)
--- a/build_configure
+++ b/build_configure
@@ -127,9 +127,9 @@ echo "./salome_adm/unix/SALOMEconfig.h \\" >> configure.in_tmp1
 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 "./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
 echo "./salome_adm/unix/make_module \\" >> configure.in_tmp1
 

diff --git a/idl/Makefile.in b/idl/Makefile.in
index 366defb72b89dc4f5fb94cc84b579fbd53b06f3d..de2dd55a52262eb5e5ca7a5f559129b86704b753 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/PYHELLO_Gen.idl b/idl/PYHELLO_Gen.idl
index 603ad160b9380a41f9bf371e89e67c591eaf7753..30d82a5d7b5845845cf47495287a230e0eaff103 100644 (file)
--- a/idl/PYHELLO_Gen.idl
+++ b/idl/PYHELLO_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/
+//
 #ifndef __PYHELLO_GEN__
 #define __PYHELLO_GEN__
 

diff --git a/resources/SalomeApp.xml b/resources/SalomeApp.xml
new file mode 100644 (file)
index 0000000..7ec465c
--- /dev/null
+++ b/resources/SalomeApp.xml
@@ -0,0 +1,12 @@
+<document>
+  <section name="PYHELLO">
+    <!-- Major module parameters -->
+    <parameter name="name"    value="PyHello"/>
+    <parameter name="icon"    value="PYHELLO.png"/>
+    <parameter name="library" value="SalomePyQtGUI"/>
+  </section>
+  <section name="resources">
+    <!-- Module resources -->
+    <parameter name="PYHELLO" value="${PYHELLO_ROOT_DIR}/share/salome/resources"/>
+  </section>
+</document>

diff --git a/src/Makefile.in b/src/Makefile.in
index 1742b1183b4be03719fc529e17f5cc1fd055ccdb..a58a04f3f8ea034c2e15038c1cdc59f0bc255caa 100644 (file)
--- a/src/Makefile.in
+++ b/src/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/
+#
 #==============================================================================
 #  File      : Makefile.in
 #  Created   : ven déc  7 13:32:20 CET 2001

diff --git a/src/PYHELLO/Makefile.in b/src/PYHELLO/Makefile.in
index bb52cee1d03868d24a53e58c1a1e34925348cc3d..32bd7fae465163613066cdab3bd1826b31267a29 100644 (file)
--- a/src/PYHELLO/Makefile.in
+++ b/src/PYHELLO/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/
+#
 # source path
 top_srcdir=@top_srcdir@
 top_builddir=../..

diff --git a/src/PYHELLO/PYHELLO.py b/src/PYHELLO/PYHELLO.py
index 527fa8064f2f7714c47278cfc1ca719d27530b1e..d15445829e0fb8da5b0126172fa57f4b5b517cd1 100644 (file)
--- a/src/PYHELLO/PYHELLO.py
+++ b/src/PYHELLO/PYHELLO.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 PYHELLO_ORB__POA
 import SALOME_ComponentPy
 import SALOME_DriverPy

diff --git a/src/PYHELLOGUI/Makefile.in b/src/PYHELLOGUI/Makefile.in
index 6e01cf931efab8b6668d85d7719ae629db5f8fe7..12914596bd0f51b2874fbb0817ab73a928bbdf99 100644 (file)
--- a/src/PYHELLOGUI/Makefile.in
+++ b/src/PYHELLOGUI/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/
+#
 # source path
 top_srcdir=@top_srcdir@
 top_builddir=../..

diff --git a/src/PYHELLOGUI/PYHELLOGUI.py b/src/PYHELLOGUI/PYHELLOGUI.py
index 79201a6dd795e525ce3a85b330fbe845a576182e..673933fd7324d61b8c86c371c88830ccecbb5393 100644 (file)
--- a/src/PYHELLOGUI/PYHELLOGUI.py
+++ b/src/PYHELLOGUI/PYHELLOGUI.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/
+#
 from qt import *
 import traceback
 
@@ -123,15 +141,18 @@ def definePopup( context, object, parent ):
 # customize popup menu
 def customPopup( popup, context, object, parent ):
     print "PYHELLOGUI::customPopup :", context, object, parent
-    id = int( object )
-    if id == __MODULE_ID__:
-        study = _getStudy()
-        if sg.SelectedCount() == 1:
-            entry = sg.getSelected( 0 )
-            if entry != '':
-                sobj = study.FindObjectID( entry )
-                if sobj and not _hasChildren( sobj ):
-                    popup.removeItem( 951 ) # remove 'Delete All' command
+    try:
+        id = int( object )
+        if id == __MODULE_ID__:
+            study = _getStudy()
+            if sg.SelectedCount() == 1:
+                entry = sg.getSelected( 0 )
+                if entry != '':
+                    sobj = study.FindObjectID( entry )
+                    if sobj and not _hasChildren( sobj ):
+                        popup.removeItem( 951 ) # remove 'Delete All' command
+    except:
+        pass
     pass
 
 # process GUI action

diff --git a/src/PYHELLOGUI/PYHELLO_icons.po b/src/PYHELLOGUI/PYHELLO_icons.po
index b386757ac53d6333472512568ee1dd51b605f34c..241a7258dab35a46a7e44a51185a1e951fbc9ac7 100644 (file)
--- a/src/PYHELLOGUI/PYHELLO_icons.po
+++ b/src/PYHELLOGUI/PYHELLO_icons.po
@@ -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/
+#
 # This is a Qt message file in .po format.  Each msgid starts with
 # a scope.  This scope should *NOT* be translated - eg. "Foo::Bar"
 # would be translated to "Pub", not "Foo::Pub".

diff --git a/src/PYHELLOGUI/PYHELLO_msg_en.po b/src/PYHELLOGUI/PYHELLO_msg_en.po
index b386757ac53d6333472512568ee1dd51b605f34c..241a7258dab35a46a7e44a51185a1e951fbc9ac7 100644 (file)
--- a/src/PYHELLOGUI/PYHELLO_msg_en.po
+++ b/src/PYHELLOGUI/PYHELLO_msg_en.po
@@ -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/
+#
 # This is a Qt message file in .po format.  Each msgid starts with
 # a scope.  This scope should *NOT* be translated - eg. "Foo::Bar"
 # would be translated to "Pub", not "Foo::Pub".