NPAL16752 (SIGSEGV on cutpanes, cutlines, plot3D on cronoshexa.med file):

To provide user's exceptions during 3d presentations creation.

diff --git a/src/VISU_I/VISU_Gen_i.cc b/src/VISU_I/VISU_Gen_i.cc
index 11f24415d303b70808a46848aff9c1752775cd78..883d34f55a6596f7dec863e809e4b0f257d9f526 100644 (file)
--- a/src/VISU_I/VISU_Gen_i.cc
+++ b/src/VISU_I/VISU_Gen_i.cc
@@ -87,8 +87,6 @@
 // STL Includes
 #include <strstream>
 
-#include "Utils_ExceptHandlers.hxx"
-
 #if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
 #define NO_CAS_CATCH
 #endif
@@ -112,8 +110,6 @@ static int MYDEBUG = 0;
 static int MYDEBUG = 0;
 #endif
 
-UNEXPECT_CATCH(SalomeException, SALOME::SALOME_Exception);
-
 extern "C" VISU::VISU_Gen_ptr GetImpl(CORBA::ORB_ptr theORB,
                                      PortableServer::POA_ptr thePOA,
                                      SALOME_NamingService* theNamingService,
@@ -935,6 +931,7 @@ namespace VISU
                                                 VISU::Entity theEntity,
                                                 const char* theFieldName,
                                                 CORBA::Double theIteration)
+    throw (SALOME::SALOME_Exception)
   {
     return Prs3dOnField<VISU::StreamLines_i>(theResult,theMeshName,theEntity,theFieldName,theIteration)._retn();
   }
@@ -944,6 +941,7 @@ namespace VISU
                                       VISU::Entity theEntity,
                                       const char* theFieldName,
                                       CORBA::Double theIteration)
+    throw (SALOME::SALOME_Exception)
   {
     return Prs3dOnField<VISU::Plot3D_i>(theResult,theMeshName,theEntity,theFieldName,theIteration)._retn();
   }
@@ -953,6 +951,7 @@ namespace VISU
                                             VISU::Entity theEntity,
                                             const char* theFieldName,
                                             CORBA::Double theIteration)
+    throw (SALOME::SALOME_Exception)
   {
     return Prs3dOnField<VISU::CutPlanes_i>(theResult,theMeshName,theEntity,theFieldName,theIteration)._retn();
   }
@@ -962,6 +961,7 @@ namespace VISU
                                           VISU::Entity theEntity,
                                           const char* theFieldName,
                                           CORBA::Double theIteration)
+    throw (SALOME::SALOME_Exception)
   {
     return Prs3dOnField<VISU::CutLines_i>(theResult,theMeshName,theEntity,theFieldName,theIteration)._retn();
   }

diff --git a/src/VISU_I/VISU_Gen_i.hh b/src/VISU_I/VISU_Gen_i.hh
index 1a5f6f8282b3f9c9cfb40f77187be3f05eb0bb22..bc52199c3c5eb275c277c024616b0b1b55b5d22f 100644 (file)
--- a/src/VISU_I/VISU_Gen_i.hh
+++ b/src/VISU_I/VISU_Gen_i.hh
@@ -29,8 +29,12 @@
 #include "SALOME_Component_i.hxx"
 #include "SALOME_NamingService.hxx"
 
+#include "Utils_ExceptHandlers.hxx"
+
 #include <string>
 
+UNEXPECT_CATCH(SalomeException, SALOME::SALOME_Exception);
+
 namespace VISU
 {
   class Result_i;
@@ -188,7 +192,9 @@ namespace VISU
                 const char* theFieldName, 
                 CORBA::Double theIteration, 
                 bool theAddToStudy = true)
+      throw (SALOME::SALOME_Exception)
     {
+      Unexpect aCatch(SalomeException);
       typedef typename TPrs3d_i::TInterface TPrs3d;
       typename TPrs3d::_var_type aPrs3d;
       if(TPrs3d_i* aPrs3d = CreatePrs3d<TPrs3d_i>(theResult,theMeshName,theEntity,theFieldName,theIteration,theAddToStudy))
@@ -249,7 +255,8 @@ namespace VISU
                     const char* theMeshName, 
                     VISU::Entity theEntity,
                     const char* theFieldName, 
-                    CORBA::Double theIteration);
+                    CORBA::Double theIteration)
+      throw (SALOME::SALOME_Exception);
 
     virtual
     CutLines_ptr
@@ -257,7 +264,8 @@ namespace VISU
                    const char* theMeshName, 
                    VISU::Entity theEntity,
                    const char* theFieldName, 
-                   CORBA::Double theIteration);
+                   CORBA::Double theIteration)
+      throw (SALOME::SALOME_Exception);
 
     virtual
     StreamLines_ptr
@@ -265,7 +273,8 @@ namespace VISU
                       const char* theMeshName, 
                       VISU::Entity theEntity,
                       const char* theFieldName, 
-                      CORBA::Double theIteration);
+                      CORBA::Double theIteration)
+      throw (SALOME::SALOME_Exception);
 
     virtual
     Plot3D_ptr
@@ -273,7 +282,8 @@ namespace VISU
                  const char* theMeshName, 
                  VISU::Entity theEntity,
                  const char* theFieldName, 
-                 CORBA::Double theIteration);
+                 CORBA::Double theIteration)
+      throw (SALOME::SALOME_Exception);
 
     //Create Digital Presentation
     virtual