Salome HOME
imn/auto-reorder_of_nodes_ver2
[modules/smesh.git] / src / SMESHGUI / SMESHGUI_VTKUtils.cxx
index c9141ec82f7b93eda661ae60c9d11522313002c1..a6755381339772b94d273354e213133579846cb7 100644 (file)
-//  Copyright (C) 2003  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+// Copyright (C) 2007-2014  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  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.
+// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-//  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.
+// 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, or (at your option) any later version.
 //
-//  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
+// 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
 //
-//  See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org
-
 
+// SMESH SMESHGUI : GUI for SMESH component
+// File   : SMESHGUI_VTKUtils.cxx
+// Author : Open CASCADE S.A.S.
+// SMESH includes
+//
 #include "SMESHGUI_VTKUtils.h"
+
+#include "SMESHGUI.h"
 #include "SMESHGUI_Utils.h"
 #include "SMESHGUI_Filter.h"
+#include "SMESH_ControlsDef.hxx"
 
-#include <vtkRenderer.h>
-#include <vtkActorCollection.h>
-
-#include <TColStd_IndexedMapOfInteger.hxx>
+#include <SMESH_Actor.h>
+#include <SMESH_ActorUtils.h>
+#include "SMESH_NodeLabelActor.h"
+#include "SMESH_CellLabelActor.h"
+#include <SMESH_ObjectDef.h>
+#include <SMDS_Mesh.hxx>
 
+// SALOME GUI includes
 #include <SUIT_Desktop.h>
 #include <SUIT_Session.h>
-#include <SUIT_Study.h>
+#include <SUIT_MessageBox.h>
+#include <SUIT_ViewManager.h>
+#include <SUIT_ResourceMgr.h>
 
-#include "SalomeApp_SelectionMgr.h"
+#include <SALOME_ListIO.hxx>
+#include <SALOME_ListIteratorOfListIO.hxx>
+
+#include <SVTK_Selector.h>
+#include <SVTK_ViewModel.h>
+#include <SVTK_ViewWindow.h>
 
-#include "SVTK_Selector.h"
-#include "SVTK_ViewModel.h"
-#include "SVTK_ViewWindow.h"
-#include "SVTK_RenderWindow.h"
-#include "SVTK_InteractorStyle.h"
-#include "SVTK_RenderWindowInteractor.h"
+#include <VTKViewer_Algorithm.h>
+
+#include <LightApp_SelectionMgr.h>
+#include <SalomeApp_Application.h>
+#include <SalomeApp_Study.h>
 
-#include "utilities.h"
+// SALOME KERNEL includes
+#include <utilities.h>
 
-#include "SALOMEconfig.h"
-#include CORBA_CLIENT_HEADER(SMESH_Gen)
+// IDL includes
+#include <SALOMEconfig.h>
 #include CORBA_CLIENT_HEADER(SMESH_Mesh)
 #include CORBA_CLIENT_HEADER(SMESH_Group)
-#include CORBA_CLIENT_HEADER(SMESH_Hypothesis)
 
-#include "SMESHGUI.h"
-#include "SMESH_Actor.h"
-#include "SMESH_ObjectDef.h"
+// VTK includes
+#include <vtkMath.h>
+#include <vtkRenderer.h>
+#include <vtkActorCollection.h>
+#include <vtkUnstructuredGrid.h>
 
-#include <SalomeApp_Application.h>
-#include <SalomeApp_SelectionMgr.h>
-#include <SalomeApp_Study.h>
+// OCCT includes
+#include <TColStd_IndexedMapOfInteger.hxx>
+#include <Standard_ErrorHandler.hxx>
+#include <ProjLib.hxx>
+#include <gp_Pln.hxx>
+#include <gp_Lin.hxx>
+#include <gce_MakePln.hxx>
+#include <gce_MakeLin.hxx>
+#include <GeomAPI_IntCS.hxx>
+#include <Geom_Line.hxx>
+#include <Geom_Plane.hxx>
+
+namespace SMESH
+{
+  typedef std::map<TKeyOfVisualObj,TVisualObjPtr> TVisualObjCont;
+  static TVisualObjCont VISUAL_OBJ_CONT;
 
-#include <SALOMEDSClient_Study.hxx>
-#include <SALOMEDSClient_SObject.hxx>
+  //=============================================================================
+  /*!
+   * \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
+   */
+  //=============================================================================
 
-#include <SALOME_ListIO.hxx>
-#include <SALOME_ListIteratorOfListIO.hxx>
+  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, bool fromAllViews )
+  {
+    SalomeApp_Application* app = dynamic_cast<SalomeApp_Application*>(SUIT_Session::session()->activeApplication());
+    if(!app)
+      return;
+    SalomeApp_Study* aStudy  = dynamic_cast<SalomeApp_Study*>(app->activeStudy());
+    if(!aStudy)
+      return;
+    ViewManagerList aList;
+
+    if(fromAllViews) {
+      app->viewManagers(SVTK_Viewer::Type() , aList);
+    } else {
+      SUIT_ViewManager* aVM = app->getViewManager(SVTK_Viewer::Type(), true);
+      if(aVM)
+        aList.append(aVM);
+    }    
+    bool actorRemoved = false;
+    ViewManagerList::ConstIterator it = aList.begin();
+    SUIT_ViewManager* aViewManager = 0;
+    for( ; it!=aList.end();it++) {
+      aViewManager = *it;
+      QVector<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);
+            actorRemoved = true;
+          }
+          actor->Delete();
+        }
+      }
+    }
+    
+    if (aViewManager ) {
+      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,0,0);
+        anIter->second->GetUnstructuredGrid()->SetPoints(0);
+      }
+      VISUAL_OBJ_CONT.erase(aKey);
+    }
+
+    if(actorRemoved)
+      aStudy->setVisibilityState(theEntry, Qtx::HiddenState);
+  }
+  //================================================================================
+  /*!
+   * \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()) {
+        QVector<SUIT_ViewWindow*> views = aViewManager->getViews();
+        for ( int iV = 0; iV < views.count(); ++iV ) {
+          if(SVTK_ViewWindow* vtkWnd = GetVtkViewWindow(views[iV])) {
+            vtkRenderer *aRenderer = vtkWnd->getRenderer();
+            VTK::ActorCollectionCopy aCopy(aRenderer->GetActors());
+            vtkActorCollection *actors = aCopy.GetActors();
+            for (int i = 0; i < actors->GetNumberOfItems(); ++i ) {
+              // size of actors changes inside the loop
+              if (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,0,0);
+      anIter->second->GetUnstructuredGrid()->SetPoints(0);
+    }
+    VISUAL_OBJ_CONT.clear();
+  }
 
-#include <set>
-using namespace std;
+  //================================================================================
+  /*!
+   * \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 ) {
+        QVector<SUIT_ViewWindow*> views = aViewManager->getViews();
+        for ( int iV = 0; iV < views.count(); ++iV ) {
+          if(SVTK_ViewWindow* vtkWnd = GetVtkViewWindow(views[iV])) {
+            vtkRenderer *aRenderer = vtkWnd->getRenderer();
+            VTK::ActorCollectionCopy aCopy(aRenderer->GetActors());
+            vtkActorCollection *actors = aCopy.GetActors();
+            for (int i = 0; i < actors->GetNumberOfItems(); ++i ) {
+              // size of actors changes inside the loop
+              if(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(); ) {
+      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,0,0);
+        anIter->second->GetUnstructuredGrid()->SetPoints(0);
+        VISUAL_OBJ_CONT.erase( anIter++ ); // anIter++ returns a copy of self before incrementing
+      }
+      else {
+        anIter++;
+      }
+    }
+  }
 
-namespace SMESH{
+  //================================================================================
+  /*!
+   * \brief Notify the user on problems during visualization
+   */
+  //================================================================================
 
-  typedef map<TKeyOfVisualObj,TVisualObjPtr> TVisualObjCont;
-  static TVisualObjCont VISUAL_OBJ_CONT;
+  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::warning(SMESHGUI::desktop(), QObject::tr("SMESH_WRN_WARNING"),
+                               QObject::tr("SMESH_VISU_PROBLEM"));
+    } catch (...) {
+      // no more memory at all: last resort
+      MESSAGE_BEGIN ( "SMESHGUI_VTKUtils::OnVisuException(), exception even at showing a message!!!" <<
+                      std::endl << "Try to remove all visual data..." );
+      if (theVISU_MemoryReserve) {
+        delete theVISU_MemoryReserve;
+        theVISU_MemoryReserve = 0;
+      }
+      RemoveAllObjectsWithActors();
+      SUIT_MessageBox::warning(SMESHGUI::desktop(), QObject::tr("SMESH_WRN_WARNING"),
+                               QObject::tr("SMESH_VISU_PROBLEM_CLEAR"));
+      MESSAGE_END ( "...done" );
+    }
+  }
+  //================================================================================
+  /*!
+   * \brief Returns an updated visual object
+   */
+  //================================================================================
 
-  TVisualObjPtr GetVisualObj(int theStudyId, const char* theEntry){
+  TVisualObjPtr GetVisualObj(int theStudyId, const char* theEntry, bool nulData){
     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;
+        aVisualObj = anIter->second;
       }else{
-        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")){
-           _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
-             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);
-               VISUAL_OBJ_CONT.insert(aValue);
-               return aVisualObj;
-             }
-             //Try narrow to SMESH_Group interafce
-             SMESH::SMESH_GroupBase_var aGroup = SMESH::SMESH_GroupBase::_narrow(anObj);
-             if(!aGroup->_is_nil()){
-               _PTR(SObject) aFatherSObj = aSObj->GetFather();
-               if(!aFatherSObj) return aVisualObj;
-               aFatherSObj = aFatherSObj->GetFather();
-               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);
-                 VISUAL_OBJ_CONT.insert(aValue);
-                 return aVisualObj;
-               }
-             }
-             //Try narrow to SMESH_subMesh interafce
-             SMESH::SMESH_subMesh_var aSubMesh = SMESH::SMESH_subMesh::_narrow(anObj);
-             if(!aSubMesh->_is_nil()){
-               _PTR(SObject) aFatherSObj = aSObj->GetFather();
-               if(!aFatherSObj) return aVisualObj;
-               aFatherSObj = aFatherSObj->GetFather();
-               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);
-                 VISUAL_OBJ_CONT.insert(aValue);
-                 return aVisualObj;
-               }
-             }
-           }
-         }
-       }
+        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")){
+            _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 interface
+              SMESH::SMESH_Mesh_var aMesh = SMESH::SMESH_Mesh::_narrow(anObj);
+              if(!aMesh->_is_nil()){
+                aVisualObj.reset(new SMESH_MeshObj(aMesh));
+                TVisualObjCont::value_type aValue(aKey,aVisualObj);
+                VISUAL_OBJ_CONT.insert(aValue);
+              }
+              //Try narrow to SMESH_Group interface
+              SMESH::SMESH_GroupBase_var aGroup = SMESH::SMESH_GroupBase::_narrow(anObj);
+              if(!aGroup->_is_nil()){
+                _PTR(SObject) aFatherSObj = aSObj->GetFather();
+                if(!aFatherSObj) return aVisualObj;
+                aFatherSObj = aFatherSObj->GetFather();
+                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));
+                  TVisualObjCont::value_type aValue(aKey,aVisualObj);
+                  VISUAL_OBJ_CONT.insert(aValue);
+                }
+              }
+              //Try narrow to SMESH_subMesh interface
+              SMESH::SMESH_subMesh_var aSubMesh = SMESH::SMESH_subMesh::_narrow(anObj);
+              if(!aSubMesh->_is_nil()){
+                _PTR(SObject) aFatherSObj = aSObj->GetFather();
+                if(!aFatherSObj) return aVisualObj;
+                aFatherSObj = aFatherSObj->GetFather();
+                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));
+                  TVisualObjCont::value_type aValue(aKey,aVisualObj);
+                  VISUAL_OBJ_CONT.insert(aValue);
+                }
+              }
+            }
+          }
+        }
       }
     }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
+        //MESSAGE("GetVisualObj");
+        if (nulData)
+                objModified = aVisualObj->NulData();
+        else
+          objModified = aVisualObj->Update();
+      }
+      catch (...) {
+#ifdef _DEBUG_
+        MESSAGE ( "Exception in SMESHGUI_VTKUtils::GetVisualObj()" );
+#endif
+        RemoveVisualObjectWithActors( theEntry ); // remove this object
+        OnVisuException();
+        aVisualObj.reset();
+      }
+    }
+
+    if ( objModified ) {
+      // PAL16631. Mesurements showed that to show aVisualObj in SHADING(default) mode,
+      // ~5 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;
+      MESSAGE("SMESHGUI_VTKUtils::GetVisualObj(), freeMB=" << freeMB << ", usedMB=" <<usedMB);
+      if ( freeMB > 0 && usedMB * 5 > freeMB ) {
+       bool continu = false;
+       if ( usedMB * 3 > freeMB )
+         // even dont try to show
+         SUIT_MessageBox::warning(SMESHGUI::desktop(), QObject::tr("SMESH_WRN_WARNING"),
+                                  QObject::tr("SMESH_NO_MESH_VISUALIZATION"));
+       else
+         // there is a chance to succeed
+         continu = SUIT_MessageBox::warning
+           (SMESHGUI::desktop(),
+            QObject::tr("SMESH_WRN_WARNING"),
+            QObject::tr("SMESH_CONTINUE_MESH_VISUALIZATION"),
+            SUIT_MessageBox::Yes | SUIT_MessageBox::No,
+            SUIT_MessageBox::Yes ) == SUIT_MessageBox::Yes;
+       if ( !continu ) {
+         // remove the corresponding actors from all views
+         RemoveVisualObjectWithActors( theEntry );
+         aVisualObj.reset();
+       }
+      }
+    }
+
     return aVisualObj;
   }
 
 
-  SVTK_ViewWindow*
-  GetViewWindow(const SalomeApp_Module* theModule)
+  /*! 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)
   {
-    if (SalomeApp_Application* anApp = theModule->getApp())
-      return dynamic_cast<SVTK_ViewWindow*>(anApp->desktop()->activeWindow());
+    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* FindVtkViewWindowSUIT_ViewManager* theMgr,
-                                          SUIT_ViewWindow* theWindow )
+  SVTK_ViewWindow* FindVtkViewWindow (SUIT_ViewManager* theMgr,
+                                      SUIT_ViewWindow * theWindow)
   {
     if( !theMgr )
       return NULL;
 
-    QPtrVector<SUIT_ViewWindow> views = theMgr->getViews();
-    if( views.containsRef( theWindow ) )
+    QVector<SUIT_ViewWindow*> views = theMgr->getViews();
+    if( views.contains( 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() );
@@ -185,33 +481,97 @@ namespace SMESH{
     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_
+        MESSAGE ( "Exception in SMESHGUI_VTKUtils::RepaintCurrentView()" );
+#endif
+        OnVisuException();
+      }
+    }
+  }
+
   void RepaintViewWindow(SVTK_ViewWindow* theWindow)
   {
-    theWindow->Repaint();
+    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_
+      MESSAGE ( "Exception in SMESHGUI_VTKUtils::RepaintViewWindow(SVTK_ViewWindow*)" );
+#endif
+      OnVisuException();
+    }
   }
 
   void RenderViewWindow(SVTK_ViewWindow* theWindow)
   {
-    theWindow->getRenderer()->Render();
-    theWindow->Repaint();
+    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_
+      MESSAGE ( "Exception in SMESHGUI_VTKUtils::RenderViewWindow(SVTK_ViewWindow*)" );
+#endif
+      OnVisuException();
+    }
+  }
+
+  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_
+        MESSAGE ( "Exception in SMESHGUI_VTKUtils::FitAll()" );
+#endif
+        OnVisuException();
+      }
+    }
   }
 
+
   SMESH_Actor* FindActorByEntry(SUIT_ViewWindow *theWindow,
-                               const char* theEntry)
+                                const char* theEntry)
   {
     if(SVTK_ViewWindow* aViewWindow = GetVtkViewWindow(theWindow)){
       vtkRenderer *aRenderer = aViewWindow->getRenderer();
-      vtkActorCollection *aCollection = aRenderer->GetActors();
+      VTK::ActorCollectionCopy aCopy(aRenderer->GetActors());
+      vtkActorCollection *aCollection = aCopy.GetActors();
       aCollection->InitTraversal();
       while(vtkActor *anAct = aCollection->GetNextActor()){
-       if(SMESH_Actor *anActor = dynamic_cast<SMESH_Actor*>(anAct)){
-         if(anActor->hasIO()){
-           Handle(SALOME_InteractiveObject) anIO = anActor->getIO();
-           if(anIO->hasEntry() && strcmp(anIO->getEntry(),theEntry) == 0){
-             return anActor;
-           }
-         }
-       }
+        if(SMESH_Actor *anActor = dynamic_cast<SMESH_Actor*>(anAct)){
+          if(anActor->hasIO()){
+            Handle(SALOME_InteractiveObject) anIO = anActor->getIO();
+            if(anIO->hasEntry() && strcmp(anIO->getEntry(),theEntry) == 0){
+              return anActor;
+            }
+          }
+        }
       }
     }
     return NULL;
@@ -233,8 +593,8 @@ namespace SMESH{
       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());
+        CORBA::String_var anEntry = aSObject->GetID().c_str();
+        return FindActorByEntry(anEntry.in());
       }
     }
     return NULL;
@@ -242,174 +602,285 @@ namespace SMESH{
 
 
   SMESH_Actor* CreateActor(_PTR(Study) theStudy,
-                          const char* theEntry,
-                          int theIsClear)
+                           const char* theEntry,
+                           int theIsClear)
   {
     SMESH_Actor *anActor = NULL;
     CORBA::Long anId = theStudy->StudyId();
     if(TVisualObjPtr aVisualObj = GetVisualObj(anId,theEntry)){
       _PTR(SObject) aSObj = theStudy->FindObjectID(theEntry);
       if(aSObj){
-       _PTR(GenericAttribute) anAttr;
-       if(aSObj->FindAttribute(anAttr,"AttributeName")){
-         _PTR(AttributeName) aName = anAttr;
-         std::string aNameVal = aName->Value();
-         anActor = SMESH_Actor::New(aVisualObj,theEntry,aNameVal.c_str(),theIsClear);
-       }
+        _PTR(GenericAttribute) anAttr;
+        if(aSObj->FindAttribute(anAttr,"AttributeName")){
+          _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) && anActor)
+        {
+          QColor c;
+          int deltaF, deltaV;
+          SMESH::GetColor( "SMESH", "fill_color", c, deltaF, "0,170,255|-100"  );
+          SMESH::GetColor( "SMESH", "volume_color", c, deltaV, "255,0,170|-100"  );
+          c = SMESH::GetColor( "SMESH", "default_grp_color", c );
+          SALOMEDS::Color aColor = aGroup->GetColor();
+          if( !( aColor.R > 0 || aColor.G > 0 || aColor.B > 0 ))
+          {
+            aColor.R = c.redF();
+            aColor.G = c.greenF();
+            aColor.B = c.blueF();
+            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 if( aGroup->GetType() == SMESH::ELEM0D )
+            anActor->Set0DColor( aColor.R, aColor.G, aColor.B );
+          else if( aGroup->GetType() == SMESH::BALL )
+            anActor->SetBallColor( aColor.R, aColor.G, aColor.B );
+          else if( aGroup->GetType() == SMESH::VOLUME )
+            anActor->SetVolumeColor( aColor.R, aColor.G, aColor.B, deltaV );
+          else
+            anActor->SetSufaceColor( aColor.R, aColor.G, aColor.B, deltaF );
+        }
       }
     }
+    MESSAGE("CreateActor " << anActor);
+    if( anActor )
+      if( SMESHGUI* aSMESHGUI = SMESHGUI::GetSMESHGUI() )
+        aSMESHGUI->addActorAsObserver( anActor );
     return anActor;
   }
 
 
   void DisplayActor( SUIT_ViewWindow *theWnd, SMESH_Actor* theActor){
     if(SVTK_ViewWindow* vtkWnd = GetVtkViewWindow(theWnd)){
-      vtkWnd->AddActor(theActor);
-      vtkWnd->Repaint();
+      try {
+#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+        OCC_CATCH_SIGNALS;
+#endif
+        MESSAGE("DisplayActor " << theActor);
+        vtkWnd->AddActor(theActor);
+        vtkWnd->Repaint();
+      }
+      catch (...) {
+#ifdef _DEBUG_
+        MESSAGE ( "Exception in SMESHGUI_VTKUtils::DisplayActor()" );
+#endif
+        OnVisuException();
+      }
     }
   }
 
 
   void RemoveActor( SUIT_ViewWindow *theWnd, SMESH_Actor* theActor){
     if(SVTK_ViewWindow* vtkWnd = GetVtkViewWindow(theWnd)){
+        MESSAGE("RemoveActor " << theActor);
       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);
-       }
+        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();
     }
   }
 
+  //================================================================================
+  /*!
+   * \brief Return true if there are no SMESH actors in a view
+   */
+  //================================================================================
 
-  void FitAll(){
-    if(SVTK_ViewWindow* wnd = GetCurrentVtkView() ){
-      wnd->onFitAll();
-      wnd->Repaint();
+  bool noSmeshActors(SUIT_ViewWindow *theWnd)
+  {
+    if(SVTK_ViewWindow* aViewWindow = GetVtkViewWindow(theWnd)) {
+      vtkRenderer *aRenderer = aViewWindow->getRenderer();
+      VTK::ActorCollectionCopy aCopy(aRenderer->GetActors());
+      vtkActorCollection *aCollection = aCopy.GetActors();
+      aCollection->InitTraversal();
+      while(vtkActor *anAct = aCollection->GetNextActor())
+        if(dynamic_cast<SMESH_Actor*>(anAct))
+          return false;
     }
+    return true;
   }
 
-  vtkRenderer* GetCurrentRenderer(){
-    if(SVTK_ViewWindow* wnd = GetCurrentVtkView() )
-      return wnd->getRenderer();
-    return NULL;
-  }
+  bool UpdateView(SUIT_ViewWindow *theWnd, EDisplaing theAction, const char* theEntry)
+  {
+        //MESSAGE("UpdateView");
+    bool OK = false;
+    SVTK_ViewWindow* aViewWnd = GetVtkViewWindow(theWnd);
+    if (!aViewWnd)
+      return OK;
 
-  void RepaintCurrentView(){
-    if(SVTK_ViewWindow* wnd = GetCurrentVtkView() )
-      {
-       wnd->getRenderer()->Render();
-       wnd->Repaint(false);
-      }
-  }
+    SVTK_ViewWindow* vtkWnd = GetVtkViewWindow(theWnd);
+    if (!vtkWnd)
+      return OK;
 
-  void UpdateView(SUIT_ViewWindow *theWnd, EDisplaing theAction, const char* theEntry)
-  {
-    if(SVTK_ViewWindow* aViewWnd = GetVtkViewWindow(theWnd)){
+    SalomeApp_Study* aStudy = dynamic_cast<SalomeApp_Study*>( vtkWnd->getViewManager()->study() );
+    
+    if (!aStudy)
+      return OK;
+
+    {
+      OK = true;
       vtkRenderer *aRenderer = aViewWnd->getRenderer();
-      vtkActorCollection *aCollection = aRenderer->GetActors();
+      VTK::ActorCollectionCopy aCopy(aRenderer->GetActors());
+      vtkActorCollection *aCollection = aCopy.GetActors();
       aCollection->InitTraversal();
-      switch(theAction){
+
+      switch (theAction) {
       case eDisplayAll: {
-       while(vtkActor *anAct = aCollection->GetNextActor()){
-         if(SMESH_Actor *anActor = dynamic_cast<SMESH_Actor*>(anAct)){
-           anActor->SetVisibility(true);
-         }
-       }
-       break;
+        while (vtkActor *anAct = aCollection->GetNextActor()) {
+          if (SMESH_Actor *anActor = dynamic_cast<SMESH_Actor*>(anAct)) {
+                MESSAGE("--- display " << anActor);
+            anActor->SetVisibility(true);
+
+            if(anActor->hasIO()){
+              Handle(SALOME_InteractiveObject) anIO = anActor->getIO();
+              if(anIO->hasEntry()){
+                aStudy->setVisibilityState(anIO->getEntry(), Qtx::ShownState);
+              }
+            }
+          }
+        }
+        break;
       }
       case eDisplayOnly:
       case eEraseAll: {
-       while(vtkActor *anAct = aCollection->GetNextActor()){
-         if(SMESH_Actor *anActor = dynamic_cast<SMESH_Actor*>(anAct)){
-           anActor->SetVisibility(false);
-         }
-       }
+        //MESSAGE("---case eDisplayOnly");
+        while (vtkActor *anAct = aCollection->GetNextActor()) {
+          if (SMESH_Actor *anActor = dynamic_cast<SMESH_Actor*>(anAct)) {
+                //MESSAGE("--- erase " << anActor);
+            anActor->SetVisibility(false);
+          }
+        }
+        aStudy->setVisibilityStateForAll(Qtx::HiddenState);
       }
       default: {
-       if(SMESH_Actor *anActor = FindActorByEntry(theWnd,theEntry)){
-         switch(theAction) {
-           case eDisplay:
-           case eDisplayOnly:
-             anActor->SetVisibility(true);
-             break;
-           case eErase:
-             anActor->SetVisibility(false);
-             break;
-         }
-       } else {
-         switch(theAction){
-         case eDisplay:
-         case eDisplayOnly:{
-           SalomeApp_Study* aStudy = dynamic_cast<SalomeApp_Study*>( theWnd->getViewManager()->study() );
-           _PTR(Study) aDocument = aStudy->studyDS();
-           if((anActor = CreateActor(aDocument,theEntry,true))) {
-             DisplayActor(theWnd,anActor);
-             FitAll();
-           }
-           break;
-         }
-         }
-       }
-      }
-      }
-    }
-  }
-
-
-  void UpdateView(EDisplaing theAction, const char* theEntry){
+        if (SMESH_Actor *anActor = FindActorByEntry(theWnd,theEntry)) {
+          switch (theAction) {
+            case eDisplay:
+            case eDisplayOnly:
+                //MESSAGE("--- display " << anActor);
+              anActor->Update();
+              anActor->SetVisibility(true);
+              if (theAction == eDisplayOnly) aRenderer->ResetCameraClippingRange();
+              aStudy->setVisibilityState(theEntry, Qtx::ShownState);
+              break;
+            case eErase:
+                //MESSAGE("--- erase " << anActor);
+              anActor->SetVisibility(false);
+              aStudy->setVisibilityState(theEntry, Qtx::HiddenState);
+              break;
+          }
+        } else {
+          switch (theAction) {
+          case eDisplay:
+          case eDisplayOnly:
+            {
+                //MESSAGE("---");
+              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();
+              TVisualObjPtr aVisualObj;
+              if ( (aVisualObj = GetVisualObj(anId,theEntry)) && aVisualObj->IsValid())
+              {
+                if ((anActor = CreateActor(aDocument,theEntry,true))) {
+                  bool needFitAll = noSmeshActors(theWnd); // fit for the first object only
+                  DisplayActor(theWnd,anActor);
+                  aStudy->setVisibilityState(theEntry, Qtx::ShownState);
+                  // FitAll(); - PAL16770(Display of a group performs an automatic fit all)
+                  if (needFitAll) FitAll();
+                } else {
+                  OK = false;
+                }
+              }
+              break;
+            }
+          }
+        }
+      }
+      }
+    }
+    return OK;
+  }
+
+
+  bool UpdateView(EDisplaing theAction, const char* theEntry){
+        //MESSAGE("UpdateView");
     SalomeApp_Study* aStudy = dynamic_cast< SalomeApp_Study* >( GetActiveStudy() );
     SalomeApp_Application* app = dynamic_cast< SalomeApp_Application* >( aStudy->application() );
     SUIT_ViewWindow *aWnd = app->activeViewManager()->getActiveView();
-    UpdateView(aWnd,theAction,theEntry);
+    return UpdateView(aWnd,theAction,theEntry);
   }
 
   void UpdateView(){
     if(SVTK_ViewWindow* aWnd = SMESH::GetCurrentVtkView()){
-      SalomeApp_SelectionMgr* mgr = SMESHGUI::selectionMgr();
+      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());
-         }
-       }
+        vtkRenderer* aRenderer = aWnd->getRenderer();
+        VTK::ActorCollectionCopy aCopy(aRenderer->GetActors());
+        vtkActorCollection *aCollection = aCopy.GetActors();
+        aCollection->InitTraversal();
+        while(vtkActor *anAct = aCollection->GetNextActor()){
+          if(SMESH_Actor *anActor = dynamic_cast<SMESH_Actor*>(anAct)){
+            if(anActor->hasIO())
+              if (!Update(anActor->getIO(),anActor->GetVisibility()))
+                break; // avoid multiple warinings if visu failed
+          }
+        }
       }else{
-       SALOME_ListIteratorOfListIO anIter( selected );
-       for(; anIter.More(); anIter.Next()){
-         Handle(SALOME_InteractiveObject) anIO = anIter.Value();
-         Update(anIO,true);
-       }
+        SALOME_ListIteratorOfListIO anIter( selected );
+        for( ; anIter.More(); anIter.Next()){
+          Handle(SALOME_InteractiveObject) anIO = anIter.Value();
+          if ( !Update(anIO,true) )
+            break; // avoid multiple warinings if visu failed
+        }
       }
       RepaintCurrentView();
     }
   }
 
 
-  void Update(const Handle(SALOME_InteractiveObject)& theIO,
-             bool theDisplay)
+  bool Update(const Handle(SALOME_InteractiveObject)& theIO, bool theDisplay)
   {
+        MESSAGE("Update");
     _PTR(Study) aStudy = GetActiveStudyDocument();
     CORBA::Long anId = aStudy->StudyId();
-    TVisualObjPtr aVisualObj = SMESH::GetVisualObj(anId,theIO->getEntry());
-    if( aVisualObj )
-      aVisualObj->Update();
-    if ( theDisplay )
-      UpdateView(SMESH::eDisplay,theIO->getEntry());
+    if ( TVisualObjPtr aVisualObj = SMESH::GetVisualObj(anId,theIO->getEntry())) {
+      if ( theDisplay )
+        UpdateView(SMESH::eDisplay,theIO->getEntry());
+      return true;
+    }
+    return false;
   }
 
+  bool UpdateNulData(const Handle(SALOME_InteractiveObject)& theIO, bool theDisplay)
+  {
+        MESSAGE("UpdateNulData");
+    _PTR(Study) aStudy = GetActiveStudyDocument();
+    CORBA::Long anId = aStudy->StudyId();
+    if ( TVisualObjPtr aVisualObj = SMESH::GetVisualObj(anId,theIO->getEntry(), true)) {
+      if ( theDisplay )
+        UpdateView(SMESH::eDisplay,theIO->getEntry());
+      return true;
+    }
+    return false;
+  }
 
   void UpdateSelectionProp( SMESHGUI* theModule ) {
     if( !theModule )
@@ -429,7 +900,7 @@ namespace SMESH{
       return;
     }
 
-    QPtrVector<SUIT_ViewWindow> views = vm->getViews();
+    QVector<SUIT_ViewWindow*> views = vm->getViews();
 
     SUIT_ResourceMgr* mgr = SMESH::GetResourceMgr( theModule );
     if( !mgr )
@@ -440,93 +911,171 @@ namespace SMESH{
 
     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 );
+           aPreColor = mgr->colorValue( "SMESH", "highlight_color", Qt::cyan );
 
-    int SW = mgr->integerValue( "SMESH", "selection_width", 5 ),
-        PW = mgr->integerValue( "SMESH", "highlight_width", 5 );
+    int aElem0DSize = mgr->integerValue("SMESH", "elem0d_size", 5);
+    int aBallSize   = mgr->integerValue("SMESH", "ball_elem_size", 5);
+    int aLineWidth  = mgr->integerValue("SMESH", "element_width", 1);
+    int maxSize = aElem0DSize;
+    if (aElem0DSize > maxSize) maxSize = aElem0DSize;
+    if (aLineWidth > maxSize) maxSize = aLineWidth;
+    if (aBallSize > maxSize) maxSize = aBallSize;
 
     double SP1 = mgr->doubleValue( "SMESH", "selection_precision_node", 0.025 ),
-           SP2 = mgr->doubleValue( "SMESH", "selection_precision_element", 0.001 );
-
-    for ( int i=0, n=views.count(); i<n; i++ ) {
-        SVTK_ViewWindow* aVtkView = GetVtkViewWindow( views[i] );
-       if (!aVtkView) continue;
-       // update VTK viewer properties
-       SVTK_RenderWindowInteractor* anInteractor = aVtkView->getRWInteractor();
-       if (anInteractor) {
-         // mesh element selection
-         anInteractor->SetSelectionProp(aSelColor.red()/255., aSelColor.green()/255.,
-                                        aSelColor.blue()/255., SW );
-
-         // tolerances
-         anInteractor->SetSelectionTolerance(SP1, SP2);
-
-         // pre-selection
-         SVTK_InteractorStyle* aStyle =
-           dynamic_cast<SVTK_InteractorStyle*>( anInteractor->GetInteractorStyle() );
-         if (aStyle) {
-           aStyle->setPreselectionProp(aPreColor.red()/255., aPreColor.green()/255.,
-                                       aPreColor.blue()/255., PW);
-         }
-       }
-       // update actors
-       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.,
-                                      aHiColor.blue()/255.);
-           anActor->SetPreHighlightColor(aPreColor.red()/255., aPreColor.green()/255.,
-                                         aPreColor.blue()/255.);
-         }
-       }
+           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.);
+        // tolerances
+        aVtkView->SetSelectionTolerance(SP1, SP2, SP3);
+
+        // pre-selection
+        aVtkView->SetPreselectionProp(aPreColor.red()/255.,
+                                      aPreColor.green()/255.,
+                                      aPreColor.blue()/255.);
+        // update actors
+        vtkRenderer* aRenderer = aVtkView->getRenderer();
+        VTK::ActorCollectionCopy aCopy(aRenderer->GetActors());
+        vtkActorCollection *aCollection = aCopy.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.,
+                                       aHiColor.blue()/255.);
+            anActor->SetPreHighlightColor(aPreColor.red()/255.,
+                                          aPreColor.green()/255.,
+                                          aPreColor.blue()/255.);
+          }
+        }
+      }
     }
   }
 
 
-  //----------------------------------------------------------------------------
-  SVTK_InteractorStyle* GetInteractorStyle(SUIT_ViewWindow *theWindow){
-    if(SVTK_ViewWindow* aWnd = GetVtkViewWindow(theWindow)){
-      if(SVTK_RenderWindowInteractor* anInteractor = aWnd->getRWInteractor()){
-       return dynamic_cast<SVTK_InteractorStyle*>( anInteractor->GetInteractorStyle() );
+  void UpdateFontProp( SMESHGUI* theModule )
+  {
+    if ( !theModule ) return;
+
+    SalomeApp_Application* app = dynamic_cast< SalomeApp_Application* >( theModule->application() );
+    if ( !app ) return;
+
+    SUIT_ResourceMgr* mgr = SMESH::GetResourceMgr( theModule );
+    if ( !mgr ) return;
+    //
+    double anRGBNd[3] = {1,1,1};
+    SMESH::GetColor( "SMESH", "numbering_node_color", anRGBNd[0], anRGBNd[1], anRGBNd[2], QColor( 255, 255, 255 ) );
+    int aSizeNd = 10;
+    SMESH::LabelFont aFamilyNd = SMESH::FntTimes;
+    bool aBoldNd    = true;
+    bool anItalicNd = false;
+    bool aShadowNd  = false;
+
+    if ( mgr->hasValue( "SMESH", "numbering_node_font" ) ) {
+      QFont f = mgr->fontValue( "SMESH", "numbering_node_font" );
+      if ( f.family()      == "Arial" )   aFamilyNd = SMESH::FntArial;
+      else if ( f.family() == "Courier" ) aFamilyNd = SMESH::FntCourier;
+      else if ( f.family() == "Times" )   aFamilyNd = SMESH::FntTimes;
+      aBoldNd    = f.bold();
+      anItalicNd = f.italic();
+      aShadowNd  = f.overline();
+      aSizeNd    = f.pointSize();
+    }
+    //
+    double anRGBEl[3] = {0,1,0};
+    SMESH::GetColor( "SMESH", "numbering_elem_color", anRGBEl[0], anRGBEl[1], anRGBEl[2], QColor( 0, 255, 0 ) );
+    int aSizeEl = 12;
+    SMESH::LabelFont aFamilyEl = SMESH::FntTimes;
+    bool aBoldEl    = true;
+    bool anItalicEl = false;
+    bool aShadowEl  = false;
+
+    if ( mgr->hasValue( "SMESH", "numbering_elem_font" ) ) {
+      QFont f = mgr->fontValue( "SMESH", "numbering_elem_font" );
+
+      if ( f.family()      == "Arial" )   aFamilyEl = SMESH::FntArial;
+      else if ( f.family() == "Courier" ) aFamilyEl = SMESH::FntCourier;
+      else if ( f.family() == "Times" )   aFamilyEl = SMESH::FntTimes;    
+      aBoldEl    = f.bold();
+      anItalicEl = f.italic();
+      aShadowEl  = f.overline();
+      aSizeEl    = f.pointSize();
+    }
+    //
+    ViewManagerList vmList;
+    app->viewManagers( SVTK_Viewer::Type(), vmList );
+    foreach ( SUIT_ViewManager* vm, vmList ) {
+      QVector<SUIT_ViewWindow*> views = vm->getViews();
+      foreach ( SUIT_ViewWindow* vw, views ) {
+        // update VTK viewer properties
+        if ( SVTK_ViewWindow* aVtkView = GetVtkViewWindow( vw ) ) {
+          // update actors
+          vtkRenderer* aRenderer = aVtkView->getRenderer();
+          VTK::ActorCollectionCopy aCopy( aRenderer->GetActors() );
+          vtkActorCollection* aCollection = aCopy.GetActors();
+          aCollection->InitTraversal();
+          while ( vtkActor* anAct = aCollection->GetNextActor() ) {
+            if ( SMESH_NodeLabelActor* anActor = dynamic_cast< SMESH_NodeLabelActor* >( anAct ) ) {
+              anActor->SetFontProperties( aFamilyNd, aSizeNd, aBoldNd, anItalicNd, aShadowNd, anRGBNd[0], anRGBNd[1], anRGBNd[2] );
+            }
+            else if ( SMESH_CellLabelActor* anActor = dynamic_cast< SMESH_CellLabelActor* >( anAct ) ) {
+              anActor->SetFontProperties( aFamilyEl, aSizeEl, aBoldEl, anItalicEl, aShadowEl, anRGBEl[0], anRGBEl[1], anRGBEl[2] );
+            }
+          }
+          aVtkView->Repaint( false ); 
+        }
       }
     }
+  }
+
+  //----------------------------------------------------------------------------
+  SVTK_Selector*
+  GetSelector(SUIT_ViewWindow *theWindow)
+  {
+    if(SVTK_ViewWindow* aWnd = GetVtkViewWindow(theWindow))
+      return aWnd->GetSelector();
+
     return NULL;
   }
 
   void SetFilter(const Handle(VTKViewer_Filter)& theFilter,
-                SVTK_InteractorStyle* theStyle)
+                 SVTK_Selector* theSelector)
   {
-    if (theStyle)
-      theStyle->SetFilter(theFilter);
+    if (theSelector)
+      theSelector->SetFilter(theFilter);
   }
 
-  Handle(VTKViewer_Filter) GetFilter(int theId, SVTK_InteractorStyle* theStyle)
+  Handle(VTKViewer_Filter) GetFilter(int theId, SVTK_Selector* theSelector)
   {
-    return theStyle->GetFilter(theId);
+    return theSelector->GetFilter(theId);
   }
 
-  bool IsFilterPresent(int theId, SVTK_InteractorStyle* theStyle)
+  bool IsFilterPresent(int theId, SVTK_Selector* theSelector)
   {
-    return theStyle->IsFilterPresent(theId);
+    return theSelector->IsFilterPresent(theId);
   }
 
-  void RemoveFilter(int theId, SVTK_InteractorStyle* theStyle)
+  void RemoveFilter(int theId, SVTK_Selector* theSelector)
   {
-    theStyle->RemoveFilter(theId);
+    theSelector->RemoveFilter(theId);
   }
 
-  void RemoveFilters(SVTK_InteractorStyle* theStyle)
+  void RemoveFilters(SVTK_Selector* theSelector)
   {
-    for ( int id = SMESHGUI_NodeFilter; theStyle && id < SMESHGUI_LastFilter; id++ )
-      theStyle->RemoveFilter( id );
+    for ( int id = SMESH::NodeFilter; theSelector && id < SMESH::LastFilter; id++ )
+      theSelector->RemoveFilter( id );
   }
 
   bool IsValid(SALOME_Actor* theActor, int theCellId,
-              SVTK_InteractorStyle* theStyle)
+               SVTK_Selector* theSelector)
   {
-    return theStyle->IsValid(theActor,theCellId);
+    return theSelector->IsValid(theActor,theCellId);
   }
 
 
@@ -534,14 +1083,15 @@ namespace SMESH{
   void SetPointRepresentation(bool theIsVisible){
     if(SVTK_ViewWindow* aViewWindow = GetCurrentVtkView()){
       vtkRenderer *aRenderer = aViewWindow->getRenderer();
-      vtkActorCollection *aCollection = aRenderer->GetActors();
+      VTK::ActorCollectionCopy aCopy(aRenderer->GetActors());
+      vtkActorCollection *aCollection = aCopy.GetActors();
       aCollection->InitTraversal();
       while(vtkActor *anAct = aCollection->GetNextActor()){
-       if(SMESH_Actor *anActor = dynamic_cast<SMESH_Actor*>(anAct)){
-         if(anActor->GetVisibility()){
-           anActor->SetPointRepresentation(theIsVisible);
-         }
-       }
+        if(SMESH_Actor *anActor = dynamic_cast<SMESH_Actor*>(anAct)){
+          if(anActor->GetVisibility()){
+            anActor->SetPointRepresentation(theIsVisible);
+          }
+        }
       }
       RepaintCurrentView();
     }
@@ -552,26 +1102,156 @@ namespace SMESH{
     if(SVTK_ViewWindow* aWnd = GetCurrentVtkView()){
       int anIsAllPickable = (theActor == NULL);
       vtkRenderer *aRenderer = aWnd->getRenderer();
-      vtkActorCollection *aCollection = aRenderer->GetActors();
+      VTK::ActorCollectionCopy aCopy(aRenderer->GetActors());
+      vtkActorCollection *aCollection = aCopy.GetActors();
       aCollection->InitTraversal();
       while(vtkActor *anAct = aCollection->GetNextActor()){
-       if(SALOME_Actor *anActor = dynamic_cast<SALOME_Actor*>(anAct)){
-         if(anActor->GetVisibility()){
-           anActor->SetPickable(anIsAllPickable);
-         }
-       }
+        if(SALOME_Actor *anActor = dynamic_cast<SALOME_Actor*>(anAct)){
+          if(anActor->GetVisibility()){
+            anActor->SetPickable(anIsAllPickable);
+          }
+        }
       }
       if(theActor)
-       theActor->SetPickable(!anIsAllPickable);
+        theActor->SetPickable(!anIsAllPickable);
       RepaintCurrentView();
     }
   }
 
 
   //----------------------------------------------------------------------------
+  int GetNameOfSelectedSortedNodes( SMDSAbs_EntityType theElementType,
+                                    SVTK_Selector* theSelector,
+                                    SMESH_Actor* theActor,
+                                    int theShift,
+                                    QString& theName)
+  {
+    theName = "";
+    TColStd_IndexedMapOfInteger aMapIndex;
+    Handle(SALOME_InteractiveObject) anIO = theActor->getIO();
+    theSelector->GetIndex(anIO, aMapIndex);
+
+    SMDS_Mesh* aMesh = 0;
+    if (theActor)
+      aMesh = theActor->GetObject()->GetMesh();
+
+    std::vector<SMESH_TNodeXYZ> aVectorOfNode;
+    std::list<int> aListOfId;
+    int aSize = aMapIndex.Extent();
+    for( int i = 1 ; i <= aSize; i++) {
+      SMESH_TNodeXYZ aCurNode = aMesh->FindNode( aMapIndex(i) );
+      aVectorOfNode.push_back( aCurNode );
+      aListOfId.push_back( aCurNode._node->GetID() );
+    }
+    SMESH_TNodeXYZ aFirstNode;
+    if ( aSize > 0 )
+      aFirstNode = aVectorOfNode[0];
+    int myNbNodes = 0;
+    std::list<int> aResultListId;
+    switch ( theElementType ) {
+      case SMDSEntity_0D:
+        myNbNodes = 1;
+        break;
+      case SMDSEntity_Ball:
+        myNbNodes = 1;
+        break;
+      case SMDSEntity_Edge:
+      case SMDSEntity_Quad_Edge:
+        myNbNodes = 2;
+        break;
+      case SMDSEntity_Triangle:
+      case SMDSEntity_Quad_Triangle:
+      case SMDSEntity_BiQuad_Triangle:
+        myNbNodes = 3;
+        break;
+      case SMDSEntity_Quadrangle:
+      case SMDSEntity_Quad_Quadrangle:
+      case SMDSEntity_BiQuad_Quadrangle:
+        myNbNodes = 4;
+        if ( myNbNodes <= aSize ) {
+          aVectorOfNode.resize( myNbNodes );
+          aVectorOfNode[0] = aVectorOfNode[theShift % myNbNodes];
+          aVectorOfNode[theShift % myNbNodes] = aFirstNode;
+          GetSortedNodesOnPolygon( aVectorOfNode, aResultListId );
+        }
+        break;
+      case SMDSEntity_Polygon:
+        myNbNodes = 0;
+        if ( aSize > 0 ) {
+          aVectorOfNode[0] = aVectorOfNode[theShift % aVectorOfNode.size()];
+          aVectorOfNode[theShift % aVectorOfNode.size()] = aFirstNode;
+        }
+        GetSortedNodesOnPolygon( aVectorOfNode, aResultListId );
+        break;
+      case SMDSEntity_Tetra:
+      case SMDSEntity_Quad_Tetra:
+        myNbNodes = 4;
+        break;
+      case SMDSEntity_Pyramid:
+      case SMDSEntity_Quad_Pyramid:
+        myNbNodes = 5;
+        if ( myNbNodes <= aSize ) {
+          aVectorOfNode.resize( myNbNodes );
+          aVectorOfNode[0] = aVectorOfNode[theShift % myNbNodes];
+          aVectorOfNode[theShift % myNbNodes] = aFirstNode;
+          GetSortedNodesOnPyramid( aVectorOfNode, aResultListId );
+        }
+        break;
+      case SMDSEntity_Hexa:
+      case SMDSEntity_Quad_Hexa:
+      case SMDSEntity_TriQuad_Hexa:
+        myNbNodes = 8;
+        if ( myNbNodes <= aSize ) {
+          aVectorOfNode.resize( myNbNodes );
+          aVectorOfNode[0] = aVectorOfNode[theShift % myNbNodes];
+          aVectorOfNode[theShift % myNbNodes] = aFirstNode;
+          GetSortedNodesOnPrism( aVectorOfNode, aResultListId );
+        }
+        break;
+      case SMDSEntity_Penta:
+      case SMDSEntity_Quad_Penta:
+        myNbNodes = 6;
+        if ( myNbNodes <= aSize ) {
+          aVectorOfNode.resize( myNbNodes );
+          aVectorOfNode[0] = aVectorOfNode[theShift % myNbNodes];
+          aVectorOfNode[theShift % myNbNodes] = aFirstNode;
+          GetSortedNodesOnPrism( aVectorOfNode, aResultListId );
+        }
+        break;
+      case SMDSEntity_Hexagonal_Prism:
+        myNbNodes = 12;
+        if ( myNbNodes <= aSize ) {
+          aVectorOfNode.resize( myNbNodes );
+          aVectorOfNode[0] = aVectorOfNode[theShift % myNbNodes];
+          aVectorOfNode[theShift % myNbNodes] = aFirstNode;
+          GetSortedNodesOnPrism( aVectorOfNode, aResultListId );
+        }
+        break;
+      default:
+        myNbNodes = 2;
+      }
+    if( myNbNodes > 0 ) {
+      if ( myNbNodes <= 3 || myNbNodes > aSize || theElementType == SMDSEntity_Tetra )
+        aResultListId = aListOfId;
+      if ( myNbNodes < aSize ) {
+        if ( aResultListId.size() == 0 )
+          return 0;
+        aVectorOfNode.resize( myNbNodes );
+        aResultListId.resize( myNbNodes );
+      }
+    }
+    std::list<int>::iterator anIter = aResultListId.begin();
+
+    for( ; anIter != aResultListId.end(); anIter++ ) {
+      theName += QString(" %1").arg( *anIter );
+    }
+    if ( myNbNodes <= 3 || myNbNodes > aSize || theElementType == SMDSEntity_Tetra )
+      return aSize;
+    return aVectorOfNode.size();
+  }
   int GetNameOfSelectedNodes(SVTK_Selector* theSelector,
-                            const Handle(SALOME_InteractiveObject)& theIO,
-                            QString& theName)
+                             const Handle(SALOME_InteractiveObject)& theIO,
+                             QString& theName)
   {
     theName = "";
     TColStd_IndexedMapOfInteger aMapIndex;
@@ -584,8 +1264,8 @@ namespace SMESH{
   }
 
   int GetNameOfSelectedElements(SVTK_Selector* theSelector,
-                               const Handle(SALOME_InteractiveObject)& theIO,
-                               QString& theName)
+                                const Handle(SALOME_InteractiveObject)& theIO,
+                                QString& theName)
   {
     theName = "";
     TColStd_IndexedMapOfInteger aMapIndex;
@@ -597,7 +1277,7 @@ namespace SMESH{
       anIdContainer.insert(aMapIndex(i));
 
     TIdContainer::const_iterator anIter = anIdContainer.begin();
-    for(; anIter != anIdContainer.end(); anIter++)
+    for( ; anIter != anIdContainer.end(); anIter++)
       theName += QString(" %1").arg(*anIter);
 
     return aMapIndex.Extent();
@@ -605,9 +1285,9 @@ namespace SMESH{
 
 
   int GetEdgeNodes(SVTK_Selector* theSelector,
-                  const TVisualObjPtr& theVisualObject,
-                  int& theId1,
-                  int& theId2)
+                   const TVisualObjPtr& theVisualObject,
+                   int& theId1,
+                   int& theId2)
   {
     const SALOME_ListIO& selected = theSelector->StoredIObjects();
 
@@ -627,9 +1307,9 @@ namespace SMESH{
     for ( int i = 1; i <= aMapIndex.Extent(); i++ ) {
       int aVal = aMapIndex( i );
       if ( aVal > 0 )
-       anObjId = aVal;
+        anObjId = aVal;
       else
-       anEdgeNum = abs( aVal ) - 1;
+        anEdgeNum = abs( aVal ) - 1;
     }
 
     if ( anObjId == -1 || anEdgeNum == -1 )
@@ -639,25 +1319,25 @@ namespace SMESH{
   }
 
   //----------------------------------------------------------------------------
-  int GetNameOfSelectedNodes(SalomeApp_SelectionMgr *theMgr,
-                            const Handle(SALOME_InteractiveObject)& theIO,
-                            QString& theName)
+  int GetNameOfSelectedNodes(LightApp_SelectionMgr *theMgr,
+                             const Handle(SALOME_InteractiveObject)& theIO,
+                             QString& theName)
   {
     theName = "";
     if(theIO->hasEntry()){
       if(FindActorByEntry(theIO->getEntry())){
-       TColStd_IndexedMapOfInteger aMapIndex;
-       theMgr->GetIndexes(theIO,aMapIndex);
-       for(int i = 1; i <= aMapIndex.Extent(); i++){
-         theName += QString(" %1").arg(aMapIndex(i));
-       }
-       return aMapIndex.Extent();
+        TColStd_IndexedMapOfInteger aMapIndex;
+        theMgr->GetIndexes(theIO,aMapIndex);
+        for(int i = 1; i <= aMapIndex.Extent(); i++){
+          theName += QString(" %1").arg(aMapIndex(i));
+        }
+        return aMapIndex.Extent();
       }
     }
     return -1;
   }
 
-  int GetNameOfSelectedNodes(SalomeApp_SelectionMgr *theMgr, QString& theName){
+  int GetNameOfSelectedNodes(LightApp_SelectionMgr *theMgr, QString& theName){
     theName = "";
     SALOME_ListIO selected; theMgr->selectedObjects( selected );
     if(selected.Extent() == 1){
@@ -668,31 +1348,31 @@ namespace SMESH{
   }
 
 
-  int GetNameOfSelectedElements(SalomeApp_SelectionMgr *theMgr,
-                               const Handle(SALOME_InteractiveObject)& theIO,
-                               QString& theName)
+  int GetNameOfSelectedElements(LightApp_SelectionMgr *theMgr,
+                                const Handle(SALOME_InteractiveObject)& theIO,
+                                QString& theName)
   {
     theName = "";
     if(theIO->hasEntry()){
       if(FindActorByEntry(theIO->getEntry())){
-       TColStd_IndexedMapOfInteger aMapIndex;
-       theMgr->GetIndexes(theIO,aMapIndex);
-       typedef 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();
+        TColStd_IndexedMapOfInteger aMapIndex;
+        theMgr->GetIndexes(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();
       }
     }
     return -1;
   }
 
 
-  int GetNameOfSelectedElements(SalomeApp_SelectionMgr *theMgr, QString& theName)
+  int GetNameOfSelectedElements(LightApp_SelectionMgr *theMgr, QString& theName)
   {
     theName = "";
     SALOME_ListIO selected; theMgr->selectedObjects( selected );
@@ -704,9 +1384,9 @@ namespace SMESH{
     return -1;
   }
 
-  int GetSelected(SalomeApp_SelectionMgr*      theMgr,
-                 TColStd_IndexedMapOfInteger& theMap,
-                 const bool                   theIsElement)
+  int GetSelected(LightApp_SelectionMgr*       theMgr,
+                  TColStd_IndexedMapOfInteger& theMap,
+                  const bool                   theIsElement)
   {
     theMap.Clear();
     SALOME_ListIO selected; theMgr->selectedObjects( selected );
@@ -715,14 +1395,14 @@ namespace SMESH{
     {
       Handle(SALOME_InteractiveObject) anIO = selected.First();
       if ( anIO->hasEntry() ) {
-       theMgr->GetIndexes( anIO, theMap );
+        theMgr->GetIndexes( anIO, theMap );
       }
     }
     return theMap.Extent();
   }
 
 
-  int GetEdgeNodes( SalomeApp_SelectionMgr* theMgr, int& theId1, int& theId2 )
+  int GetEdgeNodes( LightApp_SelectionMgr* theMgr, int& theId1, int& theId2 )
   {
     SALOME_ListIO selected; theMgr->selectedObjects( selected );
 
@@ -746,9 +1426,9 @@ namespace SMESH{
     for ( int i = 1; i <= aMapIndex.Extent(); i++ ) {
       int aVal = aMapIndex( i );
       if ( aVal > 0 )
-       anObjId = aVal;
+        anObjId = aVal;
       else
-       anEdgeNum = abs( aVal );
+        anEdgeNum = abs( aVal );
     }
 
     if ( anObjId == -1 || anEdgeNum == -1 )
@@ -762,7 +1442,8 @@ namespace SMESH{
     if( SVTK_ViewWindow* aWnd = SMESH::GetCurrentVtkView() )
     {
       vtkRenderer *aRenderer = aWnd->getRenderer();
-      vtkActorCollection *aCollection = aRenderer->GetActors();
+      VTK::ActorCollectionCopy aCopy(aRenderer->GetActors());
+      vtkActorCollection *aCollection = aCopy.GetActors();
       aCollection->InitTraversal();
 
       while ( vtkActor *anAct = aCollection->GetNextActor())
@@ -776,4 +1457,724 @@ namespace SMESH{
 
     }
   }
+
+  //----------------------------------------------------------------------------
+  // internal function
+  void ComputeBoundsParam( double theBounds[6],
+                           double theDirection[3],
+                           double theMinPnt[3],
+                           double& theMaxBoundPrj,
+                           double& theMinBoundPrj )
+  {
+    //Enlarge bounds in order to avoid conflicts of precision
+    for(int i = 0; i < 6; i += 2){
+      static double EPS = 1.0E-3;
+      double aDelta = (theBounds[i+1] - theBounds[i])*EPS;
+      theBounds[i] -= aDelta;
+      theBounds[i+1] += aDelta;
+    }
+
+    double aBoundPoints[8][3] = { {theBounds[0],theBounds[2],theBounds[4]},
+                                                {theBounds[1],theBounds[2],theBounds[4]},
+                                                {theBounds[0],theBounds[3],theBounds[4]},
+                                                {theBounds[1],theBounds[3],theBounds[4]},
+                                                {theBounds[0],theBounds[2],theBounds[5]},
+                                                {theBounds[1],theBounds[2],theBounds[5]}, 
+                                                {theBounds[0],theBounds[3],theBounds[5]}, 
+                                                {theBounds[1],theBounds[3],theBounds[5]}};
+
+    int aMaxId = 0;
+    theMaxBoundPrj = vtkMath::Dot(theDirection,aBoundPoints[aMaxId]);
+    theMinBoundPrj = theMaxBoundPrj;
+    for(int i = 1; i < 8; i++){
+      double aTmp = vtkMath::Dot(theDirection,aBoundPoints[i]);
+      if(theMaxBoundPrj < aTmp){
+        theMaxBoundPrj = aTmp;
+        aMaxId = i;
+      }
+      if(theMinBoundPrj > aTmp){
+        theMinBoundPrj = aTmp;
+      }
+    }
+    double *aMinPnt = aBoundPoints[aMaxId];
+    theMinPnt[0] = aMinPnt[0];
+    theMinPnt[1] = aMinPnt[1];
+    theMinPnt[2] = aMinPnt[2];
+  }
+
+  // internal function
+  void DistanceToPosition( double theBounds[6],
+                           double theDirection[3],
+                           double theDist,
+                           double thePos[3] )
+  {
+    double aMaxBoundPrj, aMinBoundPrj, aMinPnt[3];
+    ComputeBoundsParam(theBounds,theDirection,aMinPnt,aMaxBoundPrj,aMinBoundPrj);
+    double aLength = (aMaxBoundPrj-aMinBoundPrj)*theDist;
+    thePos[0] = aMinPnt[0]-theDirection[0]*aLength;
+    thePos[1] = aMinPnt[1]-theDirection[1]*aLength;
+    thePos[2] = aMinPnt[2]-theDirection[2]*aLength;
+  }
+
+  // internal function (currently unused, left just in case)
+  void PositionToDistance( double theBounds[6],
+                           double theDirection[3],
+                           double thePos[3],
+                           double& theDist )
+  {
+    double aMaxBoundPrj, aMinBoundPrj, aMinPnt[3];
+    ComputeBoundsParam(theBounds,theDirection,aMinPnt,aMaxBoundPrj,aMinBoundPrj);
+    double aPrj = vtkMath::Dot(theDirection,thePos);
+    theDist = (aPrj-aMinBoundPrj)/(aMaxBoundPrj-aMinBoundPrj);
+  }
+
+  bool ComputeClippingPlaneParameters( std::list<vtkActor*> theActorList,
+                                       double theNormal[3],
+                                       double theDist,
+                                       double theBounds[6],
+                                       double theOrigin[3] )
+  {
+    bool anIsOk = false;
+    anIsOk = ComputeBounds( theActorList, theBounds );
+
+
+    if( !anIsOk )
+      return false;
+
+    DistanceToPosition( theBounds, theNormal, theDist, theOrigin );
+    return true;
+  }
+  bool CreatePlaneOnThreePoints( const gp_Pnt& thePoint1,
+                                 const gp_Pnt& thePoint2,
+                                 const gp_Pnt& thePoint3,
+                                 gp_Pln& thePlane )
+  {
+    gp_Vec aVec1, aVec2;
+    aVec1 = gp_Vec( thePoint1, thePoint2 );
+    aVec2 = gp_Vec( thePoint1, thePoint3 );
+    double anAngle = aVec1.Angle( aVec2 );
+    bool isOnStraight = ( anAngle != 0 && anAngle != M_PI );
+    if ( isOnStraight ) {
+      gce_MakePln aMakePln (thePoint1, thePoint2, thePoint3);
+      if ( aMakePln.IsDone() ) {
+        thePlane = aMakePln.Value();
+      }
+    }
+    return isOnStraight;
+  }
+
+  void FindNbLowestPoint( std::list<gp_Pnt2d> theList, gp_Pnt2d& theNode )
+  {
+    std::list<gp_Pnt2d>::iterator anIter = theList.begin();
+    gp_Pnt2d aNode = gp_Pnt2d ( (*anIter).X(), (*anIter).Y());
+    for( ; anIter != theList.end(); anIter++ ) {
+      if ( (*anIter).Y() < aNode.Y() || ( (*anIter).Y() == aNode.Y() && (*anIter).X() < aNode.X() ) )
+        aNode = *anIter;
+    }
+    theNode = aNode;
+  }
+
+  static bool CompareNodeOfAngleAndDist (const TNodeOfAngleAndDist& first, const TNodeOfAngleAndDist& second )
+  {
+    if ( first.second.second == 0 )
+      return true;
+    if ( second.second.second == 0 )
+      return false;
+    if ( first.second.first == 0 && second.second.first == 0 )
+      if ( first.second.second > second.second.second )
+        return false;
+      else
+        return true;
+    if ( first.second.first < second.second.first ||
+       ( first.second.first == second.second.first && first.second.second >= second.second.second ) )
+      return true;
+    return false;
+  }
+
+  static bool CompareNodeOfDist (const TNodeOfAngleAndDist& first, const TNodeOfAngleAndDist& second )
+  {
+    if ( first.second.second < second.second.second )
+      return true;
+    return false;
+  }
+
+  static bool CompareDistOfPlane ( const TNodeOfDistToPlaneAndDist& first, const TNodeOfDistToPlaneAndDist& second )
+  {
+    if ( first.second.first == 0 && second.second.first != 0 )
+      return true;
+    if ( first.second.first != 0 && second.second.first == 0 )
+      return false;
+    if ( first.second.first < second.second.first ||
+       (  first.second.first != 0 && second.second.first != 0 &&
+          first.second.first == second.second.first && first.second.second > second.second.second ) )
+      return true;
+    return false;
+  }
+
+  static bool CompareDistOfPlaneById ( const TIdOfDistToPlaneAndDist& first, const TIdOfDistToPlaneAndDist& second )
+  {
+    if ( first.second.first == 0 && second.second.first != 0 )
+      return true;
+    if ( first.second.first != 0 && second.second.first == 0 )
+      return false;
+    if ( first.second.first < second.second.first ||
+       (  first.second.first != 0 && second.second.first != 0 &&
+          first.second.first == second.second.first && first.second.second > second.second.second ) )
+      return true;
+    return false;
+  }
+
+  static bool CompareDistForCorrectPlane ( const TNodeOfDist& first, const TNodeOfDist& second )
+  {
+    if ( first.second < second.second ) return true;
+    return false;
+  }
+
+  bool IsNotPlaneIntersection( std::vector<SMESH_TNodeXYZ>& theVector, const gp_Pln& thePlane )
+  {
+    double A, B, C, D, aCur;
+    thePlane.Coefficients(A, B, C, D);
+    int aPlus = -1;
+    for ( int i = 0 ; i < (int)theVector.size(); ++i ) {
+      aCur = A * theVector[i]._xyz[0] + B * theVector[i]._xyz[1] + C * theVector[i]._xyz[2] + D;
+      if ( aCur == 0 )
+        continue;
+      if ( aPlus == -1 && aCur != 0 )
+        aPlus = ( aCur < 0 ) ? 0 : 1;
+      if ( aPlus > -1 && aPlus != ( aCur < 0 ) ? 0 : 1 )
+        return false;
+    }
+    return true;
+  }
+
+  bool GetNextCombination ( std::vector<int>& theVector1, std::vector<int>& theVector2, int theNbPoint )
+  {
+   int aSize = (int)theVector1.size();
+   for ( int i = aSize - 1; i >= 0; --i ) {
+     if ( theVector1[i] < theNbPoint - aSize + i ) {
+       ++theVector1[i];
+       for ( int j = i + 1; j < aSize; ++j )
+         theVector1[j] = theVector1[j-1] + 1;
+       int it = 0;
+       int it2 = 0;
+       bool isVec;
+       for ( int k = 0; k < theNbPoint; ++k ) {
+         isVec = false;
+         if( it < aSize ) {
+           if( k == theVector1[it] ) {
+             isVec = true;
+             ++it;
+           }
+         }
+         if ( isVec )
+           continue;
+         theVector2[it2] = k;
+         it2++;
+         if ( it2 == (int)theVector2.size() )
+           break;
+       }
+       return true;
+     }
+   }
+     return false;
+  }
+
+  bool Get2BasePlane( std::vector<SMESH_TNodeXYZ>& theVector,
+                      std::vector<SMESH_TNodeXYZ>& thePlane1,
+                      std::vector<SMESH_TNodeXYZ>& thePlane2 )
+  {
+    int aSize = (int)theVector.size() / 2;
+    if ( aSize < 3 || (int)theVector.size() % 2 != 0 )
+      return false;
+    int anArr1[3];
+    int anArr2[2 * aSize - 3];
+    for (int i = 0; i < 3 ; i++) {
+      anArr1[i] = i;
+    }
+    for (int i = 0; i < 2 * aSize - 3 ; i++) {
+      anArr2[i] = i + 3;
+    }
+    int aNbSwapFirstPoint = 0;
+    while ( thePlane1.empty() && thePlane2.empty() && aNbSwapFirstPoint < aSize * 2 ) {
+      std::vector<int> anIndexPlane1( anArr1, anArr1 + 3 );
+      std::vector<int> anIndexPlane2( anArr2, anArr2 + 2 * aSize - 3);
+      int aNbCombination = 0;
+      double aMax = 0;
+      double aSumMin = -1;
+      int aMaxCombination = 0;
+      thePlane1.clear();
+      thePlane2.clear();
+      for (int i = 1; i < 2 * aSize - 1; i++ ) {
+        aMaxCombination += i;
+      }
+      while ( aNbCombination < aMaxCombination ) {
+        gp_Pln aPlane;
+        double aSumMinDist1 = 0;
+        double aSumMinDist2 = 0;
+        std::vector<SMESH_TNodeXYZ> aVectorOfPoint;
+        for(int i = 0; i < 2 * aSize - 3; i++) {
+          aVectorOfPoint.push_back(theVector[anIndexPlane2[i]]);
+        }
+        bool isCorrectPlane = false;
+        bool isCreatePlane = CreatePlaneOnThreePoints( gp_Pnt(theVector[anIndexPlane1[0]]._xyz[0], theVector[anIndexPlane1[0]]._xyz[1], theVector[anIndexPlane1[0]]._xyz[2]),
+            gp_Pnt(theVector[anIndexPlane1[1]]._xyz[0], theVector[anIndexPlane1[1]]._xyz[1], theVector[anIndexPlane1[1]]._xyz[2]),
+            gp_Pnt(theVector[anIndexPlane1[2]]._xyz[0], theVector[anIndexPlane1[2]]._xyz[1], theVector[anIndexPlane1[2]]._xyz[2]),
+            aPlane );
+        if ( isCreatePlane ) {
+          isCorrectPlane = IsNotPlaneIntersection( aVectorOfPoint, aPlane );
+        }
+        if ( !isCorrectPlane ) {
+          GetNextCombination( anIndexPlane1, anIndexPlane2, 2*aSize );
+          aNbCombination++;
+          continue;
+        }
+        std::vector<int> anIndexCorrectPlane1;
+        std::vector<int> anIndexCorrectPlane2;
+        if ( aSize == 3 ) {
+          for (int i = 0; i < aSize ; i++) {
+            anIndexCorrectPlane1.push_back( anIndexPlane1[i] );
+            anIndexCorrectPlane2.push_back( anIndexPlane2[i] );
+          }
+        }
+        if ( aSize >= 4 ) {
+          std::list<TIdOfDistToPlaneAndDist> aListBaseOfPoint;
+          TIdOfDistToPlaneAndDist aCurDistOfPlane;
+          for (int i = 0; i < 2 * aSize - 3; i++ ) {
+            aCurDistOfPlane.second.first = aPlane.Distance( gp_Pnt( theVector[anIndexPlane2[i]]._xyz[0], theVector[anIndexPlane2[i]]._xyz[1], theVector[anIndexPlane2[i]]._xyz[2] ));
+            if ( aCurDistOfPlane.second.first == 0 )
+              aCurDistOfPlane.second.second = 0;
+            else {
+              double aCurDist = 0;
+              for (int j = 0; j < 3; j++) {
+                aCurDist += pow( theVector[anIndexPlane1[j]]._xyz[0] - theVector[anIndexPlane2[i]]._xyz[0], 2.0 ) +
+                    pow( theVector[anIndexPlane1[j]]._xyz[1] - theVector[anIndexPlane2[i]]._xyz[1], 2.0 ) +
+                    pow( theVector[anIndexPlane1[j]]._xyz[2] - theVector[anIndexPlane2[i]]._xyz[2], 2.0 );
+              }
+              aCurDistOfPlane.second.second = aCurDist;
+            }
+            aCurDistOfPlane.first = anIndexPlane2[i];
+            aListBaseOfPoint.push_back( aCurDistOfPlane );
+          }
+          aListBaseOfPoint.sort( CompareDistOfPlaneById );
+          std::list<TIdOfDistToPlaneAndDist>::iterator anIterDist = aListBaseOfPoint.begin();
+          for (int i = 0; i < 3; i++) {
+            anIndexCorrectPlane1.push_back( anIndexPlane1[i] );
+          }
+          for (int i = 0; i < aSize - 3; i++, anIterDist++) {
+            anIndexCorrectPlane1.push_back((*anIterDist).first);
+          }
+          for (int i = 0; i < 2 * aSize - 3 ; i++) {
+            anIterDist = aListBaseOfPoint.begin();
+            bool isFinded = false;
+            for (int j = 0; j < aSize - 3; j++, anIterDist++) {
+              if ( anIndexPlane2[i] == (*anIterDist).first ) {
+                isFinded = true;
+                break;
+              }
+            }
+            if ( !isFinded )
+              anIndexCorrectPlane2.push_back( anIndexPlane2[i] );
+          }
+        }
+        double aCurDist1, aCurDist2, aMinDist1, aMinDist2, aSumDist1, aSumDist2, aSumDistBase1, aSumDistBase2;
+        bool isCorrect2Base = true;
+        aSumDist1 = aSumDistBase1 = aSumDist2 = aSumDistBase2 = 0;
+        for( int i = 0 ; i < aSize ; i++ ) {
+          aMinDist1 = 0;
+          aMinDist2 = 0;
+          for(int j = 0 ; j < aSize ; j++ ) {
+            aCurDist1 = pow( theVector[anIndexCorrectPlane1[i]]._xyz[0] - theVector[anIndexCorrectPlane2[j]]._xyz[0], 2.0 ) +
+                pow( theVector[anIndexCorrectPlane1[i]]._xyz[1] - theVector[anIndexCorrectPlane2[j]]._xyz[1], 2.0 ) +
+                pow( theVector[anIndexCorrectPlane1[i]]._xyz[2] - theVector[anIndexCorrectPlane2[j]]._xyz[2], 2.0 );
+            aCurDist2 = pow( theVector[anIndexCorrectPlane1[j]]._xyz[0] - theVector[anIndexCorrectPlane2[i]]._xyz[0], 2.0 ) +
+                pow( theVector[anIndexCorrectPlane1[j]]._xyz[1] - theVector[anIndexCorrectPlane2[i]]._xyz[1], 2.0 ) +
+                pow( theVector[anIndexCorrectPlane1[j]]._xyz[2] - theVector[anIndexCorrectPlane2[i]]._xyz[2], 2.0 );
+            aSumDistBase1 += pow( theVector[anIndexCorrectPlane1[i]]._xyz[0] - theVector[anIndexCorrectPlane1[j]]._xyz[0], 2.0 ) +
+                pow( theVector[anIndexCorrectPlane1[i]]._xyz[1] - theVector[anIndexCorrectPlane1[j]]._xyz[1], 2.0 ) +
+                pow( theVector[anIndexCorrectPlane1[i]]._xyz[2] - theVector[anIndexCorrectPlane1[j]]._xyz[2], 2.0 );
+            aSumDistBase2 += pow( theVector[anIndexCorrectPlane2[i]]._xyz[0] - theVector[anIndexCorrectPlane2[j]]._xyz[0], 2.0 ) +
+                pow( theVector[anIndexCorrectPlane2[i]]._xyz[1] - theVector[anIndexCorrectPlane2[j]]._xyz[1], 2.0 ) +
+                pow( theVector[anIndexCorrectPlane2[i]]._xyz[2] - theVector[anIndexCorrectPlane2[j]]._xyz[2], 2.0 );
+            if ( aCurDist1 < aMinDist1 || aMinDist1 == 0)
+              aMinDist1 = aCurDist1;
+            if ( aCurDist2 < aMinDist2 || aMinDist2 == 0)
+              aMinDist2 = aCurDist2;
+            aSumDist1 += aCurDist1;
+            aSumDist2 += aCurDist2;
+          }
+          aSumMinDist1 += aMinDist1;
+          aSumDist1 -= aMinDist1;
+          aSumMinDist2 += aMinDist2;
+          aSumDist2 -= aMinDist2;
+        }
+        isCorrect2Base = ( aSumDistBase1 + aSumDistBase2 <= aSumDist1 + aSumDist2 );
+        if ( isCorrect2Base && ( aSumMinDist1 == aSumMinDist2 || ( aSumMinDist1 + aSumMinDist2 )  > aMax || aMax == 0 ||
+            ( (aSumMinDist1 + aSumMinDist2 ) == aMax && ( (aSumDist1 + aSumDist2 - aSumDistBase1 - aSumDistBase2) < aSumMin || aSumMin == -1 ) ) ) ) {
+          aMax = aSumMinDist1 + aSumMinDist2;
+          aSumMin = aSumDist1 + aSumDist2 - aSumDistBase1 - aSumDistBase2;
+          thePlane1.clear();
+          thePlane2.clear();
+          for(int i = 0; i < aSize; i++) {
+            thePlane1.push_back(theVector[anIndexCorrectPlane1[i]]);
+            thePlane2.push_back(theVector[anIndexCorrectPlane2[i]]);
+          }
+        }
+        if ( aSumMinDist1 == aSumMinDist2 )
+          break;
+        if ( !GetNextCombination( anIndexPlane1, anIndexPlane2, 2 * aSize) )
+          break;
+        aNbCombination++;
+      }
+      if ( thePlane1.empty() && thePlane2.empty() ) {
+        aNbSwapFirstPoint++;
+        SMESH_TNodeXYZ aPoint;
+        aPoint = theVector[0];
+        theVector[0] = theVector[aNbSwapFirstPoint];
+        theVector[aNbSwapFirstPoint] = aPoint;
+      }
+    }
+    if ( thePlane1.empty() && thePlane2.empty() )
+      return false;
+    return true;
+  }
+
+  bool GetCorrectSequenceOfId( std::vector<SMESH_TNodeXYZ>& theVector )
+  {
+    std::list<gp_Pnt2d> aListProjection;
+    gp_Pnt2d aCurPoint;
+    int aSize = (int)theVector.size();
+    if ( aSize < 3 )
+      return false;
+    gp_Pln aPlane;
+    bool isCreatePlane = false;
+    for (int i = 0; i < aSize - 1; i++ ) {
+      isCreatePlane = CreatePlaneOnThreePoints( gp_Pnt( theVector[i]._xyz[0], theVector[i]._xyz[1], theVector[i]._xyz[2] ),
+                                                gp_Pnt( theVector[i+1]._xyz[0], theVector[i+1]._xyz[1], theVector[i+1]._xyz[2] ),
+                                                gp_Pnt( theVector[i+2]._xyz[0], theVector[i+2]._xyz[1], theVector[i+2]._xyz[2] ), aPlane );
+      if ( isCreatePlane)
+        break;
+    }
+    if ( !isCreatePlane )
+      return false;
+    for ( int i = 0; i < aSize; i++) {
+      aCurPoint = ProjLib::Project( aPlane, gp_Pnt( theVector[i]._xyz[0], theVector[i]._xyz[1], theVector[i]._xyz[2] ));
+      aListProjection.push_back( aCurPoint );
+    }
+    std::list<TNodeOfAngleAndDist> aListIdOfAngleAndDist;
+    TNodeOfAngleAndDist aCurIdOfAngleAndDist;
+    FindNbLowestPoint( aListProjection, aCurPoint);
+    std::list<gp_Pnt2d>::iterator anIter2d = aListProjection.begin();
+    gp_Vec2d aCurVec;
+    gp_Vec2d aAxisVec = gp_Vec2d( 1, 0 );
+    for( int i = 0 ; anIter2d != aListProjection.end(); anIter2d++, i++) {
+      aCurVec = gp_Vec2d( (*anIter2d).X() - aCurPoint.X(), (*anIter2d).Y() - aCurPoint.Y() );
+      aCurIdOfAngleAndDist.first = theVector[i];
+      if ( (*anIter2d).X() == aCurPoint.X() && (*anIter2d).Y() == aCurPoint.Y() )
+        aCurIdOfAngleAndDist.second.first = 0;
+      else {
+        double anAngle = aAxisVec.Angle( aCurVec );
+        double anRoundAngle = anAngle * 100000;
+        int anIntAngle = anRoundAngle + 0.5;
+        anRoundAngle = (double) anIntAngle / 100000;
+        aCurIdOfAngleAndDist.second.first = anRoundAngle;
+      }
+      aCurIdOfAngleAndDist.second.second = pow( (*anIter2d).X() - aCurPoint.X(), 2.0 ) +
+                                           pow( (*anIter2d).Y() - aCurPoint.Y(), 2.0 ) +
+                                           pow( aPlane.Distance( gp_Pnt( theVector[i]._xyz[0], theVector[i]._xyz[1], theVector[i]._xyz[2] )), 2.0 );
+      aListIdOfAngleAndDist.push_back( aCurIdOfAngleAndDist );
+    }
+    aListIdOfAngleAndDist.sort( CompareNodeOfAngleAndDist );
+    std::list<TNodeOfAngleAndDist>::iterator anIter = aListIdOfAngleAndDist.begin();
+    std::list<TNodeOfAngleAndDist> aListResult;
+    double anAngle = 0;
+    bool isSort = true;
+    for(int i = 0 ; anIter != aListIdOfAngleAndDist.end(); anIter++, i++) {
+      if ( anAngle == (*anIter).second.first && anAngle != 0 ) {
+        isSort = false;
+        break;
+      }
+      if ( ( anAngle > (*anIter).second.first && anAngle != 0 ) || i > 1)
+        break;
+      if ( (*anIter).second.first > 0 )
+        anAngle = (*anIter).second.first;
+    }
+    if ( !isSort ) {
+      anIter = aListIdOfAngleAndDist.begin();
+      for( ; anIter != aListIdOfAngleAndDist.end(); anIter++) {
+        if ( anAngle == (*anIter).second.first)
+          aListResult.push_back( *anIter );
+        else if ( anAngle < (*anIter).second.first)
+          break;
+      }
+    }
+    else
+      anAngle = 0;
+    aListResult.sort(CompareNodeOfDist);
+    anIter = aListIdOfAngleAndDist.begin();
+    theVector.clear();
+    for( ; anIter != aListIdOfAngleAndDist.end(); anIter++) {
+      if ( !isSort && anAngle == (*anIter).second.first ){
+        for( std::list<TNodeOfAngleAndDist>::iterator anIter2 = aListResult.begin() ; anIter2 != aListResult.end(); anIter2++) {
+          theVector.push_back((*anIter2).first);
+        }
+        isSort = true;
+      }
+      if ( isSort && anAngle != 0 && anAngle == (*anIter).second.first )
+        continue;
+      theVector.push_back((*anIter).first);
+    }
+
+    return true;
 }
+
+  void GetCorrectSequenceTwoPlaneOfId( std::vector<SMESH_TNodeXYZ>& thePlane1, std::vector<SMESH_TNodeXYZ>& thePlane2, std::list<int>& theResultListId )
+  {
+    int anIndex1, anIndex2, aShift = 0;
+    double aCurSum;
+    std::pair<int, double> aShiftOfDist;
+    int aSize = (int)thePlane1.size();
+    aShiftOfDist.first = aShiftOfDist.second = 0;
+    int anArr1[3];
+    int anArr2[aSize - 3];
+    for (int i = 0; i < 3 ; i++) {
+      anArr1[i] = i;
+    }
+    for (int i = 0; i < aSize - 3 ; i++) {
+      anArr2[i] = i + 3;
+    }
+    std::vector<int> anIndexPlane1( anArr1, anArr1 + 3 );
+    std::vector<int> anIndexPlane2( anArr2, anArr2 + aSize - 3);
+    std::vector<int> anIndexCorrectPlane;
+    std::vector<SMESH_TNodeXYZ> theNewPlane;
+    std::vector<SMESH_TNodeXYZ> theCorrectPlane;
+
+    GetCorrectSequenceOfId ( thePlane1 );
+
+    while( true ) {
+      anIndexCorrectPlane.clear();
+      std::vector<SMESH_TNodeXYZ> theNewPlane;
+      for (int i = 0; i < 3; i++) {
+        anIndexCorrectPlane.push_back( anIndexPlane1[i] );
+      }
+      for (int i = 0; i < aSize - 3; i++) {
+        anIndexCorrectPlane.push_back( anIndexPlane2[i] );
+      }
+      for (int i = 0; i < aSize; i++) {
+        theNewPlane.push_back( thePlane2[anIndexCorrectPlane[i]] );
+      }
+      aShift = 0;
+      if ( GetCorrectSequenceOfId ( theNewPlane ) )
+      {
+        std::vector<double> aVectorSum;
+        while ( aShift != 2 * aSize ) {
+          anIndex1 = 0;
+          aCurSum = 0;
+          ( aShift < aSize ) ? anIndex2 = 0 : anIndex2 = aSize - 1;
+          while ( ( aShift < aSize && anIndex2 < aSize ) || ( aShift >= aSize && anIndex2 >= 0 ) ) {
+            aCurSum += pow( thePlane1[anIndex1]._xyz[0] - theNewPlane[ ( anIndex2 + aShift ) % aSize ]._xyz[0], 2.0 ) +
+                       pow( thePlane1[anIndex1]._xyz[1] - theNewPlane[ ( anIndex2 + aShift ) % aSize ]._xyz[1], 2.0 ) +
+                       pow( thePlane1[anIndex1]._xyz[2] - theNewPlane[ ( anIndex2 + aShift ) % aSize ]._xyz[2], 2.0 );
+            ( aShift < aSize ) ? anIndex2++ : anIndex2--;
+            anIndex1++;
+          }
+          aVectorSum.push_back( aCurSum );
+          aShift++;
+        }
+        double aCurSumMin = 0;
+        std::pair<int, double> aCurShiftOfDist;
+        aCurShiftOfDist.first = aCurShiftOfDist.second = 0;
+        for ( int i = 0; i < (int)aVectorSum.size(); i++ ) {
+          if ( aVectorSum[i] < aCurShiftOfDist.second || aCurShiftOfDist.second == 0 ) {
+            aCurShiftOfDist.first = i;
+            aCurShiftOfDist.second = aVectorSum[i];
+          }
+        }
+        if ( aCurShiftOfDist.second <= aShiftOfDist.second || aShiftOfDist.second == 0){
+          aShiftOfDist = aCurShiftOfDist;
+          theCorrectPlane = theNewPlane;
+        }
+      }
+      if ( !GetNextCombination( anIndexPlane1, anIndexPlane2, aSize) )
+        break;
+    }
+    thePlane2 = theCorrectPlane;
+    aShift = aShiftOfDist.first;
+    anIndex1 = 0;
+    theResultListId.clear();
+    ( aShift < aSize ) ? anIndex2 = 0 : anIndex2 = aSize - 1;
+    while ( anIndex1 != aSize ) {
+      theResultListId.push_back(thePlane1[anIndex1]._node->GetID());
+      anIndex1++;
+    }
+    while ( ( aShift < aSize && anIndex2 < aSize ) || ( aShift >= aSize && anIndex2 >= 0 ) ) {
+      theResultListId.push_back( thePlane2[( anIndex2 + aShift ) % aSize]._node->GetID() );
+      ( aShift < aSize ) ? anIndex2++ : anIndex2--;
+    }
+  }
+
+  void GetSortedNodesOnPolygon( std::vector<SMESH_TNodeXYZ>& theVectorOfNode, std::list<int>& theResultListId )
+  {
+    GetCorrectSequenceOfId ( theVectorOfNode );
+    for (int i = 0; i < theVectorOfNode.size(); i++) {
+      theResultListId.push_back( theVectorOfNode[i]._node->GetID() );
+    }
+  }
+
+  void GetSortedNodesOnPrism( std::vector<SMESH_TNodeXYZ>& theVectorOfNode, std::list<int>& theResultListId )
+  {
+    int aSize = (int)theVectorOfNode.size();
+    if ( aSize < 6 && aSize % 2 == 0)
+      return;
+    std::vector<SMESH_TNodeXYZ> aPlane1, aPlane2;
+    if ( Get2BasePlane( theVectorOfNode, aPlane1, aPlane2 ) ) {
+      GetCorrectSequenceTwoPlaneOfId( aPlane1, aPlane2, theResultListId);
+    }
+  }
+
+  void GetSortedNodesOnPyramid( std::vector<SMESH_TNodeXYZ>& theVectorOfNode, std::list<int>& theResultListId )
+  {
+    int aSize = (int)theVectorOfNode.size();
+    if ( aSize < 5 )
+      return;
+    gp_Pln aPlane;
+    bool isCreatePlane, isCorrectPlane;
+    int aNumPlane = 0;
+    double aMax = 0;
+    while ( aNumPlane != aSize ) {
+      isCreatePlane = CreatePlaneOnThreePoints( gp_Pnt( theVectorOfNode[aNumPlane]._xyz[0], theVectorOfNode[aNumPlane]._xyz[1], theVectorOfNode[aNumPlane]._xyz[2] ),
+                                                gp_Pnt( theVectorOfNode[(aNumPlane + 1) % aSize]._xyz[0], theVectorOfNode[(aNumPlane + 1) % aSize]._xyz[1], theVectorOfNode[(aNumPlane + 1) % aSize]._xyz[2] ),
+                                                gp_Pnt( theVectorOfNode[(aNumPlane + 2) % aSize]._xyz[0], theVectorOfNode[(aNumPlane + 2) % aSize]._xyz[1], theVectorOfNode[(aNumPlane + 2) % aSize]._xyz[2] ), aPlane );
+      isCorrectPlane = false;
+      std::vector<SMESH_TNodeXYZ> aVectorOfPoint;
+      if ( isCreatePlane ) {
+        for(int j = 0; j < aSize - 3; j++) {
+          aVectorOfPoint.push_back(theVectorOfNode[(aNumPlane + j + 3) % aSize]);
+        }
+        isCorrectPlane = IsNotPlaneIntersection( aVectorOfPoint, aPlane );
+      }
+      if ( !isCorrectPlane ) {
+       aNumPlane++;
+       continue;
+      }
+      std::vector<SMESH_TNodeXYZ> aVectorBaseOfPoint;
+      std::list<TNodeOfDistToPlaneAndDist> aListBaseOfPoint;
+      TNodeOfDistToPlaneAndDist aCurDistOfPlane;
+      aListBaseOfPoint.clear();
+      for (int i = 0; i < aSize; i++ ) {
+        aCurDistOfPlane.second.first = aPlane.Distance( gp_Pnt( theVectorOfNode[i]._xyz[0], theVectorOfNode[i]._xyz[1], theVectorOfNode[i]._xyz[2] ));
+        if ( aCurDistOfPlane.second.first == 0 )
+          aCurDistOfPlane.second.second = 0;
+        else {
+          double aCurDist = 0;
+          for (int j = 0; j < 3; j++) {
+            aCurDist += pow( theVectorOfNode[(aNumPlane + j) % aSize]._xyz[0] - theVectorOfNode[i]._xyz[0], 2.0 ) +
+                        pow( theVectorOfNode[(aNumPlane + j) % aSize]._xyz[1] - theVectorOfNode[i]._xyz[1], 2.0 ) +
+                        pow( theVectorOfNode[(aNumPlane + j) % aSize]._xyz[2] - theVectorOfNode[i]._xyz[2], 2.0 );
+          }
+          aCurDistOfPlane.second.second = aCurDist;
+        }
+        aCurDistOfPlane.first = theVectorOfNode[i];
+        aListBaseOfPoint.push_back( aCurDistOfPlane );
+      }
+      aListBaseOfPoint.sort( CompareDistOfPlane );
+      std::list<TNodeOfDistToPlaneAndDist>::iterator anIterDist = aListBaseOfPoint.begin();
+      for (; anIterDist != aListBaseOfPoint.end(); anIterDist++ ) {
+        aVectorBaseOfPoint.push_back((*anIterDist).first);
+      }
+      SMESH_TNodeXYZ aTopNode = aVectorBaseOfPoint.back();
+      aVectorBaseOfPoint.resize( aVectorBaseOfPoint.size() - 1);
+      double aCur = 0;
+      double aSum = 0;
+      std::list<TNodeOfDist> aListBaseCorrect;
+      for (int i = 0; i < aSize - 1; i++) {
+        aCur =  pow( aVectorBaseOfPoint[i]._xyz[0] - aTopNode._xyz[0], 2.0 ) +
+                pow( aVectorBaseOfPoint[i]._xyz[1] - aTopNode._xyz[1], 2.0 ) +
+                pow( aVectorBaseOfPoint[i]._xyz[2] - aTopNode._xyz[2], 2.0 );
+        aListBaseCorrect.push_back(std::make_pair(aVectorBaseOfPoint[i], aCur) );
+      }
+      bool isCorrectTop = true;
+      for (int i = 0; i < aSize - 1; i++) {
+        isCreatePlane = CreatePlaneOnThreePoints( gp_Pnt( aVectorBaseOfPoint[i]._xyz[0], aVectorBaseOfPoint[i]._xyz[1], aVectorBaseOfPoint[i]._xyz[2] ),
+                                                  gp_Pnt( aVectorBaseOfPoint[(i+1) % (aSize - 1)]._xyz[0], aVectorBaseOfPoint[(i+1) % (aSize - 1)]._xyz[1], aVectorBaseOfPoint[(i+1) % (aSize - 1)]._xyz[2] ),
+                                                  gp_Pnt( aVectorBaseOfPoint[(i+2) % (aSize - 1)]._xyz[0], aVectorBaseOfPoint[(i+2) % (aSize - 1)]._xyz[1], aVectorBaseOfPoint[(i+2) % (aSize - 1)]._xyz[2] ), aPlane );
+        if ( isCreatePlane ) {
+          aCur = aPlane.Distance( gp_Pnt( aTopNode._xyz[0], aTopNode._xyz[1], aTopNode._xyz[2] ));
+          if ( aCur == 0 ) {
+            isCorrectTop = false;
+            continue;
+          }
+          aSum += aCur;
+        }
+      }
+      aNumPlane++;
+      if ( ( isCorrectTop || aSum == 0 ) && ( aMax == 0 || aSum > aMax ) ) {
+        aListBaseCorrect.sort(CompareDistForCorrectPlane);
+        aVectorBaseOfPoint.clear();
+        std::list<TNodeOfDist>::iterator anIter = aListBaseCorrect.begin();
+        for ( ; anIter != aListBaseCorrect.end(); anIter++) {
+          aVectorBaseOfPoint.push_back((*anIter).first);
+        }
+        GetCorrectSequenceOfId( aVectorBaseOfPoint );
+        aMax = aSum;
+        theResultListId.clear();
+        for (int i = 0; i < aVectorBaseOfPoint.size(); i++) {
+          theResultListId.push_back( aVectorBaseOfPoint[i]._node->GetID() );
+        }
+        theResultListId.push_back( aTopNode._node->GetID() );
+        if ( aSum == 0 )
+          break;
+      }
+    }
+  }
+  bool ComputeBounds( std::list<vtkActor*> theActorList,
+      double theBounds[6])
+  {
+    bool anIsOk = false;
+    theBounds[0] = theBounds[2] = theBounds[4] = VTK_DOUBLE_MAX;
+    theBounds[1] = theBounds[3] = theBounds[5] = -VTK_DOUBLE_MAX;
+    std::list<vtkActor*>::iterator anIter = theActorList.begin();
+    for( ; anIter != theActorList.end(); anIter++ ) {
+      if( vtkActor* aVTKActor = *anIter ) {
+        if( SMESH_Actor* anActor = SMESH_Actor::SafeDownCast( aVTKActor ) ) {
+          double aBounds[6];
+          anActor->GetUnstructuredGrid()->GetBounds( aBounds );
+          theBounds[0] = std::min( theBounds[0], aBounds[0] );
+          theBounds[1] = std::max( theBounds[1], aBounds[1] );
+          theBounds[2] = std::min( theBounds[2], aBounds[2] );
+          theBounds[3] = std::max( theBounds[3], aBounds[3] );
+          theBounds[4] = std::min( theBounds[4], aBounds[4] );
+          theBounds[5] = std::max( theBounds[5], aBounds[5] );
+          anIsOk = true;
+        }
+      }
+    }
+    return anIsOk;
+  }
+
+#ifndef DISABLE_PLOT2DVIEWER
+  //================================================================================
+  /*!
+   * \brief Find all SMESH_Actor's in the View Window.
+   * If actor constains Plot2d_Histogram object remove it from each Plot2d Viewer.
+   */
+  //================================================================================
+
+  void ClearPlot2Viewers( SUIT_ViewWindow* theWindow ) {
+    if(SVTK_ViewWindow* aViewWindow = GetVtkViewWindow(theWindow)){
+      vtkRenderer *aRenderer = aViewWindow->getRenderer();
+      VTK::ActorCollectionCopy aCopy(aRenderer->GetActors());
+      vtkActorCollection *aCollection = aCopy.GetActors();
+      aCollection->InitTraversal();
+      while(vtkActor *anAct = aCollection->GetNextActor()){
+        if(SMESH_Actor *anActor = dynamic_cast<SMESH_Actor*>(anAct)){
+          if(anActor->hasIO() && anActor->GetPlot2Histogram() ){
+            ProcessIn2DViewers(anActor,RemoveFrom2dViewer);
+          }
+        }
+      }
+    }
+  }
+  
+#endif
+
+} // end of namespace SMESH