Increment version number (2.2.3)

[modules/kernel.git] / src / Loader / SALOME_Session_Loader.cxx

diff --git a/src/Loader/SALOME_Session_Loader.cxx b/src/Loader/SALOME_Session_Loader.cxx
index 825fd045736fdf909596fa038582c4b03037a3c7..cc69f08688763a7010c3f5ea43a2b5d625c15280 100644 (file)
--- a/src/Loader/SALOME_Session_Loader.cxx
+++ b/src/Loader/SALOME_Session_Loader.cxx
@@ -7,17 +7,18 @@
 //  Module : SALOME
 //  $Header$
 
-using namespace std;
 /*! \file SALOME_Session_loader.cxx
  */
 
 #include <SALOMEconfig.h>
 #include CORBA_CLIENT_HEADER(SALOME_Session)
+#include CORBA_CLIENT_HEADER(Logger)
 
 #include "Utils_ORB_INIT.hxx"
 #include "Utils_SINGLETON.hxx"
 #include "SALOME_NamingService.hxx"
 #include "utilities.h"
+#include "SALOMETraceCollector.hxx"
 
 //! CORBA client for SALOME Session server : launch GUI
 /*!
@@ -26,9 +27,28 @@ using namespace std;
 
 #include <qapplication.h>
 #include "InquireServersQThread.h"
+using namespace std;
+
+void MessageOutput( QtMsgType type, const char *msg )
+{
+  switch ( type ) {
+  case QtDebugMsg:
+    MESSAGE( "Debug: " << msg );
+    break;
+  case QtWarningMsg:
+    MESSAGE( "Warning: " << msg );
+    break;
+  case QtFatalMsg:
+    MESSAGE( "Fatal: " << msg );
+    break;
+  }
+}
 
 int main(int argc, char **argv)
 {
+  CORBA::ORB_ptr orb = CORBA::ORB_init(argc,argv) ;
+  SALOMETraceCollector *myThreadTrace = SALOMETraceCollector::instance(orb);
+  qInstallMsgHandler( MessageOutput );
 //VRV: T2.4 - Trace management improvement
   QApplication myQApp(argc, argv) ;
   InquireServersGUI myIS;
@@ -40,49 +60,52 @@ int main(int argc, char **argv)
   if (myIS.getExitStatus())
     exit(1);
 //VRV: T2.4 - Trace management improvement
-  try
-    {
-      CORBA::ORB_ptr orb = CORBA::ORB_init(argc,argv) ;
-
-      SALOME_NamingService &NS = *SINGLETON_<SALOME_NamingService>::Instance() ;
-      ASSERT(SINGLETON_<SALOME_NamingService>::IsAlreadyExisting()) ;
-      NS.init_orb( orb ) ;
-
-      CORBA::Object_var obj = NS.Resolve("/Kernel/Session");
-
-      SALOME::Session_var session = SALOME::Session::_narrow(obj) ;
-      ASSERT(! CORBA::is_nil(session));
-      MESSAGE("SALOME::Session::_narrow(obj)");
-      INFOS("Corba initialisation, Distant server");
-
-      // -------------------------------------------------------------
-
-      session->GetInterface() ;
-
-      // -------------------------------------------------------------
-
-      orb->destroy() ;
-    }
-   catch (ServiceUnreachable&)
-     {
-       INFOS("Caught exception: Naming Service Unreachable");
-     }
-  catch (CORBA::COMM_FAILURE&)
-    {
-      INFOS("Caught CORBA::SystemException CommFailure.");
-    }
-  catch (CORBA::SystemException&)
-    {
-      INFOS("Caught CORBA::SystemException.");
-    }
-  catch (CORBA::Exception&)
-    {
-      INFOS("Caught CORBA::Exception.");
-    }
-  catch (...)
-    {
-      INFOS("Caught unknown exception.");
-    }
+  if (myIS.withGUI()) {
+    try
+      {
+       SALOME_NamingService &NS = *SINGLETON_<SALOME_NamingService>::Instance() ;
+       ASSERT(SINGLETON_<SALOME_NamingService>::IsAlreadyExisting()) ;
+       NS.init_orb( orb ) ;
+       
+       CORBA::Object_var obj = NS.Resolve("/Kernel/Session");
+       
+       SALOME::Session_var session = SALOME::Session::_narrow(obj) ;
+       ASSERT(! CORBA::is_nil(session));
+       MESSAGE("SALOME::Session::_narrow(obj)");
+       INFOS("Corba initialisation, Distant server");
+       
+       // -------------------------------------------------------------
+       
+       session->GetInterface() ;
+
+       // -------------------------------------------------------------
+       
+       orb->destroy() ;
+      }
+    catch (ServiceUnreachable&)
+      {
+       INFOS("Caught exception: Naming Service Unreachable");
+      }
+    catch (CORBA::COMM_FAILURE&)
+      {
+       INFOS("Caught CORBA::SystemException CommFailure.");
+      }
+    catch (CORBA::SystemException&)
+      {
+       INFOS("Caught CORBA::SystemException.");
+      }
+    catch (CORBA::Exception&)
+      {
+       INFOS("Caught CORBA::Exception.");
+      }
+    catch (...)
+      {
+       INFOS("Caught unknown exception.");
+      }
+    return 0 ;
+  }
+  INFOS("Normal Exit"); // without this trace, Splash remains on screen !
+  delete myThreadTrace;
   return 0 ;
 }