Copyright update 2022

[modules/gui.git] / src / SVTK / SVTK_Actor.cxx

diff --git a/src/SVTK/SVTK_Actor.cxx b/src/SVTK/SVTK_Actor.cxx
index 6253b2e4a0a24efd8a7bff29210318669f63a249..ec6ca767df9735748ba244a30b88f3f56dd5983e 100644 (file)
--- a/src/SVTK/SVTK_Actor.cxx
+++ b/src/SVTK/SVTK_Actor.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2020  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2022  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -44,7 +44,7 @@
 #include "utilities.h"
 
 
-vtkStandardNewMacro(SVTK_Actor);
+vtkStandardNewMacro(SVTK_Actor)
 
 /*!
   Constructor
@@ -96,7 +96,7 @@ SVTK_Actor
 {
 }
 
-const TColStd_IndexedMapOfInteger&
+const SVTK_TIndexedMapOfVtkId&
 SVTK_Actor
 ::GetMapIndex() const
 {
@@ -104,7 +104,7 @@ SVTK_Actor
 }
 
 
-const SVTK_IndexedMapOfIds&
+const SVTK_IndexedMapOfVtkIds&
 SVTK_Actor
 ::GetMapCompositeIndex() const 
 {
@@ -114,7 +114,7 @@ SVTK_Actor
 void
 SVTK_Actor
 ::MapCells(SALOME_Actor* theMapActor,
-           const TColStd_IndexedMapOfInteger& theMapIndex)
+           const SVTK_TIndexedMapOfVtkId& theMapIndex)
 {
   myUnstructuredGrid->Initialize();
   myUnstructuredGrid->Allocate();
@@ -156,7 +156,7 @@ SVTK_Actor
 void 
 SVTK_Actor
 ::MapPoints(SALOME_Actor* theMapActor,
-            const TColStd_IndexedMapOfInteger& theMapIndex)
+            const SVTK_TIndexedMapOfVtkId& theMapIndex)
 {
   myUnstructuredGrid->Initialize();
   myUnstructuredGrid->Allocate();
@@ -165,7 +165,7 @@ SVTK_Actor
     vtkPoints *aPoints = vtkPoints::New();
     aPoints->SetNumberOfPoints(aNbOfParts);
     for(vtkIdType i = 0; i < aNbOfParts; i++){
-      int aPartId = theMapIndex( i+1 );
+         vtkIdType aPartId = theMapIndex( i+1 );
       if(double* aCoord = theMapActor->GetNodeCoord(aPartId)){
         aPoints->SetPoint(i,aCoord);
         // Change the type from int to vtkIdType in order to avoid compilation errors while using VTK
@@ -185,7 +185,7 @@ SVTK_Actor
 void
 SVTK_Actor
 ::MapEdge(SALOME_Actor* theMapActor,
-          const TColStd_IndexedMapOfInteger& theMapIndex)
+          const SVTK_TIndexedMapOfVtkId& theMapIndex)
 {
   myUnstructuredGrid->Initialize();
   myUnstructuredGrid->Allocate();
@@ -224,16 +224,16 @@ SVTK_Actor
 void
 SVTK_Actor
 ::MapEdge( SALOME_Actor* theMapActor, 
-           const SVTK_IndexedMapOfIds& theMapCompositeIndex) {
+           const SVTK_IndexedMapOfVtkIds& theMapCompositeIndex) {
   myUnstructuredGrid->Initialize();
   myUnstructuredGrid->Allocate();
 
   vtkUnstructuredGrid * aSourceGrid = ( vtkUnstructuredGrid * )theMapActor->GetInput();
   GetSource()->SetPoints( aSourceGrid->GetPoints() );
 
-  int aNbOfParts = theMapCompositeIndex.Extent();
-  for(int ind = 1; ind <= aNbOfParts; ind++){
-      std::vector<int> aNodesIds = theMapCompositeIndex( ind );
+  vtkIdType aNbOfParts = theMapCompositeIndex.Extent();
+  for(vtkIdType ind = 1; ind <= aNbOfParts; ind++){
+      std::vector<vtkIdType> aNodesIds = theMapCompositeIndex( ind );
       vtkSmartPointer<vtkIdList> ids = vtkSmartPointer<vtkIdList>::New();
       ids->InsertNextId(theMapActor->GetNodeVtkId( aNodesIds[0] ) );
       ids->InsertNextId(theMapActor->GetNodeVtkId( aNodesIds[1] ) );