From: apo <apo@opencascade.com>
Date: Fri, 14 Oct 2005 15:03:57 +0000 (+0000)
Subject: Fix on Bug GVIEW10304
X-Git-Tag: TG-D5-38-2003_D2005-20-12~157
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=25eb0de15810ae2e4c97a89500ce0bf6e6830eb6;p=modules%2Fvisu.git

Fix on Bug GVIEW10304
 Failure reading incorrect med file
---

diff --git a/src/CONVERTOR/VISU_MedConvertor.cxx b/src/CONVERTOR/VISU_MedConvertor.cxx
index afa534b8..4ab71595 100644
--- a/src/CONVERTOR/VISU_MedConvertor.cxx
+++ b/src/CONVERTOR/VISU_MedConvertor.cxx
@@ -1201,42 +1201,52 @@ VISU_MedConvertor
 	      "'; myNbPoints = "<<aMesh->myNbPoints<<
 	      "; aDim = "<<aDim<<"\n");
       
-      BEGMSG(MYDEBUG,"aEntityInfo.size() = "<<aEntityInfo.size()<<"\n");
-      TFamilyCounterMap aFamilyID2CellsSize;
-
-      BuildMeshOnEntityMap(aMesh,
-			   aFamilyID2CellsSize,
-			   aEntityInfo,
-			   aNodeInfo,
-			   aMed);
-      
-      BuildFieldMap(aMesh,
-		    aEntityInfo,
-		    aMKey2Profile,
-		    aKey2Gauss,
-		    aMed);
+#ifndef _DEXCEPT_
+      try{
+#endif
+	BEGMSG(MYDEBUG,"aEntityInfo.size() = "<<aEntityInfo.size()<<"\n");
+	TFamilyCounterMap aFamilyID2CellsSize;
+	
+	BuildMeshOnEntityMap(aMesh,
+			     aFamilyID2CellsSize,
+			     aEntityInfo,
+			     aNodeInfo,
+			     aMed);
+	
+	BuildFieldMap(aMesh,
+		      aEntityInfo,
+		      aMKey2Profile,
+		      aKey2Gauss,
+		      aMed);
 
 #ifdef _LOAD_FAMILIES_
-      MED::TFamilyInfoSet aFamilyInfoSet = MED::GetFamilyInfoSet(aMed,aMeshInfo);
-      
-      BuildFamilyMap(aMesh,
-		     aFamilyID2CellsSize,
-		     aEntityInfo,
-		     anEntity2TGeom2ElemInfo,
-		     aFamilyInfoSet,
-		     aMed);
-      
-      BuildGroupMap(aMesh,
-		    aFamilyInfoSet);
+	MED::TFamilyInfoSet aFamilyInfoSet = MED::GetFamilyInfoSet(aMed,aMeshInfo);
+	
+	BuildFamilyMap(aMesh,
+		       aFamilyID2CellsSize,
+		       aEntityInfo,
+		       anEntity2TGeom2ElemInfo,
+		       aFamilyInfoSet,
+		       aMed);
+	
+	BuildGroupMap(aMesh,
+		      aFamilyInfoSet);
 #endif
 
-      PCalculateMinMax aCalculateMinMax(new TCalculateMinMax(aMesh,
-							     aEntityInfo,
-							     aMKey2Profile,
-							     aKey2Gauss,
-							     aMed));
+	PCalculateMinMax aCalculateMinMax(new TCalculateMinMax(aMesh,
+							       aEntityInfo,
+							       aMKey2Profile,
+							       aKey2Gauss,
+							       aMed));
 	
-      boost::thread aThread(boost::bind(&CalculateMinMax,aCalculateMinMax));
+	boost::thread aThread(boost::bind(&CalculateMinMax,aCalculateMinMax));
+#ifndef _DEXCEPT_
+      }catch(std::exception& exc){
+	MSG(MYDEBUG,"Follow exception was occured in:\n"<<exc.what());
+      }catch(...){
+	EXCEPTION(runtime_error,"Unknown exception !!!");
+      }
+#endif
 
 #ifndef _DEXCEPT_
     }catch(std::exception& exc){