From: eap Date: Wed, 17 Mar 2021 15:46:27 +0000 (+0300) Subject: bos #20256: [CEA 18523] Porting SMESH to int 64 bits X-Git-Tag: V9_7_0a1^0 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=refs%2Fheads%2Focc%2F20256_v2;p=modules%2Fhexablock.git bos #20256: [CEA 18523] Porting SMESH to int 64 bits --- diff --git a/src/HEXABLOCKGUI/HEXABLOCKGUI_SalomeTools.cxx b/src/HEXABLOCKGUI/HEXABLOCKGUI_SalomeTools.cxx index 1c1346a..ba1bf4b 100644 --- a/src/HEXABLOCKGUI/HEXABLOCKGUI_SalomeTools.cxx +++ b/src/HEXABLOCKGUI/HEXABLOCKGUI_SalomeTools.cxx @@ -126,17 +126,17 @@ namespace GUI theName = ""; - TColStd_IndexedMapOfInteger aMapIndex; + SVTK_TIndexedMapOfVtkId aMapIndex; theSelector->GetIndex(theIO,aMapIndex); typedef std::set TIdContainer; - std::set anIdContainer; + std::set anIdContainer; - for( int i = 1; i <= aMapIndex.Extent(); i++) + for( vtkIdType i = 1; i <= aMapIndex.Extent(); i++) anIdContainer.insert(aMapIndex(i)); - std::set::const_iterator anIter = anIdContainer.begin(); + std::set::const_iterator anIter = anIdContainer.begin(); for( ; anIter != anIdContainer.end(); anIter++) theName += QString(" %1").arg(*anIter); diff --git a/src/HEXABLOCKGUI/HEXABLOCKGUI_VtkDocumentGraphicView.cxx b/src/HEXABLOCKGUI/HEXABLOCKGUI_VtkDocumentGraphicView.cxx index f75a487..e8d13b5 100644 --- a/src/HEXABLOCKGUI/HEXABLOCKGUI_VtkDocumentGraphicView.cxx +++ b/src/HEXABLOCKGUI/HEXABLOCKGUI_VtkDocumentGraphicView.cxx @@ -27,7 +27,7 @@ #include "vtkCellArray.h" #include "vtkPolyData.h" -#include +//#include #include #include "HEXABLOCKGUI_Trace.hxx" @@ -218,7 +218,7 @@ vtkUnstructuredGrid* Document_Actor::getUnstructuredGrid() // 0 1 3 2 4 5 7 6 // Insert cells in grid - VTKViewer_CellLocationsArray* aCellLocationsArray = VTKViewer_CellLocationsArray::New(); + vtkIdTypeArray* aCellLocationsArray = vtkIdTypeArray::New(); aCellLocationsArray->SetNumberOfComponents( 1 ); aCellLocationsArray->SetNumberOfTuples( aNbCells ); // std::cout << "aNbCells =>" << aNbCells << std::endl; @@ -409,7 +409,7 @@ vtkUnstructuredGrid* Associate_Actor::getUnstructuredGrid() // 0 1 3 2 4 5 7 6 // Insert cells in grid - VTKViewer_CellLocationsArray* aCellLocationsArray = VTKViewer_CellLocationsArray::New(); + vtkIdTypeArray* aCellLocationsArray = vtkIdTypeArray::New(); aCellLocationsArray->SetNumberOfComponents( 1 ); aCellLocationsArray->SetNumberOfTuples( aNbCells ); // std::cout << "aNbCells =>" << aNbCells << std::endl; @@ -650,8 +650,8 @@ void VtkDocumentGraphicView::highlight( const QModelIndexList& elts ) // viewWindow->SetSelectionMode(VolumeSelection); // --- elements highlight --- - TColStd_IndexedMapOfInteger aMap; - int vtkElemsId; + SVTK_TIndexedMapOfVtkId aMap; + vtkIdType vtkElemsId; QString eltEntry; foreach( const QModelIndex& iElt, elts ){ @@ -697,8 +697,8 @@ void VtkDocumentGraphicView::highlightGroups( const QModelIndex& eltIndex ) case VertexNode: viewWindow->SetSelectionMode(NodeSelection); break; } - TColStd_MapOfInteger aMap; - int vtkElemsId; + SVTK_TVtkIDsMap aMap; + vtkIdType vtkElemsId; QString eltEntry; foreach( const QModelIndex& iElt, iElements ){ @@ -740,8 +740,8 @@ void VtkDocumentGraphicView::highlightPropagation( const QModelIndex& eltIndex ) // Set selection mode in VTK view viewWindow->SetSelectionMode(EdgeSelection); - TColStd_MapOfInteger aMap; - int vtkElemsId; + SVTK_TVtkIDsMap aMap; + vtkIdType vtkElemsId; QString edgeEntry; foreach( const QModelIndex& iEdge, iEdges ){