BUG: EDF 2655: Low performance of hexa to tetra splitting

[modules/smesh.git] / src / OBJECT / SMESH_SVTKActor.cxx

diff --git a/src/OBJECT/SMESH_SVTKActor.cxx b/src/OBJECT/SMESH_SVTKActor.cxx
index 48ad8691026d940a2383031b614ba60cd0d10943..de143a7901df15960ba33ab8bff1b8f6ae19f8da 100644 (file)
--- a/src/OBJECT/SMESH_SVTKActor.cxx
+++ b/src/OBJECT/SMESH_SVTKActor.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2013  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
@@ -31,7 +31,6 @@
 #include <SVTK_Utils.h>
 #include <SALOME_Actor.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 <vtkPolyhedron.h>
+
+#include <Utils_SALOME_Exception.hxx>
 
 vtkStandardNewMacro(SMESH_SVTKActor);
 
@@ -125,9 +127,7 @@ SMESH_SVTKActor
     int aPartId = theMapIndex( ind );
     if(vtkCell* aCell = theMapActor->GetElemCell(aPartId))
     {
-#if VTK_XVERSION > 50700
       if (aCell->GetCellType() != VTK_POLYHEDRON)
-#endif
       {
         if(aCell->GetCellType() == VTK_VERTEX ) {
           my0DGrid->InsertNextCell(aCell->GetCellType(),aCell->GetPointIds());
@@ -137,7 +137,6 @@ SMESH_SVTKActor
           myUnstructuredGrid->InsertNextCell(aCell->GetCellType(),aCell->GetPointIds());
         }
       }
-#if VTK_XVERSION > 50700
       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);
       }
-#endif
     }
   }
 
@@ -164,8 +162,8 @@ SMESH_SVTKActor
 ::Initialize()
 {
   Superclass::Initialize();
-  my0DActor->SetInput(my0DGrid);
-  myBallActor->SetInput(myBallGrid);
+  my0DActor->SetInputData(my0DGrid);
+  myBallActor->SetInputData(myBallGrid);
 }