X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FOBJECT%2FSMESH_SVTKActor.cxx;h=abaeeaaa810b5be7802cc4c9ab15d54e98a8c07a;hp=78ec260d66517867302678585c98df832596c352;hb=499f29d24922cec66e41b41a0039a954993bc6df;hpb=7a65c9fad427b1ccba6b9ccae612296e5092a324 diff --git a/src/OBJECT/SMESH_SVTKActor.cxx b/src/OBJECT/SMESH_SVTKActor.cxx index 78ec260d6..abaeeaaa8 100644 --- a/src/OBJECT/SMESH_SVTKActor.cxx +++ b/src/OBJECT/SMESH_SVTKActor.cxx @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2015 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 @@ -43,7 +43,7 @@ #include -vtkStandardNewMacro(SMESH_SVTKActor); +vtkStandardNewMacro(SMESH_SVTKActor) /*! Constructor @@ -108,7 +108,7 @@ SMESH_SVTKActor void SMESH_SVTKActor ::MapCells(SALOME_Actor* theMapActor, - const TColStd_IndexedMapOfInteger& theMapIndex) + const SVTK_TIndexedMapOfVtkId& theMapIndex) { myUnstructuredGrid->Initialize(); myUnstructuredGrid->Allocate(); @@ -119,11 +119,10 @@ SMESH_SVTKActor myBallGrid->Initialize(); myBallGrid->Allocate(); - vtkDataSet *aSourceDataSet = theMapActor->GetInput(); - SVTK::CopyPoints( GetSource(), aSourceDataSet ); - SVTK::CopyPoints( myBallGrid, aSourceDataSet ); - SVTK::CopyPoints( my0DGrid, aSourceDataSet ); - + vtkUnstructuredGrid * aSourceGrid = (vtkUnstructuredGrid *)theMapActor->GetInput(); + GetSource()->SetPoints( aSourceGrid->GetPoints() ); + myBallGrid->SetPoints( aSourceGrid->GetPoints() ); + my0DGrid->SetPoints( aSourceGrid->GetPoints() ); int aNbOfParts = theMapIndex.Extent(); @@ -132,11 +131,12 @@ SMESH_SVTKActor //Copy deamaters of the balls if(myVisualObj) { outputCD = myBallGrid->GetCellData(); - cd = aSourceDataSet->GetCellData(); + cd = aSourceGrid->GetCellData(); } outputCD->CopyAllocate(cd,aNbOfParts,aNbOfParts/2); - for(int ind = 1; ind <= aNbOfParts; ind++){ - int aPartId = theMapIndex( ind ); + for(int ind = 1; ind <= aNbOfParts; ind++) + { + vtkIdType aPartId = theMapIndex( ind ); if(vtkCell* aCell = theMapActor->GetElemCell(aPartId)) { if (aCell->GetCellType() != VTK_POLYHEDRON)