From 8aa656cd70d404c9e48febfff4bf631c37e39270 Mon Sep 17 00:00:00 2001 From: dmv Date: Tue, 30 Dec 2008 14:13:00 +0000 Subject: [PATCH] 0020062: [CEA 295] Type coherence in *.i files --- src/CONVERTOR/VISU_IDMapper.cxx | 2 +- src/CONVERTOR/VISU_MeshValue.cxx | 4 ++-- src/CONVERTOR/VISU_Structures_impl.hxx | 2 +- src/OBJECT/VISU_Actor.cxx | 2 +- src/PIPELINE/SALOME_ExtractGeometry.cxx | 4 ++-- src/PIPELINE/SALOME_ExtractPolyDataGeometry.cxx | 4 ++-- src/PIPELINE/VISU_DataSetMapperHolder.cxx | 2 +- src/PIPELINE/VISU_PipeLine.cxx | 3 ++- src/VISU_I/VISU_CorbaMedConvertor.cxx | 6 +++--- 9 files changed, 15 insertions(+), 14 deletions(-) diff --git a/src/CONVERTOR/VISU_IDMapper.cxx b/src/CONVERTOR/VISU_IDMapper.cxx index 91cf0e5a..0ab74a5a 100644 --- a/src/CONVERTOR/VISU_IDMapper.cxx +++ b/src/CONVERTOR/VISU_IDMapper.cxx @@ -149,7 +149,7 @@ namespace VISU vtkCell* TIDMapper - ::GetElemCell(int theObjID) + ::GetElemCell(vtkIdType theObjID) { vtkIdType aVtkID = GetElemVTKID(theObjID); return GetOutput()->GetCell(aVtkID); diff --git a/src/CONVERTOR/VISU_MeshValue.cxx b/src/CONVERTOR/VISU_MeshValue.cxx index fd5d3197..baa1c33c 100644 --- a/src/CONVERTOR/VISU_MeshValue.cxx +++ b/src/CONVERTOR/VISU_MeshValue.cxx @@ -232,7 +232,7 @@ namespace VISU const PValForTimeImpl& theValForTime) { vtkIdType aNbComp = theField->myNbComp; - vtkIdType aSize = std::max(3, aNbComp); + vtkIdType aSize = std::max(vtkIdType(3), aNbComp); TVector aDataValues(aSize); const TGeom2MeshValue& aGeom2MeshValue = theValForTime->GetGeom2MeshValue(); @@ -465,7 +465,7 @@ namespace VISU const PValForTimeImpl& theValForTime) { vtkIdType aNbComp = theField->myNbComp; - vtkIdType aSize = std::max(3, aNbComp); + vtkIdType aSize = std::max(vtkIdType(3), aNbComp); TVector aDataValues(aSize); const TGeom2MeshValue& aGeom2MeshValue = theValForTime->GetGeom2MeshValue(); diff --git a/src/CONVERTOR/VISU_Structures_impl.hxx b/src/CONVERTOR/VISU_Structures_impl.hxx index 708f3d37..a3251b5e 100644 --- a/src/CONVERTOR/VISU_Structures_impl.hxx +++ b/src/CONVERTOR/VISU_Structures_impl.hxx @@ -216,7 +216,7 @@ namespace VISU //! Get object number of mesh cell by its VTK one virtual vtkIdType - GetElemObjID(int theVtkI) const; + GetElemObjID(vtkIdType theVtkI) const; //! Get cell VTK ID for corresponding object ID virtual diff --git a/src/OBJECT/VISU_Actor.cxx b/src/OBJECT/VISU_Actor.cxx index f7519151..dfdd2bd9 100644 --- a/src/OBJECT/VISU_Actor.cxx +++ b/src/OBJECT/VISU_Actor.cxx @@ -403,7 +403,7 @@ VISU_Actor vtkFloatingPointType* VISU_Actor -::GetNodeCoord(int theObjID) +::GetNodeCoord(vtkIdType theObjID) { if(myIsVTKMapping) return Superclass::GetNodeCoord(theObjID); diff --git a/src/PIPELINE/SALOME_ExtractGeometry.cxx b/src/PIPELINE/SALOME_ExtractGeometry.cxx index 7ebfe861..92e95285 100755 --- a/src/PIPELINE/SALOME_ExtractGeometry.cxx +++ b/src/PIPELINE/SALOME_ExtractGeometry.cxx @@ -131,7 +131,7 @@ SALOME_ExtractGeometry //---------------------------------------------------------------------------- vtkIdType SALOME_ExtractGeometry -::GetElemObjId(int theVtkID) +::GetElemObjId(vtkIdType theVtkID) { if(!myStoreMapping || myIsDoneShallowCopy) return theVtkID; @@ -145,7 +145,7 @@ SALOME_ExtractGeometry vtkIdType SALOME_ExtractGeometry -::GetNodeObjId(int theVtkID) +::GetNodeObjId(vtkIdType theVtkID) { if(!myStoreMapping || myIsDoneShallowCopy) return theVtkID; diff --git a/src/PIPELINE/SALOME_ExtractPolyDataGeometry.cxx b/src/PIPELINE/SALOME_ExtractPolyDataGeometry.cxx index b21bd542..37c2dc69 100644 --- a/src/PIPELINE/SALOME_ExtractPolyDataGeometry.cxx +++ b/src/PIPELINE/SALOME_ExtractPolyDataGeometry.cxx @@ -123,7 +123,7 @@ SALOME_ExtractPolyDataGeometry //---------------------------------------------------------------------------- vtkIdType SALOME_ExtractPolyDataGeometry -::GetElemObjId(int theVtkID) +::GetElemObjId(vtkIdType theVtkID) { if(!myStoreMapping || myIsDoneShallowCopy) return theVtkID; @@ -137,7 +137,7 @@ SALOME_ExtractPolyDataGeometry vtkIdType SALOME_ExtractPolyDataGeometry -::GetNodeObjId(int theVtkID) +::GetNodeObjId(vtkIdType theVtkID) { if(!myStoreMapping || myIsDoneShallowCopy) return theVtkID; diff --git a/src/PIPELINE/VISU_DataSetMapperHolder.cxx b/src/PIPELINE/VISU_DataSetMapperHolder.cxx index db19be23..c46cc0c3 100644 --- a/src/PIPELINE/VISU_DataSetMapperHolder.cxx +++ b/src/PIPELINE/VISU_DataSetMapperHolder.cxx @@ -233,7 +233,7 @@ VISU_DataSetMapperHolder //---------------------------------------------------------------------------- vtkFloatingPointType* VISU_DataSetMapperHolder -::GetNodeCoord(int theObjID) +::GetNodeCoord(vtkIdType theObjID) { return Superclass::GetNodeCoord(theObjID); } diff --git a/src/PIPELINE/VISU_PipeLine.cxx b/src/PIPELINE/VISU_PipeLine.cxx index 40bfe9d1..4f2b51a3 100644 --- a/src/PIPELINE/VISU_PipeLine.cxx +++ b/src/PIPELINE/VISU_PipeLine.cxx @@ -32,6 +32,7 @@ #include #include +#include #include #include @@ -229,7 +230,7 @@ VISU_PipeLine //---------------------------------------------------------------------------- vtkFloatingPointType* VISU_PipeLine -::GetNodeCoord(int theObjID) +::GetNodeCoord(vtkIdType theObjID) { return GetMapperHolder()->GetNodeCoord(theObjID); } diff --git a/src/VISU_I/VISU_CorbaMedConvertor.cxx b/src/VISU_I/VISU_CorbaMedConvertor.cxx index e2289a3b..9f80ba32 100644 --- a/src/VISU_I/VISU_CorbaMedConvertor.cxx +++ b/src/VISU_I/VISU_CorbaMedConvertor.cxx @@ -886,7 +886,7 @@ VISU_MEDConvertor if(MYDEBUG) MESSAGE("VISU_MEDConvertor::Build - Support isOnAllElements = '"<> aNbPoints(%d) <= anArray[%d][%d]=%d < 0 !!!",aNbPoints,iElem,k,anArray[k]); + aString.sprintf("LoadCellsOnEntity >> aNbPoints(%d) <= anArray[%d][%d]=%d < 0 !!!",int(aNbPoints),iElem,k,anArray[k]); throw std::runtime_error(aString.latin1()); } aCell2Connect.push_back(anArray); -- 2.39.2