Salome HOME
projects
/
modules
/
smesh.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Copyright update 2022
[modules/smesh.git]
/
src
/
OBJECT
/
SMESH_SVTKActor.cxx
diff --git
a/src/OBJECT/SMESH_SVTKActor.cxx
b/src/OBJECT/SMESH_SVTKActor.cxx
index 78ec260d66517867302678585c98df832596c352..abaeeaaa810b5be7802cc4c9ab15d54e98a8c07a 100644
(file)
--- a/
src/OBJECT/SMESH_SVTKActor.cxx
+++ b/
src/OBJECT/SMESH_SVTKActor.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-20
15
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-20
22
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
//
// 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 <Utils_SALOME_Exception.hxx>
#include <Utils_SALOME_Exception.hxx>
-vtkStandardNewMacro(SMESH_SVTKActor)
;
+vtkStandardNewMacro(SMESH_SVTKActor)
/*!
Constructor
/*!
Constructor
@@
-108,7
+108,7
@@
SMESH_SVTKActor
void
SMESH_SVTKActor
::MapCells(SALOME_Actor* theMapActor,
void
SMESH_SVTKActor
::MapCells(SALOME_Actor* theMapActor,
- const
TColStd_IndexedMapOfInteger
& theMapIndex)
+ const
SVTK_TIndexedMapOfVtkId
& theMapIndex)
{
myUnstructuredGrid->Initialize();
myUnstructuredGrid->Allocate();
{
myUnstructuredGrid->Initialize();
myUnstructuredGrid->Allocate();
@@
-119,11
+119,10
@@
SMESH_SVTKActor
myBallGrid->Initialize();
myBallGrid->Allocate();
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();
int aNbOfParts = theMapIndex.Extent();
@@
-132,11
+131,12
@@
SMESH_SVTKActor
//Copy deamaters of the balls
if(myVisualObj) {
outputCD = myBallGrid->GetCellData();
//Copy deamaters of the balls
if(myVisualObj) {
outputCD = myBallGrid->GetCellData();
- cd = aSource
DataSet
->GetCellData();
+ cd = aSource
Grid
->GetCellData();
}
outputCD->CopyAllocate(cd,aNbOfParts,aNbOfParts/2);
}
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)
if(vtkCell* aCell = theMapActor->GetElemCell(aPartId))
{
if (aCell->GetCellType() != VTK_POLYHEDRON)