NPAL18078: dependance on CASCADE in Salome.

diff --git a/src/CONVERTOR/VISU_MedConvertor.cxx b/src/CONVERTOR/VISU_MedConvertor.cxx
index 229c42effaf38ca90556ba75ad0c56ab4b313a25..882a82131083f8d574c3d767a37b0ad203bcb15a 100644 (file)
--- a/src/CONVERTOR/VISU_MedConvertor.cxx
+++ b/src/CONVERTOR/VISU_MedConvertor.cxx
@@ -43,8 +43,6 @@
 
 #ifdef NO_CAS_CATCH
 #include <Standard_ErrorHandler.hxx>
-#else
-#include "CASCatch.hxx"
 #endif
 
 #include <vtkCellType.h>
@@ -1671,61 +1669,46 @@ VISU_MedConvertor
            INITMSG(MYDEBUG,"- iTimeStamp = "<<iTimeStamp<<endl);
            
 #ifndef _DEXCEPT_
+            try {
 #ifdef NO_CAS_CATCH
-            try{
               OCC_CATCH_SIGNALS;
-#else
-             CASCatch_TRY{
-               try{
 #endif
 #endif
-                 MED::PTimeStampInfo aTimeStampInfo = 
-                   myMed->GetPTimeStampInfo(aFieldInfo,
-                                            aMEntity,
-                                            aGeom2Size,
-                                            iTimeStamp);
-                 
-                 MED::PTimeStampValueBase aTimeStampValue = 
-                   myMed->GetPTimeStampValue(aTimeStampInfo,
-                                             aMKey2Profile,
-                                             aKey2Gauss);
-               
-                 const MED::TGeom2Gauss& aGeom2Gauss = aTimeStampInfo->GetGeom2Gauss();
-
-                 if(aFieldInfo->GetType() == MED::eFLOAT64)
-                   BuildTimeStampMinMax<MED::TFloatTimeStampValue>(CastToFloatTimeStampValue(aTimeStampValue),
-                                                                   aGeom2Gauss,
-                                                                   aMinMaxArr,
-                                                                   aNbComp,
-                                                                   aNbComp2);
-                 else
-                   BuildTimeStampMinMax<MED::TIntTimeStampValue>(CastToIntTimeStampValue(aTimeStampValue),
-                                                                 aGeom2Gauss,
-                                                                 aMinMaxArr,
-                                                                 aNbComp,
-                                                                 aNbComp2);
-                 
+              MED::PTimeStampInfo aTimeStampInfo = 
+                myMed->GetPTimeStampInfo(aFieldInfo,
+                                         aMEntity,
+                                         aGeom2Size,
+                                         iTimeStamp);
+
+              MED::PTimeStampValueBase aTimeStampValue = 
+                myMed->GetPTimeStampValue(aTimeStampInfo,
+                                          aMKey2Profile,
+                                          aKey2Gauss);
+
+              const MED::TGeom2Gauss& aGeom2Gauss = aTimeStampInfo->GetGeom2Gauss();
+
+              if(aFieldInfo->GetType() == MED::eFLOAT64)
+                BuildTimeStampMinMax<MED::TFloatTimeStampValue>(CastToFloatTimeStampValue(aTimeStampValue),
+                                                                aGeom2Gauss,
+                                                                aMinMaxArr,
+                                                                aNbComp,
+                                                                aNbComp2);
+              else
+                BuildTimeStampMinMax<MED::TIntTimeStampValue>(CastToIntTimeStampValue(aTimeStampValue),
+                                                              aGeom2Gauss,
+                                                              aMinMaxArr,
+                                                              aNbComp,
+                                                              aNbComp2);
+
 #ifndef _DEXCEPT_
-#ifdef NO_CAS_CATCH
-               }catch(Standard_Failure){
-                 Handle(Standard_Failure) aFail = Standard_Failure::Caught();          
-                 MSG(MYDEBUG,"Follow signal was occured in:\n"<<aFail->GetMessageString());
-               }catch(std::exception& exc){
-                 MSG(MYDEBUG,"Follow exception was occured in:\n"<<exc.what());
-               }catch(...){
-                 MSG(MYDEBUG,"Unknown exception !!!");
-               }
-#else
-             }catch(std::exception& exc){
-               MSG(MYDEBUG,"Follow exception was occured in:\n"<<exc.what());
-             }catch(...){
-               MSG(MYDEBUG,"Unknown exception !!!");
-             }
-            }CASCatch_CATCH(Standard_Failure){
+            }catch(Standard_Failure){
               Handle(Standard_Failure) aFail = Standard_Failure::Caught();          
               MSG(MYDEBUG,"Follow signal was occured in:\n"<<aFail->GetMessageString());
+            }catch(std::exception& exc){
+              MSG(MYDEBUG,"Follow exception was occured in:\n"<<exc.what());
+            }catch(...){
+              MSG(MYDEBUG,"Unknown exception !!!");
             }
-#endif
 #endif
          }
          for(TInt iComp = 0; iComp <= aNbComp; iComp++){

diff --git a/src/VISU_I/VISU_ColoredPrs3dFactory.cc b/src/VISU_I/VISU_ColoredPrs3dFactory.cc
index fa3f05abb784f1c55b436f2e93bf75059e83b766..cff778da6a6851ba8d6241340e742e113326750c 100644 (file)
--- a/src/VISU_I/VISU_ColoredPrs3dFactory.cc
+++ b/src/VISU_I/VISU_ColoredPrs3dFactory.cc
@@ -35,8 +35,6 @@
 
 #ifdef NO_CAS_CATCH
 #include <Standard_ErrorHandler.hxx>
-#else
-#include "CASCatch.hxx"
 #endif
 
 #ifdef _DEBUG_
@@ -59,42 +57,27 @@ namespace VISU
                    CORBA::Long theIteration)
   {
 #ifndef _DEXCEPT_
-#ifdef NO_CAS_CATCH
     try{
+#ifdef NO_CAS_CATCH
       OCC_CATCH_SIGNALS;
-#else
-      CASCatch_TRY{
-       try{
 #endif
 #endif
-         theColoredPrs3d->SetCResult(theResult);
-         theColoredPrs3d->SetMeshName(theMeshName.c_str());
-         theColoredPrs3d->SetEntity(theEntity);
-         theColoredPrs3d->SetFieldName(theFieldName.c_str());
-         theColoredPrs3d->SetTimeStampNumber(theIteration);
-         if(theColoredPrs3d->Apply(false))
-           return true;
+      theColoredPrs3d->SetCResult(theResult);
+      theColoredPrs3d->SetMeshName(theMeshName.c_str());
+      theColoredPrs3d->SetEntity(theEntity);
+      theColoredPrs3d->SetFieldName(theFieldName.c_str());
+      theColoredPrs3d->SetTimeStampNumber(theIteration);
+      if(theColoredPrs3d->Apply(false))
+       return true;
 #ifndef _DEXCEPT_
-#ifdef NO_CAS_CATCH
-       }catch(Standard_Failure) {
-         Handle(Standard_Failure) aFail = Standard_Failure::Caught();
-         INFOS("Follow signal was occured :\n"<<aFail->GetMessageString());
-       }catch(std::exception& exc){
-         INFOS("Follow exception was occured :\n"<<exc.what());
-       }catch(...){
-         INFOS("Unknown exception was occured!");
-       }
-#else
-      }catch(std::exception& exc){
-       INFOS("Follow exception was occured :\n"<<exc.what());
-      }catch(...){
-       INFOS("Unknown exception was occured!");
-      }
-    }CASCatch_CATCH(Standard_Failure){
-      Handle(Standard_Failure) aFail = Standard_Failure::Caught();          
+    }catch(Standard_Failure) {
+      Handle(Standard_Failure) aFail = Standard_Failure::Caught();
       INFOS("Follow signal was occured :\n"<<aFail->GetMessageString());
+    }catch(std::exception& exc){
+      INFOS("Follow exception was occured :\n"<<exc.what());
+    }catch(...){
+      INFOS("Unknown exception was occured!");
     }
-#endif
 #endif
     return false;
   }

diff --git a/src/VISU_I/VISU_TimeAnimation.cxx b/src/VISU_I/VISU_TimeAnimation.cxx
index dcee2bc1595f6476aac52c226790eb1ab88decd0..ca28ac6e924a9bf8eb5f53a87714f12eb8f1195f 100644 (file)
--- a/src/VISU_I/VISU_TimeAnimation.cxx
+++ b/src/VISU_I/VISU_TimeAnimation.cxx
@@ -62,7 +62,6 @@
 
 #include "SALOMEDSClient_AttributeString.hxx"
 #include "SALOMEDSClient_AttributeName.hxx"
-#include "CASCatch.hxx"
 
 #include "Utils_ExceptHandlers.hxx"
 
@@ -79,8 +78,6 @@
 
 #ifdef NO_CAS_CATCH
 #include <Standard_ErrorHandler.hxx>
-#else
-#include "CASCatch.hxx"
 #endif
 
 
@@ -401,45 +398,30 @@ namespace
       aPresent->SetEntity(anEntity);
       aPresent->SetFieldName(aFieldName.latin1());
       aPresent->SetTimeStampNumber(aTimeStampId);
-#ifdef NO_CAS_CATCH
       try{       
+#ifdef NO_CAS_CATCH
         OCC_CATCH_SIGNALS;
-#else
-      CASCatch_TRY{
-        try{
 #endif
-          if(aPresent->Apply(false)){
-           /*
+        if(aPresent->Apply(false)){
+          /*
            if(isSequenceDefined)
            {
              theData.myPrs[aSequenceId] = aPresent;
              aFrameId++;
            }
            else
-           */
-           theData.myPrs[aFrameId++] = aPresent;
-            anIsCreated = true;
-          }
-#ifdef NO_CAS_CATCH
-        }catch(Standard_Failure) {
-          Handle(Standard_Failure) aFail = Standard_Failure::Caught();
-          INFOS("Follow signal was occured :\n"<<aFail->GetMessageString());
-        }catch(std::exception& exc){
-          INFOS("Follow exception was occured :\n"<<exc.what());
-        }catch(...){
-          INFOS("Unknown exception was occured!");
-        }
-#else
-        }catch(std::exception& exc){
-          INFOS("Follow exception was occured :\n"<<exc.what());
-        }catch(...){
-          INFOS("Unknown exception was occured!");
+          */
+          theData.myPrs[aFrameId++] = aPresent;
+          anIsCreated = true;
         }
-      }CASCatch_CATCH(Standard_Failure){
-        Handle(Standard_Failure) aFail = Standard_Failure::Caught();          
+      }catch(Standard_Failure) {
+        Handle(Standard_Failure) aFail = Standard_Failure::Caught();
         INFOS("Follow signal was occured :\n"<<aFail->GetMessageString());
+      }catch(std::exception& exc){
+        INFOS("Follow exception was occured :\n"<<exc.what());
+      }catch(...){
+        INFOS("Unknown exception was occured!");
       }
-#endif
       if(!anIsCreated)
        aPresent->_remove_ref();
     }