Join modifications from branch OCC_debug_for_3_2_0b1

[modules/visu.git] / src / CONVERTOR / VISU_Convertor.hxx

diff --git a/src/CONVERTOR/VISU_Convertor.hxx b/src/CONVERTOR/VISU_Convertor.hxx
index 4a5ac9938b7fbae890518416cf237ed3be38c058..4dc7b49c0b20014239de8d3d5e23bba34b612579 100644 (file)
--- a/src/CONVERTOR/VISU_Convertor.hxx
+++ b/src/CONVERTOR/VISU_Convertor.hxx
@@ -79,6 +79,9 @@ namespace VISU
     TName myName; //! Name of the corresponding MED MESH
     int myDim; //! Dimension of the corresponding MED MESH
 
+    std::string myGroupsEntry; //!< To simplify publication of the groups in a data tree
+    std::string myFieldsEntry; //!< To simplify publication of the fiels in a data tree
+
     TMesh(): myDim(0)
     {}
   };
@@ -178,7 +181,7 @@ namespace VISU
 
   //---------------------------------------------------------------
   typedef std::map<vtkIdType,PValForTime> TValField;
-  typedef std::pair<float,float> TMinMax;
+  typedef std::pair<vtkFloatingPointType,vtkFloatingPointType> TMinMax;
 
   //! Define a basic class for MED FIELD entity
   struct TField: virtual TIntId
@@ -305,7 +308,7 @@ public:
 
   //! Get amount of memory to build VTK representations for all existing MED entities
   virtual
-  float
+  vtkFloatingPointType
   GetSize() = 0;
 
   //! Get mesh for corresponding MED ENTITY
@@ -316,7 +319,7 @@ public:
   
   //! Get amount of memory to build mesh for corresponding MED ENTITY
   virtual
-  float
+  vtkFloatingPointType
   GetMeshOnEntitySize(const std::string& theMeshName, 
                      const VISU::TEntity& theEntity) = 0;
   
@@ -329,7 +332,7 @@ public:
 
   //! Get amount of memory to build mesh for corresponding MED FAMILY
   virtual 
-  float 
+  vtkFloatingPointType 
   GetFamilyOnEntitySize(const std::string& theMeshName, 
                        const VISU::TEntity& theEntity,
                        const std::string& theFamilyName) = 0;
@@ -342,7 +345,7 @@ public:
   
   //! Get amount of memory to build mesh for corresponding MED GROUP
   virtual
-  float
+  vtkFloatingPointType
   GetMeshOnGroupSize(const std::string& theMeshName, 
                     const std::string& theGroupName) = 0;
   
@@ -364,7 +367,7 @@ public:
    
   //! Get amount of memory to build mesh for corresponding MED TIMESTAMP
   virtual 
-  float
+  vtkFloatingPointType
   GetTimeStampSize(const std::string& theMeshName, 
                   const VISU::TEntity& theEntity,
                   const std::string& theFieldName,
@@ -372,7 +375,7 @@ public:
     
   //! Get amount of memory to build all MED TIMESTAMPS for corresponding MED FIELD
   virtual 
-  float
+  vtkFloatingPointType
   GetFieldOnMeshSize(const std::string& theMeshName, 
                     const VISU::TEntity& theEntity,
                     const std::string& theFieldName) = 0;