Merge branch 'master' into agy/NewPV1_For_850

[modules/gui.git] / src / VTKViewer / VTKViewer_Actor.h

diff --git a/src/VTKViewer/VTKViewer_Actor.h b/src/VTKViewer/VTKViewer_Actor.h
index d561e48f36637ba830e3b43272d2ca60c3e699fd..4786236386c00237ea6f3d0f771c3dce526a4f93 100755 (executable)
--- a/src/VTKViewer/VTKViewer_Actor.h
+++ b/src/VTKViewer/VTKViewer_Actor.h
@@ -146,6 +146,11 @@ class VTKVIEWER_EXPORT VTKViewer_Actor : public vtkLODActor
   double*
   GetNodeCoord(int theObjID);
 
+  //! Maps object index of a node to corresponding VTK index
+  virtual
+  int 
+  GetNodeVtkId(int theObjID);
+
   //! Maps VTK index of a cell to corresponding object index
   virtual 
   int
@@ -179,7 +184,7 @@ class VTKVIEWER_EXPORT VTKViewer_Actor : public vtkLODActor
 
   //! To calculatate last modified time
   virtual
-  unsigned long int
+  vtkMTimeType
   GetMTime();
 
   //----------------------------------------------------------------------------
@@ -257,6 +262,12 @@ class VTKVIEWER_EXPORT VTKViewer_Actor : public vtkLODActor
   void
   GetPolygonOffsetParameters(double& factor, 
                              double& units);
+  
+  //! Get default ResolveCoincidentTopology parameters
+  static 
+  void
+  GetDefaultPolygonOffsetParameters(double& factor, 
+                                   double& units);
 
   virtual
   void
@@ -305,6 +316,11 @@ class VTKVIEWER_EXPORT VTKViewer_Actor : public vtkLODActor
   GetChildActors(vtkActorCollection*);
 
   //----------------------------------------------------------------------------
+  //! Is notified on enabling/disabling selection
+  virtual
+  void
+  EnableSelection( bool enable ) {}
+
   //! Ask, if the descendant of the VTKViewer_Actor will implement its own highlight or not
   virtual
   bool