-// Copyright (C) 2005 OPEN CASCADE, CEA/DEN, EDF R&D, PRINCIPIA R&D
-//
+// Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//
// 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
+// 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
+//
+// 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
+// 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/
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
+
#include "SalomeApp_ExceptionHandler.h"
+#include "Utils_CorbaException.hxx"
-#include <OSD.hxx>
+#include "CASCatch.hxx"
+#include "Basics_OCCTVersion.hxx"
-#include <Standard_Failure.hxx>
-#include <Standard_ErrorHandler.hxx>
+#include <OSD.hxx>
#include <stdexcept>
#include <exception>
-#include <qstring.h>
-
-#include <CASCatch_CatchSignals.hxx>
-#include <CASCatch_ErrorHandler.hxx>
-#include <CASCatch_Failure.hxx>
+#include <QString>
+#if OCC_VERSION_LARGE > 0x06010000
+ #include <Standard_ErrorHandler.hxx>
+ #include <Standard_Failure.hxx>
+#else
+ #include "CASCatch.hxx"
+#endif
/*!Constructor. Initialize by \a floatSignal.*/
SalomeApp_ExceptionHandler::SalomeApp_ExceptionHandler( const bool floatSignal )
: SUIT_ExceptionHandler()
{
- OSD::SetSignal( floatSignal );
+ // JFA 2006-09-28: PAL10867: suppress signal catching,
+ // if environment variable DISABLE_SIGNALS_CATCHING is set to 1.
+ // Commonly this is used with "noexcepthandler" option.
+ char* envNoCatchSignals = getenv("NOT_INTERCEPT_SIGNALS");
+ if (!envNoCatchSignals || !atoi(envNoCatchSignals))
+ {
+ OSD::SetSignal( floatSignal );
+ }
}
/*!Try to call SUIT_ExceptionHandler::internalHandle(o, e), catch if failure.*/
bool SalomeApp_ExceptionHandler::handleSignals( QObject* o, QEvent* e )
{
-
- CASCatch_CatchSignals aCatchSignals;
- aCatchSignals.Activate();
-
-
- CASCatch_TRY {
+#if OCC_VERSION_LARGE > 0x06010000
+ try {
+ OCC_CATCH_SIGNALS;
+#else
+ CASCatch_TRY {
+#endif
SUIT_ExceptionHandler::internalHandle( o, e );
}
- CASCatch_CATCH(CASCatch_Failure) {
- aCatchSignals.Deactivate();
- Handle(CASCatch_Failure) aFail = CASCatch_Failure::Caught();
- throw std::runtime_error( aFail->GetError() );
+#if OCC_VERSION_LARGE > 0x06010000
+ catch(Standard_Failure) {
+#else
+ CASCatch_CATCH(Standard_Failure) {
+#endif
+ Handle(Standard_Failure) aFail = Standard_Failure::Caught();
+ throw Standard_Failure( aFail->GetMessageString() );
}
-
- aCatchSignals.Deactivate();
+
return true;
}
-#ifdef try
-#undef try
-#endif
-
-#ifdef catch
-#undef catch
-#endif
-
/*!Try to call handleSignals( o, e ), catch and show error message.*/
bool SalomeApp_ExceptionHandler::handle( QObject* o, QEvent* e )
{
{
showMessage( title, QString( e.GetMessageString() ) );
}
-#ifndef WNT
+ catch( SALOME::SALOME_Exception& ex)
+ {
+ showMessage( title, QString( ex.details.text));
+ }
+#ifndef WIN32
catch(...)
{
showMessage( title, "Unknown Exception" );
/*!Create new SUIT_ExceptionHandler*/
extern "C" SALOMEAPP_EXPORT SUIT_ExceptionHandler* getExceptionHandler()
{
- return new SalomeApp_ExceptionHandler( true );
+ // MSV 2006-04-26: work around PAL12004 "VTK window => SIGFPE Arithmetic Exception Detected"
+ // We disable FPE signal as it was in earlier versions of SALOME. It is enabled
+ // only in debug mode if the environment variable DISABLE_FPE is not set to 1.
+ bool raiseFPE;
+#if defined(_DEBUG_) | defined(_DEBUG) //the Last for WIN32 default settings
+ raiseFPE = true;
+ char* envDisableFPE = getenv("DISABLE_FPE");
+ if (envDisableFPE && atoi(envDisableFPE))
+ raiseFPE = false;
+#else
+ raiseFPE = false;
+#endif
+
+ return new SalomeApp_ExceptionHandler( raiseFPE );
}
