From 787a3f37aeaa1101556df865381abd117780ea3e Mon Sep 17 00:00:00 2001 From: jfa Date: Sat, 6 May 2006 09:10:50 +0000 Subject: [PATCH] Join modifications from branch OCC_debug_for_3_2_0b1 --- INSTALL | 6 ++--- Makefile.in | 20 +++++++++++++++- adm_local/Makefile.in | 18 +++++++++++++++ adm_local/unix/make_commence.in | 14 ++++++++---- bin/VERSION | 2 +- bin/myrunSalome.py | 18 +++++++++++++++ build_configure | 4 ++-- idl/Makefile.in | 18 +++++++++++++++ idl/PYHELLO_Gen.idl | 18 +++++++++++++++ resources/SalomeApp.xml | 12 ++++++++++ src/Makefile.in | 18 +++++++++++++++ src/PYHELLO/Makefile.in | 18 +++++++++++++++ src/PYHELLO/PYHELLO.py | 18 +++++++++++++++ src/PYHELLOGUI/Makefile.in | 18 +++++++++++++++ src/PYHELLOGUI/PYHELLOGUI.py | 39 ++++++++++++++++++++++++-------- src/PYHELLOGUI/PYHELLO_icons.po | 18 +++++++++++++++ src/PYHELLOGUI/PYHELLO_msg_en.po | 18 +++++++++++++++ 17 files changed, 257 insertions(+), 20 deletions(-) create mode 100644 resources/SalomeApp.xml diff --git a/INSTALL b/INSTALL index ab9dfd1..968bce7 100644 --- 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 33913b7..bd44218 100644 --- 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 9b5e810..40ceced 100644 --- 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 e6c484b..5ad69cc 100644 --- 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 f9a67f9..0fc7088 100755 --- 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 42cff9d..a3a2d53 100755 --- 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 f2ef6da..bc34d96 100755 --- 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 366defb..de2dd55 100644 --- 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 603ad16..30d82a5 100644 --- 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 index 0000000..7ec465c --- /dev/null +++ b/resources/SalomeApp.xml @@ -0,0 +1,12 @@ + +
+ + + + +
+
+ + +
+ diff --git a/src/Makefile.in b/src/Makefile.in index 1742b11..a58a04f 100644 --- 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 bb52cee..32bd7fa 100644 --- 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 527fa80..d154458 100644 --- 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 6e01cf9..1291459 100644 --- 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 79201a6..673933f 100644 --- 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 b386757..241a725 100644 --- 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 b386757..241a725 100644 --- 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". -- 2.30.2