Salome HOME
Join modifications from BR_Dev_For_4_0 tag V4_1_1.
[modules/smesh.git] / src / SMESHGUI / SMESHGUI_VTKUtils.cxx
index 42e6db2615853cf3a6ad4abc84d8ff0a828f941a..d8144f320dd16aacb844c71be3fa2fd5afd21519 100644 (file)
 //  Copyright (C) 2003  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS 
-// 
-//  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. 
-// 
-//  This library is distributed in the hope that it will be useful, 
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of 
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU 
-//  Lesser General Public License for more details. 
-// 
-//  You should have received a copy of the GNU Lesser General Public 
-//  License along with this library; if not, write to the Free Software 
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
-// 
-//  See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//
+//  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.
+//
+//  This library is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//  Lesser General Public License for more details.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 
 
 #include "SMESHGUI_VTKUtils.h"
 #include "SMESHGUI_Utils.h"
+#include "SMESHGUI_Filter.h"
 
-#include <vtkRenderer.h>
-#include <vtkActorCollection.h>
+#include "SMESHGUI.h"
+#include "SMESH_Actor.h"
+#include "SMESH_ActorUtils.h"
+#include "SMESH_ObjectDef.h"
+#include <SMDS_Mesh.hxx>
 
-#include <TColStd_IndexedMapOfInteger.hxx>
+#include <SUIT_Desktop.h>
+#include <SUIT_Session.h>
+#include <SUIT_Study.h>
+#include <SUIT_MessageBox.h>
 
-#include "QAD_Config.h"
-#include "QAD_Desktop.h"
-#include "QAD_Study.h"
-#include "QAD_Settings.h"
-#include "QAD_RightFrame.h"
+#include <SALOME_ListIO.hxx>
+#include <SALOME_ListIteratorOfListIO.hxx>
 
-#include "SALOME_Selection.h"
-#include "SALOME_ListIteratorOfListIO.hxx"
+#include <SVTK_Selector.h>
+#include <SVTK_ViewModel.h>
+#include <SVTK_ViewWindow.h>
 
-#include "VTKViewer_ViewFrame.h"
-#include "VTKViewer_RenderWindow.h"
-#include "VTKViewer_InteractorStyleSALOME.h"
-#include "VTKViewer_RenderWindowInteractor.h"
+#include <LightApp_SelectionMgr.h>
+#include <SalomeApp_Application.h>
+#include <SalomeApp_Study.h>
 
-#include "utilities.h"
+#include <utilities.h>
 
-#include "SALOMEconfig.h"
+#include <SALOMEconfig.h>
 #include CORBA_CLIENT_HEADER(SMESH_Gen)
 #include CORBA_CLIENT_HEADER(SMESH_Mesh)
 #include CORBA_CLIENT_HEADER(SMESH_Group)
 #include CORBA_CLIENT_HEADER(SMESH_Hypothesis)
-#include CORBA_CLIENT_HEADER(SALOMEDS_Attributes)
 
-#include "SMESH_Actor.h"
+#include <SALOMEDSClient_Study.hxx>
+#include <SALOMEDSClient_SObject.hxx>
 
+// VTK
+#include <vtkRenderer.h>
+#include <vtkActorCollection.h>
+#include <vtkUnstructuredGrid.h>
+
+// OCCT
+#include <TColStd_IndexedMapOfInteger.hxx>
+#include <Standard_ErrorHandler.hxx>
+
+// STL
+#include <set>
 using namespace std;
 
-namespace SMESH{
+
+namespace SMESH {
 
   typedef map<TKeyOfVisualObj,TVisualObjPtr> TVisualObjCont;
   static TVisualObjCont VISUAL_OBJ_CONT;
 
+  //=============================================================================
+  /*!
+   * \brief Allocate some memory at construction and release it at destruction.
+   * Is used to be able to continue working after mesh generation or visualization
+   * break due to lack of memory
+   */
+  //=============================================================================
+
+  struct MemoryReserve
+  {
+    char* myBuf;
+    MemoryReserve(): myBuf( new char[1024*1024*1] ){} // 1M
+    void Free() { if (myBuf) { delete [] myBuf; myBuf = 0; }}
+    ~MemoryReserve() { Free(); }
+  };
+  static MemoryReserve* theVISU_MemoryReserve = new MemoryReserve;
+
+  //================================================================================
+  /*!
+   * \brief Remove VisualObj and its actor from all views
+   */
+  //================================================================================
+
+  void RemoveVisualObjectWithActors( const char* theEntry )
+  {
+    SalomeApp_Application* app = dynamic_cast<SalomeApp_Application*>
+      ( SUIT_Session::session()->activeApplication() );
+    SUIT_ViewManager* aViewManager =
+      app ? app->getViewManager(SVTK_Viewer::Type(), true) : 0;
+    if ( aViewManager ) {
+      QPtrVector<SUIT_ViewWindow> views = aViewManager->getViews();
+      for ( int iV = 0; iV < views.count(); ++iV ) {
+        if ( SMESH_Actor* actor = FindActorByEntry( views[iV], theEntry)) {
+          if(SVTK_ViewWindow* vtkWnd = GetVtkViewWindow(views[iV]))
+            vtkWnd->RemoveActor(actor);
+          actor->Delete();
+        }
+      }
+      int aStudyId = aViewManager->study()->id();
+      TVisualObjCont::key_type aKey(aStudyId,theEntry);
+      TVisualObjCont::iterator anIter = VISUAL_OBJ_CONT.find(aKey);
+      if(anIter != VISUAL_OBJ_CONT.end()) {
+        // for unknown reason, object destructor is not called, so clear object manually
+        anIter->second->GetUnstructuredGrid()->SetCells(0,0,0);
+        anIter->second->GetUnstructuredGrid()->SetPoints(0);
+      }
+      VISUAL_OBJ_CONT.erase(aKey);
+    }
+  }
+  //================================================================================
+  /*!
+   * \brief Remove all VisualObjs and their actors from all views
+   */
+  //================================================================================
+
+  void RemoveAllObjectsWithActors()
+  {
+    SalomeApp_Application* app = dynamic_cast<SalomeApp_Application*>
+      ( SUIT_Session::session()->activeApplication() );
+    if (!app) return;
+    ViewManagerList viewMgrs = app->viewManagers();
+    for ( int iM = 0; iM < viewMgrs.count(); ++iM ) {
+      SUIT_ViewManager* aViewManager = viewMgrs.at( iM );
+      if ( aViewManager && aViewManager->getType() == SVTK_Viewer::Type()) {
+        QPtrVector<SUIT_ViewWindow> views = aViewManager->getViews();
+        for ( int iV = 0; iV < views.count(); ++iV ) {
+          if(SVTK_ViewWindow* vtkWnd = GetVtkViewWindow(views[iV])) {
+            vtkRenderer *aRenderer = vtkWnd->getRenderer();
+            vtkActorCollection *actors = aRenderer->GetActors();
+            for (int i = 0; i < actors->GetNumberOfItems(); ++i ) {
+              // size of actors changes inside the loop
+              while (SMESH_Actor *actor = dynamic_cast<SMESH_Actor*>(actors->GetItemAsObject(i)))
+              {
+                vtkWnd->RemoveActor(actor);
+                actor->Delete();
+              }
+            }
+          }
+        }
+      }
+    }
+    TVisualObjCont::iterator anIter = VISUAL_OBJ_CONT.begin();
+    for ( ; anIter != VISUAL_OBJ_CONT.end(); ++anIter ) {
+      // for unknown reason, object destructor is not called, so clear object manually
+      anIter->second->GetUnstructuredGrid()->SetCells(0,0,0);
+      anIter->second->GetUnstructuredGrid()->SetPoints(0);
+    }
+    VISUAL_OBJ_CONT.clear();
+  }
+
+  //================================================================================
+  /*!
+   * \brief Remove all VisualObjs of a study
+   */
+  //================================================================================
+
+  void RemoveVisuData(int studyID)
+  {
+    SalomeApp_Application* app = dynamic_cast<SalomeApp_Application*>
+      ( SUIT_Session::session()->activeApplication() );
+    if (!app) return;
+    ViewManagerList viewMgrs = app->viewManagers();
+    for ( int iM = 0; iM < viewMgrs.count(); ++iM ) {
+      SUIT_ViewManager* aViewManager = viewMgrs.at( iM );
+      if ( aViewManager && aViewManager->getType() == SVTK_Viewer::Type() &&
+           aViewManager->study()->id() == studyID ) {
+        QPtrVector<SUIT_ViewWindow> views = aViewManager->getViews();
+        for ( int iV = 0; iV < views.count(); ++iV ) {
+          if(SVTK_ViewWindow* vtkWnd = GetVtkViewWindow(views[iV])) {
+            vtkRenderer *aRenderer = vtkWnd->getRenderer();
+            vtkActorCollection *actors = aRenderer->GetActors();
+            for (int i = 0; i < actors->GetNumberOfItems(); ++i ) {
+              // size of actors changes inside the loop
+              while(SMESH_Actor *actor = dynamic_cast<SMESH_Actor*>(actors->GetItemAsObject(i)))
+              {
+                vtkWnd->RemoveActor(actor);
+                actor->Delete();
+              }
+            }
+          }
+        }
+      }
+    }
+    TVisualObjCont::iterator anIter = VISUAL_OBJ_CONT.begin();
+    for ( ; anIter != VISUAL_OBJ_CONT.end(); ++anIter ) {
+      int curId = anIter->first.first;
+      if ( curId == studyID ) {
+        // for unknown reason, object destructor is not called, so clear object manually
+        anIter->second->GetUnstructuredGrid()->SetCells(0,0,0);
+        anIter->second->GetUnstructuredGrid()->SetPoints(0);
+        VISUAL_OBJ_CONT.erase( anIter-- );  // dercement occures before erase()
+      }
+    }
+  }
+
+  //================================================================================
+  /*!
+   * \brief Notify the user on problems during visualization
+   */
+  //================================================================================
+
+  void OnVisuException()
+  {
+    try {
+#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+      OCC_CATCH_SIGNALS;
+#endif
+      // PAL16774 (Crash after display of many groups). Salome sometimes crashes just
+      // after or at showing this message, so we do an additional check of available memory
+//       char* buf = new char[100*1024];
+//       delete [] buf;
+      SUIT_MessageBox::warn1 (SMESHGUI::desktop(), QObject::tr("SMESH_WRN_WARNING"),
+                              QObject::tr("SMESH_VISU_PROBLEM"),
+                              QObject::tr("SMESH_BUT_OK"));
+    } catch (...) {
+      // no more memory at all: last resort
+      cout<< "SMESHGUI_VTKUtils::OnVisuException(), exception even at showing a message!!!" <<endl;
+      cout<< "Try to remove all visual data..." <<endl;
+      if (theVISU_MemoryReserve) {
+        delete theVISU_MemoryReserve;
+        theVISU_MemoryReserve = 0;
+      }
+      RemoveAllObjectsWithActors();
+      SUIT_MessageBox::warn1 (SMESHGUI::desktop(), QObject::tr("SMESH_WRN_WARNING"),
+                              QObject::tr("SMESH_VISU_PROBLEM_CLEAR"),
+                              QObject::tr("SMESH_BUT_OK"));
+      cout<< "...done" << endl;
+    }
+  }
+  //================================================================================
+  /*!
+   * \brief Returns an updated visual object
+   */
+  //================================================================================
+
   TVisualObjPtr GetVisualObj(int theStudyId, const char* theEntry){
     TVisualObjPtr aVisualObj;
+    TVisualObjCont::key_type aKey(theStudyId,theEntry);
     try{
-      TVisualObjCont::key_type aKey(theStudyId,theEntry);
+#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+      OCC_CATCH_SIGNALS;
+#endif
       TVisualObjCont::iterator anIter = VISUAL_OBJ_CONT.find(aKey);
       if(anIter != VISUAL_OBJ_CONT.end()){
        aVisualObj = anIter->second;
       }else{
-       SALOMEDS::Study_var aStudy = QAD_Application::getDesktop()->getActiveStudy()->getStudyDocument();
-       SALOMEDS::SObject_var aSObj = aStudy->FindObjectID(theEntry);
-       if(!CORBA::is_nil(aSObj)){
-         SALOMEDS::GenericAttribute_var anAttr;
+        SalomeApp_Application* app =
+          dynamic_cast<SalomeApp_Application*>( SMESHGUI::activeStudy()->application() );
+       _PTR(Study) aStudy = SMESHGUI::activeStudy()->studyDS();
+       _PTR(SObject) aSObj = aStudy->FindObjectID(theEntry);
+       if(aSObj){
+         _PTR(GenericAttribute) anAttr;
          if(aSObj->FindAttribute(anAttr,"AttributeIOR")){
-           SALOMEDS::AttributeIOR_var anIOR = SALOMEDS::AttributeIOR::_narrow(anAttr);
-           CORBA::String_var aVal = anIOR->Value();
-           CORBA::Object_var anObj = aStudy->ConvertIORToObject(aVal.in());
+           _PTR(AttributeIOR) anIOR = anAttr;
+           CORBA::String_var aVal = anIOR->Value().c_str();
+           CORBA::Object_var anObj = app->orb()->string_to_object( aVal.in() );
            if(!CORBA::is_nil(anObj)){
-             //Try narrow to SMESH_Mesh interafce
+             //Try narrow to SMESH_Mesh interface
              SMESH::SMESH_Mesh_var aMesh = SMESH::SMESH_Mesh::_narrow(anObj);
              if(!aMesh->_is_nil()){
                aVisualObj.reset(new SMESH_MeshObj(aMesh));
-               aVisualObj->Update();
-               TVisualObjCont::value_type aValue(aKey,aVisualObj); 
+               TVisualObjCont::value_type aValue(aKey,aVisualObj);
                VISUAL_OBJ_CONT.insert(aValue);
-               return aVisualObj;
              }
-             //Try narrow to SMESH_Group interafce
+             //Try narrow to SMESH_Group interface
              SMESH::SMESH_GroupBase_var aGroup = SMESH::SMESH_GroupBase::_narrow(anObj);
              if(!aGroup->_is_nil()){
-               SALOMEDS::SObject_var aFatherSObj = aSObj->GetFather();
-               if(aFatherSObj->_is_nil()) return aVisualObj;
+               _PTR(SObject) aFatherSObj = aSObj->GetFather();
+               if(!aFatherSObj) return aVisualObj;
                aFatherSObj = aFatherSObj->GetFather();
-               if(aFatherSObj->_is_nil()) return aVisualObj;
-               CORBA::String_var anEntry = aFatherSObj->GetID();
+               if(!aFatherSObj) return aVisualObj;
+               CORBA::String_var anEntry = aFatherSObj->GetID().c_str();
                TVisualObjPtr aVisObj = GetVisualObj(theStudyId,anEntry.in());
                if(SMESH_MeshObj* aMeshObj = dynamic_cast<SMESH_MeshObj*>(aVisObj.get())){
                  aVisualObj.reset(new SMESH_GroupObj(aGroup,aMeshObj));
-                 aVisualObj->Update();
-                 TVisualObjCont::value_type aValue(aKey,aVisualObj); 
+                 TVisualObjCont::value_type aValue(aKey,aVisualObj);
                  VISUAL_OBJ_CONT.insert(aValue);
-                 return aVisualObj;
                }
              }
-             //Try narrow to SMESH_subMesh interafce
+             //Try narrow to SMESH_subMesh interface
              SMESH::SMESH_subMesh_var aSubMesh = SMESH::SMESH_subMesh::_narrow(anObj);
              if(!aSubMesh->_is_nil()){
-               SALOMEDS::SObject_var aFatherSObj = aSObj->GetFather();
-               if(aFatherSObj->_is_nil()) return aVisualObj;
+               _PTR(SObject) aFatherSObj = aSObj->GetFather();
+               if(!aFatherSObj) return aVisualObj;
                aFatherSObj = aFatherSObj->GetFather();
-               if(aFatherSObj->_is_nil()) return aVisualObj;
-               CORBA::String_var anEntry = aFatherSObj->GetID();
+               if(!aFatherSObj) return aVisualObj;
+               CORBA::String_var anEntry = aFatherSObj->GetID().c_str();
                TVisualObjPtr aVisObj = GetVisualObj(theStudyId,anEntry.in());
                if(SMESH_MeshObj* aMeshObj = dynamic_cast<SMESH_MeshObj*>(aVisObj.get())){
                  aVisualObj.reset(new SMESH_subMeshObj(aSubMesh,aMeshObj));
-                 aVisualObj->Update();
-                 TVisualObjCont::value_type aValue(aKey,aVisualObj); 
+                 TVisualObjCont::value_type aValue(aKey,aVisualObj);
                  VISUAL_OBJ_CONT.insert(aValue);
-                 return aVisualObj;
                }
              }
            }
@@ -124,42 +314,210 @@ namespace SMESH{
       }
     }catch(...){
       INFOS("GetMeshObj - There is no SMESH_Mesh object for the SALOMEDS::Strudy and Entry!!!");
+      return TVisualObjPtr();
+    }
+    // Update object
+    bool objModified = false;
+    if ( aVisualObj ) {
+      try {
+#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+        OCC_CATCH_SIGNALS;
+#endif
+        objModified = aVisualObj->Update();
+      }
+      catch (...) {
+#ifdef _DEBUG_
+        cout << "Exception in SMESHGUI_VTKUtils::GetVisualObj()" << endl;
+#endif
+        RemoveVisualObjectWithActors( theEntry ); // remove this object
+        OnVisuException();
+        aVisualObj.reset();
+      }
     }
+
+    if ( objModified ) {
+      // PAL16631. Mesurements showed that to show aVisualObj in SHADING(default) mode,
+      // ~10 times more memory is used than it occupies.
+      // Warn the user if there is less free memory than 30 sizes of a grid
+      // TODO: estimate memory usage in other modes and take current mode into account
+      int freeMB = SMDS_Mesh::CheckMemory(true);
+      int usedMB = aVisualObj->GetUnstructuredGrid()->GetActualMemorySize() / 1024;
+      if ( freeMB > 0 && usedMB * 30 > freeMB ) {
+#ifdef _DEBUG_
+        cout << "SMESHGUI_VTKUtils::GetVisualObj(), freeMB=" << freeMB
+             << ", usedMB=" << usedMB<< endl;
+#endif
+        int continu = 0;
+        if ( usedMB * 10 > freeMB )
+          // even dont try to show
+          SUIT_MessageBox::warn1 (SMESHGUI::desktop(), QObject::tr("SMESH_WRN_WARNING"),
+                                  QObject::tr("SMESH_NO_MESH_VISUALIZATION"),
+                                  QObject::tr("SMESH_BUT_OK"));
+        else
+          // there is a chance to succeed
+          continu = SUIT_MessageBox::warn2
+            (SMESHGUI::desktop(),
+             QObject::tr("SMESH_WRN_WARNING"),
+             QObject::tr("SMESH_CONTINUE_MESH_VISUALIZATION"),
+             QObject::tr("SMESH_BUT_YES"),  QObject::tr("SMESH_BUT_NO"),
+             1, 0, 1);
+        if ( !continu ) {
+          // remove the corresponding actors from all views
+          RemoveVisualObjectWithActors( theEntry );
+          aVisualObj.reset();
+        }
+      }
+    }
+
     return aVisualObj;
   }
 
 
-  VTKViewer_ViewFrame* FindVtkViewFrame(QAD_Study* theStudy,
-                                       QAD_StudyFrame* theStudyFrame)
+  /*! Return active view window, if it instantiates SVTK_ViewWindow class,
+   *  overwise find or create corresponding view window, make it active and return it.
+   *  \note Active VVTK_ViewWindow can be returned, because it inherits SVTK_ViewWindow.
+   */
+  SVTK_ViewWindow* GetViewWindow (const SalomeApp_Module* theModule,
+                                  bool createIfNotFound)
   {
-    QList<QAD_Study>& aStudies = 
-      QAD_Application::getDesktop()->getActiveApp()->getStudies();
-    if(aStudies.containsRef(theStudy)){
-      const QList<QAD_StudyFrame>& aStudyFrames = theStudy->getStudyFrames();
-      if(aStudyFrames.containsRef(theStudyFrame)){
-       return GetVtkViewFrame(theStudyFrame);
+    SalomeApp_Application* anApp;
+    if (theModule)
+      anApp = theModule->getApp();
+    else
+      anApp = dynamic_cast<SalomeApp_Application*>
+        (SUIT_Session::session()->activeApplication());
+
+    if (anApp) {
+      if (SVTK_ViewWindow* aView = dynamic_cast<SVTK_ViewWindow*>(anApp->desktop()->activeWindow()))
+       return aView;
+
+      SUIT_ViewManager* aViewManager =
+        anApp->getViewManager(SVTK_Viewer::Type(), createIfNotFound);
+      if (aViewManager) {
+        if (SUIT_ViewWindow* aViewWindow = aViewManager->getActiveView()) {
+          if (SVTK_ViewWindow* aView = dynamic_cast<SVTK_ViewWindow*>(aViewWindow)) {
+            aViewWindow->raise();
+            aViewWindow->setFocus();
+            return aView;
+          }
+        }
       }
     }
     return NULL;
   }
 
+  SVTK_ViewWindow* FindVtkViewWindow (SUIT_ViewManager* theMgr,
+                                      SUIT_ViewWindow * theWindow)
+  {
+    if( !theMgr )
+      return NULL;
+
+    QPtrVector<SUIT_ViewWindow> views = theMgr->getViews();
+    if( views.containsRef( theWindow ) )
+      return GetVtkViewWindow( theWindow );
+    else
+      return NULL;
+  }
+
+  SVTK_ViewWindow* GetVtkViewWindow(SUIT_ViewWindow* theWindow){
+    return dynamic_cast<SVTK_ViewWindow*>(theWindow);
+  }
+
+/*  SUIT_ViewWindow* GetActiveWindow()
+  {
+    SalomeApp_Application* app = dynamic_cast<SalomeApp_Application*>( SUIT_Session::session()->activeApplication() );
+    if( !app )
+      return NULL;
+    SUIT_ViewManager* mgr = app->activeViewManager();
+    if( mgr )
+      return mgr->getActiveView();
+    else
+      return NULL;
+  }*/
+
+  SVTK_ViewWindow* GetCurrentVtkView(){
+    return GetVtkViewWindow( GetActiveWindow() );
+  }
+
+
+  void RepaintCurrentView()
+  {
+    if (SVTK_ViewWindow* wnd = GetCurrentVtkView())
+    {
+      try {
+#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+        OCC_CATCH_SIGNALS;
+#endif
+        wnd->getRenderer()->Render();
+        wnd->Repaint(false);
+      }
+      catch (...) {
+#ifdef _DEBUG_
+        cout << "Exception in SMESHGUI_VTKUtils::RepaintCurrentView()" << endl;
+#endif
+        OnVisuException();
+      }
+    }
+  }
 
-  VTKViewer_ViewFrame* GetVtkViewFrame(QAD_StudyFrame* theStudyFrame){
-    QAD_ViewFrame* aViewFrame = theStudyFrame->getRightFrame()->getViewFrame();
-    return dynamic_cast<VTKViewer_ViewFrame*>(aViewFrame);
+  void RepaintViewWindow(SVTK_ViewWindow* theWindow)
+  {
+    try {
+#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+      OCC_CATCH_SIGNALS;
+#endif
+      theWindow->getRenderer()->Render();
+      theWindow->Repaint();
+    }
+    catch (...) {
+#ifdef _DEBUG_
+        cout << "Exception in SMESHGUI_VTKUtils::RepaintViewWindow(SVTK_ViewWindow)" << endl;
+#endif
+      OnVisuException();
+    }
   }
 
+  void RenderViewWindow(SVTK_ViewWindow* theWindow)
+  {
+    try {
+#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+      OCC_CATCH_SIGNALS;
+#endif
+      theWindow->getRenderer()->Render();
+      theWindow->Repaint();
+    }
+    catch (...) {
+#ifdef _DEBUG_
+        cout << "Exception in SMESHGUI_VTKUtils::RenderViewWindow(SVTK_ViewWindow)" << endl;
+#endif
+      OnVisuException();
+    }
+  }
 
-  VTKViewer_ViewFrame* GetCurrentVtkView(){
-    return GetVtkViewFrame(GetActiveStudy()->getActiveStudyFrame());
+  void FitAll(){
+    if(SVTK_ViewWindow* wnd = GetCurrentVtkView() ){
+      try {
+#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+        OCC_CATCH_SIGNALS;
+#endif
+        wnd->onFitAll();
+        wnd->Repaint();
+      }
+      catch (...) {
+#ifdef _DEBUG_
+        cout << "Exception in SMESHGUI_VTKUtils::FitAll()" << endl;
+#endif
+        OnVisuException();
+      }
+    }
   }
 
 
-  SMESH_Actor* FindActorByEntry(QAD_StudyFrame *theStudyFrame, 
+  SMESH_Actor* FindActorByEntry(SUIT_ViewWindow *theWindow,
                                const char* theEntry)
   {
-    if(VTKViewer_ViewFrame* aViewFrame = GetVtkViewFrame(theStudyFrame)){
-      vtkRenderer *aRenderer = aViewFrame->getRenderer();
+    if(SVTK_ViewWindow* aViewWindow = GetVtkViewWindow(theWindow)){
+      vtkRenderer *aRenderer = aViewWindow->getRenderer();
       vtkActorCollection *aCollection = aRenderer->GetActors();
       aCollection->InitTraversal();
       while(vtkActor *anAct = aCollection->GetNextActor()){
@@ -175,20 +533,24 @@ namespace SMESH{
     }
     return NULL;
   }
-  
-  
+
+
   SMESH_Actor* FindActorByEntry(const char* theEntry){
-    return FindActorByEntry(GetActiveStudy()->getActiveStudyFrame(),theEntry);
+    return FindActorByEntry(GetActiveWindow(),theEntry);
   }
-  
-  
+
+
   SMESH_Actor* FindActorByObject(CORBA::Object_ptr theObject){
+    SalomeApp_Application* app = dynamic_cast<SalomeApp_Application*>( SUIT_Session::session()->activeApplication() );
+    if( !app )
+      return NULL;
+
     if(!CORBA::is_nil(theObject)){
-      SALOMEDS::Study_var aStudy = GetActiveStudyDocument();
-      CORBA::String_var anIOR = aStudy->ConvertObjectToIOR(theObject);
-      SALOMEDS::SObject_var aSObject = aStudy->FindObjectIOR(anIOR.in());
-      if(!aSObject->_is_nil()){
-       CORBA::String_var anEntry = aSObject->GetID();
+      _PTR(Study) aStudy = GetActiveStudyDocument();
+      CORBA::String_var anIOR = app->orb()->object_to_string( theObject );
+      _PTR(SObject) aSObject = aStudy->FindObjectIOR(anIOR.in());
+      if(aSObject){
+       CORBA::String_var anEntry = aSObject->GetID().c_str();
        return FindActorByEntry(anEntry.in());
       }
     }
@@ -196,75 +558,121 @@ namespace SMESH{
   }
 
 
-  SMESH_Actor* CreateActor(SALOMEDS::Study_ptr theStudy,
+  SMESH_Actor* CreateActor(_PTR(Study) theStudy,
                           const char* theEntry,
                           int theIsClear)
   {
     SMESH_Actor *anActor = NULL;
     CORBA::Long anId = theStudy->StudyId();
     if(TVisualObjPtr aVisualObj = GetVisualObj(anId,theEntry)){
-      SALOMEDS::SObject_var aSObj = theStudy->FindObjectID(theEntry);
-      if(!aSObj->_is_nil()){
-       SALOMEDS::GenericAttribute_var anAttr;
+      _PTR(SObject) aSObj = theStudy->FindObjectID(theEntry);
+      if(aSObj){
+       _PTR(GenericAttribute) anAttr;
        if(aSObj->FindAttribute(anAttr,"AttributeName")){
-         SALOMEDS::AttributeName_var aName = SALOMEDS::AttributeName::_narrow(anAttr);
-         CORBA::String_var aVal = aName->Value();
-         string aNameVal = aVal.in();
+         _PTR(AttributeName) aName = anAttr;
+         std::string aNameVal = aName->Value();
          anActor = SMESH_Actor::New(aVisualObj,theEntry,aNameVal.c_str(),theIsClear);
        }
+
+       SMESH::SMESH_GroupBase_var aGroup = SMESH::SMESH_GroupBase::_narrow( SMESH::SObjectToObject( aSObj ));
+       if(!CORBA::is_nil(aGroup))
+       {
+         SALOMEDS::Color aColor = aGroup->GetColor();
+         if( !( aColor.R > 0 || aColor.G > 0 || aColor.B > 0 ) )
+         {
+           int r = 0, g = 0, b = 0;
+           SMESH::GetColor( "SMESH", "fill_color", r, g, b, QColor( 0, 170, 255 ) );
+           aColor.R = (float)r / 255.0;
+           aColor.G = (float)g / 255.0;
+           aColor.B = (float)b / 255.0;
+           aGroup->SetColor( aColor );
+         }
+         if( aGroup->GetType() == SMESH::NODE )
+           anActor->SetNodeColor( aColor.R, aColor.G, aColor.B );
+         else if( aGroup->GetType() == SMESH::EDGE )
+           anActor->SetEdgeColor( aColor.R, aColor.G, aColor.B );
+         else
+           anActor->SetSufaceColor( aColor.R, aColor.G, aColor.B );
+       }
       }
     }
     return anActor;
   }
 
 
-  void DisplayActor(QAD_StudyFrame *theStudyFrame, SMESH_Actor* theActor){
-    if(VTKViewer_ViewFrame* aViewFrame = GetVtkViewFrame(theStudyFrame)){
-      aViewFrame->AddActor(theActor);
-      aViewFrame->Repaint();
+  void DisplayActor( SUIT_ViewWindow *theWnd, SMESH_Actor* theActor){
+    if(SVTK_ViewWindow* vtkWnd = GetVtkViewWindow(theWnd)){
+      try {
+#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+        OCC_CATCH_SIGNALS;
+#endif
+        vtkWnd->AddActor(theActor);
+        vtkWnd->Repaint();
+      }
+      catch (...) {
+#ifdef _DEBUG_
+        cout << "Exception in SMESHGUI_VTKUtils::DisplayActor()" << endl;
+#endif
+        OnVisuException();
+      }
     }
   }
 
 
-  void RemoveActor(QAD_StudyFrame *theStudyFrame, SMESH_Actor* theActor){
-    if(VTKViewer_ViewFrame* aViewFrame = GetVtkViewFrame(theStudyFrame)){
-      aViewFrame->RemoveActor(theActor);
-      aViewFrame->Repaint();
+  void RemoveActor( SUIT_ViewWindow *theWnd, SMESH_Actor* theActor){
+    if(SVTK_ViewWindow* vtkWnd = GetVtkViewWindow(theWnd)){
+      vtkWnd->RemoveActor(theActor);
+      if(theActor->hasIO()){
+       Handle(SALOME_InteractiveObject) anIO = theActor->getIO();
+       if(anIO->hasEntry()){
+         std::string anEntry = anIO->getEntry();
+         SalomeApp_Study* aStudy = dynamic_cast<SalomeApp_Study*>( vtkWnd->getViewManager()->study() );
+         int aStudyId = aStudy->id();
+         TVisualObjCont::key_type aKey(aStudyId,anEntry);
+         VISUAL_OBJ_CONT.erase(aKey);
+       }
+      }
+      theActor->Delete();
+      vtkWnd->Repaint();
     }
   }
-  
 
-  void FitAll(){
-    if(VTKViewer_ViewFrame* aViewFrame = GetVtkViewFrame(GetActiveStudy()->getActiveStudyFrame())){
-      aViewFrame->onViewFitAll();
-      aViewFrame->Repaint();
-    }
-  }
-  
-  vtkRenderer* GetCurrentRenderer(){
-    if(VTKViewer_ViewFrame* aViewFrame = GetVtkViewFrame(GetActiveStudy()->getActiveStudyFrame()))
-      return aViewFrame->getRenderer();
-    return NULL;
-  }
+  //================================================================================
+  /*!
+   * \brief Return true if there are no SMESH actors in a view
+   */
+  //================================================================================
 
-  void RepaintCurrentView(){
-    if(VTKViewer_ViewFrame* aViewFrame = GetVtkViewFrame(GetActiveStudy()->getActiveStudyFrame())){
-      aViewFrame->getRW()->getRenderWindow()->Render();
-      //aViewFrame->Repaint();
+  bool noSmeshActors(SUIT_ViewWindow *theWnd)
+  {
+    if(SVTK_ViewWindow* aViewWindow = GetVtkViewWindow(theWnd)) {
+      vtkRenderer *aRenderer = aViewWindow->getRenderer();
+      vtkActorCollection *aCollection = aRenderer->GetActors();
+      aCollection->InitTraversal();
+      while(vtkActor *anAct = aCollection->GetNextActor())
+       if(SMESH_Actor *anActor = dynamic_cast<SMESH_Actor*>(anAct))
+          return false;
     }
+    return true;
   }
-  
-  
-  void UpdateView(QAD_StudyFrame *theStudyFrame, EDisplaing theAction, const char* theEntry)
+
+  bool UpdateView(SUIT_ViewWindow *theWnd, EDisplaing theAction, const char* theEntry)
   {
-    if(VTKViewer_ViewFrame* aViewFrame = GetVtkViewFrame(theStudyFrame)){
-      vtkRenderer *aRenderer = aViewFrame->getRenderer();
+    bool OK = false;
+    SVTK_ViewWindow* aViewWnd = GetVtkViewWindow(theWnd);
+    if (!aViewWnd)
+      return OK;
+
+    {
+      OK = true;
+      vtkRenderer *aRenderer = aViewWnd->getRenderer();
       vtkActorCollection *aCollection = aRenderer->GetActors();
       aCollection->InitTraversal();
-      switch(theAction){
+
+      switch (theAction) {
       case eDisplayAll: {
-       while(vtkActor *anAct = aCollection->GetNextActor()){
-         if(SMESH_Actor *anActor = dynamic_cast<SMESH_Actor*>(anAct)){
+       while (vtkActor *anAct = aCollection->GetNextActor()) {
+         if (SMESH_Actor *anActor = dynamic_cast<SMESH_Actor*>(anAct)) {
            anActor->SetVisibility(true);
          }
        }
@@ -272,67 +680,84 @@ namespace SMESH{
       }
       case eDisplayOnly:
       case eEraseAll: {
-       while(vtkActor *anAct = aCollection->GetNextActor()){
-         if(SMESH_Actor *anActor = dynamic_cast<SMESH_Actor*>(anAct)){
+       while (vtkActor *anAct = aCollection->GetNextActor()) {
+         if (SMESH_Actor *anActor = dynamic_cast<SMESH_Actor*>(anAct)) {
            anActor->SetVisibility(false);
          }
        }
       }
       default: {
-       if(SMESH_Actor *anActor = FindActorByEntry(theStudyFrame,theEntry)){
-         switch(theAction) {
+       if (SMESH_Actor *anActor = FindActorByEntry(theWnd,theEntry)) {
+         switch (theAction) {
            case eDisplay:
            case eDisplayOnly:
              anActor->SetVisibility(true);
+             if (theAction == eDisplayOnly) aRenderer->ResetCameraClippingRange();
              break;
            case eErase:
              anActor->SetVisibility(false);
              break;
          }
        } else {
-         switch(theAction){
+         switch (theAction) {
          case eDisplay:
-         case eDisplayOnly:{
-           QAD_Study* aStudy = theStudyFrame->getStudy();
-           SALOMEDS::Study_var aDocument = aStudy->getStudyDocument();
-           if((anActor = CreateActor(aDocument,theEntry,true))) {
-             DisplayActor(theStudyFrame,anActor);
-             FitAll();
-           }
-           break;
-         }
+         case eDisplayOnly:
+            {
+              SalomeApp_Study* aStudy = dynamic_cast<SalomeApp_Study*>(theWnd->getViewManager()->study());
+              _PTR(Study) aDocument = aStudy->studyDS();
+              // Pass non-visual objects (hypotheses, etc.), return true in this case
+              CORBA::Long anId = aDocument->StudyId();
+              if (TVisualObjPtr aVisualObj = GetVisualObj(anId,theEntry))
+              {
+                if ((anActor = CreateActor(aDocument,theEntry,true))) {
+                  bool needFitAll = noSmeshActors(theWnd); // fit for the first object only
+                  DisplayActor(theWnd,anActor);
+                  // FitAll(); - PAL16770(Display of a group performs an automatic fit all)
+                  if (needFitAll) FitAll();
+                } else {
+                  OK = false;
+                }
+              }
+              break;
+            }
          }
        }
       }
       }
     }
+    return OK;
   }
 
 
-  void UpdateView(EDisplaing theAction, const char* theEntry){
-    QAD_Study* aStudy = GetActiveStudy();
-    QAD_StudyFrame *aStudyFrame = aStudy->getActiveStudyFrame();
-    UpdateView(aStudyFrame,theAction,theEntry);
+  bool UpdateView(EDisplaing theAction, const char* theEntry){
+    SalomeApp_Study* aStudy = dynamic_cast< SalomeApp_Study* >( GetActiveStudy() );
+    SalomeApp_Application* app = dynamic_cast< SalomeApp_Application* >( aStudy->application() );
+    SUIT_ViewWindow *aWnd = app->activeViewManager()->getActiveView();
+    return UpdateView(aWnd,theAction,theEntry);
   }
-  
+
   void UpdateView(){
-    if(VTKViewer_ViewFrame* aViewFrame = SMESH::GetCurrentVtkView()){
-      SALOME_Selection *aSel = SALOME_Selection::Selection(GetActiveStudy()->getSelection());
-      if(aSel->IObjectCount() == 0){
-       vtkRenderer* aRenderer = aViewFrame->getRenderer();
+    if(SVTK_ViewWindow* aWnd = SMESH::GetCurrentVtkView()){
+      LightApp_SelectionMgr* mgr = SMESHGUI::selectionMgr();
+      SALOME_ListIO selected; mgr->selectedObjects( selected );
+
+      if( selected.Extent() == 0){
+       vtkRenderer* aRenderer = aWnd->getRenderer();
        vtkActorCollection *aCollection = aRenderer->GetActors();
        aCollection->InitTraversal();
        while(vtkActor *anAct = aCollection->GetNextActor()){
          if(SMESH_Actor *anActor = dynamic_cast<SMESH_Actor*>(anAct)){
            if(anActor->hasIO())
-             Update(anActor->getIO(),anActor->GetVisibility());
+             if (!Update(anActor->getIO(),anActor->GetVisibility()))
+                break; // avoid multiple warinings if visu failed
          }
        }
       }else{
-       SALOME_ListIteratorOfListIO anIter(aSel->StoredIObjects());
+       SALOME_ListIteratorOfListIO anIter( selected );
        for(; anIter.More(); anIter.Next()){
          Handle(SALOME_InteractiveObject) anIO = anIter.Value();
-         Update(anIO,true);
+         if ( !Update(anIO,true) )
+            break; // avoid multiple warinings if visu failed
        }
       }
       RepaintCurrentView();
@@ -340,83 +765,84 @@ namespace SMESH{
   }
 
 
-  void Update(const Handle(SALOME_InteractiveObject)& theIO,
-             bool theDisplay)
+  bool Update(const Handle(SALOME_InteractiveObject)& theIO, bool theDisplay)
   {
-    SALOMEDS::Study_var aStudy = GetActiveStudyDocument();
+    _PTR(Study) aStudy = GetActiveStudyDocument();
     CORBA::Long anId = aStudy->StudyId();
-    TVisualObjPtr aVisualObj = SMESH::GetVisualObj(anId,theIO->getEntry());
-    aVisualObj->Update();
-    if ( theDisplay )
-      UpdateView(SMESH::eDisplay,theIO->getEntry());
-  }
-
-
-  void UpdateSelectionProp() {
-    QAD_Study* aStudy = GetActiveStudy();
-    QList<QAD_StudyFrame> aFrameList = aStudy->getStudyFrames();
-    
-    QString SCr, SCg, SCb;
-    SCr = QAD_CONFIG->getSetting("SMESH:SettingsSelectColorRed");
-    SCg = QAD_CONFIG->getSetting("SMESH:SettingsSelectColorGreen");
-    SCb = QAD_CONFIG->getSetting("SMESH:SettingsSelectColorBlue");
-    QColor aHiColor = Qt::white;
-    if (!SCr.isEmpty() && !SCg.isEmpty() && !SCb.isEmpty())
-      aHiColor = QColor(SCr.toInt(), SCg.toInt(), SCb.toInt());
-    
-    SCr = QAD_CONFIG->getSetting("SMESH:SettingsItemSelectColorRed");
-    SCg = QAD_CONFIG->getSetting("SMESH:SettingsItemSelectColorGreen");
-    SCb = QAD_CONFIG->getSetting("SMESH:SettingsItemSelectColorBlue");
-    QColor aSelColor = Qt::yellow;
-    if (!SCr.isEmpty() && !SCg.isEmpty() && !SCb.isEmpty())
-      aSelColor = QColor(SCr.toInt(), SCg.toInt(), SCb.toInt());
-    QString SW = QAD_CONFIG->getSetting("SMESH:SettingsItemSelectWidth");
-    if (SW.isEmpty()) SW = "5";
-    
-    SCr = QAD_CONFIG->getSetting("SMESH:SettingsPreSelectColorRed");
-    SCg = QAD_CONFIG->getSetting("SMESH:SettingsPreSelectColorGreen");
-    SCb = QAD_CONFIG->getSetting("SMESH:SettingsPreSelectColorBlue");
-    QColor aPreColor = Qt::cyan;
-    if (!SCr.isEmpty() && !SCg.isEmpty() && !SCb.isEmpty())
-      aPreColor = QColor(SCr.toInt(), SCg.toInt(), SCb.toInt());
-    QString PW = QAD_CONFIG->getSetting("SMESH:SettingsPreSelectWidth");
-    if (PW.isEmpty()) PW = "5";
-    
-    QString SP1 = QAD_CONFIG->getSetting("SMESH:SettingsNodeSelectTol");
-    if (SP1.isEmpty()) SP1 = "0.025";
-    QString SP2 = QAD_CONFIG->getSetting("SMESH:SettingsElementsSelectTol");
-    if (SP2.isEmpty()) SP2 = "0.001";
-    
-    for (QAD_StudyFrame* aStudyFrame = aFrameList.first(); aStudyFrame; aStudyFrame = aFrameList.next()) {
-      if (aStudyFrame->getTypeView() == VIEW_VTK) {
-       VTKViewer_ViewFrame* aVtkViewFrame = GetVtkViewFrame(aStudyFrame);
-       if (!aVtkViewFrame) continue;
-       // update VTK viewer properties
-       VTKViewer_RenderWindowInteractor* anInteractor = aVtkViewFrame->getRWInteractor();
-       if (anInteractor) {
-         // mesh element selection
-         anInteractor->SetSelectionProp(aSelColor.red()/255., aSelColor.green()/255., 
-                                        aSelColor.blue()/255., SW.toInt());
-         
-         // tolerances
-         anInteractor->SetSelectionTolerance(SP1.toDouble(), SP2.toDouble());
-         
-         // pre-selection
-         VTKViewer_InteractorStyleSALOME* aStyle = anInteractor->GetInteractorStyleSALOME();
-         if (aStyle) {
-           aStyle->setPreselectionProp(aPreColor.red()/255., aPreColor.green()/255., 
-                                       aPreColor.blue()/255., PW.toInt());
-         }
-       }
+    if ( TVisualObjPtr aVisualObj = SMESH::GetVisualObj(anId,theIO->getEntry())) {
+      if ( theDisplay )
+        UpdateView(SMESH::eDisplay,theIO->getEntry());
+      return true;
+    }
+    return false;
+  }
+
+
+  void UpdateSelectionProp( SMESHGUI* theModule ) {
+    if( !theModule )
+      return;
+
+    SalomeApp_Application* app = dynamic_cast< SalomeApp_Application* >( theModule->application() );
+    if( !app )
+    {
+      MESSAGE( "UpdateSelectionProp: Application is null" );
+      return;
+    }
+
+    SUIT_ViewManager* vm = app->activeViewManager();
+    if( !vm )
+    {
+      MESSAGE( "UpdateSelectionProp: View manager is null" );
+      return;
+    }
+
+    QPtrVector<SUIT_ViewWindow> views = vm->getViews();
+
+    SUIT_ResourceMgr* mgr = SMESH::GetResourceMgr( theModule );
+    if( !mgr )
+    {
+      MESSAGE( "UpdateSelectionProp: Resource manager is null" );
+      return;
+    }
+
+    QColor aHiColor = mgr->colorValue( "SMESH", "selection_object_color", Qt::white ),
+           aSelColor = mgr->colorValue( "SMESH", "selection_element_color", Qt::yellow ),
+          aPreColor = mgr->colorValue( "SMESH", "highlight_color", Qt::cyan );
+
+    int SW = mgr->integerValue( "SMESH", "selection_width", 5 ),
+        PW = mgr->integerValue( "SMESH", "highlight_width", 5 );
+
+    double SP1 = mgr->doubleValue( "SMESH", "selection_precision_node", 0.025 ),
+           SP2 = mgr->doubleValue( "SMESH", "selection_precision_element", 0.001 ),
+          SP3 = mgr->doubleValue( "SMESH", "selection_precision_object", 0.025 );
+
+    for ( int i=0, n=views.count(); i<n; i++ ){
+      // update VTK viewer properties
+      if(SVTK_ViewWindow* aVtkView = GetVtkViewWindow( views[i] )){
+       // mesh element selection
+       aVtkView->SetSelectionProp(aSelColor.red()/255.,
+                                  aSelColor.green()/255.,
+                                  aSelColor.blue()/255.,
+                                  SW );
+       // tolerances
+       aVtkView->SetSelectionTolerance(SP1, SP2, SP3);
+
+       // pre-selection
+       aVtkView->SetPreselectionProp(aPreColor.red()/255.,
+                                     aPreColor.green()/255.,
+                                     aPreColor.blue()/255.,
+                                     PW);
        // update actors
-       vtkRenderer* aRenderer = aVtkViewFrame->getRenderer();
+       vtkRenderer* aRenderer = aVtkView->getRenderer();
        vtkActorCollection *aCollection = aRenderer->GetActors();
        aCollection->InitTraversal();
        while(vtkActor *anAct = aCollection->GetNextActor()){
          if(SMESH_Actor *anActor = dynamic_cast<SMESH_Actor*>(anAct)){
-           anActor->SetHighlightColor(aHiColor.red()/255., aHiColor.green()/255., 
+           anActor->SetHighlightColor(aHiColor.red()/255.,
+                                      aHiColor.green()/255.,
                                       aHiColor.blue()/255.);
-           anActor->SetPreHighlightColor(aPreColor.red()/255., aPreColor.green()/255., 
+           anActor->SetPreHighlightColor(aPreColor.red()/255.,
+                                         aPreColor.green()/255.,
                                          aPreColor.blue()/255.);
          }
        }
@@ -424,48 +850,56 @@ namespace SMESH{
     }
   }
 
-  
+
   //----------------------------------------------------------------------------
-  VTKViewer_InteractorStyleSALOME* GetInteractorStyle(QAD_StudyFrame *theStudyFrame){
-    if(VTKViewer_ViewFrame* aViewFrame = GetVtkViewFrame(theStudyFrame)){
-      if(VTKViewer_RenderWindowInteractor* anInteractor = aViewFrame->getRWInteractor()){
-       return anInteractor->GetInteractorStyleSALOME();
-      }
-    }
+  SVTK_Selector*
+  GetSelector(SUIT_ViewWindow *theWindow)
+  {
+    if(SVTK_ViewWindow* aWnd = GetVtkViewWindow(theWindow))
+      return aWnd->GetSelector();
+
     return NULL;
   }
 
   void SetFilter(const Handle(VTKViewer_Filter)& theFilter,
-                VTKViewer_InteractorStyleSALOME* theStyle)
+                SVTK_Selector* theSelector)
   {
-    theStyle->SetFilter(theFilter);
+    if (theSelector)
+      theSelector->SetFilter(theFilter);
   }
 
-  Handle(VTKViewer_Filter) GetFilter(int theId, VTKViewer_InteractorStyleSALOME* theStyle)
+  Handle(VTKViewer_Filter) GetFilter(int theId, SVTK_Selector* theSelector)
   {
-    return theStyle->GetFilter(theId);
+    return theSelector->GetFilter(theId);
   }
 
-  bool IsFilterPresent(int theId, VTKViewer_InteractorStyleSALOME* theStyle)
+  bool IsFilterPresent(int theId, SVTK_Selector* theSelector)
   {
-    return theStyle->IsFilterPresent(theId);
+    return theSelector->IsFilterPresent(theId);
   }
 
-  void RemoveFilter(int theId, VTKViewer_InteractorStyleSALOME* theStyle){
-    theStyle->RemoveFilter(theId);
+  void RemoveFilter(int theId, SVTK_Selector* theSelector)
+  {
+    theSelector->RemoveFilter(theId);
+  }
+
+  void RemoveFilters(SVTK_Selector* theSelector)
+  {
+    for ( int id = SMESHGUI_NodeFilter; theSelector && id < SMESHGUI_LastFilter; id++ )
+      theSelector->RemoveFilter( id );
   }
 
   bool IsValid(SALOME_Actor* theActor, int theCellId,
-              VTKViewer_InteractorStyleSALOME* theStyle)
+              SVTK_Selector* theSelector)
   {
-    return theStyle->IsValid(theActor,theCellId);
+    return theSelector->IsValid(theActor,theCellId);
   }
 
 
   //----------------------------------------------------------------------------
   void SetPointRepresentation(bool theIsVisible){
-    if(VTKViewer_ViewFrame* aViewFrame = GetCurrentVtkView()){
-      vtkRenderer *aRenderer = aViewFrame->getRenderer();
+    if(SVTK_ViewWindow* aViewWindow = GetCurrentVtkView()){
+      vtkRenderer *aRenderer = aViewWindow->getRenderer();
       vtkActorCollection *aCollection = aRenderer->GetActors();
       aCollection->InitTraversal();
       while(vtkActor *anAct = aCollection->GetNextActor()){
@@ -481,9 +915,9 @@ namespace SMESH{
 
 
   void SetPickable(SMESH_Actor* theActor){
-    if(VTKViewer_ViewFrame* aViewFrame = GetCurrentVtkView()){
+    if(SVTK_ViewWindow* aWnd = GetCurrentVtkView()){
       int anIsAllPickable = (theActor == NULL);
-      vtkRenderer *aRenderer = aViewFrame->getRenderer();
+      vtkRenderer *aRenderer = aWnd->getRenderer();
       vtkActorCollection *aCollection = aRenderer->GetActors();
       aCollection->InitTraversal();
       while(vtkActor *anAct = aCollection->GetNextActor()){
@@ -500,15 +934,86 @@ namespace SMESH{
   }
 
 
-  int GetNameOfSelectedNodes(SALOME_Selection *theSel, 
-                            const Handle(SALOME_InteractiveObject)& theIO, 
+  //----------------------------------------------------------------------------
+  int GetNameOfSelectedNodes(SVTK_Selector* theSelector,
+                            const Handle(SALOME_InteractiveObject)& theIO,
+                            QString& theName)
+  {
+    theName = "";
+    TColStd_IndexedMapOfInteger aMapIndex;
+    theSelector->GetIndex(theIO,aMapIndex);
+
+    for(int i = 1; i <= aMapIndex.Extent(); i++)
+      theName += QString(" %1").arg(aMapIndex(i));
+
+    return aMapIndex.Extent();
+  }
+
+  int GetNameOfSelectedElements(SVTK_Selector* theSelector,
+                               const Handle(SALOME_InteractiveObject)& theIO,
+                               QString& theName)
+  {
+    theName = "";
+    TColStd_IndexedMapOfInteger aMapIndex;
+    theSelector->GetIndex(theIO,aMapIndex);
+
+    typedef std::set<int> TIdContainer;
+    TIdContainer anIdContainer;
+    for( int i = 1; i <= aMapIndex.Extent(); i++)
+      anIdContainer.insert(aMapIndex(i));
+
+    TIdContainer::const_iterator anIter = anIdContainer.begin();
+    for(; anIter != anIdContainer.end(); anIter++)
+      theName += QString(" %1").arg(*anIter);
+
+    return aMapIndex.Extent();
+  }
+
+
+  int GetEdgeNodes(SVTK_Selector* theSelector,
+                  const TVisualObjPtr& theVisualObject,
+                  int& theId1,
+                  int& theId2)
+  {
+    const SALOME_ListIO& selected = theSelector->StoredIObjects();
+
+    if ( selected.Extent() != 1 )
+      return -1;
+
+    Handle(SALOME_InteractiveObject) anIO = selected.First();
+    if ( anIO.IsNull() || !anIO->hasEntry() )
+      return -1;
+
+    TColStd_IndexedMapOfInteger aMapIndex;
+    theSelector->GetIndex( anIO, aMapIndex );
+    if ( aMapIndex.Extent() != 2 )
+      return -1;
+
+    int anObjId = -1, anEdgeNum = -1;
+    for ( int i = 1; i <= aMapIndex.Extent(); i++ ) {
+      int aVal = aMapIndex( i );
+      if ( aVal > 0 )
+       anObjId = aVal;
+      else
+       anEdgeNum = abs( aVal ) - 1;
+    }
+
+    if ( anObjId == -1 || anEdgeNum == -1 )
+      return -1;
+
+    return theVisualObject->GetEdgeNodes( anObjId, anEdgeNum, theId1, theId2 ) ? 1 : -1;
+  }
+
+  //----------------------------------------------------------------------------
+  int GetNameOfSelectedNodes(LightApp_SelectionMgr *theMgr,
+                            const Handle(SALOME_InteractiveObject)& theIO,
                             QString& theName)
   {
     theName = "";
     if(theIO->hasEntry()){
-      if(SMESH_Actor *anActor = FindActorByEntry(theIO->getEntry())){
+      if(FindActorByEntry(theIO->getEntry())){
        TColStd_IndexedMapOfInteger aMapIndex;
-       theSel->GetIndex(theIO,aMapIndex);
+       theMgr->GetIndexes(theIO,aMapIndex);
        for(int i = 1; i <= aMapIndex.Extent(); i++){
          theName += QString(" %1").arg(aMapIndex(i));
        }
@@ -517,28 +1022,28 @@ namespace SMESH{
     }
     return -1;
   }
-  
 
-  int GetNameOfSelectedNodes(SALOME_Selection *theSel, QString& theName){
+  int GetNameOfSelectedNodes(LightApp_SelectionMgr *theMgr, QString& theName){
     theName = "";
-    if(theSel->IObjectCount() == 1){
-      Handle(SALOME_InteractiveObject) anIO = theSel->firstIObject();
-      return GetNameOfSelectedNodes(theSel,anIO,theName);
+    SALOME_ListIO selected; theMgr->selectedObjects( selected );
+    if(selected.Extent() == 1){
+      Handle(SALOME_InteractiveObject) anIO = selected.First();
+      return GetNameOfSelectedNodes(theMgr,anIO,theName);
     }
     return -1;
   }
-  
 
-  int GetNameOfSelectedElements(SALOME_Selection *theSel, 
-                               const Handle(SALOME_InteractiveObject)& theIO, 
+
+  int GetNameOfSelectedElements(LightApp_SelectionMgr *theMgr,
+                               const Handle(SALOME_InteractiveObject)& theIO,
                                QString& theName)
   {
     theName = "";
     if(theIO->hasEntry()){
-      if(SMESH_Actor *anActor = FindActorByEntry(theIO->getEntry())){
+      if(FindActorByEntry(theIO->getEntry())){
        TColStd_IndexedMapOfInteger aMapIndex;
-       theSel->GetIndex(theIO,aMapIndex);
-       typedef std::set<int> TIdContainer;
+       theMgr->GetIndexes(theIO,aMapIndex);
+       typedef set<int> TIdContainer;
        TIdContainer anIdContainer;
        for( int i = 1; i <= aMapIndex.Extent(); i++)
          anIdContainer.insert(aMapIndex(i));
@@ -553,40 +1058,44 @@ namespace SMESH{
   }
 
 
-  int GetNameOfSelectedElements(SALOME_Selection *theSel, QString& theName)
+  int GetNameOfSelectedElements(LightApp_SelectionMgr *theMgr, QString& theName)
   {
     theName = "";
-    if(theSel->IObjectCount() == 1){
-      Handle(SALOME_InteractiveObject) anIO = theSel->firstIObject();
-      return GetNameOfSelectedElements(theSel,anIO,theName);
+    SALOME_ListIO selected; theMgr->selectedObjects( selected );
+
+    if( selected.Extent() == 1){
+      Handle(SALOME_InteractiveObject) anIO = selected.First();
+      return GetNameOfSelectedElements(theMgr,anIO,theName);
     }
     return -1;
   }
 
-  
-  int GetSelected(SALOME_Selection*            theSel, 
-                 TColStd_IndexedMapOfInteger& theMap, 
+  int GetSelected(LightApp_SelectionMgr*       theMgr,
+                 TColStd_IndexedMapOfInteger& theMap,
                  const bool                   theIsElement)
   {
     theMap.Clear();
+    SALOME_ListIO selected; theMgr->selectedObjects( selected );
 
-    if ( theSel->IObjectCount() == 1 )
+    if ( selected.Extent() == 1 )
     {
-      Handle(SALOME_InteractiveObject) anIO = theSel->firstIObject();
+      Handle(SALOME_InteractiveObject) anIO = selected.First();
       if ( anIO->hasEntry() ) {
-       theSel->GetIndex( anIO, theMap );
+       theMgr->GetIndexes( anIO, theMap );
       }
     }
     return theMap.Extent();
   }
 
 
-  int GetEdgeNodes( SALOME_Selection* theSel, int& theId1, int& theId2 )
+  int GetEdgeNodes( LightApp_SelectionMgr* theMgr, int& theId1, int& theId2 )
   {
-    if ( theSel->IObjectCount() != 1 )
+    SALOME_ListIO selected; theMgr->selectedObjects( selected );
+
+    if ( selected.Extent() != 1 )
       return -1;
 
-    Handle(SALOME_InteractiveObject) anIO = theSel->firstIObject();
+    Handle(SALOME_InteractiveObject) anIO = selected.First();
     if ( anIO.IsNull() || !anIO->hasEntry() )
       return -1;
 
@@ -595,10 +1104,10 @@ namespace SMESH{
       return -1;
 
     TColStd_IndexedMapOfInteger aMapIndex;
-    theSel->GetIndex( anIO, aMapIndex );
+    theMgr->GetIndexes( anIO, aMapIndex );
     if ( aMapIndex.Extent() != 2 )
       return -1;
-    
+
     int anObjId = -1, anEdgeNum = -1;
     for ( int i = 1; i <= aMapIndex.Extent(); i++ ) {
       int aVal = aMapIndex( i );
@@ -607,21 +1116,21 @@ namespace SMESH{
       else
        anEdgeNum = abs( aVal );
     }
-    
+
     if ( anObjId == -1 || anEdgeNum == -1 )
       return -1;
-    
+
     return anActor->GetObject()->GetEdgeNodes( anObjId, anEdgeNum, theId1, theId2 ) ? 1 : -1;
   }
-  
+
   void SetControlsPrecision( const long theVal )
   {
-    if( VTKViewer_ViewFrame* aViewFrame = SMESH::GetCurrentVtkView() )
+    if( SVTK_ViewWindow* aWnd = SMESH::GetCurrentVtkView() )
     {
-      vtkRenderer *aRenderer = aViewFrame->getRenderer();
+      vtkRenderer *aRenderer = aWnd->getRenderer();
       vtkActorCollection *aCollection = aRenderer->GetActors();
       aCollection->InitTraversal();
-      
+
       while ( vtkActor *anAct = aCollection->GetNextActor())
       {
         if ( SMESH_Actor *anActor = dynamic_cast<SMESH_Actor*>( anAct ) )
@@ -634,20 +1143,3 @@ namespace SMESH{
     }
   }
 }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-