Upgrade to paraview 5.4

[modules/gui.git] / src / SVTK / SVTK_DeviceActor.h

diff --git a/src/SVTK/SVTK_DeviceActor.h b/src/SVTK/SVTK_DeviceActor.h
index 366ed9ae4cc8deaa9cc986f4371cf9016c5d112b..95c13743f0472200d1e077059616564b5e34b4de 100644 (file)
--- a/src/SVTK/SVTK_DeviceActor.h
+++ b/src/SVTK/SVTK_DeviceActor.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2016  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
@@ -6,7 +6,7 @@
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
 // License as published by the Free Software Foundation; either
-// version 2.1 of the License.
+// version 2.1 of the License, or (at your option) any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -47,6 +47,7 @@ class vtkShrinkFilter;
 class vtkFeatureEdges;
 class VTKViewer_DataSetMapper;
 class vtkPassThroughFilter;
+class vtkAlgorithmOutput;
 
 #ifdef WIN32
 #pragma warning ( disable:4251 )
@@ -79,7 +80,12 @@ class SVTK_EXPORT SVTK_DeviceActor: public vtkLODActor
   //! Allows to set initial #vtkDataSet
   virtual
   void
-  SetInput(vtkDataSet* theDataSet); 
+  SetInputData(vtkDataSet* theDataSet); 
+
+  //! Allows to set initial #vtkAlgorithmOutput
+  virtual
+  void
+  SetInputConnection(vtkAlgorithmOutput* theAlgorithmOutput); 
 
   /** @name For selection mapping purpose */
   //@{
@@ -106,7 +112,7 @@ class SVTK_EXPORT SVTK_DeviceActor: public vtkLODActor
   //@}
 
   virtual 
-  unsigned long int 
+  vtkMTimeType
   GetMTime();
 
   /** @name For shrink mamnagement purpose */
@@ -208,10 +214,17 @@ class SVTK_EXPORT SVTK_DeviceActor: public vtkLODActor
   SetShaded(bool theShaded);
   //@}
 
+  /** @name For ball marker management purpose */
+  void 
+  SetBallEnabled( bool );
+
   /** @name For marker management purpose */
   void
   SetMarkerEnabled( bool );
 
+  void
+  SetBallScale( double );
+
   void
   SetMarkerStd( VTK::MarkerType, VTK::MarkerScale );