Merge from BR_Dev_For_4_0.

diff --git a/build_configure b/build_configure
index 4d417f314e81afbd07f3ac9258be08bdb51353d9..3c8e79eb8abf85939d4ddd4dd9891968d2949c30 100755 (executable)
--- a/build_configure
+++ b/build_configure
@@ -33,20 +33,20 @@ cd ${CONF_DIR}
 ABS_CONF_DIR=`pwd`
 
 mkdir -p salome_adm/unix/config_files
-cp -f ${KERNEL_ROOT_DIR}/salome_adm/unix/config_files/* salome_adm/unix/config_files
-cp -f ${KERNEL_ROOT_DIR}/salome_adm/unix/pythonbe.py salome_adm/unix
+#cp -f ${KERNEL_ROOT_DIR}/salome_adm/unix/config_files/* salome_adm/unix/config_files
+#cp -f ${KERNEL_ROOT_DIR}/salome_adm/unix/pythonbe.py salome_adm/unix
 
 cp -f ${KERNEL_ROOT_DIR}/salome_adm/unix/SALOMEconfig.h.in salome_adm/unix
 
-cp -f ${GUI_ROOT_DIR}/adm_local/unix/config_files/* salome_adm/unix/config_files
+#cp -f ${GUI_ROOT_DIR}/adm_local/unix/config_files/* salome_adm/unix/config_files
 
 # remove KERNEL deprecated configure files
-for deprecated in ac_cc_warnings.m4 ac_cxx_partial_specialization.m4 \
-  check_mico.m4 config.guess ltmain.sh ac_cxx_bool.m4 ltconfig ac_cxx_typename.m4 \
-    check_pthreads.m4 config.sub libtool.m4 ac_cxx_mutable.m4 missing
-    do
-      rm -f salome_adm/unix/config_files/${deprecated}
-      done
+#for deprecated in ac_cc_warnings.m4 ac_cxx_partial_specialization.m4 \
+#  check_mico.m4 config.guess ltmain.sh ac_cxx_bool.m4 ltconfig ac_cxx_typename.m4 \
+#    check_pthreads.m4 config.sub libtool.m4 ac_cxx_mutable.m4 missing
+#    do
+#      rm -f salome_adm/unix/config_files/${deprecated}
+#      done
 
 
 # ____________________________________________________________________
@@ -58,7 +58,9 @@ for deprecated in ac_cc_warnings.m4 ac_cxx_partial_specialization.m4 \
 #   autom4te.cache (directory)
 echo "====================================================== aclocal"
 
-aclocal -I adm_local/unix/config_files -I salome_adm/unix/config_files  || exit 1
+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 || exit 1
 
 # ____________________________________________________________________
 # libtoolize creates some configuration files (ltmain.sh,

diff --git a/configure.ac b/configure.ac
index 8221ca31ff3d25286f5c24459fdeb650fa8c780b..d72094c03ee098e4e2884d37949eee145740acb4 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -15,18 +15,13 @@
 # Created from configure.in.base
 #
 
-AC_INIT([Salome2 Project PYHELLO module], [4.0.0], [gboulant@CS], [salome])
+AC_INIT([Salome2 Project PYHELLO module], [4.1.1], [webmaster.salome@opencascade.com], [salome])
 AC_CONFIG_AUX_DIR(salome_adm/unix/config_files)
 AC_CANONICAL_HOST
 AC_CANONICAL_TARGET
 AM_INIT_AUTOMAKE
 
-PACKAGE=salome
-AC_SUBST(PACKAGE)
-
-VERSION=4.0.0
-XVERSION=0x040000
-AC_SUBST(VERSION)
+XVERSION=`echo $VERSION | awk -F. '{printf("0x%02x%02x%02x",$1,$2,$3)}'`
 AC_SUBST(XVERSION)
 
 # set up MODULE_NAME variable for dynamic construction of directories (resources, etc.)

diff --git a/resources/Makefile.am b/resources/Makefile.am
index 0602e1121b5700168f7dfae74cfac7be16d7a10d..031081601a48be9900ab5c03e895c92c928fe714 100644 (file)
--- a/resources/Makefile.am
+++ b/resources/Makefile.am
@@ -28,6 +28,7 @@ include $(top_srcdir)/adm_local/unix/make_common_starter.am
 dist_salomeres_DATA = \
        PYHELLO.png \
        ExecPYHELLO.png \
-       SalomeApp.xml
+       SalomeApp.xml \
+       PYHELLO_en.xml
 
 nodist_salomeres_DATA = PYHELLOCatalog.xml

diff --git a/src/PYHELLOGUI/PYHELLOGUI.py b/src/PYHELLOGUI/PYHELLOGUI.py
index 8afba7277c496fd5ef27065aa8dc281b9d79980a..af4ce65cef3099716156d0549af17f028b43cfef 100644 (file)
--- a/src/PYHELLOGUI/PYHELLOGUI.py
+++ b/src/PYHELLOGUI/PYHELLOGUI.py
@@ -25,6 +25,8 @@ from LifeCycleCORBA import *
 import SALOMEDS
 import SALOMEDS_Attributes_idl
 
+import PYHELLO_ORB
+
 ################################################
 # module name
 __MODULE_NAME__ = "PYHELLO"
@@ -60,7 +62,6 @@ studyManager = obj._narrow( SALOMEDS.StudyManager )
 
 # --- get PYHELLO engine ---
 def _getEngine():
-    import PYHELLO_ORB
     engine = lcc.FindOrLoadComponent( "FactoryServerPy", __MODULE_NAME__ )
     return engine
 
@@ -94,8 +95,7 @@ def _findOrCreateComponent():
         attr = builder.FindOrCreateAttribute( father, "AttributeLocalID" )
         attr.SetValue( __MODULE_ID__ )
         try:
-            ### The following line is commented because it causes crashes ! ###
-            ### builder.DefineComponentInstance( father, _getEngine() )
+            builder.DefineComponentInstance( father, _getEngine() )
             pass
         except:
             pass
@@ -225,7 +225,7 @@ def CreateObject():
     attr.SetValue( "Object " +  str( __id__ ) )
     attr    = builder.FindOrCreateAttribute( object, "AttributeLocalID" )
     attr.SetValue( __OBJECT_ID__ )
-    sgPyQt.updateObjBrowser()
+    sg.updateObjBrowser(True)
     pass
 
 # ----------------------- #
@@ -239,7 +239,7 @@ def DeleteAll():
             sobj = iter.Value()
             iter.Next()
             builder.RemoveObjectWithChildren( sobj )
-        sgPyQt.updateObjBrowser()
+        sg.updateObjBrowser(True)
     pass
 
 # ----------------------- #
@@ -264,7 +264,7 @@ def Delete():
         if ( sobj ):
             builder = study.NewBuilder()
             builder.RemoveObject( sobj )
-            sgPyQt.updateObjBrowser()
+            sg.updateObjBrowser(True)
     pass
 
 # ----------------------- #