Merge from PortingMED3 07Apr11

diff --git a/src/CONVERTOR/VISU_MedConvertor.cxx b/src/CONVERTOR/VISU_MedConvertor.cxx
index 764e4376e18e8644d34c196a0bc9d1551f430a4d..8ee84ca66cb9c60100d6e4957264e4f4594d18f9 100644 (file)
--- a/src/CONVERTOR/VISU_MedConvertor.cxx
+++ b/src/CONVERTOR/VISU_MedConvertor.cxx
@@ -1115,7 +1115,7 @@ namespace VISU
   {
     TMEDCoordHolder* aCoordHolder = new TMEDCoordHolder();
     TInt aNbElem = theNodeInfo->GetNbElem();
-    TInt aDim = theNodeInfo->GetMeshInfo()->GetDim();
+    TInt aDim = theNodeInfo->GetMeshInfo()->GetSpaceDim();
     aCoordHolder->Init(aNbElem, aDim, theNodeInfo->myCoord);
     TNamedPointCoords::Init(PCoordHolder(aCoordHolder));
     myVersion = theVersion;
@@ -1138,7 +1138,7 @@ namespace VISU
   {
     TMEDCoordHolder* aCoordHolder = new TMEDCoordHolder();
     TInt aNbElem = theGrilleInfo->GetNbNodes();
-    TInt aDim = theGrilleInfo->GetMeshInfo()->GetDim();
+    TInt aDim = theGrilleInfo->GetMeshInfo()->GetSpaceDim();
     MED::PNodeCoord aCoord(new MED::TNodeCoord(aNbElem * aDim));
     aCoordHolder->Init(aNbElem, aDim, aCoord);
     TNamedPointCoords::Init(PCoordHolder(aCoordHolder));
@@ -1902,7 +1902,8 @@ VISU_MedConvertor
 
         MED::TEntityInfo anEntityInfo = myMed->GetEntityInfo(aMeshInfo);
 
-        for(TInt iField = 1; iField <= aNbFields; iField++){
+        for(TInt iField = 1; iField <= aNbFields; iField++)
+        {
           VISU::TTimerLog aTimerLog(MYDEBUG,"BuildMinMax - GetPFieldInfo()");
 
           MED::TErr anError = 0;
@@ -1912,7 +1913,7 @@ VISU_MedConvertor
 
           std::string aFieldName = aFieldInfo->GetName();
           INITMSG(MYDEBUG,"- aFieldName = '"<<aFieldName<<"'\n");
-          
+
           MED::TGeom2Size aGeom2Size;
           MED::EEntiteMaillage aMEntity;
           TInt aNbTimeStamps = myMed->GetNbTimeStamps(aFieldInfo,
@@ -1972,6 +1973,7 @@ VISU_MedConvertor
                                                                 aMetric2Comp2Group2AverageMinMax,
                                                                 aNbComp,
                                                                 aNbComp2);
+
               else
                 BuildTimeStampMinMax<MED::TIntTimeStampValue>(CastToIntTimeStampValue(aTimeStampValue),
                                                               aMeshOnEntity,
@@ -2043,7 +2045,7 @@ VISU_MedConvertor
       VISU::TTimerLog aTimerLog(MYDEBUG,"GetPMeshInfo");
 
       MED::PMeshInfo aMeshInfo = myMed->GetPMeshInfo(iMesh);
-      std::string aMeshName = aMeshInfo->GetName();      
+      std::string aMeshName = aMeshInfo->GetName();
 
       VISU::TMeshMap::const_iterator anIter = aMeshMap.find(aMeshName);
       if(anIter == aMeshMap.end())

diff --git a/src/CONVERTOR/VISU_Vtk2MedConvertor.cxx b/src/CONVERTOR/VISU_Vtk2MedConvertor.cxx
index fe67d6dbfbbd5abd43314aed6f99cb9aef43a4a9..d1f64940d7a6e830b1f6db3d9fab68ae903e4c0a 100644 (file)
--- a/src/CONVERTOR/VISU_Vtk2MedConvertor.cxx
+++ b/src/CONVERTOR/VISU_Vtk2MedConvertor.cxx
@@ -231,7 +231,7 @@ VISU_Vtk2MedConvertor
 
 /*!
   \brief Adds field names, which used as specific fields with ids or elements 
-  (or something else). (Default: \93VISU_CELLS_MAPPER\94,\94VISU_POINTS_MAPPER\94,\94VISU_FILED\94)
+  (or something else). (Default: "VISU_CELLS_MAPPER","VISU_POINTS_MAPPER","VISU_FILED")
   \param theFieldName field name
   \sa eraseFromIgnoringFieldList()
 */
@@ -337,7 +337,7 @@ VISU_Vtk2MedConvertor
 }
 
 /*!
-  \brief Sets output mesh name. (\93vtk2med\94 - default)
+  \brief Sets output mesh name. ("vtk2med" - default)
   \param theMeshName mesh name
   \sa getMeshName()
 */
@@ -349,7 +349,7 @@ VISU_Vtk2MedConvertor
 }
 
 /*!
-  \brief Gets output mesh name. (\93vtk2med\94 - default)
+  \brief Gets output mesh name. ("vtk2med" - default)
   \return mesh name
   \sa setMeshName()
 */
@@ -1244,8 +1244,9 @@ VISU_Vtk2MedConvertor
   MED::PWrapper myMed;
   MED::PMeshInfo aMeshInfo;
   int aMeshDimension = 3;
+  int aSpaceDimension = 3;
   myMed = CrWrapper(myMEDFileName.c_str(),myVersion);
-  aMeshInfo = myMed->CrMeshInfo(aMeshDimension,myMeshName.c_str());
+  aMeshInfo = myMed->CrMeshInfo(aMeshDimension,aSpaceDimension,myMeshName.c_str());
   myMed->SetMeshInfo(aMeshInfo);
     
   {

diff --git a/src/ENGINE/VISU_Engine_i.cc b/src/ENGINE/VISU_Engine_i.cc
index c0ccce709ac9025af15ffc0b2daffa6ab7080122..851320c8935447f1f44cb410cf97d5f1d64c8783 100644 (file)
--- a/src/ENGINE/VISU_Engine_i.cc
+++ b/src/ENGINE/VISU_Engine_i.cc
@@ -488,7 +488,7 @@ namespace VISU{
   }
   Engines::TMPFile* VISU_Gen_i::DumpPython(CORBA::Object_ptr theStudy,
                                            CORBA::Boolean theIsPublished,
-                                           CORBA::Boolean theIsMultiFile,
+                                          CORBA::Boolean theIsMultiFile,
                                            CORBA::Boolean& theIsValidScript)
   {
     return myVisuGen->DumpPython(theStudy, theIsPublished, theIsMultiFile, theIsValidScript);

diff --git a/src/ENGINE/VISU_Engine_i.hh b/src/ENGINE/VISU_Engine_i.hh
index dbb80c5ef0ba7d4c6c1c898af9a1a5366e2d44d3..e1cd39247f9a32af6e262e776a2c8ea3252d322b 100644 (file)
--- a/src/ENGINE/VISU_Engine_i.hh
+++ b/src/ENGINE/VISU_Engine_i.hh
@@ -243,7 +243,7 @@ namespace VISU
     // inherited methods from Engines::Component
     virtual Engines::TMPFile* DumpPython(CORBA::Object_ptr theStudy,
                                         CORBA::Boolean theIsPublished,
-                                        CORBA::Boolean theIsMultiFile,
+                                        CORBA::Boolean theIsMultiFile,
                                         CORBA::Boolean& theIsValidScript);   
 
     virtual

diff --git a/src/VISU_I/VISU_CorbaMedConvertor.cxx b/src/VISU_I/VISU_CorbaMedConvertor.cxx
index 85870069b4ad9aa7f9fee15ac2652775feb84318..bdad1a52aa015343431f4dfa4014142c032d7591 100644 (file)
--- a/src/VISU_I/VISU_CorbaMedConvertor.cxx
+++ b/src/VISU_I/VISU_CorbaMedConvertor.cxx
@@ -66,49 +66,49 @@ namespace
   
   SALOME_MED::medGeometryElement 
   CELLGEOM[MED_NBR_GEOMETRIE_MAILLE] = {
-    SALOME_MED::MED_POINT1,
-    SALOME_MED::MED_SEG2,
-    SALOME_MED::MED_SEG3,
-    SALOME_MED::MED_TRIA3,
-    SALOME_MED::MED_QUAD4,
-    SALOME_MED::MED_TRIA6,
-    SALOME_MED::MED_QUAD8,
-    SALOME_MED::MED_TETRA4,
-    SALOME_MED::MED_PYRA5,
-    SALOME_MED::MED_PENTA6,
-    SALOME_MED::MED_HEXA8,
-    SALOME_MED::MED_TETRA10,
-    SALOME_MED::MED_PYRA13,
-    SALOME_MED::MED_PENTA15,
-    SALOME_MED::MED_HEXA20,
-    SALOME_MED::MED_POLYGON,
-    SALOME_MED::MED_POLYHEDRA
+    SALOME_MED::MEDMEM_POINT1,
+    SALOME_MED::MEDMEM_SEG2,
+    SALOME_MED::MEDMEM_SEG3,
+    SALOME_MED::MEDMEM_TRIA3,
+    SALOME_MED::MEDMEM_QUAD4,
+    SALOME_MED::MEDMEM_TRIA6,
+    SALOME_MED::MEDMEM_QUAD8,
+    SALOME_MED::MEDMEM_TETRA4,
+    SALOME_MED::MEDMEM_PYRA5,
+    SALOME_MED::MEDMEM_PENTA6,
+    SALOME_MED::MEDMEM_HEXA8,
+    SALOME_MED::MEDMEM_TETRA10,
+    SALOME_MED::MEDMEM_PYRA13,
+    SALOME_MED::MEDMEM_PENTA15,
+    SALOME_MED::MEDMEM_HEXA20,
+    SALOME_MED::MEDMEM_POLYGON,
+    SALOME_MED::MEDMEM_POLYHEDRA
   };
   
   const int MED_NBR_GEOMETRIE_FACE = 5;
   
   SALOME_MED::medGeometryElement
   FACEGEOM[MED_NBR_GEOMETRIE_FACE] = {
-    SALOME_MED::MED_TRIA3,
-    SALOME_MED::MED_QUAD4,
-    SALOME_MED::MED_TRIA6,
-    SALOME_MED::MED_QUAD8,
-    SALOME_MED::MED_POLYGON
+    SALOME_MED::MEDMEM_TRIA3,
+    SALOME_MED::MEDMEM_QUAD4,
+    SALOME_MED::MEDMEM_TRIA6,
+    SALOME_MED::MEDMEM_QUAD8,
+    SALOME_MED::MEDMEM_POLYGON
   };
   
   const int MED_NBR_GEOMETRIE_ARETE = 2;
   
   SALOME_MED::medGeometryElement
   EDGEGEOM[MED_NBR_GEOMETRIE_ARETE] = {
-    SALOME_MED::MED_SEG2,
-    SALOME_MED::MED_SEG3
+    SALOME_MED::MEDMEM_SEG2,
+    SALOME_MED::MEDMEM_SEG3
   };
   
   const int MED_NBR_GEOMETRIE_NODE = 1;
   
   SALOME_MED::medGeometryElement
   NODEGEOM[MED_NBR_GEOMETRIE_NODE] = {
-    SALOME_MED::MED_POINT1,
+    SALOME_MED::MEDMEM_POINT1,
   };
   
 
@@ -140,37 +140,37 @@ namespace
   MEDGeom2NbNodes(int theMEDGeomType)
   { 
     switch(theMEDGeomType){
-    case SALOME_MED::MED_NONE: 
+    case SALOME_MED::MEDMEM_NONE: 
       return 0;
-    case SALOME_MED::MED_POINT1: 
+    case SALOME_MED::MEDMEM_POINT1: 
       return 1;
-    case SALOME_MED::MED_SEG2: 
+    case SALOME_MED::MEDMEM_SEG2: 
       return 2;
-    case SALOME_MED::MED_SEG3: 
+    case SALOME_MED::MEDMEM_SEG3: 
       return 3;
-    case SALOME_MED::MED_TRIA3: 
+    case SALOME_MED::MEDMEM_TRIA3: 
       return 3;
-    case SALOME_MED::MED_TRIA6: 
+    case SALOME_MED::MEDMEM_TRIA6: 
       return 6;
-    case SALOME_MED::MED_QUAD4: 
+    case SALOME_MED::MEDMEM_QUAD4: 
       return 4;
-    case SALOME_MED::MED_QUAD8: 
+    case SALOME_MED::MEDMEM_QUAD8: 
       return 8;
-    case SALOME_MED::MED_TETRA4: 
+    case SALOME_MED::MEDMEM_TETRA4: 
       return 4;
-    case SALOME_MED::MED_TETRA10: 
+    case SALOME_MED::MEDMEM_TETRA10: 
       return 10;
-    case SALOME_MED::MED_HEXA8: 
+    case SALOME_MED::MEDMEM_HEXA8: 
       return 8;
-    case SALOME_MED::MED_HEXA20: 
+    case SALOME_MED::MEDMEM_HEXA20: 
       return 20;
-    case SALOME_MED::MED_PENTA6: 
+    case SALOME_MED::MEDMEM_PENTA6: 
       return 6;
-    case SALOME_MED::MED_PENTA15: 
+    case SALOME_MED::MEDMEM_PENTA15: 
       return 15;
-    case SALOME_MED::MED_PYRA5: 
+    case SALOME_MED::MEDMEM_PYRA5: 
       return 5;
-    case SALOME_MED::MED_PYRA13: 
+    case SALOME_MED::MEDMEM_PYRA13: 
       return 13;
     }
     return -1;
@@ -182,39 +182,39 @@ namespace
   MEDGeom2VISU(SALOME_MED::medGeometryElement theGeom)
   { 
     switch(theGeom){
-    case SALOME_MED::MED_POINT1:
+    case SALOME_MED::MEDMEM_POINT1:
       return VISU::ePOINT1;
-    case SALOME_MED::MED_SEG2: 
+    case SALOME_MED::MEDMEM_SEG2: 
       return VISU::eSEG2;
-    case SALOME_MED::MED_SEG3: 
+    case SALOME_MED::MEDMEM_SEG3: 
       return VISU::eSEG3;
-    case SALOME_MED::MED_TRIA3: 
+    case SALOME_MED::MEDMEM_TRIA3: 
       return VISU::eTRIA3;
-    case SALOME_MED::MED_TRIA6: 
+    case SALOME_MED::MEDMEM_TRIA6: 
       return VISU::eTRIA6;
-    case SALOME_MED::MED_QUAD4: 
+    case SALOME_MED::MEDMEM_QUAD4: 
       return VISU::eQUAD4;
-    case SALOME_MED::MED_QUAD8: 
+    case SALOME_MED::MEDMEM_QUAD8: 
       return VISU::eQUAD8;
-    case SALOME_MED::MED_TETRA4: 
+    case SALOME_MED::MEDMEM_TETRA4: 
       return VISU::eTETRA4;
-    case SALOME_MED::MED_TETRA10: 
+    case SALOME_MED::MEDMEM_TETRA10: 
       return VISU::eTETRA10;
-    case SALOME_MED::MED_HEXA8: 
+    case SALOME_MED::MEDMEM_HEXA8: 
       return VISU::eHEXA8;
-    case SALOME_MED::MED_HEXA20: 
+    case SALOME_MED::MEDMEM_HEXA20: 
       return VISU::eHEXA20;
-    case SALOME_MED::MED_PENTA6: 
+    case SALOME_MED::MEDMEM_PENTA6: 
       return VISU::ePENTA6;
-    case SALOME_MED::MED_PENTA15: 
+    case SALOME_MED::MEDMEM_PENTA15: 
       return VISU::ePENTA15;
-    case SALOME_MED::MED_PYRA5: 
+    case SALOME_MED::MEDMEM_PYRA5: 
       return VISU::ePYRA5;
-    case SALOME_MED::MED_PYRA13: 
+    case SALOME_MED::MEDMEM_PYRA13: 
       return VISU::ePYRA13;
-    case SALOME_MED::MED_POLYGON: 
+    case SALOME_MED::MEDMEM_POLYGON: 
       return VISU::ePOLYGONE;
-    case SALOME_MED::MED_POLYHEDRA: 
+    case SALOME_MED::MEDMEM_POLYHEDRA: 
       return VISU::ePOLYEDRE;
     }
     return VISU::eNONE;
@@ -226,40 +226,40 @@ namespace
   { 
     switch(theGeom){
     case VISU::ePOINT1: 
-      return SALOME_MED::MED_POINT1;
+      return SALOME_MED::MEDMEM_POINT1;
     case VISU::eSEG2: 
-      return SALOME_MED::MED_SEG2;
+      return SALOME_MED::MEDMEM_SEG2;
     case VISU::eTRIA3: 
-      return SALOME_MED::MED_TRIA3;
+      return SALOME_MED::MEDMEM_TRIA3;
     case VISU::eQUAD4: 
-      return SALOME_MED::MED_QUAD4;
+      return SALOME_MED::MEDMEM_QUAD4;
     case VISU::eTETRA4: 
-      return SALOME_MED::MED_TETRA4;
+      return SALOME_MED::MEDMEM_TETRA4;
     case VISU::eHEXA8: 
-      return SALOME_MED::MED_HEXA8;
+      return SALOME_MED::MEDMEM_HEXA8;
     case VISU::ePENTA6: 
-      return SALOME_MED::MED_PENTA6;
+      return SALOME_MED::MEDMEM_PENTA6;
     case VISU::ePYRA5: 
-      return SALOME_MED::MED_PYRA5;
+      return SALOME_MED::MEDMEM_PYRA5;
 
     case VISU::eSEG3: 
-      return SALOME_MED::MED_SEG3;
+      return SALOME_MED::MEDMEM_SEG3;
     case VISU::eTRIA6: 
-      return SALOME_MED::MED_TRIA6;
+      return SALOME_MED::MEDMEM_TRIA6;
     case VISU::eQUAD8: 
-      return SALOME_MED::MED_QUAD8;
+      return SALOME_MED::MEDMEM_QUAD8;
     case VISU::eTETRA10: 
-      return SALOME_MED::MED_TETRA10;
+      return SALOME_MED::MEDMEM_TETRA10;
     case VISU::eHEXA20: 
-      return SALOME_MED::MED_HEXA20;
+      return SALOME_MED::MEDMEM_HEXA20;
     case VISU::ePENTA15: 
-      return SALOME_MED::MED_PENTA15;
+      return SALOME_MED::MEDMEM_PENTA15;
     case VISU::ePYRA13: 
-      return SALOME_MED::MED_PYRA13;
+      return SALOME_MED::MEDMEM_PYRA13;
     case VISU::ePOLYGONE: 
-      return SALOME_MED::MED_POLYGON;
+      return SALOME_MED::MEDMEM_POLYGON;
     case VISU::ePOLYEDRE: 
-      return  SALOME_MED::MED_POLYHEDRA;
+      return  SALOME_MED::MEDMEM_POLYHEDRA;
     }
     return SALOME_MED::medGeometryElement(-1);
   }
@@ -270,23 +270,23 @@ namespace
   { 
     switch(theVTKGeomType){
     case VTK_VERTEX: 
-      return SALOME_MED::MED_POINT1;
+      return SALOME_MED::MEDMEM_POINT1;
     case VTK_LINE: 
-      return SALOME_MED::MED_SEG2;
+      return SALOME_MED::MEDMEM_SEG2;
     case VTK_TRIANGLE:
-      return SALOME_MED::MED_TRIA3;
+      return SALOME_MED::MEDMEM_TRIA3;
     case VTK_QUAD: 
-      return SALOME_MED::MED_QUAD4;
+      return SALOME_MED::MEDMEM_QUAD4;
     case VTK_TETRA: 
-      return SALOME_MED::MED_TETRA4;
+      return SALOME_MED::MEDMEM_TETRA4;
     case VTK_HEXAHEDRON: 
-      return SALOME_MED::MED_HEXA8;
+      return SALOME_MED::MEDMEM_HEXA8;
     case VTK_WEDGE:
-      return SALOME_MED::MED_PENTA6;
+      return SALOME_MED::MEDMEM_PENTA6;
     case VTK_PYRAMID: 
-      return SALOME_MED::MED_PYRA5;
+      return SALOME_MED::MEDMEM_PYRA5;
     case VTK_POLYGON: 
-      return SALOME_MED::MED_POLYGON;
+      return SALOME_MED::MEDMEM_POLYGON;
     }
     return SALOME_MED::medGeometryElement(-1);
   }
@@ -443,9 +443,9 @@ namespace
     const VISU::TCellsFirstIndex& aCellsFirstIndex = theMeshOnEntity.myCellsFirstIndex;
     VISU::TCellsFirstIndex::const_iterator aTimeStampIter = aCellsFirstIndex.find(theMGeom);
     if(aTimeStampIter == (theMeshOnEntity.myCellsFirstIndex).end() && 
-       theMGeom != SALOME_MED::MED_POINT1)
+       theMGeom != SALOME_MED::MEDMEM_POINT1)
       aSubProfile->myStatus = VISU::eRemoveAll;
-    else if(aTimeStampIter == aCellsFirstIndex.end() && theMGeom == SALOME_MED::MED_POINT1){
+    else if(aTimeStampIter == aCellsFirstIndex.end() && theMGeom == SALOME_MED::MEDMEM_POINT1){
       if(theNbElems > 0){
         aSubProfile->myName = "";
         aSubProfile->myStatus = VISU::eAddPart;
@@ -482,9 +482,9 @@ namespace
     SALOME_MED::SUPPORT_var aSupport = theValForTime->myField->getSupport();
     int aNbElems = 0;
     if(anIter == aFirstIndex.end() && aSupport->getEntity() == SALOME_MED::MED_NODE){
-      SALOME_MED::medGeometryElement aMGeom = SALOME_MED::MED_POINT1;
+      SALOME_MED::medGeometryElement aMGeom = SALOME_MED::MEDMEM_POINT1;
       try{
-        aNbElems = aSupport->getNumberOfElements(SALOME_MED::MED_NONE);
+        aNbElems = aSupport->getNumberOfElements(SALOME_MED::MEDMEM_NONE);
         if(MYDEBUG)MESSAGE("aMGeom="<<aMGeom<<"   aNbElems="<<aNbElems);
       }catch(...){
         MESSAGE("Error in theValForTime->myField->getSupport()->getNumberOfElements(aMGeom);");
@@ -584,8 +584,8 @@ namespace
       std::vector<int> aGeom2Profile;
       if(!aSupport->isOnAllElements()){
         try{
-          if(aMGeom == SALOME_MED::MED_POINT1)
-            aGeom2ProfileIds = aSupport->getNumberFromFile(SALOME_MED::MED_NONE);
+          if(aMGeom == SALOME_MED::MEDMEM_POINT1)
+            aGeom2ProfileIds = aSupport->getNumberFromFile(SALOME_MED::MEDMEM_NONE);
           else
             aGeom2ProfileIds = aSupport->getNumberFromFile(aMGeom);
           int aLen = aGeom2ProfileIds->length();
@@ -635,7 +635,7 @@ VISU_MEDFieldConvertor
 
   SALOME_MED::medEntityMesh aMEntity = aMEDSupport->getEntity();
   VISU::TEntity aVEntity = MEDEntityToVTK(aMEntity);
-  SALOME_MED::MESH_var aMEDMesh = aMEDSupport->getMesh();
+  SALOME_MED::MESH_var aMEDMesh = aMEDSupport->getMesh()->convertInMESH();
   if(aMEDMesh->_is_nil()) 
     throw std::runtime_error("VISU_MEDFieldConvertor::Build >> aMEDMesh->_is_nil() !!!");
 
@@ -878,7 +878,7 @@ VISU_MEDConvertor
         if(aMEDSupport->_is_nil()) 
           continue;
         
-        SALOME_MED::MESH_var aMeshOnSupport = aMEDSupport->getMesh();
+        SALOME_MED::MESH_var aMeshOnSupport = aMEDSupport->getMesh()->convertInMESH();
         SALOME_MED::medEntityMesh aMEntity = aMEDSupport->getEntity();
         VISU::TEntity aVEntity = MEDEntityToVTK(aMEntity);
         CORBA::String_var aSupportName = aMEDSupport->getName();
@@ -923,7 +923,7 @@ VISU_MEDConvertor
         if(aMEDSupport->_is_nil()) 
           continue;
         
-        SALOME_MED::MESH_var aMeshOnSupport = aMEDSupport->getMesh();
+        SALOME_MED::MESH_var aMeshOnSupport = aMEDSupport->getMesh()->convertInMESH();
         SALOME_MED::medEntityMesh aMEntity = aMEDSupport->getEntity();
         VISU::TEntity aVEntity = MEDEntityToVTK(aMEntity);
         CORBA::String_var aSupportName = aMEDSupport->getName();
@@ -977,7 +977,7 @@ VISU_MEDConvertor
         if(aMEDSupport->_is_nil()) 
           continue;
         
-        SALOME_MED::MESH_var aMeshOnSupport = aMEDSupport->getMesh();
+        SALOME_MED::MESH_var aMeshOnSupport = aMEDSupport->getMesh()->convertInMESH();
         SALOME_MED::medEntityMesh aMEntity = aMEDSupport->getEntity();
         VISU::TEntity aVEntity = MEDEntityToVTK(aMEntity);
         CORBA::String_var aSupportName = aMEDSupport->getName();
@@ -1047,7 +1047,7 @@ VISU_MEDConvertor
 
         SALOME_MED::medEntityMesh aMEntity = aMEDSupport->getEntity();
         VISU::TEntity anEntity = MEDEntityToVTK(aMEntity);
-        SALOME_MED::MESH_var aMEDMesh = aMEDSupport->getMesh();
+        SALOME_MED::MESH_var aMEDMesh = aMEDSupport->getMesh()->convertInMESH();
         if(aMEDMesh->_is_nil()) 
           continue;
 
@@ -1137,7 +1137,7 @@ VISU_MEDConvertor
 
     SALOME_MED::medEntityMesh aMEntity = aMEDSupport->getEntity();
     VISU::TEntity aVEntity = MEDEntityToVTK(aMEntity);
-    SALOME_MED::MESH_var aMEDMesh = aMEDSupport->getMesh();
+    SALOME_MED::MESH_var aMEDMesh = aMEDSupport->getMesh()->convertInMESH();
     if(aMEDMesh->_is_nil()) continue;
     CORBA::String_var aMeshName = aMEDMesh->getName();
     CORBA::String_var aFieldName = aMEDField->getName();
@@ -1420,14 +1420,14 @@ namespace
     {
       {
         SALOME::SenderInt_var aSender = 
-          theMesh->getSenderForPolygonsConnectivity(SALOME_MED::MED_NODAL, theEntity);
+          theMesh->getSenderForConnectivity(SALOME_MED::MED_NODAL, theEntity, SALOME_MED::MEDMEM_POLYGON);
         long int aSize;
         int* aValuePtr = ReceiverFactory::getValue(aSender.in(), aSize);
         myConn.assign(aValuePtr, aValuePtr + aSize);
       }
       {
         SALOME::SenderInt_var aSender = 
-          theMesh->getSenderForPolygonsConnectivityIndex(SALOME_MED::MED_NODAL, theEntity);
+          theMesh->getSenderForConnectivityIndex(SALOME_MED::MED_NODAL, theEntity, SALOME_MED::MEDMEM_POLYGON);
         long int aSize;
         int* aValuePtr = ReceiverFactory::getValue(aSender, aSize);
         myConnIndex.assign(aValuePtr, aValuePtr + aSize);
@@ -1464,28 +1464,42 @@ namespace
     TIntArray myFaceIndex;
   public:
 
-    MEDPolyhedraConnectivity(SALOME_MED::MESH_var theMesh)
+    MEDPolyhedraConnectivity(SALOME_MED::MESH_var theMesh,
+                             SALOME_MED::medEntityMesh theEntity)
     {
       {
         SALOME::SenderInt_var aSender = 
-          theMesh->getSenderForPolyhedronConnectivity(SALOME_MED::MED_NODAL);
+          theMesh->getSenderForConnectivity(SALOME_MED::MED_NODAL, theEntity, SALOME_MED::MEDMEM_POLYHEDRA);
         long int aSize;
-        int* aValuePtr = ReceiverFactory::getValue(aSender, aSize);
-        myConn.assign(aValuePtr, aValuePtr + aSize);
-      }
-      {
-        SALOME::SenderInt_var aSender = 
-          theMesh->getSenderForPolyhedronIndex(SALOME_MED::MED_NODAL);
-        long int aSize;
-        int* aValuePtr = ReceiverFactory::getValue(aSender, aSize);
-        myConnIndex.assign(aValuePtr, aValuePtr + aSize);
-      }
-      {
-        SALOME::SenderInt_var aSender = 
-          theMesh->getSenderForPolyhedronFacesIndex();
-        long int aSize;
-        int* aValuePtr = ReceiverFactory::getValue(aSender, aSize);
-        myFaceIndex.assign(aValuePtr, aValuePtr + aSize);
+        int* pt = ReceiverFactory::getValue(aSender, aSize);
+        //
+        SALOME::SenderInt_var aSender2 = 
+          theMesh->getSenderForConnectivityIndex(SALOME_MED::MED_NODAL, theEntity, SALOME_MED::MEDMEM_POLYHEDRA);
+        long int aSizeI;
+        int* ptI = ReceiverFactory::getValue(aSender, aSize);
+        //
+        int nbOfPolyHCells=aSizeI-1;
+        std::vector<int> polh1v(aSizeI);
+        polh1v[0]=1;
+        std::vector<int> polh2v,polh3v;
+        for(int i=0;i<nbOfPolyHCells;i++)
+          {
+            int nbOfFaces=std::count(pt+ptI[i]-1,pt+ptI[i+1]-1,-1)+1;
+            polh1v[i+1]=polh1v[i]+nbOfFaces;
+            int *work=pt+ptI[i]-1;
+            for(int j=0;j<nbOfFaces;j++)
+              {
+                int *work2=std::find(work,pt+ptI[i+1]-1,-1);
+                int connLgthOfFace=std::distance(work,work2);
+                polh2v.push_back(connLgthOfFace);
+                polh3v.insert(polh3v.end(),work,work2);
+                work=work2+1;
+              }
+          }
+        //
+        myConn.assign(polh3v.begin(),polh3v.end());
+        myFaceIndex.assign(polh2v.begin(),polh2v.end());
+        myConnIndex.assign(polh1v.begin(),polh1v.end());
       }
     }
 
@@ -1531,7 +1545,7 @@ VISU_MEDConvertor
     return 0;
 
   SALOME_MED::SUPPORT_var& aMedSupport = theMeshOnEntity->mySupport;
-  SALOME_MED::MESH_var aMedMesh = aMedSupport->getMesh();
+  SALOME_MED::MESH_var aMedMesh = aMedSupport->getMesh()->convertInMESH();
 
   //Main part of code
   const VISU::TEntity& aVEntity = theMeshOnEntity->myEntity;
@@ -1548,7 +1562,7 @@ VISU_MEDConvertor
     SALOME_MED::medGeometryElement aMGeom = anInfo->meshTypes[iGeom];
     VISU::EGeometry aEGeom = MEDGeom2VISU(aMGeom);
     switch (aMGeom) {
-    case SALOME_MED::MED_POLYGON:
+    case SALOME_MED::MEDMEM_POLYGON:
     {
       MEDPolygonConnectivity aConn(aMedMesh, aMEntity);
       int aNbElem = aConn.GetNbElem();
@@ -1570,9 +1584,9 @@ VISU_MEDConvertor
       }
     }
     break;
-    case SALOME_MED::MED_POLYHEDRA:
+    case SALOME_MED::MEDMEM_POLYHEDRA:
     {
-      MEDPolyhedraConnectivity aConn( aMedMesh );
+      MEDPolyhedraConnectivity aConn( aMedMesh, aMEntity );
       int aNbElem = aConn.GetNbElem();
       if (aNbElem > 0) {
         VISU::PSubMeshImpl aSubMesh = aGeom2SubMesh[aEGeom](new VISU::TCSubMesh());
@@ -1603,8 +1617,7 @@ VISU_MEDConvertor
       int aNbElem = anInfo->numberOfElements[iGeom];
       if (aNbElem > 0) {
         SALOME_TYPES::ListOfLong_var aConn = 
-          aMedMesh->getConnectivity(SALOME_MED::MED_FULL_INTERLACE,
-                                    SALOME_MED::MED_NODAL,
+          aMedMesh->getConnectivity(SALOME_MED::MED_NODAL,
                                     aMEntity,
                                     aMGeom);
         VISU::PSubMeshImpl aSubMesh = aGeom2SubMesh[aEGeom](new VISU::TCSubMesh());
@@ -1629,7 +1642,7 @@ VISU_MEDConvertor
 
           switch(aMGeom){
 #if !(defined(VTK_QUADRATIC_EDGE) && defined(VISU_USE_VTK_QUADRATIC)) && defined(VISU_ENABLE_QUADRATIC)
-          case SALOME_MED::MED_SEG3:
+          case SALOME_MED::MEDMEM_SEG3:
             anArray[0] = aConnect[0];
             anArray[2] = aConnect[1];  
 
@@ -1637,7 +1650,7 @@ VISU_MEDConvertor
             break;
 #endif
 #if !(defined(VTK_QUADRATIC_TRIANGLE) && defined(VISU_USE_VTK_QUADRATIC)) && defined(VISU_ENABLE_QUADRATIC)
-          case SALOME_MED::MED_TRIA6:
+          case SALOME_MED::MEDMEM_TRIA6:
             anArray[0] = aConnect[0];
             anArray[2] = aConnect[1];  
             anArray[4] = aConnect[2];  
@@ -1648,7 +1661,7 @@ VISU_MEDConvertor
             break;
 #endif
 #if !(defined(VTK_QUADRATIC_QUAD) && defined(VISU_USE_VTK_QUADRATIC)) && defined(VISU_ENABLE_QUADRATIC)
-          case SALOME_MED::MED_QUAD8:
+          case SALOME_MED::MEDMEM_QUAD8:
             anArray[0] = aConnect[0];
             anArray[2] = aConnect[1];  
             anArray[4] = aConnect[2];  
@@ -1661,18 +1674,18 @@ VISU_MEDConvertor
             break;
 #endif
 #if (defined(VTK_QUADRATIC_TETRA) && defined(VISU_USE_VTK_QUADRATIC)) && defined(VISU_ENABLE_QUADRATIC)
-          case SALOME_MED::MED_TETRA10 :
+          case SALOME_MED::MEDMEM_TETRA10 :
 #endif
-          case SALOME_MED::MED_TETRA4 :
+          case SALOME_MED::MEDMEM_TETRA4 :
             anArray[0] = aConnect[0];
             anArray[1] = aConnect[1];
             anArray[2] = aConnect[3];  
             anArray[3] = aConnect[2];  
             break;
 #if (defined(VTK_QUADRATIC_PYRAMID) && defined(VISU_USE_VTK_QUADRATIC)) && defined(VISU_ENABLE_QUADRATIC)
-          case SALOME_MED::MED_PYRA13:
+          case SALOME_MED::MEDMEM_PYRA13:
 #endif
-          case SALOME_MED::MED_PYRA5 :
+          case SALOME_MED::MEDMEM_PYRA5 :
             anArray[0] = aConnect[0];
             anArray[1] = aConnect[3];  
             anArray[2] = aConnect[2];

diff --git a/src/VISU_I/VISU_ResultUtils.cc b/src/VISU_I/VISU_ResultUtils.cc
index 86457d7c87313ab5a2b1ff349ec5a0b217532f27..fab0b1b89a342138a68d6e05f959a5b72b9e419b 100644 (file)
--- a/src/VISU_I/VISU_ResultUtils.cc
+++ b/src/VISU_I/VISU_ResultUtils.cc
@@ -360,11 +360,11 @@ namespace VISU
   //----------------------------------------------------------------------------
   void
   BuildGroups(Result_i* theResult,
-             Result_i::PInput theInput,
-             CORBA::Boolean* theIsDone,
-             CORBA::Boolean theIsBuild,
-             CORBA::Boolean theIsAtOnce,
-             _PTR(Study) theStudy)
+              Result_i::PInput theInput,
+              CORBA::Boolean* theIsDone,
+              CORBA::Boolean theIsBuild,
+              CORBA::Boolean theIsAtOnce,
+              _PTR(Study) theStudy)
   {
     if(!theIsBuild || *theIsDone)
       return;
@@ -387,73 +387,70 @@ namespace VISU
       
       const TMeshOnEntityMap& aMeshOnEntityMap = aMesh->myMeshOnEntityMap;
       if(aMeshOnEntityMap.empty()) 
-       continue;
+        continue;
       
       TMeshOnEntityMap::const_iterator aMeshOnEntityMapIter = aMeshOnEntityMap.begin();
       for(; aMeshOnEntityMapIter != aMeshOnEntityMap.end(); aMeshOnEntityMapIter++){
-       const TEntity& anEntity = aMeshOnEntityMapIter->first;
-       const PMeshOnEntity& aMeshOnEntity = aMeshOnEntityMapIter->second;
-       
-       const TFamilyMap& aFamilyMap = aMeshOnEntity->myFamilyMap;
-       TFamilyMap::const_iterator aFamilyMapIter = aFamilyMap.begin();
-       for(; aFamilyMapIter != aFamilyMap.end(); aFamilyMapIter++){
-         const string& aFamilyName = aFamilyMapIter->first;
-         const PFamily& aFamily = aFamilyMapIter->second;
+        const TEntity& anEntity = aMeshOnEntityMapIter->first;
+        const PMeshOnEntity& aMeshOnEntity = aMeshOnEntityMapIter->second;
+        const TFamilyMap& aFamilyMap = aMeshOnEntity->myFamilyMap;
+        TFamilyMap::const_iterator aFamilyMapIter = aFamilyMap.begin();
+        for(; aFamilyMapIter != aFamilyMap.end(); aFamilyMapIter++){
+          const string& aFamilyName = aFamilyMapIter->first;
+          const PFamily& aFamily = aFamilyMapIter->second;
           aComment=QString("myComment=FAMILY;myMeshName=%1;myEntityId=%2;myName=%3");
           aComment=aComment.arg(aMeshName.c_str());
           aComment=aComment.arg(anEntity);
           aComment=aComment.arg(aFamilyName.c_str());
-         aFamily->myEntry =
-           CreateAttributes(theStudy,
-                            aMeshOnEntity->myEntry,
-                            NO_ICON,
-                            NO_IOR,
-                            aFamilyName,
-                            NO_PERFSITENT_REF,
-                            aComment.toLatin1().data(),
-                            true);
-       }
+          aFamily->myEntry = CreateAttributes(theStudy,
+                                              aMeshOnEntity->myEntry,
+                                              NO_ICON,
+                                              NO_IOR,
+                                              aFamilyName,
+                                              NO_PERFSITENT_REF,
+                                              aComment.toLatin1().data(),
+                                              true);
+        }
       }
       //Importing groups
       const TGroupMap& aGroupMap = aMesh->myGroupMap;
       if(!aGroupMap.empty()){
-       aComment = QString("myComment=GROUPS;myMeshName=%1").arg(aMeshName.c_str());
-       
-       CreateAttributes(theStudy,
-                        aMesh->myGroupsEntry,
-                        NO_ICON,
-                        NO_IOR,
-                        "Groups",
-                        NO_PERFSITENT_REF,
-                        aComment.toLatin1().data(),
-                        false);
-
-       TGroupMap::const_iterator aGroupMapIter = aGroupMap.begin();
-       for(; aGroupMapIter != aGroupMap.end(); aGroupMapIter++){
-         const string& aGroupName = aGroupMapIter->first;
-         const PGroup& aGroup = aGroupMapIter->second;
-         aComment = QString("myComment=GROUP;myMeshName=%1;myName=%2").arg(aMeshName.c_str()).arg(aGroupName.c_str());
-         aGroup->myEntry = 
-           CreateAttributes(theStudy,
-                            aMesh->myGroupsEntry,
-                            NO_ICON,
-                            NO_IOR,
-                            aGroupName,
-                            NO_PERFSITENT_REF,
-                            aComment.toLatin1().data(),
-                            true);
-         const TFamilySet& aFamilySet = aGroup->myFamilySet;
-         TFamilySet::const_iterator aFamilyIter = aFamilySet.begin();
-         for(; aFamilyIter != aFamilySet.end(); aFamilyIter++){
-           const PFamily& aFamily = (*aFamilyIter).second;
-           CreateReference(theStudy,
-                           aGroup->myEntry,
-                           aFamily->myEntry);
-         }
-       }
+        aComment = QString("myComment=GROUPS;myMeshName=%1").arg(aMeshName.c_str());
+        
+        CreateAttributes(theStudy,
+                         aMesh->myGroupsEntry,
+                         NO_ICON,
+                         NO_IOR,
+                         "Groups",
+                         NO_PERFSITENT_REF,
+                         aComment.toLatin1().data(),
+                         false);
+                         
+        TGroupMap::const_iterator aGroupMapIter = aGroupMap.begin();
+        for(; aGroupMapIter != aGroupMap.end(); aGroupMapIter++){
+          const string& aGroupName = aGroupMapIter->first;
+          const PGroup& aGroup = aGroupMapIter->second;
+          aComment = QString("myComment=GROUP;myMeshName=%1;myName=%2").arg(aMeshName.c_str()).arg(aGroupName.c_str());
+          aGroup->myEntry = CreateAttributes(theStudy,
+                                             aMesh->myGroupsEntry,
+                                             NO_ICON,
+                                             NO_IOR,
+                                             aGroupName,
+                                             NO_PERFSITENT_REF,
+                                             aComment.toLatin1().data(),
+                                             true);
+          const TFamilySet& aFamilySet = aGroup->myFamilySet;
+          TFamilySet::const_iterator aFamilyIter = aFamilySet.begin();
+          for(; aFamilyIter != aFamilySet.end(); aFamilyIter++){
+            const PFamily& aFamily = (*aFamilyIter).second;
+            CreateReference(theStudy,
+                            aGroup->myEntry,
+                            aFamily->myEntry);
+          }
+        }
       }else if(!theIsAtOnce)
-       RemoveSObject(theStudy,
-                     aMesh->myGroupsEntry);
+        RemoveSObject(theStudy,
+                      aMesh->myGroupsEntry);
     }
     
     ProcessVoidEvent(new TUpdateObjBrowser(theStudy->StudyId(),theIsDone));
@@ -492,7 +489,7 @@ namespace VISU
 
       const TMeshOnEntityMap& aMeshOnEntityMap = aMesh->myMeshOnEntityMap;
       if(aMeshOnEntityMap.empty()) 
-       continue;
+        continue;
 
       //Import fields
       bool anIsFieldsEntryUpdated = false;
@@ -500,84 +497,83 @@ namespace VISU
 
       for(; aMeshOnEntityMapIter != aMeshOnEntityMap.end(); aMeshOnEntityMapIter++)
       {
-       const TEntity& anEntity = aMeshOnEntityMapIter->first;
-       const PMeshOnEntity& aMeshOnEntity = aMeshOnEntityMapIter->second;
-       const TFieldMap& aFieldMap = aMeshOnEntity->myFieldMap;
-       TFieldMap::const_iterator aFieldMapIter = aFieldMap.begin();
-
-       for(; aFieldMapIter != aFieldMap.end(); aFieldMapIter++)
-       {
-         if(!anIsFieldsEntryUpdated)
-         {
-           aComment = "";
-           aComment.append("myComment=FIELDS;");
-           aComment.append("myMeshName=");aComment.append(aMeshName.c_str());
-
-           CreateAttributes(theStudy,
-                            aMesh->myFieldsEntry,
-                            NO_ICON,
-                            NO_IOR,
-                            "Fields",
-                            NO_PERFSITENT_REF,
-                            aComment.toLatin1().data(),
-                            false);
-
-           anIsFieldsEntryUpdated = true;
-         }
-
-         const string& aFieldName = aFieldMapIter->first;
-         const PField& aField = aFieldMapIter->second;
-         const TValField& aValField = aField->myValField;
-         QString aFieldNameWithUnit = GenerateFieldName(aFieldName,aField->myUnitNames[0]);
-         aComment = QString("myComment=FIELD;myMeshName=%1;myEntityId=%2;myName=%3;myNbTimeStamps=%4;myNumComponent=%5");
+        const TEntity& anEntity = aMeshOnEntityMapIter->first;
+        const PMeshOnEntity& aMeshOnEntity = aMeshOnEntityMapIter->second;
+        const TFieldMap& aFieldMap = aMeshOnEntity->myFieldMap;
+        TFieldMap::const_iterator aFieldMapIter = aFieldMap.begin();
+        
+        for(; aFieldMapIter != aFieldMap.end(); aFieldMapIter++)
+        {
+          if(!anIsFieldsEntryUpdated)
+          {
+            aComment = "";
+            aComment.append("myComment=FIELDS;");
+            aComment.append("myMeshName=");aComment.append(aMeshName.c_str());
+            
+            CreateAttributes(theStudy,
+                             aMesh->myFieldsEntry,
+                             NO_ICON,
+                             NO_IOR,
+                             "Fields",
+                             NO_PERFSITENT_REF,
+                             aComment.toLatin1().data(),
+                             false);
+            anIsFieldsEntryUpdated = true;
+          }
+        
+          const string& aFieldName = aFieldMapIter->first;
+          const PField& aField = aFieldMapIter->second;
+          const TValField& aValField = aField->myValField;
+          QString aFieldNameWithUnit = GenerateFieldName(aFieldName,aField->myUnitNames[0]);
+          aComment = QString("myComment=FIELD;myMeshName=%1;myEntityId=%2;myName=%3;myNbTimeStamps=%4;myNumComponent=%5");
           aComment = aComment.arg(aMeshName.c_str());
           aComment = aComment.arg(anEntity);
           aComment = aComment.arg(aFieldName.c_str());
           aComment = aComment.arg(aValField.size());
           aComment = aComment.arg(aField->myNbComp);
-         
-         aField->myEntry = CreateAttributes(theStudy,
-                                            aMesh->myFieldsEntry,
-                                            NO_ICON,
-                                            NO_IOR,
-                                            aFieldNameWithUnit.toLatin1().data(),
-                                            NO_PERFSITENT_REF,
-                                            aComment.toLatin1().data(),
-                                            true);
-
-         CreateReference(theStudy,
-                         aField->myEntry,
-                         aMeshOnEntity->myEntry);
-
-         TValField::const_iterator aValFieldIter = aValField.begin();
-
-         for(; aValFieldIter != aValField.end(); aValFieldIter++)
-         {
-           int aTimeStamp = aValFieldIter->first;
-           const PValForTime& aValForTime = aValFieldIter->second;
-           aComment = QString("myComment=TIMESTAMP;myMeshName=%1;myEntityId=%2;myFieldName=%3;myTimeStampId=%4;myNumComponent=%5");
+          
+          aField->myEntry = CreateAttributes(theStudy,
+                                            aMesh->myFieldsEntry,
+                                            NO_ICON,
+                                            NO_IOR,
+                                            aFieldNameWithUnit.toLatin1().data(),
+                                            NO_PERFSITENT_REF,
+                                            aComment.toLatin1().data(),
+                                            true);
+
+          CreateReference(theStudy,
+                          aField->myEntry,
+                          aMeshOnEntity->myEntry);
+
+          TValField::const_iterator aValFieldIter = aValField.begin();
+          
+          for(; aValFieldIter != aValField.end(); aValFieldIter++)
+          {
+            int aTimeStamp = aValFieldIter->first;
+            const PValForTime& aValForTime = aValFieldIter->second;
+            aComment = QString("myComment=TIMESTAMP;myMeshName=%1;myEntityId=%2;myFieldName=%3;myTimeStampId=%4;myNumComponent=%5");
             aComment = aComment.arg(aMeshName.c_str());
             aComment = aComment.arg(anEntity);
             aComment = aComment.arg(aFieldName.c_str());
             aComment = aComment.arg(aTimeStamp);
             aComment = aComment.arg(aField->myNbComp);
-
-           string aTimeStampId = VISU_Convertor::GenerateName(aValForTime->myTime);
-
-           aValForTime->myEntry = CreateAttributes(theStudy,
-                                                   aField->myEntry,
-                                                   NO_ICON,
-                                                   NO_IOR,
-                                                   aTimeStampId,
-                                                   NO_PERFSITENT_REF,
-                                                   aComment.toLatin1().data(),
-                                                   true);
-         }
-       }
+            
+            string aTimeStampId = VISU_Convertor::GenerateName(aValForTime->myTime);
+            
+            aValForTime->myEntry = CreateAttributes(theStudy,
+                                                    aField->myEntry,
+                                                    NO_ICON,
+                                                    NO_IOR,
+                                                    aTimeStampId,
+                                                    NO_PERFSITENT_REF,
+                                                    aComment.toLatin1().data(),
+                                                    true);
+          }
+        }
       }
 
       if(!anIsFieldsEntryUpdated && !theIsAtOnce)
-       RemoveSObject(theStudy, aMesh->myFieldsEntry);
+        RemoveSObject(theStudy, aMesh->myFieldsEntry);
     }
 
     ProcessVoidEvent(new TUpdateObjBrowser(theStudy->StudyId(),theIsDone));
@@ -587,9 +583,9 @@ namespace VISU
   //----------------------------------------------------------------------------
   void
   BuildMinMax(Result_i* theResult,
-             Result_i::PInput theInput,
-             CORBA::Boolean* theIsDone,
-             CORBA::Boolean theIsBuild)
+              Result_i::PInput theInput,
+              CORBA::Boolean* theIsDone,
+              CORBA::Boolean theIsBuild)
   {
     if(!theIsBuild || *theIsDone)
       return;
@@ -608,19 +604,19 @@ namespace VISU
   //----------------------------------------------------------------------------
   void
   BuildFieldDataTree(Result_i* theResult,
-                    Result_i::PInput theInput,
-                    CORBA::Boolean* theIsFieldsDone,
-                    CORBA::Boolean theIsBuildFields,
-                    CORBA::Boolean* theIsMinMaxDone,
-                    CORBA::Boolean theIsBuildMinMax,
-                    _PTR(Study) theStudy)
+                     Result_i::PInput theInput,
+                     CORBA::Boolean* theIsFieldsDone,
+                     CORBA::Boolean theIsBuildFields,
+                     CORBA::Boolean* theIsMinMaxDone,
+                     CORBA::Boolean theIsBuildMinMax,
+                     _PTR(Study) theStudy)
   {
     BuildFields(theResult,
-               theInput,
-               theIsFieldsDone,
-               theIsBuildFields,
-               false,
-               theStudy);
+                theInput,
+                theIsFieldsDone,
+                theIsBuildFields,
+                false,
+                theStudy);
 
     BuildMinMax(theResult,
                theInput,

diff --git a/src/VISU_I/VISU_Result_i.cc b/src/VISU_I/VISU_Result_i.cc
index b158404c7da5666b528fde98a76ea61b276d6d58..2abbd7d4578d856ee3039d2d57aee8be8d74089e 100644 (file)
--- a/src/VISU_I/VISU_Result_i.cc
+++ b/src/VISU_I/VISU_Result_i.cc
@@ -505,6 +505,7 @@ VISU::Result_i
                                       false,
                                       myStudy));
   }
+
   {
     boost::thread aThread(boost::bind(&BuildFieldDataTree,
                                       this,