From eee0b3c75c3a78070bdf05404e537d2c6073f6a3 Mon Sep 17 00:00:00 2001
From: maintenance team <salome-mnt@opencascade.com>
Date: Wed, 23 Aug 2006 08:46:16 +0000
Subject: [PATCH] SMH: Version ported on new OCT6.1.1

---
 src/CONVERTOR/VISU_MedConvertor.cxx | 16 ++++++++--------
 src/VISU_I/VISU_Gen_i.cc            | 27 ++++++++++++++-------------
 src/VISU_I/VISU_TimeAnimation.cxx   | 29 +++++++++++++++--------------
 3 files changed, 37 insertions(+), 35 deletions(-)

diff --git a/src/CONVERTOR/VISU_MedConvertor.cxx b/src/CONVERTOR/VISU_MedConvertor.cxx
index f6e5127c..7df59c1e 100644
--- a/src/CONVERTOR/VISU_MedConvertor.cxx
+++ b/src/CONVERTOR/VISU_MedConvertor.cxx
@@ -17,7 +17,7 @@
 //  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/ or email : webmaster.salome@opencascade.com
+//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 //
 //  File   : VISU_MedConvertor.cxx
@@ -34,7 +34,8 @@
 #include "MED_GaussUtils.hxx"
 #include "MED_Utilities.hxx"
 
-#include "CASCatch.hxx"
+#include <Standard_Failure.hxx>
+#include <Standard_ErrorHandler.hxx>
 
 #include <vtkCellType.h>
 
@@ -1399,8 +1400,8 @@ VISU_MedConvertor
 	    INITMSG(MYDEBUG,"- iTimeStamp = "<<iTimeStamp<<endl);
 	    
 #ifndef _DEXCEPT_
-	    CASCatch_TRY{ 
-	      try{
+            try{
+                OCC_CATCH_SIGNALS;
 #endif
 		MED::PTimeStampInfo aTimeStampInfo = aMed->GetPTimeStampInfo(aFieldInfo,
 									     aMEntity,
@@ -1470,15 +1471,14 @@ VISU_MedConvertor
 		  }
 		}
 #ifndef _DEXCEPT_
+              }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 !!!");
 	      }
-	    }CASCatch_CATCH(Standard_Failure){
-	      Handle(Standard_Failure) aFail = Standard_Failure::Caught();          
-	      MSG(MYDEBUG,"Follow signal was occured in:\n"<<aFail->GetMessageString());
-	    }
 #endif
 	  }
 	  for(TInt iComp = 0; iComp <= aNbComp; iComp++){
diff --git a/src/VISU_I/VISU_Gen_i.cc b/src/VISU_I/VISU_Gen_i.cc
index 8823e2f6..ca54a2f6 100644
--- a/src/VISU_I/VISU_Gen_i.cc
+++ b/src/VISU_I/VISU_Gen_i.cc
@@ -17,7 +17,7 @@
 //  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/ or email : webmaster.salome@opencascade.com
+//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 //
 //  File   : VISU_Gen_i.cc
@@ -85,7 +85,9 @@
 #include <strstream>
 
 #include "Utils_ExceptHandlers.hxx"
-#include "CASCatch.hxx"
+
+#include <Standard_Failure.hxx>
+#include <Standard_ErrorHandler.hxx>
 
 using namespace std;
 
@@ -239,23 +241,22 @@ namespace VISU
 		    const char* theFieldName, 
 		    CORBA::Double theIteration)
   {
-    CASCatch_TRY{       
 #ifndef _DEXCEPT_
-      try{
+    try{
+      OCC_CATCH_SIGNALS;
 #endif
-	if(theColoredPrs3d->Create(theMeshName,theEntity,theFieldName,int(theIteration)))
-	  return true;
+      if(theColoredPrs3d->Create(theMeshName,theEntity,theFieldName,int(theIteration)))
+	return true;
 #ifndef _DEXCEPT_
-      }catch(std::exception& exc){
-	INFOS("Follow exception was occured :\n"<<exc.what());
-      }catch(...){
-	INFOS("Unknown exception was occured!");
-      }
-#endif
-    }CASCatch_CATCH(Standard_Failure) {
+    }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
     return false;
   }
 
diff --git a/src/VISU_I/VISU_TimeAnimation.cxx b/src/VISU_I/VISU_TimeAnimation.cxx
index b337e3ad..ce7b42ad 100644
--- a/src/VISU_I/VISU_TimeAnimation.cxx
+++ b/src/VISU_I/VISU_TimeAnimation.cxx
@@ -57,7 +57,9 @@
 
 #include "SALOMEDSClient_AttributeComment.hxx"
 #include "SALOMEDSClient_AttributeName.hxx"
-#include "CASCatch.hxx"
+
+#include <Standard_Failure.hxx>
+#include <Standard_ErrorHandler.hxx>
 
 #include <qpixmap.h>
 #include <qimage.h>
@@ -235,22 +237,21 @@ namespace
       
       bool anIsCreated = false;
       TPrs3d* aPresent = new TPrs3d(theResult, false);
-      CASCatch_TRY{       
-	try{
-	  if(aPresent->Create(aMeshName.latin1(),anEntity,aFieldName.latin1(),aTimeStampId)){
-	    anIsCreated = true;
-	    theData.myPrs[aFrameId++] = aPresent;
-	    aMin = std::min(aPresent->GetMin(), aMin);
-	    aMax = std::max(aPresent->GetMax(), aMax);
-	  }
-	}catch(std::exception& exc){
-	  INFOS("Follow exception was occured :\n"<<exc.what());
-	}catch(...){
-	  INFOS("Unknown exception was occured!");
+      try{       
+        OCC_CATCH_SIGNALS;
+	if(aPresent->Create(aMeshName.latin1(),anEntity,aFieldName.latin1(),aTimeStampId)){
+	  anIsCreated = true;
+	  theData.myPrs[aFrameId++] = aPresent;
+	  aMin = std::min(aPresent->GetMin(), aMin);
+	  aMax = std::max(aPresent->GetMax(), aMax);
 	}
-      }CASCatch_CATCH(Standard_Failure) {
+      }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!");
       }
       if(!anIsCreated)
 	aPresent->_remove_ref();
-- 
2.39.2