PR: merge from trunk tag mergeto_KLOSS_br1_13Mar04

diff --git a/salome_adm/unix/config_files/check_omniorb.m4 b/salome_adm/unix/config_files/check_omniorb.m4
index 500abac3114190acd0bbd813d81bc0a220106325..c7a9699e31edaaa1ce5d3f3fa64a4834873999e1 100644 (file)
--- a/salome_adm/unix/config_files/check_omniorb.m4
+++ b/salome_adm/unix/config_files/check_omniorb.m4
@@ -30,19 +30,35 @@ then
   AC_SUBST(OMNIORB_IDL)
 
   OMNIORB_BIN=`echo ${OMNIORB_IDL} | sed -e "s,[[^/]]*$,,;s,/$,,;s,^$,.,"`
-  OMNIORB_LIB=`echo ${OMNIORB_BIN} | sed -e "s,bin,lib,"`
-
-  OMNIORB_ROOT=`echo ${OMNIORB_BIN}  | sed -e "s,[[^/]]*$,,;s,/$,,;s,^$,.,"`
-  OMNIORB_ROOT=`echo ${OMNIORB_ROOT} | sed -e "s,[[^/]]*$,,;s,/$,,;s,^$,.,"`
+  OMNIORB_ROOT=${OMNIORB_BIN}
+  # one-level up
+  OMNIORB_ROOT=`echo ${OMNIORB_ROOT}  | sed -e "s,[[^/]]*$,,;s,/$,,;s,^$,.,"`
+  #
+  #
+  if test -d $OMNIORB_ROOT/include ; then
+    # if $OMNIORB_ROOT/include exists, there are a lot of chance that
+    # this is omniORB4.x installed via configure && make && make install
+    OMNIORB_LIB=`echo ${OMNIORB_BIN} | sed -e "s,bin\$,lib,"`
+    OMNIORB_VERSION=4
+  else
+    # omniORB has been installed old way
+    OMNIORB_LIB=`echo ${OMNIORB_BIN} | sed -e "s,bin/,lib/,"`
+    # one-level up again
+    OMNIORB_ROOT=`echo ${OMNIORB_ROOT}  | sed -e "s,[[^/]]*$,,;s,/$,,;s,^$,.,"`
+    if test -d $OMNIORB_ROOT/include/omniORB4 ; then
+      OMNIORB_VERSION=4
+    else
+      OMNIORB_VERSION=3
+    fi
+  fi
   AC_SUBST(OMNIORB_ROOT)
 
-  OMNIORB_INCLUDES="-I$OMNIORB_ROOT/include -I$OMNIORB_ROOT/include/omniORB3 -I$OMNIORB_ROOT/include/COS"
-dnl  OMNIORB_INCLUDES="-I$OMNIORB_ROOT/include -I$OMNIORB_ROOT/include/omniORB4 -I$OMNIORB_ROOT/include/COS"
+  OMNIORB_INCLUDES="-I$OMNIORB_ROOT/include -I$OMNIORB_ROOT/include/omniORB${OMNIORB_VERSION} -I$OMNIORB_ROOT/include/COS"
   AC_SUBST(OMNIORB_INCLUDES)
 
   ENABLE_PTHREADS
 
-  OMNIORB_CXXFLAGS=
+  OMNIORB_CXXFLAGS="-DOMNIORB_VERSION=$OMNIORB_VERSION"
   case $build_cpu in
     sparc*)
       AC_DEFINE(__sparc__)
@@ -120,16 +136,23 @@ then
   AC_CHECK_LIB(nsl,gethostbyname, LIBS="-lnsl $LIBS",,)
 
   LIBS_old=$LIBS
-  OMNIORB_LIBS="$OMNIORB_LDFLAGS -lomniORB3 -ltcpwrapGK -lomniDynamic3 -lomnithread -lCOS3 -lCOSDynamic3"
-dnl  OMNIORB_LIBS="$OMNIORB_LDFLAGS -lomniORB4 -lomniDynamic4 -lomnithread -lCOS4 -lCOSDynamic4"
+  OMNIORB_LIBS="$OMNIORB_LDFLAGS"
+  OMNIORB_LIBS="$OMNIORB_LIBS -lomniORB${OMNIORB_VERSION}"
+  OMNIORB_LIBS="$OMNIORB_LIBS -lomniDynamic${OMNIORB_VERSION}"
+  OMNIORB_LIBS="$OMNIORB_LIBS -lCOS${OMNIORB_VERSION}"
+  OMNIORB_LIBS="$OMNIORB_LIBS -lCOSDynamic${OMNIORB_VERSION}"
+  OMNIORB_LIBS="$OMNIORB_LIBS -lomnithread"
+  if test $OMNIORB_VERSION = 3 ; then
+    OMNIORB_LIBS="$OMNIORB_LIBS -ltcpwrapGK"
+  fi
   AC_SUBST(OMNIORB_LIBS)
 
   LIBS="$OMNIORB_LIBS $LIBS"
   CXXFLAGS_old=$CXXFLAGS
   CXXFLAGS="$CXXFLAGS $OMNIORB_CXXFLAGS $OMNIORB_INCLUDES"
 
-  AC_MSG_CHECKING(whether we can link with omniORB3)
-  AC_CACHE_VAL(salome_cv_lib_omniorb3,[
+  AC_MSG_CHECKING(whether we can link with omniORB)
+  AC_CACHE_VAL(salome_cv_lib_omniorb,[
     AC_TRY_LINK(
 #include <CORBA.h>
 ,   CORBA::ORB_var orb,
@@ -184,21 +207,22 @@ then
 
   CORBA_ORB_INIT_HAVE_3_ARGS=1
   AC_DEFINE(CORBA_ORB_INIT_HAVE_3_ARGS)
-  CORBA_ORB_INIT_THIRD_ARG='"omniORB3"'
-  AC_DEFINE(CORBA_ORB_INIT_THIRD_ARG, "omniORB3")
+  CORBA_ORB_INIT_THIRD_ARG='"omniORB"'
+  AC_DEFINE(CORBA_ORB_INIT_THIRD_ARG, "omniORB")
 
 fi
 
 omniORBpy_ok=no
 if  test "x$omniORB_ok" = "xyes"
 then
-  AC_MSG_CHECKING(omniORBpy (CORBA.py file available))
-  if test -f ${OMNIORB_ROOT}/lib/python/CORBA.py
-  then
-    omniORBpy_ok=yes
-    PYTHONPATH=${OMNIORB_ROOT}/lib/python:${OMNIORB_LIB}:${PYTHON_PREFIX}/lib/python${PYTHON_VERSION}:${PYTHONPATH}
-    AC_SUBST(PYTHONPATH)
+  AC_MSG_CHECKING(omniORBpy)
+  $PYTHON -c "import omniORB" &> /dev/null
+  if test $? = 0 ; then
     AC_MSG_RESULT(yes)
+    omniORBpy_ok=yes
+  else
+    AC_MSG_RESULT(no, check your installation of omniORBpy)
+    omniORBpy_ok=no
   fi
 fi
 

diff --git a/src/NamingService/SALOME_NamingService.hxx b/src/NamingService/SALOME_NamingService.hxx
index e22bf2d169a65f3fb79bbcb8e64e63b6d188ea5f..dde3261388331532bb793ee1da79e7e61e41f558 100644 (file)
--- a/src/NamingService/SALOME_NamingService.hxx
+++ b/src/NamingService/SALOME_NamingService.hxx
@@ -31,7 +31,8 @@
 
 #include "utilities.h"
 //#include <omniORB4/CORBA.h>
-#include <omniORB3/CORBA.h>
+//##include <omniORB3/CORBA.h>
+#include <CORBA.h>
 #include <vector>
 #include <string>
 

diff --git a/src/SALOMEDS/SALOMEDS_Client.cxx b/src/SALOMEDS/SALOMEDS_Client.cxx
index aa39a9f526eb935fa043f095df9f9168077e65bd..37104eab0728c56c1fce0c9f6562f75bd8a2c331 100644 (file)
--- a/src/SALOMEDS/SALOMEDS_Client.cxx
+++ b/src/SALOMEDS/SALOMEDS_Client.cxx
@@ -279,8 +279,13 @@ int main(int argc, char** argv)
 { 
   try {
     // Initialise the ORB.
+#if OMNIORB_VERSION >= 4
+    const char* options[][2] = { { "giopMaxMsgSize", "104857600" }, { 0, 0 } };
+    CORBA::ORB_var orb = CORBA::ORB_init( argc , argv , "omniORB4", options) ;
+#else
     CORBA::ORB_var orb = CORBA::ORB_init(argc, argv, "omniORB3");
     omniORB::MaxMessageSize(100 * 1024 * 1024);
+#endif
     
     // Obtain a reference to the root POA.
     CORBA::Object_var obj = orb->resolve_initial_references("RootPOA");

diff --git a/src/SALOMEDS/SALOMEDS_Server.cxx b/src/SALOMEDS/SALOMEDS_Server.cxx
index 11be220654bbb55fb295c09ec34430591caa1f76..1ed30a91efe121876a87ea94c498d6faaa05ce3e 100644 (file)
--- a/src/SALOMEDS/SALOMEDS_Server.cxx
+++ b/src/SALOMEDS/SALOMEDS_Server.cxx
@@ -129,8 +129,7 @@ int main(int argc, char** argv)
                      }
                  }
              }
-       
-           }
+                   }
          catch( const SALOME_Exception &ex )
            {
              MESSAGE( "Communication Error : " << ex.what() );

diff --git a/src/SALOMEGUI/QAD_ObjectBrowser.cxx b/src/SALOMEGUI/QAD_ObjectBrowser.cxx
index d72f4c9d3a6413a8a31e94e5f81036d2c9ea8f6a..eb8435512adb282ff7eeb9c251a6e3006a673f7e 100644 (file)
--- a/src/SALOMEGUI/QAD_ObjectBrowser.cxx
+++ b/src/SALOMEGUI/QAD_ObjectBrowser.cxx
@@ -150,6 +150,8 @@ QAD_ObjectBrowser::QAD_ObjectBrowser( SALOMEDS::Study_var study, QWidget* parent
   myStudy = SALOMEDS::Study::_duplicate( study );
   myListViewMap.clear();
   myUseCaseMap.clear();
+  myListView=0;    // must be done before setupListView(): setCornerWidget() provoque call to eventFilter
+  myUseCaseView=0; // and test myUseCaseView->viewport() before initialisation
   setupListView();
 }
 
@@ -339,6 +341,7 @@ bool QAD_ObjectBrowser::eventFilter( QObject* o, QEvent* e )
     return QTabWidget::eventFilter( o, e );
 
   SALOMEDS::UseCaseBuilder_var UCBuilder = myStudy->GetUseCaseBuilder();
+  if (! myUseCaseView) return QTabWidget::eventFilter( o, e );
   if (o == myUseCaseView->viewport()) {
     if ( e->type() == QEvent::MouseButtonPress ) {
       // Test if clicked on selection and start drag if necessary

diff --git a/src/Session/SALOME_Session_QThread.cxx b/src/Session/SALOME_Session_QThread.cxx
index 8531be10fc1e303a8a0adeb9e5bdf8f293d46a42..8c598f1dadc30b28bde50372b2b76974a0583b01 100644 (file)
--- a/src/Session/SALOME_Session_QThread.cxx
+++ b/src/Session/SALOME_Session_QThread.cxx
@@ -48,6 +48,8 @@ using namespace std;
 #include <SALOMEconfig.h>
 #include CORBA_SERVER_HEADER(SALOMEDS)
 
+SALOME_Session_QThread* SALOME_Session_QThread::_singleton = 0;
+
 //=============================================================================
 /*! SALOME_Session_QThread
  *  constructor
@@ -56,6 +58,7 @@ using namespace std;
 
 SALOME_Session_QThread::SALOME_Session_QThread(int argc, char ** argv) : QThread()
 {
+  INFOS("Creation SALOME_Session_QThread");
   _qappl = 0 ;
   _mw = 0 ;
   _argc = argc ;
@@ -63,6 +66,19 @@ SALOME_Session_QThread::SALOME_Session_QThread(int argc, char ** argv) : QThread
   _NS = 0 ;
 } ;
 
+//=============================================================================
+/*!
+ *  
+ */
+//=============================================================================
+
+  SALOME_Session_QThread* SALOME_Session_QThread::Instance(int argc, char ** argv)
+{
+  if (_singleton == 0) _singleton = new SALOME_Session_QThread(argc, argv);
+  return _singleton;
+
+}
+
 //=============================================================================
 /*! run
  *  Creates one QApplication for the all the session life.

diff --git a/src/Session/SALOME_Session_QThread.hxx b/src/Session/SALOME_Session_QThread.hxx
index 9e9941bd7814552fbc47286b31d00b2b4e4bd7b7..eac1da8d65ceb0be7fe031e362d872e5f2271783 100644 (file)
--- a/src/Session/SALOME_Session_QThread.hxx
+++ b/src/Session/SALOME_Session_QThread.hxx
@@ -41,7 +41,7 @@ class SALOME_Session_QThread: public QThread
 {
 
 public:
-  SALOME_Session_QThread(int argc, char ** argv) ;
+  static SALOME_Session_QThread* Instance(int argc, char ** argv);
 
   //! launch the Qt main window of the GUI on a separate thread
   virtual void run() ;
@@ -57,6 +57,10 @@ protected:
   QApplication *_qappl ;
 
   SALOMEGUI_Application* _mw ;
+  SALOME_Session_QThread(int argc, char ** argv);
+
+private:
+  static SALOME_Session_QThread* _singleton;
 } ;
 
 #endif

diff --git a/src/Session/SALOME_Session_i.cxx b/src/Session/SALOME_Session_i.cxx
index fb2d92a94031fed84a862a671fa5b83461df285d..154848f2119832547e2864b461b96d77ea671cf8 100644 (file)
--- a/src/Session/SALOME_Session_i.cxx
+++ b/src/Session/SALOME_Session_i.cxx
@@ -52,7 +52,7 @@ SALOME_Session_i::SALOME_Session_i(int argc, char ** argv, CORBA::ORB_ptr orb, P
 {
   _argc = argc ;
   _argv = argv ;
-  _IAPPThread = new SALOME_Session_QThread(_argc, _argv) ;
+  _IAPPThread = SALOME_Session_QThread::Instance(_argc, _argv);
   _isGUI = FALSE ;
   _runningStudies= 0 ;
   _orb = CORBA::ORB::_duplicate(orb) ;

diff --git a/src/Utils/Utils_ORB_INIT.cxx b/src/Utils/Utils_ORB_INIT.cxx
index 0da127b344b0d6dc5b776e0feff7cc261f1d4a8f..0f39159ec27e0463503efc39782c84e5cfce2d0a 100644 (file)
--- a/src/Utils/Utils_ORB_INIT.cxx
+++ b/src/Utils/Utils_ORB_INIT.cxx
@@ -53,12 +53,15 @@ CORBA::ORB_var &ORB_INIT::operator() ( int argc , char **argv ) throw( CommExcep
        {
                try
                {
-                 //              const char* options[][2] = { { "giopMaxMsgSize", "104857600" }, { 0, 0 } };
-                 //              _orb = CORBA::ORB_init( argc , argv , "omniORB4", options) ;
+#if OMNIORB_VERSION >= 4
+                 const char* options[][2] = { { "giopMaxMsgSize", "104857600" }, { 0, 0 } };
+                 _orb = CORBA::ORB_init( argc , argv , "omniORB4", options) ;
+#else
                  _orb = CORBA::ORB_init( argc , argv ) ;
                  //set GIOP message size equal to 50Mb for transferring brep shapes as 
                  //sequence of bytes using C++ streams
                  omniORB::MaxMessageSize(100*1024*1024);
+#endif
                }
                catch( const CORBA::Exception &ex )
                {