Merge from OCC_development_generic_2006

[modules/smesh.git] / src / SMESHGUI / SMESHGUI_VTKUtils.h

diff --git a/src/SMESHGUI/SMESHGUI_VTKUtils.h b/src/SMESHGUI/SMESHGUI_VTKUtils.h
index ec68ea5b11a909cd2b39a306f92116f20c3ba302..6b64521f0526b36b0cc7af5af0643070cc7ab043 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_VTKUtils.h
+++ b/src/SMESHGUI/SMESHGUI_VTKUtils.h
@@ -34,11 +34,11 @@ class SUIT_Study;
 class SUIT_ViewWindow;
 class SUIT_ViewManager;
 
-class SVTK_InteractorStyle;
 class SVTK_ViewWindow;
 class SVTK_Selector;
 
-class SalomeApp_SelectionMgr;
+class LightApp_SelectionMgr;
+class SMESHGUI;
 
 #include <CORBA.h>
 
@@ -114,29 +114,29 @@ namespace SMESH{
 
   void SetPickable(SMESH_Actor* theActor = NULL);
 
-  void UpdateSelectionProp();
+  void UpdateSelectionProp( SMESHGUI* );
 
 
   //----------------------------------------------------------------------------
-  SVTK_InteractorStyle* 
-    GetInteractorStyle (SUIT_ViewWindow* = GetActiveWindow());
+  SVTK_Selector* 
+    GetSelector(SUIT_ViewWindow* = GetActiveWindow());
 
   void SetFilter (const Handle(VTKViewer_Filter)& theFilter,
-                 SVTK_InteractorStyle* theStyle = GetInteractorStyle());
+                 SVTK_Selector* theSelector = GetSelector());
 
   Handle(VTKViewer_Filter) 
-    GetFilter (int theId, SVTK_InteractorStyle* theStyle = GetInteractorStyle());
+    GetFilter (int theId, SVTK_Selector* theSelector = GetSelector());
 
   bool IsFilterPresent (int theId, 
-                       SVTK_InteractorStyle* theStyle = GetInteractorStyle());
+                       SVTK_Selector* theSelector = GetSelector());
 
   void RemoveFilter (int theId, 
-                    SVTK_InteractorStyle* theStyle = GetInteractorStyle());
+                    SVTK_Selector* theSelector = GetSelector());
 
-  void RemoveFilters (SVTK_InteractorStyle* theStyle = GetInteractorStyle());
+  void RemoveFilters (SVTK_Selector* theSelector = GetSelector());
 
   bool IsValid (SALOME_Actor* theActor, int theCellId,
-               SVTK_InteractorStyle* theStyle = GetInteractorStyle());
+               SVTK_Selector* theSelector = GetSelector());
 
   //----------------------------------------------------------------------------
   int GetNameOfSelectedNodes(SVTK_Selector* theSelector, 
@@ -153,25 +153,25 @@ namespace SMESH{
                   int& theId2);
 
   //----------------------------------------------------------------------------
-  int GetNameOfSelectedNodes (SalomeApp_SelectionMgr*, 
+  int GetNameOfSelectedNodes (LightApp_SelectionMgr*, 
                              const Handle(SALOME_InteractiveObject)& theIO, 
                              QString& theName);
 
-  int GetNameOfSelectedNodes (SalomeApp_SelectionMgr*, 
+  int GetNameOfSelectedNodes (LightApp_SelectionMgr*, 
                              QString& aName);
 
-  int GetNameOfSelectedElements (SalomeApp_SelectionMgr*, 
+  int GetNameOfSelectedElements (LightApp_SelectionMgr*, 
                                 const Handle(SALOME_InteractiveObject)& theIO, 
                                 QString& theName);
 
-  int GetNameOfSelectedElements (SalomeApp_SelectionMgr*, 
+  int GetNameOfSelectedElements (LightApp_SelectionMgr*, 
                                 QString& aName);
 
-  int GetSelected (SalomeApp_SelectionMgr*, 
+  int GetSelected (LightApp_SelectionMgr*, 
                   TColStd_IndexedMapOfInteger& theMap, 
                   const bool theIsElement = true );
 
-  int GetEdgeNodes (SalomeApp_SelectionMgr*, int& theId1, int& theId2);
+  int GetEdgeNodes (LightApp_SelectionMgr*, int& theId1, int& theId2);
 
   void SetControlsPrecision (const long theVal);
 };