From: apo <apo@opencascade.com>
Date: Mon, 3 Oct 2005 12:10:04 +0000 (+0000)
Subject: To adjust to polygonal and polyedral datas
X-Git-Tag: BR-D5-38-2003_D2005-12-10~87
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=912ae0f27012ccd8a47e497febd3af082a3a7601;p=modules%2Fvisu.git

To adjust to polygonal and polyedral datas
---

diff --git a/src/CONVERTOR/VISU_Convertor_impl.cxx b/src/CONVERTOR/VISU_Convertor_impl.cxx
index 94a61b7e..8b81fe72 100644
--- a/src/CONVERTOR/VISU_Convertor_impl.cxx
+++ b/src/CONVERTOR/VISU_Convertor_impl.cxx
@@ -282,6 +282,9 @@ namespace VISU
     if(aLeft->myGeom != aRight->myGeom)
       return aLeft->myGeom < aRight->myGeom;
 
+    if(aLeft->myStatus != aRight->myStatus)
+      return aLeft->myStatus < aRight->myStatus;
+
     return aLeft->myName < aRight->myName;
   }
 
diff --git a/src/CONVERTOR/VISU_MedConvertor.cxx b/src/CONVERTOR/VISU_MedConvertor.cxx
index 54d2037e..dae99499 100644
--- a/src/CONVERTOR/VISU_MedConvertor.cxx
+++ b/src/CONVERTOR/VISU_MedConvertor.cxx
@@ -173,7 +173,7 @@ namespace
 	       const MED::TGeom2Profile& theGeom2Profile)
   {
     vtkIdType aVGeom = MEDGeomToVTK(theMGeom);
-    vtkIdType aVNbNodes = VTKGeom2NbNodes(theMGeom);
+    vtkIdType aVNbNodes = VTKGeom2NbNodes(aVGeom);
 
     PMEDSubProfile aSubProfile(new TMEDSubProfile());
     aSubProfile->myGeom = aVGeom;
@@ -260,7 +260,8 @@ namespace
       }
     }
     INITMSG(MYDEBUG,
-	    "- aVGeom = "<<aVGeom<<
+	    "- aMGeom = "<<theMGeom<<
+	    "; aVGeom = "<<aVGeom<<
 	    "; aName = '"<<aSubProfile->myName<<"'"<<
 	    "; aStatus = "<<aSubProfile->myStatus<<
 	    "; aNbCells = "<<aSubProfile->myNbCells<<
@@ -1811,11 +1812,21 @@ LoadProfile(const MED::PWrapper& theMed,
       MED::PElemInfo anElemInfo;
       if(aMEntity == MED::eNOEUD)
 	anElemInfo = theMed->GetPNodeInfo(aMeshInfo);
-      else
-	anElemInfo = theMed->GetPCellInfo(aMeshInfo,
-					  aMEntity, 
-					  aMGeom);
-      
+      else{
+	switch(aMGeom){
+	case MED::ePOLYGONE: {
+	  anElemInfo = theMed->GetPPolygoneInfo(aMeshInfo,aMEntity,aMGeom);
+	  break;
+	}
+	case MED::ePOLYEDRE: {
+	  anElemInfo = theMed->GetPPolyedreInfo(aMeshInfo,aMEntity,aMGeom);
+	  break;
+	}
+	default: {
+	  anElemInfo = theMed->GetPCellInfo(aMeshInfo,aMEntity,aMGeom);
+	  break;
+	}}
+      }
       aSubProfile->myIsElemNum = anElemInfo->IsElemNum();
       aSubProfile->myElemNum = anElemInfo->myElemNum;
     }
@@ -1861,12 +1872,32 @@ LoadGaussMesh(const MED::PWrapper& theMed,
     const TSubMeshID& aSubMeshID = aSubProfile->mySubMeshID;
     MED::EGeometrieElement aMGeom = aSubProfile->myMGeom;
 
-    MED::PCellInfo aCellInfo = theMed->GetPCellInfo(aMeshInfo,
-						    aMEntity, 
-						    aMGeom);
-      
-    aGaussSubMesh->myIsElemNum = aCellInfo->IsElemNum();
-    aGaussSubMesh->myElemNum = aCellInfo->myElemNum;
+    MED::PPolygoneInfo aPolygoneInfo;
+    MED::PPolyedreInfo aPolyedreInfo;
+    MED::PCellInfo aCellInfo;
+    MED::PElemInfo anElemInfo;
+
+    switch(aMGeom){
+    case MED::ePOLYGONE: 
+      aPolygoneInfo = theMed->GetPPolygoneInfo(aMeshInfo,
+					       aMEntity,
+					       aMGeom);
+      anElemInfo = aPolygoneInfo;
+      break;
+    case MED::ePOLYEDRE: 
+      aPolyedreInfo = theMed->GetPPolyedreInfo(aMeshInfo,
+					       aMEntity,
+					       aMGeom);
+      anElemInfo = aPolyedreInfo;
+      break;
+    default:
+      aCellInfo = theMed->GetPCellInfo(aMeshInfo,
+				       aMEntity, 
+				       aMGeom);
+      anElemInfo = aCellInfo;
+    }
+    aGaussSubMesh->myIsElemNum = anElemInfo->IsElemNum();
+    aGaussSubMesh->myElemNum = anElemInfo->myElemNum;
 
     std::string aName;
     MED::TGaussCoord aGaussCoord;
@@ -1903,15 +1934,43 @@ LoadGaussMesh(const MED::PWrapper& theMed,
 							     aProfileName);
 	if(aProfileInfo){
 	  const MED::TElemNum& anElemNum = aProfileInfo->myElemNum;
+	  switch(aMGeom){
+	  case MED::ePOLYGONE: 
+	    anIsGaussCoord3D = MED::GetBaryCenter(aPolygoneInfo,
+						  aNodeInfo,
+						  aGaussCoord,
+						  anElemNum);
+	    break;
+	  case MED::ePOLYEDRE: 
+	    anIsGaussCoord3D = MED::GetBaryCenter(aPolyedreInfo,
+						  aNodeInfo,
+						  aGaussCoord,
+						  anElemNum);
+	    break;
+	  default:
+	    anIsGaussCoord3D = MED::GetBaryCenter(aCellInfo,
+						  aNodeInfo,
+						  aGaussCoord,
+						  anElemNum);
+	  }
+	}
+      }else
+	switch(aMGeom){
+	case MED::ePOLYGONE: 
+	  anIsGaussCoord3D = MED::GetBaryCenter(aPolygoneInfo,
+						aNodeInfo,
+						aGaussCoord);
+	  break;
+	case MED::ePOLYEDRE: 
+	  anIsGaussCoord3D = MED::GetBaryCenter(aPolyedreInfo,
+						aNodeInfo,
+						aGaussCoord);
+	  break;
+	default:
 	  anIsGaussCoord3D = MED::GetBaryCenter(aCellInfo,
 						aNodeInfo,
-						aGaussCoord,
-						anElemNum);
+						aGaussCoord);
 	}
-      }else
-	anIsGaussCoord3D = MED::GetBaryCenter(aCellInfo,
-					      aNodeInfo,
-					      aGaussCoord);
     }
     
     if(anIsGaussCoord3D){