Join modifications from branch OCC_debug_for_3_2_0b1

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

diff --git a/src/CONVERTOR/VISU_Convertor_impl.hxx b/src/CONVERTOR/VISU_Convertor_impl.hxx
index c4efc7d25c80c2471f5f83b6b4651e4869cdcbad..413613633198170dd1dfd6a9806ba4ddacef8043 100644 (file)
--- a/src/CONVERTOR/VISU_Convertor_impl.hxx
+++ b/src/CONVERTOR/VISU_Convertor_impl.hxx
@@ -76,7 +76,7 @@ namespace VISU
 
   typedef vtkSmartPointer<VTKViewer_AppendFilter> TVTKAppendFilter;
 
-  typedef float TCoord;
+  typedef vtkFloatingPointType TCoord;
 
   //---------------------------------------------------------------
   //! Define an utility base class which is repsonsible for preventing repetion
@@ -338,7 +338,7 @@ namespace VISU
 
     //! Reimplement the TIDMapper::GetNodeCoord
     virtual 
-    float*  
+    vtkFloatingPointType*  
     GetNodeCoord(vtkIdType theObjID);
 
     //! Reimplement the TIDMapper::GetElemObjID
@@ -401,7 +401,7 @@ namespace VISU
 
     //! Reimplement the TIDMapper::GetNodeCoord
     virtual 
-    float*  
+    vtkFloatingPointType*  
     GetNodeCoord(vtkIdType theObjID);
 
     //! Reimplement the TIDMapper::GetElemObjID
@@ -456,7 +456,8 @@ namespace VISU
     //! To implement the TGaussPtsIDMapper::GetObjID
     virtual
     TGaussPointID
-    GetObjID(vtkIdType theID) const;
+    GetObjID(vtkIdType theID,
+            vtkIdType theStartID) const;
     
     PGaussImpl myGauss; //<! Keep reference to corresponding TGauss structure
 
@@ -701,7 +702,7 @@ namespace VISU
 
 
   //---------------------------------------------------------------
-  typedef TVector<float> TValue;
+  typedef TVector<vtkFloatingPointType> TValue;
   typedef TSlice<TValue> TValueSlice;
   typedef TCSlice<TValue> TCValueSlice;
 
@@ -813,7 +814,7 @@ public:
 
   //! Implemention of the VISU_Convertor::GetSize
   virtual 
-  float
+  vtkFloatingPointType
   GetSize();
 
   //! Implemention of the VISU_Convertor::GetMeshOnEntity
@@ -824,7 +825,7 @@ public:
 
   //! Implemention of the VISU_Convertor::GetMeshOnEntitySize
   virtual 
-  float 
+  vtkFloatingPointType 
   GetMeshOnEntitySize(const std::string& theMeshName, 
                       const VISU::TEntity& theEntity);
 
@@ -837,7 +838,7 @@ public:
 
   //! Implemention of the VISU_Convertor::GetFamilyOnEntitySize
   virtual 
-  float 
+  vtkFloatingPointType 
   GetFamilyOnEntitySize(const std::string& theMeshName, 
                        const VISU::TEntity& theEntity,
                        const std::string& theFamilyName);
@@ -850,7 +851,7 @@ public:
   
   //! Implemention of the VISU_Convertor::GetMeshOnGroupSize
   virtual 
-  float 
+  vtkFloatingPointType 
   GetMeshOnGroupSize(const std::string& theMeshName, 
                     const std::string& theGroupName);
 
@@ -864,7 +865,7 @@ public:
 
   //! Implemention of the VISU_Convertor::GetTimeStampSize
   virtual 
-  float 
+  vtkFloatingPointType 
   GetTimeStampSize(const std::string& theMeshName, 
                   const VISU::TEntity& theEntity,
                   const std::string& theFieldName,
@@ -880,7 +881,7 @@ public:
   
   //! Implemention of the VISU_Convertor::GetFieldOnMeshSize
   virtual 
-  float 
+  vtkFloatingPointType 
   GetFieldOnMeshSize(const std::string& theMeshName, 
                     const VISU::TEntity& theEntity,
                     const std::string& theFieldName);