From 3dda4ebff302428e162ef589f80cedb749cd3290 Mon Sep 17 00:00:00 2001 From: apo Date: Wed, 31 Aug 2005 07:37:35 +0000 Subject: [PATCH] Minor changes --- src/CONVERTOR/VISU_MedConvertor.cxx | 30 +++++++++++++++++++++-------- src/CONVERTOR/VISU_MedConvertor.hxx | 9 +++++++++ 2 files changed, 31 insertions(+), 8 deletions(-) diff --git a/src/CONVERTOR/VISU_MedConvertor.cxx b/src/CONVERTOR/VISU_MedConvertor.cxx index eaae6fdf..5fc96d78 100644 --- a/src/CONVERTOR/VISU_MedConvertor.cxx +++ b/src/CONVERTOR/VISU_MedConvertor.cxx @@ -1011,7 +1011,11 @@ VISU_MedConvertor } TGeom2SubMesh& aGeom2SubMesh = aMeshOnEntity->myGeom2SubMesh; - PSubMeshImpl aSubMesh = aGeom2SubMesh[VTK_VERTEX]; + PMEDSubMesh aSubMesh = aGeom2SubMesh[VTK_VERTEX](new TMEDSubMesh()); + + aSubMesh->myIsElemNum = aNodeInfo->IsElemNum(); + aSubMesh->myElemNum = aNodeInfo->myElemNum; + TCell2Connect& aCell2Connect = aSubMesh->myCell2Connect; aCell2Connect.resize(aNbElem); for (int iElem = 0; iElem < aNbElem; iElem++) @@ -1115,7 +1119,11 @@ VISU_MedConvertor MED::PPolygoneInfo aPolygoneInfo = theMed->GetPPolygoneInfo(aMeshInfo,aMEntity,aMGeom); TInt aNbElem = aPolygoneInfo->GetNbElem(); if(aNbElem > 0){ - PSubMeshImpl aSubMesh = aGeom2SubMesh[aVGeom]; + PMEDSubMesh aSubMesh = aGeom2SubMesh[aVGeom](new TMEDSubMesh()); + + aSubMesh->myIsElemNum = aPolygoneInfo->IsElemNum(); + aSubMesh->myElemNum = aPolygoneInfo->myElemNum; + TCell2Connect& aCell2Connect = aSubMesh->myCell2Connect; aCell2Connect.resize(aNbElem); @@ -1135,7 +1143,11 @@ VISU_MedConvertor TInt aNbElem = aPolyedreInfo->GetNbElem(); if(aNbElem > 0){ - PSubMeshImpl aSubMesh = aGeom2SubMesh[aVGeom]; + PMEDSubMesh aSubMesh = aGeom2SubMesh[aVGeom](new TMEDSubMesh()); + + aSubMesh->myIsElemNum = aPolyedreInfo->IsElemNum(); + aSubMesh->myElemNum = aPolyedreInfo->myElemNum; + TCell2Connect& aCell2Connect = aSubMesh->myCell2Connect; aCell2Connect.resize(aNbElem); @@ -1172,7 +1184,11 @@ VISU_MedConvertor TInt aNbElem = aCellInfo->GetNbElem(); if(aNbElem > 0){ - PSubMeshImpl aSubMesh = aGeom2SubMesh[aVGeom]; + PMEDSubMesh aSubMesh = aGeom2SubMesh[aVGeom](new TMEDSubMesh()); + + aSubMesh->myIsElemNum = aCellInfo->IsElemNum(); + aSubMesh->myElemNum = aCellInfo->myElemNum; + TCell2Connect& aCell2Connect = aSubMesh->myCell2Connect; aCell2Connect.resize(aNbElem); @@ -1376,8 +1392,7 @@ LoadProfile(const MED::PWrapper& theMed, aMGeom); aSubProfile->myIsElemNum = anElemInfo->IsElemNum(); - if(aSubProfile->myIsElemNum) - aSubProfile->myElemNum = anElemInfo->myElemNum; + aSubProfile->myElemNum = anElemInfo->myElemNum; } } aProfile->myNamedPointCoords = theMesh->myNamedPointCoords; @@ -1427,8 +1442,7 @@ LoadGaussMesh(const MED::PWrapper& theMed, aMGeom); aGaussSubMesh->myIsElemNum = aCellInfo->IsElemNum(); - if(aGaussSubMesh->myIsElemNum) - aGaussSubMesh->myElemNum = aCellInfo->myElemNum; + aGaussSubMesh->myElemNum = aCellInfo->myElemNum; std::string aName; MED::TGaussCoord aGaussCoord; diff --git a/src/CONVERTOR/VISU_MedConvertor.hxx b/src/CONVERTOR/VISU_MedConvertor.hxx index d6362209..3ae1891f 100644 --- a/src/CONVERTOR/VISU_MedConvertor.hxx +++ b/src/CONVERTOR/VISU_MedConvertor.hxx @@ -75,6 +75,15 @@ namespace VISU typedef SharedPtr PMEDGaussMesh; + //--------------------------------------------------------------- + struct TMEDSubMesh: virtual TSubMeshImpl + { + MED::EBooleen myIsElemNum; + MED::TElemNum myElemNum; + }; + typedef SharedPtr PMEDSubMesh; + + //--------------------------------------------------------------- struct TMEDMeshOnEntity: virtual TMeshOnEntityImpl { -- 2.39.2