From b592aa66f0da15e2c434aa6836af9f0d40890e10 Mon Sep 17 00:00:00 2001 From: apo Date: Thu, 21 Jul 2005 13:50:19 +0000 Subject: [PATCH] Minor changes --- src/CONVERTOR/VISU_Convertor_impl.hxx | 2 +- src/CONVERTOR/VISU_MedConvertor.cxx | 14 ++++++-------- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/src/CONVERTOR/VISU_Convertor_impl.hxx b/src/CONVERTOR/VISU_Convertor_impl.hxx index c1d97dbf..a8193838 100644 --- a/src/CONVERTOR/VISU_Convertor_impl.hxx +++ b/src/CONVERTOR/VISU_Convertor_impl.hxx @@ -55,7 +55,6 @@ namespace VISU struct TPoints: virtual TBaseStructure { vtkIdType myDim; - TPointsCoord myCoord; public: @@ -143,6 +142,7 @@ namespace VISU { TGaussSubMeshImpl(); + TPoints myPoints; ESubMeshStatus myStatus; }; diff --git a/src/CONVERTOR/VISU_MedConvertor.cxx b/src/CONVERTOR/VISU_MedConvertor.cxx index 8b27ec3d..f9d9dbdb 100644 --- a/src/CONVERTOR/VISU_MedConvertor.cxx +++ b/src/CONVERTOR/VISU_MedConvertor.cxx @@ -265,7 +265,6 @@ namespace{ vtkIdType aVNbNodes = VTKGeom2NbNodes(aVGeom); PMEDGaussSubMesh aGaussSubMesh(new TMEDGaussSubMesh()); - aGaussSubMesh->myStatus = eAddAll; TGeom2SubProfile::iterator anIter2 = aGeom2SubProfile.find(aVGeom); if(anIter2 == aGeom2SubProfile.end()){ @@ -273,8 +272,10 @@ namespace{ continue; } - aGaussSubMesh->mySubProfile = anIter2->second; - + PMEDSubProfile aSubProfile = anIter2->second; + aGaussSubMesh->mySubProfile = aSubProfile; + aGaussSubMesh->myStatus = aSubProfile->myStatus; + PMEDGauss aGauss(new TMEDGauss()); aGaussSubMesh->myGauss = aGauss; @@ -284,9 +285,7 @@ namespace{ TInt aNbGauss = 0; TGeom2Size::const_iterator aTimeStampIter = theGeom2Size.find(aMGeom); - if(aTimeStampIter == theGeom2Size.end()) - aGaussSubMesh->myStatus = eRemoveAll; - else{ + if(aTimeStampIter != theGeom2Size.end()){ TGeom2Gauss::const_iterator aGaussIter = aGeom2Gauss.find(aMGeom); TInt aNbCells = aTimeStampIter->second; if(aGaussIter != aGeom2Gauss.end()){ @@ -300,8 +299,6 @@ namespace{ aGaussSubMesh->myNbCells = aNbCells*aNbGauss; aGaussSubMesh->myCellsSize = aGaussSubMesh->myNbCells*2; - - aGaussSubMesh->myStatus = eAddPart; }else{ aGaussSubMesh->myNbCells = aNbCells; aGaussSubMesh->myCellsSize = aGaussSubMesh->myNbCells*(aVNbNodes+1); @@ -1143,6 +1140,7 @@ LoadGaussMesh(MED::TTimeStampVal& theTimeStampVal, INITMSG(MYDEBUG, "- aVGeom = "<