X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;ds=inline;f=src%2FCONVERTOR%2FVISU_Convertor.cxx;h=c08d9a6122a46ecc94e955509b7745b49a0125cd;hb=3b6d998db9aa756d3c49e1ce0923c7bb43e35d19;hp=8238d72a15b37a8eb74c7705e9ce1a5d65bac9f7;hpb=de799091f3bde871c887d0bf34f9f5f1c9146de8;p=modules%2Fvisu.git

diff --git a/src/CONVERTOR/VISU_Convertor.cxx b/src/CONVERTOR/VISU_Convertor.cxx
index 8238d72a..c08d9a61 100644
--- a/src/CONVERTOR/VISU_Convertor.cxx
+++ b/src/CONVERTOR/VISU_Convertor.cxx
@@ -27,24 +27,12 @@
 #include "VISU_Convertor.hxx"
 #include "VISU_ConvertorUtils.hxx"
 
-using namespace std;
-
-#ifdef _DEBUG_
-static int MYDEBUG = 0;
-#else
-static int MYDEBUG = 0;
-#endif
+#include <qstring.h>
 
-extern "C" {
-  VISU_Convertor* CreateConvertor(const string& theFileName) {
-    if(QFileInfo(theFileName.c_str()).extension(false) == "med")
-      return CreateMedConvertor(theFileName);
-    else
-      return CreateDatConvertor(theFileName);
-  }
-}
+using namespace std;
 
 namespace VISU{
+
   inline int GetNbOfPoints(int theVTKCellType){
     switch(theVTKCellType){
     case VTK_VERTEX : return 1;
@@ -61,78 +49,53 @@ namespace VISU{
 
   pair<int,int> TMeshOnEntity::GetCellsDims(const string& theFamilyName) const
   {
-    bool isFamilyPresent = (theFamilyName != "");
-    int aNbCells = 0, aCellsSize = 0;
-    if(!isFamilyPresent){
-      TCellsConn::const_iterator aCellsConnIter = myCellsConn.begin();
-      for(; aCellsConnIter != myCellsConn.end(); aCellsConnIter++){
-	const TConnForCellType& aConnForCellType = aCellsConnIter->second;
-	if(!aConnForCellType.empty()){
-	  aNbCells += aConnForCellType.size();
-	  aCellsSize += aConnForCellType.size()*(aConnForCellType[0].size()+1);
-	}
-      }
-    }else{
-      TFamilyMap::const_iterator aFamilyMapIter = myFamilyMap.find(theFamilyName);
-      if(aFamilyMapIter == myFamilyMap.end())
-	throw std::runtime_error("GetCellsDims >> There is no family on the mesh with entity !!!");
-      const TFamily& aFamily = aFamilyMapIter->second; 
-      const TFamily::TSubMesh& aSubMesh = aFamily.mySubMesh;
-      TFamily::TSubMesh::const_iterator aSubMeshIter = aSubMesh.begin();
-      for(; aSubMeshIter != aSubMesh.end(); aSubMeshIter++){
-	const TFamily::TSubMeshOnCellType& aSubMeshOnCellType = aSubMeshIter->second;
-	if(!aSubMeshOnCellType.empty()){
-	  int tmp = aSubMeshOnCellType.size();
-	  aNbCells += tmp;
-	  int aVtkType = aSubMeshIter->first;
-	  int aVtkSize = GetNbOfPoints(aVtkType);
-	  aCellsSize += tmp*(aVtkSize+1);
-	}
-      }
-    }
-    return make_pair(aNbCells,aCellsSize);
+    if(theFamilyName == "")
+      return make_pair(myNbCells,myCellsSize);
+    TFamilyMap::const_iterator aFamilyMapIter = myFamilyMap.find(theFamilyName);
+    if(aFamilyMapIter == myFamilyMap.end())
+      throw std::runtime_error("GetCellsDims >> There is no family on the mesh with entity !!!");
+    const PFamily& aFamily = aFamilyMapIter->second; 
+    return make_pair(aFamily->myNbCells,aFamily->myCellsSize);
   }
   
-  const TField* TMesh::GetField(const string& theFieldName) const {
+  const PField TMesh::GetField(const string& theFieldName) const {
     TMeshOnEntityMap::const_iterator aMeshOnEntityMapIter = myMeshOnEntityMap.begin();
     for(; aMeshOnEntityMapIter != myMeshOnEntityMap.end(); aMeshOnEntityMapIter++){
-      const TFieldMap& aFieldMap = (aMeshOnEntityMapIter->second).myFieldMap;
+      const TFieldMap& aFieldMap = aMeshOnEntityMapIter->second->myFieldMap;
       TFieldMap::const_iterator aFieldMapIter = aFieldMap.begin();
       for(; aFieldMapIter != aFieldMap.end(); aFieldMapIter++)
-	if(theFieldName == aFieldMapIter->first) return &(aFieldMapIter->second);
+	if(theFieldName == aFieldMapIter->first) 
+	  return aFieldMapIter->second;
     }
-    return NULL;
+    return PField();
   }
 
-  const TFamily* GetFamily(const VISU::TMeshOnEntity& theMeshOnEntity, const string& theFamilyName)
+
+  PFamily FindFamily(VISU::PMesh theMesh, const string& theFamilyName)
   {
-    if(theFamilyName == "") return NULL;
-    const VISU::TFamilyMap& aFamilyMap = theMeshOnEntity.myFamilyMap;
-    VISU::TFamilyMap::const_iterator aFamilyMapIter = aFamilyMap.find(theFamilyName);
-    if(aFamilyMapIter == aFamilyMap.end())
-      throw std::runtime_error("GetFamily >> There is no family on the mesh with entity !!!");
-    const VISU::TFamily& aFamily = aFamilyMapIter->second;
-    return &aFamily;
+    PFamily aFamily;
+    const TMeshOnEntityMap& aMeshOnEntityMap = theMesh->myMeshOnEntityMap;
+    TMeshOnEntityMap::const_iterator aMeshOnEntityMapIter = aMeshOnEntityMap.begin();
+    for(; aMeshOnEntityMapIter != aMeshOnEntityMap.end(); aMeshOnEntityMapIter++){
+      const PMeshOnEntity aMeshOnEntity = aMeshOnEntityMapIter->second;
+      aFamily = GetFamily(aMeshOnEntity,theFamilyName);
+      if(aFamily)
+	break;
+    }
+    return aFamily;
   }
   
-  TFamily* GetFamily(VISU::TMeshOnEntity& theMeshOnEntity, const string& theFamilyName)
+
+  PFamily GetFamily(VISU::PMeshOnEntity theMeshOnEntity, const string& theFamilyName)
   {
-    if(theFamilyName == "") return NULL;
-    VISU::TFamilyMap& aFamilyMap = theMeshOnEntity.myFamilyMap;
-    VISU::TFamilyMap::iterator aFamilyMapIter = aFamilyMap.find(theFamilyName);
-    if(aFamilyMapIter == aFamilyMap.end())
-      throw std::runtime_error("GetFamily >> There is no family on the mesh with entity !!!");
-    VISU::TFamily& aFamily = aFamilyMapIter->second;
-    return &aFamily;
-  }
-  
-  void TField::ShallowCopy(const TField& aField){
-    myEntity = aField.myEntity;
-    myMeshName = aField.myMeshName;
-    myNbComp = aField.myNbComp;
-    VISU::TField::TValField::const_iterator iter = aField.myValField.begin();
-    for(; iter != aField.myValField.end(); iter++)
-      myValField[iter->first];
+    PFamily aFamily;
+    if(theFamilyName != ""){
+      TFamilyMap& aFamilyMap = theMeshOnEntity->myFamilyMap;
+      TFamilyMap::iterator aFamilyMapIter = aFamilyMap.find(theFamilyName);
+      if(aFamilyMapIter != aFamilyMap.end())
+	aFamily = aFamilyMapIter->second;
+    }
+    return aFamily;
   }
 }
 
@@ -143,7 +106,7 @@ const VISU::TMeshMap& VISU_Convertor::GetMeshMap() {
 }
 
 
-string VISU_Convertor::GenerateName(const VISU::TField::TTime& aTime){
+string VISU_Convertor::GenerateName(const VISU::TTime& aTime){
   static QString aName;
   const string aUnits = aTime.second, tmp(aUnits.size(),' ');
   if(aUnits == "" || aUnits == tmp)