From: dmv <dmv@opencascade.com>
Date: Wed, 5 Mar 2008 09:56:42 +0000 (+0000)
Subject: NPAL18863 One field can't be displayed.
X-Git-Tag: V3_2_10~2
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=13790dc18bdff5330f2885107539b3709a0427e5;p=modules%2Fvisu.git

NPAL18863 One field can't be displayed.
---

diff --git a/src/CONVERTOR/VISU_MedConvertor.cxx b/src/CONVERTOR/VISU_MedConvertor.cxx
index ddccb73a..af5dd6ca 100644
--- a/src/CONVERTOR/VISU_MedConvertor.cxx
+++ b/src/CONVERTOR/VISU_MedConvertor.cxx
@@ -405,7 +405,9 @@ static int MY_GROUP_DEBUG = 0;
 	  aGauss->myGaussInfo = aGaussInfo;
 	  aGauss->myName = aGaussInfo->GetName();
 	  aGauss->myNbPoints = aGaussInfo->GetNbGauss();
-	}
+	} else if ( aTimeStampInfo.GetNbGauss(aMGeom) > 1 )
+	  EXCEPTION( runtime_error, "aGaussIter == aGeom2Gauss.end()"
+		     " && aTimeStampInfo.GetNbGauss(aMGeom) > 1 !!!" );
 	
 	aGaussSubMesh->myNbCells = aNbCells*aGauss->myNbPoints;
 	aGaussSubMesh->myCellsSize = aGaussSubMesh->myNbCells*2;
@@ -481,35 +483,6 @@ static int MY_GROUP_DEBUG = 0;
   }
 
 
-  //---------------------------------------------------------------
-  void
-  InitGaussProfile(const MED::PWrapper& theMEDWrapper,
-		   const MED::PMeshInfo& theMeshInfo,
-		   MED::TTimeStampVal& theTimeStampVal,
-		   VISU::TMEDMeshOnEntity& theMeshOnEntity,
-		   MED::EEntiteMaillage theMEntity,
-		   const MED::TGeom2Size& theGeom2Size,
-		   VISU::TMEDValForTime& theValForTime)
-  {
-    TTimerLog aTimerLog(MYDEBUG,"InitGaussProfile");
-    INITMSG(MYDEBUG,"InitGaussProfile"<<endl);
-
-    // The order of the function calls is important
-    InitProfile(theMEDWrapper,
-		theMeshInfo,
-		theTimeStampVal,
-		theMeshOnEntity,
-		theMEntity,
-		theGeom2Size,
-		theValForTime);
-
-    InitGaussMesh(theTimeStampVal,
-		  theMeshOnEntity,
-		  theGeom2Size,
-		  theValForTime);
-  }
-
-
   //---------------------------------------------------------------
   void
   BuildMeshOnEntityMap(PMEDMesh theMesh,
@@ -2717,14 +2690,14 @@ LoadValForTime(const MED::PWrapper& theMed,
     theMed->GetPTimeStampVal(aTimeStampInfo,
 			     aMKey2Profile,
 			     aKey2Gauss);
-
-  InitGaussProfile(theMed,
-		   aMeshInfo,
-		   aTimeStampVal,
-		   theMeshOnEntity,
-		   aMEntity,
-		   aGeom2Size,
-		   theValForTime);
+  
+  InitProfile(theMed,
+	      aMeshInfo,
+	      aTimeStampVal,
+	      theMeshOnEntity,
+	      aMEntity,
+	      aGeom2Size,
+	      theValForTime);
 
   LoadProfile(theMed,
 	      theMesh,
@@ -2732,13 +2705,19 @@ LoadValForTime(const MED::PWrapper& theMed,
 	      theValForTime,
 	      theMeshOnEntity);
   
-  if(theIsGauss)
+  if ( theIsGauss ) {
+    InitGaussMesh(aTimeStampVal,
+		  theMeshOnEntity,
+		  aGeom2Size,
+		  theValForTime);
+
     LoadGaussMesh(theMed,
 		  theMesh,
 		  aTimeStampVal,
 		  theValForTime,
 		  theMeshOnEntity);
-  
+  }  
+
   PMEDProfile aProfile = theValForTime->myProfile;
   TGeom2SubProfile& aGeom2SubProfile = aProfile->myGeom2SubProfile;
 
diff --git a/src/VISUGUI/VisuGUI_Prs3dTools.h b/src/VISUGUI/VisuGUI_Prs3dTools.h
index 61180fb1..e30d3c8a 100644
--- a/src/VISUGUI/VisuGUI_Prs3dTools.h
+++ b/src/VISUGUI/VisuGUI_Prs3dTools.h
@@ -128,7 +128,8 @@ namespace VISU
 	  GetVisuGen(theModule)->template CreatePrs3d<TPrs3d_i>
 	  (aResult,theMeshName,theEntity,theFieldName,theTimeId);
 	QApplication::restoreOverrideCursor();
-	return aPrs3d;
+	if (aPrs3d)
+	  return aPrs3d;
       }
       SUIT_MessageBox::warn1(GetDesktop(theModule),
 			     QObject::tr("WRN_VISU"),