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
add SMESH plugin MGCleaner
[modules/smesh.git]
/
src
/
OBJECT
/
SMESH_SVTKActor.cxx
diff --git
a/src/OBJECT/SMESH_SVTKActor.cxx
b/src/OBJECT/SMESH_SVTKActor.cxx
index 40f986b39ec20bf0473017b057065a426edfdd9e..de143a7901df15960ba33ab8bff1b8f6ae19f8da 100644
(file)
--- a/
src/OBJECT/SMESH_SVTKActor.cxx
+++ b/
src/OBJECT/SMESH_SVTKActor.cxx
@@
-31,7
+31,6
@@
#include <SVTK_Utils.h>
#include <SALOME_Actor.h>
#include <SVTK_Utils.h>
#include <SALOME_Actor.h>
-
#include <SVTK_DeviceActor.h>
#include <vtkPoints.h>
#include <vtkRenderer.h>
#include <SVTK_DeviceActor.h>
#include <vtkPoints.h>
#include <vtkRenderer.h>
@@
-39,6
+38,9
@@
#include <vtkUnstructuredGrid.h>
#include <vtkCell.h>
#include <vtkDataSetMapper.h>
#include <vtkUnstructuredGrid.h>
#include <vtkCell.h>
#include <vtkDataSetMapper.h>
+#include <vtkPolyhedron.h>
+
+#include <Utils_SALOME_Exception.hxx>
vtkStandardNewMacro(SMESH_SVTKActor);
vtkStandardNewMacro(SMESH_SVTKActor);
@@
-125,9
+127,7
@@
SMESH_SVTKActor
int aPartId = theMapIndex( ind );
if(vtkCell* aCell = theMapActor->GetElemCell(aPartId))
{
int aPartId = theMapIndex( ind );
if(vtkCell* aCell = theMapActor->GetElemCell(aPartId))
{
-#if VTK_XVERSION > 50700
if (aCell->GetCellType() != VTK_POLYHEDRON)
if (aCell->GetCellType() != VTK_POLYHEDRON)
-#endif
{
if(aCell->GetCellType() == VTK_VERTEX ) {
my0DGrid->InsertNextCell(aCell->GetCellType(),aCell->GetPointIds());
{
if(aCell->GetCellType() == VTK_VERTEX ) {
my0DGrid->InsertNextCell(aCell->GetCellType(),aCell->GetPointIds());
@@
-137,7
+137,6
@@
SMESH_SVTKActor
myUnstructuredGrid->InsertNextCell(aCell->GetCellType(),aCell->GetPointIds());
}
}
myUnstructuredGrid->InsertNextCell(aCell->GetCellType(),aCell->GetPointIds());
}
}
-#if VTK_XVERSION > 50700
else
{
vtkPolyhedron *polyhedron = dynamic_cast<vtkPolyhedron*>(aCell);
else
{
vtkPolyhedron *polyhedron = dynamic_cast<vtkPolyhedron*>(aCell);
@@
-146,7
+145,6
@@
SMESH_SVTKActor
vtkIdType *pts = polyhedron->GetFaces();
myUnstructuredGrid->InsertNextCell(aCell->GetCellType(),pts[0], pts+1);
}
vtkIdType *pts = polyhedron->GetFaces();
myUnstructuredGrid->InsertNextCell(aCell->GetCellType(),pts[0], pts+1);
}
-#endif
}
}
}
}