From: enk <enk@opencascade.com>
Date: Mon, 28 Feb 2005 10:43:45 +0000 (+0000)
Subject: Fix on Bug PAL8297. REGRESSION:Reading several time stamps on a field of a med2.1... 
X-Git-Tag: smh_before_merge~7
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=09741d0ea0b7181311cb555eed81d6ac5f28a5a0;p=modules%2Fvisu.git

Fix on Bug PAL8297. REGRESSION:Reading several time stamps on a field of a med2.1 file.
The regression is appeared during porting to MED2.2. The pointed MED files have TimeStamps that don't belong to whole mesh, only partially. The fix recovers the previus functionality.
---

diff --git a/src/CONVERTOR/VISU_MedConvertor.cxx b/src/CONVERTOR/VISU_MedConvertor.cxx
index 3eabe088..9c5e342e 100644
--- a/src/CONVERTOR/VISU_MedConvertor.cxx
+++ b/src/CONVERTOR/VISU_MedConvertor.cxx
@@ -756,17 +756,20 @@ VISU_MedConvertor::LoadField(const MED::PWrapper& theMed,
   MED::TInt aNbGauss = aTimeStampInfo->GetNbGauss();
   MED::TInt aNbComp = theField->myNbComp;
 
+  bool anIsTrimmed = theField->myIsTrimmed;
   const MED::TGeom& anEntityTGeom = theMeshOnEntity->myGeom;
   MED::TGeom::const_iterator aTGeomIter = anEntityTGeom.begin();
   for(; aTGeomIter != anEntityTGeom.end(); aTGeomIter++){
     const MED::EGeometrieElement& aGeom = aTGeomIter->first;
     const MED::TInt& aNbElem = aTGeomIter->second;
 
-    INITMSG(MYDEBUG,"LoadField - aGeom = "<<aGeom<<"; aNbElem = '"<<aNbElem<<endl);
+    INITMSG(MYDEBUG,"LoadField - aGeom = "<<aGeom<<"; aNbElem = "<<aNbElem<<endl);
 
     if(aTGeom.find(aGeom) == aTGeom.end()){
-      theField->myDataSize -= aNbElem*theField->myNbComp;
-      theField->myIsTrimmed = true;
+      if(!theField->myIsTrimmed){
+	theField->myDataSize -= aNbElem*theField->myNbComp;
+	anIsTrimmed = true;
+      }
     }else{
       int aVTKGeomType = MEDGeomToVTK(aGeom);
       VISU::TValForTimeImpl::TValForCellsWithType& anArray = theValForTime->myValForCells[aVTKGeomType];
@@ -781,5 +784,6 @@ VISU_MedConvertor::LoadField(const MED::PWrapper& theMed,
       }
     }
   }
+  theField->myIsTrimmed = anIsTrimmed;
   return 1; 
 }