From: ouv Date: Mon, 19 Jun 2006 11:22:00 +0000 (+0000) Subject: Merging from BR_DEBUG_3_2_0b1 X-Git-Tag: LAST_STABLE_VERSION_21_09_2006_ON_3_2_0~2 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=5c812cde548e52d7275ef03c6cb96bd8b7dbab1a;p=samples%2Fpyhello.git Merging from BR_DEBUG_3_2_0b1 --- diff --git a/INSTALL b/INSTALL index 1dc658f..e490384 100644 --- a/INSTALL +++ b/INSTALL @@ -1,4 +1 @@ -This is the version 3.2.0a1 of PYHELLO (SALOME 2 EXAMPLE MODULE) -Compatible with : - - KERNEL 3.2.0a1 - - GUI 3.2.0a1 +SALOME2 : PYHELLO module (sample) diff --git a/Makefile.in b/Makefile.in index 30d7608..d1dbea2 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/ or email : webmaster.salome@opencascade.com +# # -* Makefile *- # # Author : C. Caremoli @@ -9,26 +27,34 @@ top_srcdir=@top_srcdir@ top_builddir=. srcdir=@srcdir@ -VPATH=.:@srcdir@:@top_srcdir@/bin:@top_srcdir@/resources:./bin:@top_srcdir@/idl +VPATH=.:@srcdir@:@top_srcdir@/bin:./bin/salome:./resources:@top_srcdir@/resources:./bin:@top_srcdir@/idl + @COMMENCE@ -SUBDIRS = idl src +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 # copy header files in common directory -ifeq ($(HAVE_SSTREAM),yes) - include_list=include/salome/SALOMEconfig.h -else - include_list=include/salome/SALOMEconfig.h include/salome/sstream + +include_list = include/salome/SALOMEconfig.h + +ifneq ($(HAVE_SSTREAM),yes) + include_list += include/salome/sstream endif inc: idl $(include_list) +bin: bin/salome/VERSION + +bin/salome/VERSION : bin/VERSION + -$(RM) $@ + $(LN_S) ../../$< $@ + include/salome/SALOMEconfig.h: salome_adm/unix/SALOMEconfig.ref -$(RM) $@ $(LN_S) ../../$< $@ diff --git a/adm_local/unix/make_commence.in b/adm_local/unix/make_commence.in index 623267d..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,14 +244,21 @@ $(top_srcdir)/configure.in: $(top_srcdir)/configure.in.base cd $(top_srcdir) && ./build_configure -ACLOCAL_SRC = \ -ac_cxx_bool.m4 check_corba.m4 check_vtk.m4 \ +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 \ ac_cxx_namespaces.m4 check_omniorb.m4 pyembed.m4 \ -ac_cxx_partial_specialization.m4 check_opengl.m4 python.m4 \ +ac_cxx_partial_specialization.m4 python.m4 \ ac_cxx_typename.m4 check_pthreads.m4 check_cas.m4 \ -ac_cc_warnings.m4 check_qt.m4 check_swig.m4 +ac_cc_warnings.m4 check_swig.m4 + +ACLOCAL_GUI = \ +check_vtk.m4 check_opengl.m4 check_qt.m4 \ +check_GUI.m4 check_corba_in_GUI.m4 + +$(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 -I adm_local/unix/config_files -I @KERNEL_ROOT_DIR@/salome_adm/unix/config_files + -I @GUI_ROOT_DIR@/adm_local/unix/config_files -$(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 diff --git a/bin/VERSION b/bin/VERSION deleted file mode 100755 index fed23e1..0000000 --- a/bin/VERSION +++ /dev/null @@ -1 +0,0 @@ -THIS IS SALOME - PYHELLO VERSION: 3.2.0a1 diff --git a/bin/myrunSalome.py b/bin/myrunSalome.py index 42cff9d..3b4d6cf 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/ or email : webmaster.salome@opencascade.com +# #!/usr/bin/env python def test(clt): diff --git a/build_configure b/build_configure index 573a23b..bc34d96 100755 --- a/build_configure +++ b/build_configure @@ -20,6 +20,14 @@ if test ! -d "${KERNEL_ROOT_DIR}"; then exit fi +######################################################################## +# Test if the GUI_ROOT_DIR is set correctly + +if test ! -d "${GUI_ROOT_DIR}"; then + echo "failed : GUI_ROOT_DIR variable is not correct !" + exit +fi + ######################################################################## # find_in - utility function # @@ -49,6 +57,7 @@ find_in() case $1 in */CVS) return ;; + */adm_local/*) return ;; *) ;; esac @@ -118,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 @@ -128,9 +137,9 @@ echo "./salome_adm/unix/make_module \\" >> configure.in_tmp1 touch configure.in_tmp2 find_in . configure.in_tmp2 -sed -e '/^.\/salome_adm/d' \ +sed -e '/^...salome_adm/d' \ -e '/configure.in/d' \ - -e '/^.\/adm_local/d' \ + -e '/^...adm_local/d' \ -e 's/.in / /' \ configure.in_tmp2 >> configure.in_tmp1 @@ -194,7 +203,8 @@ else echo -n "Creating 'configure' script ... " fi -aclocal --acdir=adm_local/unix/config_files -I ${KERNEL_ROOT_DIR}/salome_adm/unix/config_files +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 if autoconf then echo "done" diff --git a/configure.in.base b/configure.in.base index 9eaef0a..b3ee35c 100644 --- a/configure.in.base +++ b/configure.in.base @@ -22,8 +22,10 @@ AC_CANONICAL_HOST PACKAGE=salome AC_SUBST(PACKAGE) -VERSION=1.2.1 +VERSION=3.2.0 +XVERSION=0x030200 AC_SUBST(VERSION) +AC_SUBST(XVERSION) dnl dnl Initialize source and build root directories @@ -123,6 +125,26 @@ echo CHECK_MSG2QM +echo +echo --------------------------------------------- +echo Testing GUI +echo --------------------------------------------- +echo + +CHECK_SALOME_GUI + +echo +echo --------------------------------------------- +echo Testing full GUI +echo --------------------------------------------- +echo + +CHECK_CORBA_IN_GUI +if test "x${CORBA_IN_GUI}" != "xyes"; then + echo "failed : For configure PYHELLO1 module necessary full GUI !" + exit +fi + echo echo --------------------------------------------- echo Testing Kernel diff --git a/doc/dev_guide.pdf b/doc/dev_guide.pdf index bc7b7f9..8c36392 100644 Binary files a/doc/dev_guide.pdf and b/doc/dev_guide.pdf differ diff --git a/idl/Makefile.in b/idl/Makefile.in index 366defb..ea79c31 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/ or email : webmaster.salome@opencascade.com +# # # generate dependencies for idl file : # diff --git a/idl/PYHELLO_Gen.idl b/idl/PYHELLO_Gen.idl index 603ad16..665544c 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/ or email : webmaster.salome@opencascade.com +// #ifndef __PYHELLO_GEN__ #define __PYHELLO_GEN__ diff --git a/resources/ExecPYHELLO.png b/resources/ExecPYHELLO.png index 16a20c1..56134d4 100644 Binary files a/resources/ExecPYHELLO.png and b/resources/ExecPYHELLO.png differ diff --git a/resources/PYHELLO.png b/resources/PYHELLO.png index 16a20c1..56134d4 100644 Binary files a/resources/PYHELLO.png and b/resources/PYHELLO.png differ diff --git a/resources/PYHELLOCatalog.xml b/resources/PYHELLOCatalog.xml deleted file mode 100644 index 701ef00..0000000 --- a/resources/PYHELLOCatalog.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - - - - - PYHELLO - PYHELLO GUI - Data - C. Caremoli - 3.2.0a1 - EDF - RD - 1 - PYHELLO.png - 'linux' ~ OS - - - - diff --git a/src/Makefile.in b/src/Makefile.in index 1742b11..ac69a9f 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/ or email : webmaster.salome@opencascade.com +# #============================================================================== # 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..e6fa779 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/ or email : webmaster.salome@opencascade.com +# # source path top_srcdir=@top_srcdir@ top_builddir=../.. diff --git a/src/PYHELLO/PYHELLO.py b/src/PYHELLO/PYHELLO.py index 527fa80..0a12777 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/ or email : webmaster.salome@opencascade.com +# import PYHELLO_ORB__POA import SALOME_ComponentPy import SALOME_DriverPy diff --git a/src/PYHELLOGUI/Makefile.in b/src/PYHELLOGUI/Makefile.in index 6e01cf9..4c52b1b 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/ or email : webmaster.salome@opencascade.com +# # source path top_srcdir=@top_srcdir@ top_builddir=../.. diff --git a/src/PYHELLOGUI/PYHELLOGUI.py b/src/PYHELLOGUI/PYHELLOGUI.py index 79201a6..8afba72 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/ or email : webmaster.salome@opencascade.com +# 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..7268d4d 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/ or email : webmaster.salome@opencascade.com +# # 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..7268d4d 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/ or email : webmaster.salome@opencascade.com +# # 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".